Module Name: src
Committed By: snj
Date: Fri May 15 04:12:07 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic [netbsd-7]: amlogic_genfb.c
src/sys/arch/arm/arm [netbsd-7]: disassem.c
src/sys/arch/arm/omap [netbsd-7]: am335x_cm_padconf.c sitara_cm.h
src/sys/dev/ic [netbsd-7]: i82557var.h rtl8169.c
src/sys/dev/ieee1394 [netbsd-7]: fwcrom.c
src/sys/external/bsd/dwc2 [netbsd-7]: dwc2.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #772):
sys/arch/arm/amlogic/amlogic_genfb.c: revision 1.4
sys/arch/arm/arm/disassem.c: revision 1.25
sys/arch/arm/omap/am335x_cm_padconf.c: revision 1.3
sys/arch/arm/omap/sitara_cm.h: revision 1.2
sys/dev/ic/i82557var.h: revision 1.51
sys/dev/ic/rtl8169.c: revision 1.143
sys/dev/ieee1394/fwcrom.c: revision 1.17
sys/external/bsd/dwc2/dwc2.c: revision 1.32
dwc2_hubd appears to be unused so #if 0 it in order to appease clang
--
Preserve const.
--
No reason not to make the string const.
--
Drop unnecessary-but-harmful casts.
--
Replace void * cast with proper __UNVOLATILE.
--
Preserve const.
--
amlogic_genfb_hdmi_write_4 is currently unused, mark it as such.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/arm/amlogic/amlogic_genfb.c
cvs rdiff -u -r1.24.4.2 -r1.24.4.3 src/sys/arch/arm/arm/disassem.c
cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/arch/arm/omap/am335x_cm_padconf.c
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/arm/omap/sitara_cm.h
cvs rdiff -u -r1.50 -r1.50.22.1 src/sys/dev/ic/i82557var.h
cvs rdiff -u -r1.140.2.1 -r1.140.2.2 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/sys/dev/ieee1394/fwcrom.c
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/external/bsd/dwc2/dwc2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/amlogic_genfb.c
diff -u src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.4 src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.5
--- src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.4 Mon Apr 6 01:48:25 2015
+++ src/sys/arch/arm/amlogic/amlogic_genfb.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $ */
+/* $NetBSD: amlogic_genfb.c,v 1.1.2.5 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_genfb.c,v 1.1.2.5 2015/05/15 04:12:07 snj Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -137,7 +137,7 @@ amlogic_genfb_hdmi_read_4(struct amlogic
return bus_space_read_4(sc->sc_bst, sc->sc_hdmi_bsh, HDMI_DATA_REG);
}
-static inline void
+static __unused inline void
amlogic_genfb_hdmi_write_4(struct amlogic_genfb_softc *sc, uint32_t addr,
uint32_t data)
{
Index: src/sys/arch/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.24.4.2 src/sys/arch/arm/arm/disassem.c:1.24.4.3
--- src/sys/arch/arm/arm/disassem.c:1.24.4.2 Sun Jan 4 11:43:53 2015
+++ src/sys/arch/arm/arm/disassem.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.24.4.2 2015/01/04 11:43:53 martin Exp $ */
+/* $NetBSD: disassem.c,v 1.24.4.3 2015/05/15 04:12:07 snj Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.24.4.2 2015/01/04 11:43:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.24.4.3 2015/05/15 04:12:07 snj Exp $");
#include <sys/systm.h>
@@ -321,7 +321,7 @@ static void disassemble_printaddr(u_int
vaddr_t
disasm(const disasm_interface_t *di, vaddr_t loc, int altfmt)
{
- struct arm32_insn *i_ptr = (struct arm32_insn *)&arm32_i;
+ const struct arm32_insn *i_ptr = (const struct arm32_insn *)&arm32_i;
u_int insn;
int matchp;
Index: src/sys/arch/arm/omap/am335x_cm_padconf.c
diff -u src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2.14.1
--- src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 Mon May 6 18:53:40 2013
+++ src/sys/arch/arm/omap/am335x_cm_padconf.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $ */
+/* $NetBSD: am335x_cm_padconf.c,v 1.2.14.1 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2012 Damjan Marion <[email protected]>
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am335x_cm_padconf.c,v 1.2.14.1 2015/05/15 04:12:07 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,8 +295,8 @@ const struct sitara_cm_padconf ti_padcon
const struct sitara_cm_device sitara_cm_dev = {
.padconf_muxmode_mask = 0x7,
.padconf_sate_mask = 0x78,
- .padstate = (struct sitara_cm_padstate *) &ti_padstate_devmap,
- .padconf = (struct sitara_cm_padconf *) &ti_padconf_devmap,
+ .padstate = ti_padstate_devmap,
+ .padconf = ti_padconf_devmap,
};
int
Index: src/sys/arch/arm/omap/sitara_cm.h
diff -u src/sys/arch/arm/omap/sitara_cm.h:1.1 src/sys/arch/arm/omap/sitara_cm.h:1.1.14.1
--- src/sys/arch/arm/omap/sitara_cm.h:1.1 Wed Apr 17 14:31:02 2013
+++ src/sys/arch/arm/omap/sitara_cm.h Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sitara_cm.h,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */
+/* $NetBSD: sitara_cm.h,v 1.1.14.1 2015/05/15 04:12:07 snj Exp $ */
/*
* Copyright (c) 2010
* Ben Gray <[email protected]>.
@@ -59,8 +59,8 @@ struct sitara_cm_padstate {
struct sitara_cm_device {
uint16_t padconf_muxmode_mask;
uint16_t padconf_sate_mask;
- struct sitara_cm_padstate *padstate;
- struct sitara_cm_padconf *padconf;
+ const struct sitara_cm_padstate *padstate;
+ const struct sitara_cm_padconf *padconf;
};
int sitara_cm_padconf_set(const char *padname, const char *muxmode,
Index: src/sys/dev/ic/i82557var.h
diff -u src/sys/dev/ic/i82557var.h:1.50 src/sys/dev/ic/i82557var.h:1.50.22.1
--- src/sys/dev/ic/i82557var.h:1.50 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/i82557var.h Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557var.h,v 1.50 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: i82557var.h,v 1.50.22.1 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -323,8 +323,8 @@ do { \
/* NOTE: the RFA is misaligned, so we must copy. */ \
/* BIG_ENDIAN: no need to swap to store 0xffffffff */ \
__v = 0xffffffff; \
- memcpy((void *)&__rfa->link_addr, &__v, sizeof(__v)); \
- memcpy((void *)&__rfa->rbd_addr, &__v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(&__rfa->link_addr), &__v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(&__rfa->rbd_addr), &__v, sizeof(__v)); \
\
FXP_RFASYNC((sc), (m), \
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \
@@ -337,7 +337,7 @@ do { \
RFA_ALIGNMENT_FUDGE); \
FXP_RFASYNC((sc), __p_m, \
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); \
- memcpy((void *)&__p_rfa->link_addr, &__v, \
+ memcpy(__UNVOLATILE(&__p_rfa->link_addr), &__v, \
sizeof(__v)); \
__p_rfa->rfa_control &= htole16(~(FXP_RFA_CONTROL_EL| \
FXP_RFA_CONTROL_S)); \
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.140.2.1 src/sys/dev/ic/rtl8169.c:1.140.2.2
--- src/sys/dev/ic/rtl8169.c:1.140.2.1 Sun Dec 14 16:44:04 2014
+++ src/sys/dev/ic/rtl8169.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.140.2.1 2014/12/14 16:44:04 martin Exp $ */
+/* $NetBSD: rtl8169.c,v 1.140.2.2 2015/05/15 04:12:07 snj Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.140.2.1 2014/12/14 16:44:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.140.2.2 2015/05/15 04:12:07 snj Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -454,8 +454,8 @@ re_diag(struct rtk_softc *sc)
/* Put some data in the mbuf */
eh = mtod(m0, struct ether_header *);
- memcpy(eh->ether_dhost, (char *)&dst, ETHER_ADDR_LEN);
- memcpy(eh->ether_shost, (char *)&src, ETHER_ADDR_LEN);
+ memcpy(eh->ether_dhost, &dst, ETHER_ADDR_LEN);
+ memcpy(eh->ether_shost, &src, ETHER_ADDR_LEN);
eh->ether_type = htons(ETHERTYPE_IP);
m0->m_pkthdr.len = m0->m_len = ETHER_MIN_LEN - ETHER_CRC_LEN;
@@ -517,8 +517,8 @@ re_diag(struct rtk_softc *sc)
/* Test that the received packet data matches what we sent. */
- if (memcmp((char *)&eh->ether_dhost, (char *)&dst, ETHER_ADDR_LEN) ||
- memcmp((char *)&eh->ether_shost, (char *)&src, ETHER_ADDR_LEN) ||
+ if (memcmp(&eh->ether_dhost, &dst, ETHER_ADDR_LEN) ||
+ memcmp(&eh->ether_shost, &src, ETHER_ADDR_LEN) ||
ntohs(eh->ether_type) != ETHERTYPE_IP) {
aprint_error_dev(sc->sc_dev, "WARNING, DMA FAILURE!\n"
"expected TX data: %s/%s/0x%x\n"
Index: src/sys/dev/ieee1394/fwcrom.c
diff -u src/sys/dev/ieee1394/fwcrom.c:1.14.4.1 src/sys/dev/ieee1394/fwcrom.c:1.14.4.2
--- src/sys/dev/ieee1394/fwcrom.c:1.14.4.1 Thu Oct 30 12:04:46 2014
+++ src/sys/dev/ieee1394/fwcrom.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fwcrom.c,v 1.14.4.1 2014/10/30 12:04:46 martin Exp $ */
+/* $NetBSD: fwcrom.c,v 1.14.4.2 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.14.4.1 2014/10/30 12:04:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.14.4.2 2015/05/15 04:12:07 snj Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -172,7 +172,7 @@ crom_parse_text(struct crom_context *cc,
struct csrtext *textleaf;
uint32_t *bp;
int i, qlen;
- static char *nullstr = (char *)&"(null)";
+ static const char nullstr[] = "(null)";
if (cc->depth < 0)
return;
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.31 src/sys/external/bsd/dwc2/dwc2.c:1.31.2.1
--- src/sys/external/bsd/dwc2/dwc2.c:1.31 Tue Aug 5 10:33:46 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.31.2.1 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31.2.1 2015/05/15 04:12:07 snj Exp $");
#include "opt_usb.h"
@@ -667,6 +667,8 @@ Static const struct dwc2_config_desc dwc
};
#define HSETW(ptr, val) ptr = { (uint8_t)(val), (uint8_t)((val) >> 8) }
+#if 0
+/* appears to be unused */
Static const usb_hub_descriptor_t dwc2_hubd = {
.bDescLength = USB_HUB_DESCRIPTOR_SIZE,
.bDescriptorType = UDESC_HUB,
@@ -676,6 +678,7 @@ Static const usb_hub_descriptor_t dwc2_h
.bHubContrCurrent = 0,
.DeviceRemovable = {0}, /* port is removable */
};
+#endif
Static usbd_status
dwc2_root_ctrl_transfer(usbd_xfer_handle xfer)
