Module Name: src
Committed By: skrll
Date: Wed Oct 7 10:39:25 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: if_rum.c if_ural.c
Log Message:
Use __arraycount
To generate a diff of this commit:
cvs rdiff -u -r1.48.6.10 -r1.48.6.11 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.44.14.7 -r1.44.14.8 src/sys/dev/usb/if_ural.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/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.48.6.10 src/sys/dev/usb/if_rum.c:1.48.6.11
--- src/sys/dev/usb/if_rum.c:1.48.6.10 Tue Oct 6 21:32:15 2015
+++ src/sys/dev/usb/if_rum.c Wed Oct 7 10:39:25 2015
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.48.6.10 2015/10/06 21:32:15 skrll Exp $ */
+/* $NetBSD: if_rum.c,v 1.48.6.11 2015/10/07 10:39:25 skrll Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.10 2015/10/06 21:32:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.11 2015/10/07 10:39:25 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1930,7 +1930,6 @@ rum_read_eeprom(struct rum_softc *sc)
static int
rum_bbp_init(struct rum_softc *sc)
{
-#define N(a) (sizeof (a) / sizeof ((a)[0]))
unsigned int i, ntries;
uint8_t val;
@@ -1948,7 +1947,7 @@ rum_bbp_init(struct rum_softc *sc)
}
/* initialize BBP registers to default values */
- for (i = 0; i < N(rum_def_bbp); i++)
+ for (i = 0; i < __arraycount(rum_def_bbp); i++)
rum_bbp_write(sc, rum_def_bbp[i].reg, rum_def_bbp[i].val);
/* write vendor-specific BBP values (from EEPROM) */
@@ -1959,13 +1958,11 @@ rum_bbp_init(struct rum_softc *sc)
}
return 0;
-#undef N
}
static int
rum_init(struct ifnet *ifp)
{
-#define N(a) (sizeof (a) / sizeof ((a)[0]))
struct rum_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
uint32_t tmp;
@@ -1980,7 +1977,7 @@ rum_init(struct ifnet *ifp)
rum_stop(ifp, 0);
/* initialize MAC registers to default values */
- for (i = 0; i < N(rum_def_mac); i++)
+ for (i = 0; i < __arraycount(rum_def_mac); i++)
rum_write(sc, rum_def_mac[i].reg, rum_def_mac[i].val);
/* set host ready */
@@ -2110,7 +2107,6 @@ rum_init(struct ifnet *ifp)
fail: rum_stop(ifp, 1);
return error;
-#undef N
}
static void
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.44.14.7 src/sys/dev/usb/if_ural.c:1.44.14.8
--- src/sys/dev/usb/if_ural.c:1.44.14.7 Tue Oct 6 21:32:15 2015
+++ src/sys/dev/usb/if_ural.c Wed Oct 7 10:39:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.44.14.7 2015/10/06 21:32:15 skrll Exp $ */
+/* $NetBSD: if_ural.c,v 1.44.14.8 2015/10/07 10:39:25 skrll Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.7 2015/10/06 21:32:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.8 2015/10/07 10:39:25 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2007,7 +2007,6 @@ ural_read_eeprom(struct ural_softc *sc)
Static int
ural_bbp_init(struct ural_softc *sc)
{
-#define N(a) (sizeof (a) / sizeof ((a)[0]))
int i, ntries;
/* wait for BBP to be ready */
@@ -2022,7 +2021,7 @@ ural_bbp_init(struct ural_softc *sc)
}
/* initialize BBP registers to default values */
- for (i = 0; i < N(ural_def_bbp); i++)
+ for (i = 0; i < __arraycount(ural_def_bbp); i++)
ural_bbp_write(sc, ural_def_bbp[i].reg, ural_def_bbp[i].val);
#if 0
@@ -2035,7 +2034,6 @@ ural_bbp_init(struct ural_softc *sc)
#endif
return 0;
-#undef N
}
Static void
@@ -2090,7 +2088,6 @@ ural_set_rxantenna(struct ural_softc *sc
Static int
ural_init(struct ifnet *ifp)
{
-#define N(a) (sizeof (a) / sizeof ((a)[0]))
struct ural_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_key *wk;
@@ -2104,7 +2101,7 @@ ural_init(struct ifnet *ifp)
ural_stop(ifp, 0);
/* initialize MAC registers to default values */
- for (i = 0; i < N(ural_def_mac); i++)
+ for (i = 0; i < __arraycount(ural_def_mac); i++)
ural_write(sc, ural_def_mac[i].reg, ural_def_mac[i].val);
/* wait for BBP and RF to wake up (this can take a long time!) */
@@ -2235,7 +2232,6 @@ ural_init(struct ifnet *ifp)
fail: ural_stop(ifp, 1);
return error;
-#undef N
}
Static void
