Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys -No functional change:
details: https://anonhg.NetBSD.org/src/rev/2ba2bdd6021c
branches: trunk
changeset: 451446:2ba2bdd6021c
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Thu May 23 10:57:27 2019 +0000
description:
-No functional change:
- KNF
- u_int*_t -> uint*_t.
diffstat:
sys/arch/arm/sunxi/sun4i_emac.c | 52 ++--
sys/arch/macppc/dev/if_bm.c | 24 +-
sys/arch/macppc/dev/if_gm.c | 20 +-
sys/arch/mips/adm5120/dev/if_admsw.c | 54 ++--
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 24 +-
sys/arch/sgimips/hpc/if_sq.c | 8 +-
sys/arch/sgimips/mace/if_mec.c | 14 +-
sys/arch/sun3/dev/if_ie.c | 67 +++---
sys/arch/x86/pci/if_vmx.c | 18 +-
sys/dev/ic/ath.c | 30 +-
sys/dev/ic/atw.c | 136 ++++++------
sys/dev/ic/awi.c | 6 +-
sys/dev/ic/cs89x0.c | 15 +-
sys/dev/ic/dm9000.c | 17 +-
sys/dev/ic/dp83932.c | 50 ++--
sys/dev/ic/dwc_gmac.c | 134 ++++++------
sys/dev/ic/lan9118.c | 20 +-
sys/dev/ic/lemac.c | 24 +-
sys/dev/ic/mb86960.c | 12 +-
sys/dev/ic/pdq_ifsubr.c | 20 +-
sys/dev/ic/rtw.c | 75 +++---
sys/dev/ic/sgec.c | 36 +-
sys/dev/ic/wi.c | 120 +++++-----
sys/dev/isa/if_iy.c | 90 ++++----
sys/dev/pci/if_cas.c | 128 ++++++------
sys/dev/pci/if_de.c | 348 +++++++++++++++++++--------------
sys/dev/pci/if_dge.c | 69 +++---
sys/dev/pci/if_jme.c | 83 ++++---
sys/dev/pci/if_lii.c | 20 +-
sys/dev/pci/if_sk.c | 113 +++++-----
sys/dev/pci/if_wm.c | 78 +++---
sys/dev/pci/if_xge.c | 17 +-
sys/dev/pci/ixgbe/ixgbe.c | 52 ++--
sys/dev/pci/ixgbe/ixv.c | 27 +-
sys/dev/pcmcia/if_ray.c | 108 +++++-----
sys/dev/qbus/if_il.c | 42 ++-
sys/dev/qbus/if_qe.c | 36 +-
sys/dev/sbus/qe.c | 16 +-
sys/dev/usb/if_aue.c | 24 +-
sys/dev/usb/if_axe.c | 10 +-
sys/dev/usb/if_axen.c | 18 +-
sys/dev/usb/if_cue.c | 13 +-
sys/dev/usb/if_kue.c | 10 +-
sys/dev/usb/if_mue.c | 20 +-
sys/dev/usb/if_otus.c | 18 +-
sys/dev/usb/if_udav.c | 14 +-
sys/dev/usb/if_ure.c | 22 +-
sys/dev/usb/if_url.c | 20 +-
48 files changed, 1227 insertions(+), 1145 deletions(-)
diffs (truncated from 8343 to 300 lines):
diff -r d9cece9901b4 -r 2ba2bdd6021c sys/arch/arm/sunxi/sun4i_emac.c
--- a/sys/arch/arm/sunxi/sun4i_emac.c Thu May 23 10:51:38 2019 +0000
+++ b/sys/arch/arm/sunxi/sun4i_emac.c Thu May 23 10:57:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_emac.c,v 1.8 2019/05/08 09:53:43 ozaki-r Exp $ */
+/* $NetBSD: sun4i_emac.c,v 1.9 2019/05/23 10:57:27 msaitoh Exp $ */
/*-
* Copyright (c) 2013-2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.8 2019/05/08 09:53:43 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.9 2019/05/23 10:57:27 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -113,7 +113,7 @@
#define EMAC_INT_TX1 __BIT(1)
#define EMAC_INT_TX0 __BIT(0)
#define EMAC_INT_ENABLE \
- (EMAC_INT_RX|EMAC_INT_TX1|EMAC_INT_TX0)
+ (EMAC_INT_RX | EMAC_INT_TX1 | EMAC_INT_TX0)
#define EMAC_MAC_CTL0_REG 0x5c
#define EMAC_MAC_CTL0_SOFT_RESET __BIT(15)
#define EMAC_MAC_CTL0_TFC __BIT(3)
@@ -358,20 +358,20 @@
mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0);
- if (LIST_EMPTY(&mii->mii_phys)) {
+ if (LIST_EMPTY(&mii->mii_phys)) {
aprint_error_dev(self, "no PHY found!\n");
- ifmedia_add(&mii->mii_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_MANUAL);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
} else {
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
- /*
+ /*
* Attach the interface.
*/
if_attach(ifp);
if_deferred_start_init(ifp, NULL);
- ether_ifattach(ifp, enaddr);
+ ether_ifattach(ifp, enaddr);
rnd_attach_source(&sc->sc_rnd_source, device_xname(self),
RND_TYPE_NET, RND_FLAG_DEFAULT);
}
@@ -440,8 +440,8 @@
/*
* Set MII interface based on the speed
- * negotiated by the PHY.
- */
+ * negotiated by the PHY.
+ */
switch (IFM_SUBTYPE(media)) {
case IFM_10_T:
sun4i_emac_clear_set(sc, EMAC_MAC_SUPP_REG,
@@ -453,7 +453,7 @@
break;
}
- const bool link = (IFM_SUBTYPE(media) & (IFM_10_T|IFM_100_TX)) != 0;
+ const bool link = (IFM_SUBTYPE(media) & (IFM_10_T | IFM_100_TX)) != 0;
if (link) {
if (media & IFM_FDX) {
sun4i_emac_clear_set(sc, EMAC_MAC_CTL1_REG,
@@ -508,7 +508,7 @@
uint32_t *dp32 = mtod(m, uint32_t *);
const int len = roundup2(m->m_len, 4);
- bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh,
+ bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh,
EMAC_RX_IO_DATA_REG, dp32, len / 4);
}
@@ -657,7 +657,7 @@
if (sts & EMAC_INT_TX1) {
sun4i_emac_tx_intr(sc, 1);
}
- if (sts & (EMAC_INT_TX0|EMAC_INT_TX1)) {
+ if (sts & (EMAC_INT_TX0 | EMAC_INT_TX1)) {
if (sc->sc_tx_active == 0)
ifp->if_timer = 0;
if_schedule_deferred_start(ifp);
@@ -867,25 +867,29 @@
ETHER_LOCK(&sc->sc_ec);
ETHER_FIRST_MULTI(step, &sc->sc_ec, enm);
while (enm != NULL) {
- if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
+ ETHER_ADDR_LEN)) {
ETHER_UNLOCK(&sc->sc_ec);
/*
- * We must listen to a range of multicast addresses.
- * For now, just accept all multicasts, rather than
- * trying to set only those filter bits needed to match
- * the range. (At this time, the only use of address
- * ranges is for IP multicast routing, for which the
- * range is big enough to require all bits set.)
- */
+ * We must listen to a range of multicast
+ * addresses. For now, just accept all
+ * multicasts, rather than trying to set only
+ * those filter bits needed to match the range.
+ * (At this time, the only use of address
+ * ranges is for IP multicast routing, for
+ * which the range is big enough to require all
+ * bits set.)
+ */
hash[0] = hash[1] = ~0;
ifp->if_flags |= IFF_ALLMULTI;
goto done;
}
- u_int crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
+ u_int crc = ether_crc32_be(enm->enm_addrlo,
+ ETHER_ADDR_LEN);
/* Just want the 6 most significant bits. */
- crc >>= 26;
+ crc >>= 26;
/* Set the corresponding bit in the filter. */
hash[crc >> 5] |= __BIT(crc & 31);
diff -r d9cece9901b4 -r 2ba2bdd6021c sys/arch/macppc/dev/if_bm.c
--- a/sys/arch/macppc/dev/if_bm.c Thu May 23 10:51:38 2019 +0000
+++ b/sys/arch/macppc/dev/if_bm.c Thu May 23 10:57:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.58 2019/04/22 08:30:31 msaitoh Exp $ */
+/* $NetBSD: if_bm.c,v 1.59 2019/05/23 10:57:27 msaitoh Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.58 2019/04/22 08:30:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.59 2019/05/23 10:57:27 msaitoh Exp $");
#include "opt_inet.h"
@@ -118,8 +118,8 @@
int bmac_mii_writereg(device_t, int, int, uint16_t);
void bmac_mii_statchg(struct ifnet *);
void bmac_mii_tick(void *);
-u_int32_t bmac_mbo_read(device_t);
-void bmac_mbo_write(device_t, u_int32_t);
+uint32_t bmac_mbo_read(device_t);
+void bmac_mbo_write(device_t, uint32_t);
CFATTACH_DECL_NEW(bm, sizeof(struct bmac_softc),
bmac_match, bmac_attach, NULL, NULL);
@@ -251,10 +251,10 @@
/* Choose a default media. */
if (LIST_FIRST(&mii->mii_phys) == NULL) {
- ifmedia_add(&mii->mii_media, IFM_ETHER|IFM_10_T, 0, NULL);
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_10_T);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_10_T, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T);
} else
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
bmac_reset_chip(sc);
@@ -321,7 +321,7 @@
printf("%s: reset timeout\n", ifp->if_xname);
if (! (sc->sc_flags & BMAC_BMACPLUS))
- bmac_set_bits(sc, XCVRIF, ClkBit|SerialMode|COLActiveLow);
+ bmac_set_bits(sc, XCVRIF, ClkBit | SerialMode | COLActiveLow);
if ((mfpvr() >> 16) == MPC601)
tb = mfrtcl();
@@ -777,8 +777,8 @@
struct ifnet *ifp = &sc->sc_if;
struct ether_multi *enm;
struct ether_multistep step;
- u_int32_t crc;
- u_int16_t hash[4];
+ uint32_t crc;
+ uint16_t hash[4];
int x;
/*
@@ -853,7 +853,7 @@
return mii_bitbang_writereg(self, &bmac_mbo, phy, reg, val);
}
-u_int32_t
+uint32_t
bmac_mbo_read(device_t self)
{
struct bmac_softc *sc = device_private(self);
@@ -862,7 +862,7 @@
}
void
-bmac_mbo_write(device_t self, u_int32_t val)
+bmac_mbo_write(device_t self, uint32_t val)
{
struct bmac_softc *sc = device_private(self);
diff -r d9cece9901b4 -r 2ba2bdd6021c sys/arch/macppc/dev/if_gm.c
--- a/sys/arch/macppc/dev/if_gm.c Thu May 23 10:51:38 2019 +0000
+++ b/sys/arch/macppc/dev/if_gm.c Thu May 23 10:57:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gm.c,v 1.53 2019/04/22 08:30:31 msaitoh Exp $ */
+/* $NetBSD: if_gm.c,v 1.54 2019/05/23 10:57:27 msaitoh Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.53 2019/04/22 08:30:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.54 2019/05/23 10:57:27 msaitoh Exp $");
#include "opt_inet.h"
@@ -150,7 +150,7 @@
int node, i;
char *p;
struct gmac_dma *dp;
- u_int32_t reg[10];
+ uint32_t reg[10];
u_char laddr[6];
char buf[PCI_INTRSTR_LEN];
@@ -240,16 +240,16 @@
/* Choose a default media. */
if (LIST_FIRST(&mii->mii_phys) == NULL) {
- ifmedia_add(&mii->mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_NONE);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE);
} else
- ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
if_attach(ifp);
if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, laddr);
rnd_attach_source(&sc->sc_rnd_source, xname, RND_TYPE_NET,
- RND_FLAG_DEFAULT);
+ RND_FLAG_DEFAULT);
}
u_int
@@ -602,7 +602,7 @@
gmac_write_reg(sc, GMAC_MAXFRAMESIZE, ETHER_MAX_LEN);
gmac_write_reg(sc, GMAC_PASIZE, 7);
gmac_write_reg(sc, GMAC_JAMSIZE, 4);
- gmac_write_reg(sc, GMAC_ATTEMPTLIMIT,0x10);
+ gmac_write_reg(sc, GMAC_ATTEMPTLIMIT, 0x10);
gmac_write_reg(sc, GMAC_MACCNTLTYPE, 0x8808);
gmac_write_reg(sc, GMAC_MACADDRESS0, (laddr[4] << 8) | laddr[5]);
@@ -646,8 +646,8 @@
struct ether_multi *enm;
struct ether_multistep step;
struct ethercom *ec = &sc->sc_ethercom;
- u_int32_t crc;
- u_int32_t hash[16];
+ uint32_t crc;
+ uint32_t hash[16];
u_int v;
int i;
diff -r d9cece9901b4 -r 2ba2bdd6021c sys/arch/mips/adm5120/dev/if_admsw.c
--- a/sys/arch/mips/adm5120/dev/if_admsw.c Thu May 23 10:51:38 2019 +0000
+++ b/sys/arch/mips/adm5120/dev/if_admsw.c Thu May 23 10:57:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.22 2019/04/26 06:33:33 msaitoh Exp $ */
+/* $NetBSD: if_admsw.c,v 1.23 2019/05/23 10:57:27 msaitoh Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.22 2019/04/26 06:33:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.23 2019/05/23 10:57:27 msaitoh Exp $");
#include <sys/param.h>
@@ -163,7 +163,7 @@
Home |
Main Index |
Thread Index |
Old Index