Module Name: src Committed By: msaitoh Date: Wed May 29 06:21:58 UTC 2019
Modified Files: src/sys/arch/acorn32/podulebus: if_ne_pbus.c src/sys/arch/amiga/dev: if_es.c src/sys/arch/arm/broadcom: bcm53xx_eth.c src/sys/arch/arm/gemini: if_gpn.c src/sys/arch/arm/omap: omapl1x_emac.c src/sys/arch/emips/ebus: if_le_ebus.c src/sys/arch/evbppc/virtex/dev: if_temac.c src/sys/arch/next68k/dev: mb8795.c src/sys/arch/playstation2/dev: if_smap.c src/sys/arch/shark/ofw: if_cs_ofisa_machdep.c src/sys/arch/sun2/dev: if_ec.c src/sys/arch/usermode/dev: if_veth.c src/sys/dev/isa: if_ec.c src/sys/dev/ofw: ofw_network_subr.c src/sys/dev/sbus: if_le.c if_le_lebuffer.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn32/podulebus/if_ne_pbus.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amiga/dev/if_es.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/broadcom/bcm53xx_eth.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/gemini/if_gpn.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omapl1x_emac.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/emips/ebus/if_le_ebus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/virtex/dev/if_temac.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/next68k/dev/mb8795.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/playstation2/dev/if_smap.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sun2/dev/if_ec.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/dev/if_veth.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isa/if_ec.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ofw/ofw_network_subr.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/sbus/if_le.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sbus/if_le_lebuffer.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/acorn32/podulebus/if_ne_pbus.c diff -u src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.19 src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.20 --- src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.19 Thu Apr 25 10:08:45 2019 +++ src/sys/arch/acorn32/podulebus/if_ne_pbus.c Wed May 29 06:21:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_pbus.c,v 1.19 2019/04/25 10:08:45 msaitoh Exp $ */ +/* $NetBSD: if_ne_pbus.c,v 1.20 2019/05/29 06:21:56 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.19 2019/04/25 10:08:45 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.20 2019/05/29 06:21:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -496,9 +496,9 @@ eh600_preattach(struct ne_pbus_softc *sc bus_space_write_1(nict, nich, DP83905_MCRA, DP83905_MCRA_INT3); /* Enable interrupts for the card */ - tmp = bus_space_read_1(&sc->sc_tag,sc->sc_extrah,0); + tmp = bus_space_read_1(&sc->sc_tag, sc->sc_extrah, 0); tmp |= EH_INTR_MASK; - bus_space_write_1(&sc->sc_tag,sc->sc_extrah,0,tmp); + bus_space_write_1(&sc->sc_tag, sc->sc_extrah, 0, tmp); } /* @@ -572,7 +572,7 @@ void en_init_media(struct dp8390_softc *sc) { static int en_media[] = { - IFM_ETHER|IFM_10_T + IFM_ETHER | IFM_10_T }; aprint_normal_dev(sc->sc_dev, "10baseT, default 10baseT\n"); Index: src/sys/arch/amiga/dev/if_es.c diff -u src/sys/arch/amiga/dev/if_es.c:1.62 src/sys/arch/amiga/dev/if_es.c:1.63 --- src/sys/arch/amiga/dev/if_es.c:1.62 Wed May 29 05:06:39 2019 +++ src/sys/arch/amiga/dev/if_es.c Wed May 29 06:21:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_es.c,v 1.62 2019/05/29 05:06:39 msaitoh Exp $ */ +/* $NetBSD: if_es.c,v 1.63 2019/05/29 06:21:56 msaitoh Exp $ */ /* * Copyright (c) 1995 Michael L. Hitch @@ -33,7 +33,7 @@ #include "opt_ns.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.62 2019/05/29 05:06:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.63 2019/05/29 06:21:56 msaitoh Exp $"); #include <sys/param.h> @@ -177,8 +177,8 @@ esattach(device_t parent, device_t self, ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifmedia_init(&sc->sc_media, 0, esmediachange, esmediastatus); - ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_MANUAL); /* Attach the interface. */ if_attach(ifp); Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.35 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.36 --- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.35 Fri Apr 26 06:33:33 2019 +++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Wed May 29 06:21:56 2019 @@ -35,7 +35,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.35 2019/04/26 06:33:33 msaitoh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.36 2019/05/29 06:21:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/atomic.h> @@ -65,9 +65,9 @@ __KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth. //#define BCMETH_MPSAFE #ifdef BCMETH_COUNTERS -#define BCMETH_EVCNT_ADD(a,b) ((void)((a).ev_count += (b))) +#define BCMETH_EVCNT_ADD(a, b) ((void)((a).ev_count += (b))) #else -#define BCMETH_EVCNT_ADD(a,b) do { } while (/*CONSTCOND*/0) +#define BCMETH_EVCNT_ADD(a, b) do { } while (/*CONSTCOND*/0) #endif #define BCMETH_EVCNT_INCR(a) BCMETH_EVCNT_ADD((a), 1) @@ -377,8 +377,8 @@ bcmeth_ccb_attach(device_t parent, devic * Since each port in plugged into the switch/flow-accelerator, * we hard code at Gige Full-Duplex with Flow Control enabled. */ - int ifmedia = IFM_ETHER|IFM_1000_T|IFM_FDX; - //ifmedia |= IFM_FLOW|IFM_ETH_TXPAUSE|IFM_ETH_RXPAUSE; + int ifmedia = IFM_ETHER | IFM_1000_T | IFM_FDX; + //ifmedia |= IFM_FLOW | IFM_ETH_TXPAUSE | IFM_ETH_RXPAUSE; ifmedia_init(&sc->sc_media, IFM_IMASK, bcmeth_mediachange, bcmeth_mediastatus); ifmedia_add(&sc->sc_media, ifmedia, 0, NULL); @@ -550,7 +550,7 @@ bcmeth_ifinit(struct ifnet *ifp) | (lladdr[1] << 16) | (lladdr[2] << 24); #endif - sc->sc_intmask = DESCPROTOERR|DATAERR|DESCERR; + sc->sc_intmask = DESCPROTOERR | DATAERR | DESCERR; /* 5. Load RCVADDR_LO with new pointer */ bcmeth_rxq_reset(sc, &sc->sc_rxq); @@ -589,13 +589,13 @@ bcmeth_ifinit(struct ifnet *ifp) bcmeth_write_4(sc, GMAC_INTRCVLAZY, sc->sc_rcvlazy); /* 11. Enable transmit queues in TQUEUE, and ensure that the transmit scheduling mode is correctly set in TCTRL. */ - sc->sc_intmask |= XMTINT_0|XMTUF; + sc->sc_intmask |= XMTINT_0 | XMTUF; bcmeth_write_4(sc, sc->sc_txq.txq_reg_xmtctl, bcmeth_read_4(sc, sc->sc_txq.txq_reg_xmtctl) | XMTCTL_ENABLE); /* 12. Enable receive queues in RQUEUE, */ - sc->sc_intmask |= RCVINT|RCVDESCUF|RCVFIFOOF; + sc->sc_intmask |= RCVINT | RCVDESCUF | RCVFIFOOF; bcmeth_write_4(sc, sc->sc_rxq.rxq_reg_rcvctl, bcmeth_read_4(sc, sc->sc_rxq.rxq_reg_rcvctl) | RCVCTL_ENABLE); @@ -817,7 +817,7 @@ bcmeth_mapcache_create( for (u_int i = 0; i < maxmaps; i++) { int error = bus_dmamap_create(sc->sc_dmat, dmc->dmc_maxmapsize, dmc->dmc_maxseg, dmc->dmc_maxmapsize, 0, - BUS_DMA_WAITOK|BUS_DMA_ALLOCNOW, &dmc->dmc_maps[i]); + BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW, &dmc->dmc_maps[i]); if (error) { aprint_error_dev(sc->sc_dev, "failed to creat dma map cache " @@ -919,7 +919,7 @@ bcmeth_rx_buf_alloc( M_SETCTX(m, map); m->m_len = m->m_pkthdr.len = MCLBYTES; int error = bus_dmamap_load_mbuf(sc->sc_dmat, map, m, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "fail to load rx dmamap: %d\n", error); @@ -932,7 +932,7 @@ bcmeth_rx_buf_alloc( #ifdef BCMETH_RCVMAGIC *mtod(m, uint32_t *) = htole32(BCMETH_RCVMAGIC); bus_dmamap_sync(sc->sc_dmat, map, 0, sizeof(uint32_t), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->sc_dmat, map, sizeof(uint32_t), map->dm_mapsize - sizeof(uint32_t), BUS_DMASYNC_PREREAD); #else @@ -1137,7 +1137,7 @@ bcmeth_rxq_consume( } else #endif /* BCMETH_RCVMAGIC */ if (rxsts - & (RXSTS_CRC_ERROR|RXSTS_OVERSIZED|RXSTS_PKT_OVERFLOW)) { + & (RXSTS_CRC_ERROR |RXSTS_OVERSIZED |RXSTS_PKT_OVERFLOW)) { aprint_error_dev(sc->sc_dev, "[%zu]: count=%zu rxsts=%#x\n", consumer - rxq->rxq_first, desc_count, rxsts); @@ -1263,7 +1263,7 @@ bcmeth_rxq_reset( /* * Last descriptor has the wrap flag. */ - rxdb->rxdb_flags = htole32(RXDB_FLAG_ET|RXDB_FLAG_IC); + rxdb->rxdb_flags = htole32(RXDB_FLAG_ET | RXDB_FLAG_IC); /* * Reset the producer consumer indexes. @@ -1274,7 +1274,7 @@ bcmeth_rxq_reset( if (rxq->rxq_threshold < BCMETH_MINRXMBUFS) rxq->rxq_threshold = BCMETH_MINRXMBUFS; - sc->sc_intmask |= RCVINT|RCVFIFOOF|RCVDESCUF; + sc->sc_intmask |= RCVINT | RCVFIFOOF | RCVDESCUF; /* * Restart the receiver at the first descriptor Index: src/sys/arch/arm/gemini/if_gpn.c diff -u src/sys/arch/arm/gemini/if_gpn.c:1.10 src/sys/arch/arm/gemini/if_gpn.c:1.11 --- src/sys/arch/arm/gemini/if_gpn.c:1.10 Fri Apr 26 06:33:33 2019 +++ src/sys/arch/arm/gemini/if_gpn.c Wed May 29 06:21:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gpn.c,v 1.10 2019/04/26 06:33:33 msaitoh Exp $ */ +/* $NetBSD: if_gpn.c,v 1.11 2019/05/29 06:21:56 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -32,7 +32,7 @@ #include "opt_gemini.h" -__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.10 2019/04/26 06:33:33 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.11 2019/05/29 06:21:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -174,7 +174,7 @@ gpn_alloc_dmamaps(struct gpn_softc *sc) continue; error = bus_dmamap_create(sc->sc_dmat, 10000, 2, 8192, 0, - BUS_DMA_ALLOCNOW|BUS_DMA_WAITOK, + BUS_DMA_ALLOCNOW | BUS_DMA_WAITOK, &ti->ti_map); if (error) break; @@ -441,7 +441,7 @@ gpn_ifstart(struct ifnet *ifp) map = ti->ti_map; error = bus_dmamap_load(sc->sc_dmat, map, mtod(m, void *), m->m_len, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { ifp->if_oerrors++; m_freem(m); @@ -486,7 +486,7 @@ gpn_ipm_ifup(struct gpn_softc *sc) { sc->sc_remoteup = true; if (sc->sc_if.if_flags & IFF_UP) - ifmedia_set(&sc->sc_im, IFM_ETHER|IFM_1000_T|IFM_FDX); + ifmedia_set(&sc->sc_im, IFM_ETHER | IFM_1000_T | IFM_FDX); } static void @@ -512,7 +512,7 @@ gpn_ipm_ifdown(struct gpn_softc *sc) ti->ti_mbuf = NULL; } sc->sc_lastid = 0; - ifmedia_set(&sc->sc_im, IFM_ETHER|IFM_NONE); + ifmedia_set(&sc->sc_im, IFM_ETHER | IFM_NONE); sc->sc_remoteup = false; } @@ -579,7 +579,7 @@ gpn_ifinit(struct ifnet *ifp) gemini_ipm_produce(&gd, 1); if (sc->sc_remoteup) - ifmedia_set(&sc->sc_im, IFM_ETHER|IFM_1000_T|IFM_FDX); + ifmedia_set(&sc->sc_im, IFM_ETHER | IFM_1000_T | IFM_FDX); ifp->if_flags |= IFF_RUNNING; @@ -692,9 +692,9 @@ gpn_attach(device_t parent, device_t sel * Pretend we are full-duplex gigabit ethernet. */ ifmedia_init(&sc->sc_im, 0, gpn_mediachange, gpn_mediastatus); - ifmedia_add(&sc->sc_im, IFM_ETHER|IFM_1000_T|IFM_FDX, 0, NULL); - ifmedia_add(&sc->sc_im, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_im, IFM_ETHER|IFM_NONE); + ifmedia_add(&sc->sc_im, IFM_ETHER | IFM_1000_T | IFM_FDX, 0, NULL); + ifmedia_add(&sc->sc_im, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&sc->sc_im, IFM_ETHER | IFM_NONE); strlcpy(ifp->if_xname, device_xname(self), sizeof(ifp->if_xname)); ifp->if_softc = sc; Index: src/sys/arch/arm/omap/omapl1x_emac.c diff -u src/sys/arch/arm/omap/omapl1x_emac.c:1.9 src/sys/arch/arm/omap/omapl1x_emac.c:1.10 --- src/sys/arch/arm/omap/omapl1x_emac.c:1.9 Wed May 29 05:05:24 2019 +++ src/sys/arch/arm/omap/omapl1x_emac.c Wed May 29 06:21:56 2019 @@ -30,7 +30,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.9 2019/05/29 05:05:24 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.10 2019/05/29 06:21:56 msaitoh Exp $"); #include "opt_omapl1x.h" @@ -1020,7 +1020,7 @@ emac_ifstop (struct ifnet *ifp, int disa mutex_exit(rx_chan->lock); - ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE); + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); } static int @@ -1335,10 +1335,10 @@ emac_attach (device_t parent, device_t s if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL); + IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_MANUAL); } else { - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO); } strlcpy(ifp->if_xname, xname, IFNAMSIZ); Index: src/sys/arch/emips/ebus/if_le_ebus.c diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.18 src/sys/arch/emips/ebus/if_le_ebus.c:1.19 --- src/sys/arch/emips/ebus/if_le_ebus.c:1.18 Wed May 29 05:06:39 2019 +++ src/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ebus.c,v 1.18 2019/05/29 05:06:39 msaitoh Exp $ */ +/* $NetBSD: if_le_ebus.c,v 1.19 2019/05/29 06:21:57 msaitoh Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.18 2019/05/29 05:06:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.19 2019/05/29 06:21:57 msaitoh Exp $"); #include "opt_inet.h" @@ -195,8 +195,8 @@ enic_attach(device_t parent, device_t se /* Initialize ifmedia structures. */ ifmedia_init(&sc->sc_media, 0, enic_mediachange, enic_mediastatus); - ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_MANUAL); /* Make sure the chip is stopped. */ enic_stop(ifp, 0); @@ -317,7 +317,7 @@ enic_reset(struct ifnet *ifp) int s; s = splnet(); - enic_stop(ifp,0); + enic_stop(ifp, 0); enic_init(ifp); splx(s); } @@ -508,7 +508,7 @@ void enic_refill(struct enic_softc *sc) m->m_len = MCLBYTES; ADJUST_MBUF_OFFSET(m); - enic_post_recv(sc,m); + enic_post_recv(sc, m); } int @@ -619,7 +619,7 @@ enic_ioctl(struct ifnet *ifp, u_long cmd for (i = 0; i < 64; i++) if (ei_drops[i]) - printf(" %d.%d",i,ei_drops[i]); + printf(" %d.%d", i, ei_drops[i]); printf("\n"); } } @@ -635,7 +635,7 @@ enic_ioctl(struct ifnet *ifp, u_long cmd * on after a stop. So. */ #if 0 - printf("enic_ioctl(%lx)\n",cmd); + printf("enic_ioctl(%lx)\n", cmd); #endif enic_init(ifp); } @@ -663,7 +663,7 @@ enic_intr(void *cookie, void *f) isr = sc->sc_regs->Control; /* Make sure there is one and that we should take it */ - if ((isr & (EC_INTEN|EC_DONE)) != (EC_INTEN|EC_DONE)) + if ((isr & (EC_INTEN | EC_DONE)) != (EC_INTEN | EC_DONE)) return 0; if (isr & EC_ERROR) { @@ -685,9 +685,9 @@ enic_intr(void *cookie, void *f) fl = saf & (ES_F_MASK &~ ES_F_DONE); if (fl == ES_F_RECV) - enic_rint(sc,saf, lo); + enic_rint(sc, saf, lo); else if (fl == ES_F_XMIT) - enic_tint(sc,saf, lo); + enic_tint(sc, saf, lo); else { /* * we do not currently expect or care for @@ -748,7 +748,7 @@ enic_rint(struct enic_softc *sc, uint32_ ifp->if_ierrors++; /* reuse it */ - enic_post_recv(sc,m); + enic_post_recv(sc, m); return; } @@ -897,7 +897,7 @@ enic_start(struct ifnet *ifp) sc->sc_no_td++; - tpostone(phys,len); + tpostone(phys, len); if (sc->sc_regs->Control & EC_IF_FULL) { ifp->if_flags |= IFF_OACTIVE; Index: src/sys/arch/evbppc/virtex/dev/if_temac.c diff -u src/sys/arch/evbppc/virtex/dev/if_temac.c:1.14 src/sys/arch/evbppc/virtex/dev/if_temac.c:1.15 --- src/sys/arch/evbppc/virtex/dev/if_temac.c:1.14 Wed May 29 05:06:39 2019 +++ src/sys/arch/evbppc/virtex/dev/if_temac.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_temac.c,v 1.14 2019/05/29 05:06:39 msaitoh Exp $ */ +/* $NetBSD: if_temac.c,v 1.15 2019/05/29 06:21:57 msaitoh Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.14 2019/05/29 05:06:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.15 2019/05/29 06:21:57 msaitoh Exp $"); #include <sys/param.h> @@ -500,10 +500,10 @@ temac_attach(device_t parent, device_t s mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); 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); } /* Hold PHY in reset. */ @@ -630,7 +630,7 @@ temac_init(struct ifnet *ifp) sc->sc_rx_drained = 0; temac_rxcdsync(sc, 0, TEMAC_NRXDESC, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); cdmac_rx_start(sc, sc->sc_cdaddr + TEMAC_RXDOFF(0)); } @@ -743,7 +743,7 @@ temac_start(struct ifnet *ifp) */ temac_txcdsync(sc, sc->sc_txcur, dmap->dm_nsegs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); for (i = 0; i < dmap->dm_nsegs; i++) { sc->sc_txdescs[sc->sc_txcur].desc_addr = @@ -775,7 +775,7 @@ temac_start(struct ifnet *ifp) sc->sc_txdescs[tail].desc_stat |= CDMAC_STAT_STOP | CDMAC_STAT_INTR; temac_txcdsync(sc, head, nsegs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); temac_txkick(sc); #if TEMAC_TXDEBUG > 0 @@ -820,7 +820,7 @@ temac_stop(struct ifnet *ifp, int disabl sc->sc_txbusy = 0; /* Acknowledge we're down. */ - ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE); + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); } static int @@ -1157,7 +1157,7 @@ temac_rxreap(struct temac_softc *sc) continue; } temac_rxcdsync(sc, sc->sc_rxreap, 1, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); stat = sc->sc_rxdescs[sc->sc_rxreap].desc_stat; m = NULL; @@ -1234,7 +1234,7 @@ temac_rxreap(struct temac_softc *sc) head, sc->sc_rxreap, nseg); #endif temac_rxcdsync(sc, head, nseg, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); if (TEMAC_ISLAST(tail)) cdmac_rx_start(sc, sc->sc_cdaddr + TEMAC_RXDOFF(0)); Index: src/sys/arch/next68k/dev/mb8795.c diff -u src/sys/arch/next68k/dev/mb8795.c:1.63 src/sys/arch/next68k/dev/mb8795.c:1.64 --- src/sys/arch/next68k/dev/mb8795.c:1.63 Wed May 29 05:06:39 2019 +++ src/sys/arch/next68k/dev/mb8795.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mb8795.c,v 1.63 2019/05/29 05:06:39 msaitoh Exp $ */ +/* $NetBSD: mb8795.c,v 1.64 2019/05/29 06:21:57 msaitoh Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.63 2019/05/29 05:06:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.64 2019/05/29 06:21:57 msaitoh Exp $"); #include "opt_inet.h" @@ -156,10 +156,10 @@ mb8795_mediachange(struct ifnet *ifp) !(bus_space_read_1(sc->sc_bmap_bst, sc->sc_bmap_bsh, BMAP_DATA) & BMAP_DATA_UTPCARRIER_MASK)) { data = BMAP_DATA_UTPENABLE; - sc->sc_media.ifm_cur->ifm_data = IFM_ETHER|IFM_10_T; + sc->sc_media.ifm_cur->ifm_data = IFM_ETHER | IFM_10_T; } else { data = BMAP_DATA_BNCENABLE; - sc->sc_media.ifm_cur->ifm_data = IFM_ETHER|IFM_10_2; + sc->sc_media.ifm_cur->ifm_data = IFM_ETHER | IFM_10_2; } break; case IFM_10_T: @@ -430,7 +430,7 @@ mb8795_reset(struct mb8795_softc *sc) DPRINTF (("%s: mb8795_reset()\n", device_xname(sc->sc_dev))); - sc->sc_ethercom.ec_if.if_flags &= ~(IFF_RUNNING|IFF_OACTIVE); + sc->sc_ethercom.ec_if.if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); sc->sc_ethercom.ec_if.if_timer = 0; MBDMA_RESET(sc); @@ -593,7 +593,7 @@ mb8795_ioctl(struct ifnet *ifp, u_long c device_xname(sc->sc_dev))); if ((error = ifioctl_common(ifp, cmd, data)) != 0) break; - switch (ifp->if_flags & (IFF_UP|IFF_RUNNING)) { + switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) { case IFF_RUNNING: /* * If interface is marked down and it is running, then Index: src/sys/arch/playstation2/dev/if_smap.c diff -u src/sys/arch/playstation2/dev/if_smap.c:1.29 src/sys/arch/playstation2/dev/if_smap.c:1.30 --- src/sys/arch/playstation2/dev/if_smap.c:1.29 Wed May 29 05:06:39 2019 +++ src/sys/arch/playstation2/dev/if_smap.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smap.c,v 1.29 2019/05/29 05:06:39 msaitoh Exp $ */ +/* $NetBSD: if_smap.c,v 1.30 2019/05/29 06:21:57 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.29 2019/05/29 05:06:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.30 2019/05/29 06:21:57 msaitoh Exp $"); #include "debug_playstation2.h" @@ -235,10 +235,10 @@ smap_attach(struct device *parent, struc /* 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); Index: src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c diff -u src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.11 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.12 --- src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.11 Mon Apr 13 21:18:42 2015 +++ src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_ofisa_machdep.c,v 1.11 2015/04/13 21:18:42 riastradh Exp $ */ +/* $NetBSD: if_cs_ofisa_machdep.c,v 1.12 2019/05/29 06:21:57 msaitoh Exp $ */ /* * Copyright 1998 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.11 2015/04/13 21:18:42 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.12 2019/05/29 06:21:57 msaitoh Exp $"); #include "opt_compat_old_ofw.h" @@ -144,8 +144,8 @@ cs_ofisa_md_media_fixup(device_t parent, media = malloc(2 * sizeof(int), M_TEMP, M_NOWAIT); if (media == NULL) return (NULL); - media[0] = IFM_ETHER|IFM_10_T; - media[1] = IFM_ETHER|IFM_10_T|IFM_FDX; + media[0] = IFM_ETHER | IFM_10_T; + media[1] = IFM_ETHER | IFM_10_T | IFM_FDX; *nmediap = 2; *defmediap = media[0]; } @@ -172,5 +172,5 @@ int cs_ofisa_md_cfgflags_fixup(device_t parent, device_t self, void *aux) { - return (CFGFLG_USE_SA|CFGFLG_IOCHRDY|CFGFLG_NOT_EEPROM); + return (CFGFLG_USE_SA | CFGFLG_IOCHRDY | CFGFLG_NOT_EEPROM); } Index: src/sys/arch/sun2/dev/if_ec.c diff -u src/sys/arch/sun2/dev/if_ec.c:1.32 src/sys/arch/sun2/dev/if_ec.c:1.33 --- src/sys/arch/sun2/dev/if_ec.c:1.32 Wed May 29 05:06:40 2019 +++ src/sys/arch/sun2/dev/if_ec.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ec.c,v 1.32 2019/05/29 05:06:40 msaitoh Exp $ */ +/* $NetBSD: if_ec.c,v 1.33 2019/05/29 06:21:57 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.32 2019/05/29 05:06:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.33 2019/05/29 06:21:57 msaitoh Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -224,8 +224,8 @@ ec_attach(device_t parent, device_t self /* Initialize ifmedia structures. */ ifmedia_init(&sc->sc_media, 0, ec_mediachange, ec_mediastatus); - ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_MANUAL); /* Now we can attach the interface. */ if_attach(ifp); @@ -586,7 +586,7 @@ ec_ioctl(struct ifnet *ifp, u_long cmd, case SIOCSIFFLAGS: if ((error = ifioctl_common(ifp, cmd, data)) != 0) break; - switch (ifp->if_flags & (IFF_UP|IFF_RUNNING)) { + switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) { case IFF_RUNNING: /* * If interface is marked down and it is running, then Index: src/sys/arch/usermode/dev/if_veth.c diff -u src/sys/arch/usermode/dev/if_veth.c:1.11 src/sys/arch/usermode/dev/if_veth.c:1.12 --- src/sys/arch/usermode/dev/if_veth.c:1.11 Mon Sep 3 16:29:28 2018 +++ src/sys/arch/usermode/dev/if_veth.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_veth.c,v 1.11 2018/09/03 16:29:28 riastradh Exp $ */ +/* $NetBSD: if_veth.c,v 1.12 2019/05/29 06:21:57 msaitoh Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_veth.c,v 1.11 2018/09/03 16:29:28 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_veth.c,v 1.12 2019/05/29 06:21:57 msaitoh Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -151,8 +151,8 @@ veth_attach(device_t parent, device_t se ifmedia_init(&sc->sc_ifmedia, 0, veth_ifmedia_change, veth_ifmedia_status); - ifmedia_add(&sc->sc_ifmedia, IFM_ETHER|IFM_100_TX, 0, NULL); - ifmedia_set(&sc->sc_ifmedia, IFM_ETHER|IFM_100_TX); + ifmedia_add(&sc->sc_ifmedia, IFM_ETHER | IFM_100_TX, 0, NULL); + ifmedia_set(&sc->sc_ifmedia, IFM_ETHER | IFM_100_TX); sc->sc_rx_intr = softint_establish(SOFTINT_NET, veth_softrx, sc); if (sc->sc_rx_intr == NULL) @@ -272,7 +272,7 @@ veth_start(struct ifnet *ifp) vethprintf("%s: %s flags=%x\n", __func__, ifp->if_xname, ifp->if_flags); - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; for (;;) { Index: src/sys/dev/isa/if_ec.c diff -u src/sys/dev/isa/if_ec.c:1.35 src/sys/dev/isa/if_ec.c:1.36 --- src/sys/dev/isa/if_ec.c:1.35 Thu Feb 8 09:05:19 2018 +++ src/sys/dev/isa/if_ec.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ec.c,v 1.35 2018/02/08 09:05:19 dholland Exp $ */ +/* $NetBSD: if_ec.c,v 1.36 2019/05/29 06:21:57 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.35 2018/02/08 09:05:19 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.36 2019/05/29 06:21:57 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -722,9 +722,9 @@ ec_media_init(struct dp8390_softc *sc) { ifmedia_init(&sc->sc_media, 0, dp8390_mediachange, dp8390_mediastatus); - ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_10_2, 0, NULL); - ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_10_5, 0, NULL); - ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_10_2); + ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_10_2, 0, NULL); + ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_10_5, 0, NULL); + ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_10_2); } int Index: src/sys/dev/ofw/ofw_network_subr.c diff -u src/sys/dev/ofw/ofw_network_subr.c:1.7 src/sys/dev/ofw/ofw_network_subr.c:1.8 --- src/sys/dev/ofw/ofw_network_subr.c:1.7 Sat Mar 14 21:04:21 2009 +++ src/sys/dev/ofw/ofw_network_subr.c Wed May 29 06:21:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_network_subr.c,v 1.7 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: ofw_network_subr.c,v 1.8 2019/05/29 06:21:57 msaitoh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.7 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.8 2019/05/29 06:21:57 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -191,17 +191,17 @@ of_network_parse_network_type(const char */ static const struct table_entry mediatab[] = { { "ethernet,10,rj45,half", - IFM_ETHER|IFM_10_T }, + IFM_ETHER | IFM_10_T }, { "ethernet,10,rj45,full", - IFM_ETHER|IFM_10_T|IFM_FDX }, + IFM_ETHER | IFM_10_T | IFM_FDX }, { "ethernet,10,aui,half", - IFM_ETHER|IFM_10_5, }, + IFM_ETHER | IFM_10_5, }, { "ethernet,10,bnc,half", - IFM_ETHER|IFM_10_2, }, + IFM_ETHER | IFM_10_2, }, { "ethernet,100,rj45,half", - IFM_ETHER|IFM_100_TX }, + IFM_ETHER | IFM_100_TX }, { "ethernet,100,rj45,full", - IFM_ETHER|IFM_100_TX|IFM_FDX }, + IFM_ETHER | IFM_100_TX | IFM_FDX }, { NULL, -1 }, }; int i; Index: src/sys/dev/sbus/if_le.c diff -u src/sys/dev/sbus/if_le.c:1.40 src/sys/dev/sbus/if_le.c:1.41 --- src/sys/dev/sbus/if_le.c:1.40 Tue Jan 19 22:07:43 2010 +++ src/sys/dev/sbus/if_le.c Wed May 29 06:21:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.40 2010/01/19 22:07:43 pooka Exp $ */ +/* $NetBSD: if_le.c,v 1.41 2019/05/29 06:21:58 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.40 2010/01/19 22:07:43 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.41 2019/05/29 06:21:58 msaitoh Exp $"); #include "opt_inet.h" @@ -84,7 +84,7 @@ void leattach_sbus(device_t, device_t, v * Media types supported. */ static int lemedia[] = { - IFM_ETHER|IFM_10_5, + IFM_ETHER | IFM_10_5, }; #define NLEMEDIA __arraycount(lemedia) @@ -223,16 +223,14 @@ leattach_sbus(device_t parent, device_t #endif /* Get a DMA handle */ if ((error = bus_dmamap_create(dmatag, MEMSIZE, 1, MEMSIZE, 0, - BUS_DMA_NOWAIT|BUS_DMA_24BIT, - &lesc->sc_dmamap)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_24BIT, &lesc->sc_dmamap)) != 0) { aprint_error(": DMA map create error %d\n", error); return; } /* Allocate DMA buffer */ if ((error = bus_dmamem_alloc(dmatag, MEMSIZE, 0, 0, - &seg, 1, &rseg, - BUS_DMA_NOWAIT|BUS_DMA_24BIT)) != 0){ + &seg, 1, &rseg, BUS_DMA_NOWAIT | BUS_DMA_24BIT)) != 0) { aprint_error(": DMA buffer allocation error %d\n", error); return; @@ -240,8 +238,8 @@ leattach_sbus(device_t parent, device_t /* Map DMA buffer into kernel space */ if ((error = bus_dmamem_map(dmatag, &seg, rseg, MEMSIZE, - (void **)&sc->sc_mem, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + (void **)&sc->sc_mem, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) + != 0) { aprint_error(": DMA buffer map error %d\n", error); bus_dmamem_free(lesc->sc_dmatag, &seg, rseg); return; Index: src/sys/dev/sbus/if_le_lebuffer.c diff -u src/sys/dev/sbus/if_le_lebuffer.c:1.28 src/sys/dev/sbus/if_le_lebuffer.c:1.29 --- src/sys/dev/sbus/if_le_lebuffer.c:1.28 Tue Jan 19 22:07:43 2010 +++ src/sys/dev/sbus/if_le_lebuffer.c Wed May 29 06:21:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_lebuffer.c,v 1.28 2010/01/19 22:07:43 pooka Exp $ */ +/* $NetBSD: if_le_lebuffer.c,v 1.29 2019/05/29 06:21:58 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.28 2010/01/19 22:07:43 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.29 2019/05/29 06:21:58 msaitoh Exp $"); #include "opt_inet.h" @@ -87,7 +87,7 @@ void leattach_lebuffer(device_t, device_ * Media types supported. */ static int lemedia[] = { - IFM_ETHER|IFM_10_T, + IFM_ETHER | IFM_10_T, }; #define NLEMEDIA __arraycount(lemedia)