Module Name: src
Committed By: snj
Date: Sun Mar 15 22:59:39 UTC 2015
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_eth.c awin_gige.c
awin_gpio.c awin_usb.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #595):
sys/arch/arm/allwinner/awin_eth.c: revision 1.8
sys/arch/arm/allwinner/awin_gige.c: revision 1.22
sys/arch/arm/allwinner/awin_gpio.c: revision 1.17
sys/arch/arm/allwinner/awin_usb.c: revision 1.20
sprinkle __diagused to fix "no options DIAGNOSTIC" build
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/arm/allwinner/awin_eth.c
cvs rdiff -u -r1.4.10.2 -r1.4.10.3 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.8.10.4 -r1.8.10.5 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/arch/arm/allwinner/awin_usb.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/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.1 src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.2
--- src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_eth.c Sun Mar 15 22:59:39 2015
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.5.2.1 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.5.2.2 2015/03/15 22:59:39 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -141,10 +141,8 @@ awin_eth_clear_set(struct awin_eth_softc
static int
awin_eth_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
-#ifdef DIAGNOSTIC
- const struct awin_locators * const loc = &aio->aio_loc;
-#endif
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
const struct awin_gpio_pinset * const pinset =
&awin_eth_pinsets[cf->cf_flags & 1];
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.2 src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.3
--- src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.2 Tue Nov 25 08:03:06 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Sun Mar 15 22:59:39 2015
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.2 2014/11/25 08:03:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.3 2015/03/15 22:59:39 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -76,13 +76,11 @@ CFATTACH_DECL_NEW(awin_gige, sizeof(stru
static int
awin_gige_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
const struct awin_gpio_pinset *pinset =
awin_chip_id() == AWIN_CHIP_ID_A31 ?
&awin_gige_gpio_pinset_a31 : &awin_gige_gpio_pinset;
-#ifdef DIAGNOSTIC
- const struct awin_locators * const loc = &aio->aio_loc;
-#endif
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
if (cf->cf_flags & 1)
return 0;
Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.4 src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.5
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.4 Tue Nov 25 08:03:06 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c Sun Mar 15 22:59:39 2015
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.4 2014/11/25 08:03:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.5 2015/03/15 22:59:39 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -243,8 +243,8 @@ CFATTACH_DECL_NEW(awin_gpio, sizeof(stru
static int
awin_gpio_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
- const struct awin_locators * const loc = &aio->aio_loc;
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
KASSERT(!strcmp(cf->cf_name, loc->loc_name));
KASSERT(loc->loc_port == AWINIOCF_PORT_DEFAULT);
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.2 src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.3
--- src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.2 Thu Nov 20 10:05:06 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Sun Mar 15 22:59:39 2015
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.2 2014/11/20 10:05:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.3 2015/03/15 22:59:39 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -354,8 +354,8 @@ static const uint32_t awinusb_usb_ahb_re
int
awinusb_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
- const struct awin_locators * const loc = &aio->aio_loc;
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
KASSERT(loc->loc_port != AWINIOCF_PORT_DEFAULT);
KASSERT(!strcmp(cf->cf_name, loc->loc_name));
