Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys KNF. No functional change.
details: https://anonhg.NetBSD.org/src/rev/015e069aa946
branches: trunk
changeset: 451622:015e069aa946
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed May 29 06:21:56 2019 +0000
description:
KNF. No functional change.
diffstat:
sys/arch/acorn32/podulebus/if_ne_pbus.c | 10 +++++-----
sys/arch/amiga/dev/if_es.c | 8 ++++----
sys/arch/arm/broadcom/bcm53xx_eth.c | 28 ++++++++++++++--------------
sys/arch/arm/gemini/if_gpn.c | 20 ++++++++++----------
sys/arch/arm/omap/omapl1x_emac.c | 10 +++++-----
sys/arch/emips/ebus/if_le_ebus.c | 26 +++++++++++++-------------
sys/arch/evbppc/virtex/dev/if_temac.c | 22 +++++++++++-----------
sys/arch/next68k/dev/mb8795.c | 12 ++++++------
sys/arch/playstation2/dev/if_smap.c | 10 +++++-----
sys/arch/shark/ofw/if_cs_ofisa_machdep.c | 10 +++++-----
sys/arch/sun2/dev/if_ec.c | 10 +++++-----
sys/arch/usermode/dev/if_veth.c | 10 +++++-----
sys/dev/isa/if_ec.c | 10 +++++-----
sys/dev/ofw/ofw_network_subr.c | 16 ++++++++--------
sys/dev/sbus/if_le.c | 16 +++++++---------
sys/dev/sbus/if_le_lebuffer.c | 6 +++---
16 files changed, 111 insertions(+), 113 deletions(-)
diffs (truncated from 833 to 300 lines):
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/acorn32/podulebus/if_ne_pbus.c
--- a/sys/arch/acorn32/podulebus/if_ne_pbus.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/acorn32/podulebus/if_ne_pbus.c Wed May 29 06:21:56 2019 +0000
@@ -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 @@
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 @@
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");
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/amiga/dev/if_es.c Wed May 29 06:21:56 2019 +0000
@@ -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 @@
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);
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c Wed May 29 06:21:56 2019 +0000
@@ -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 @@
//#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 @@
* 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 @@
| (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_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 @@
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 @@
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 @@
#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 @@
} 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 @@
/*
* 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 @@
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
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/arm/gemini/if_gpn.c
--- a/sys/arch/arm/gemini/if_gpn.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/arm/gemini/if_gpn.c Wed May 29 06:21:56 2019 +0000
@@ -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 @@
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 @@
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 @@
{
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 @@
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 @@
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 @@
* 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;
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/arm/omap/omapl1x_emac.c
--- a/sys/arch/arm/omap/omapl1x_emac.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/arm/omap/omapl1x_emac.c Wed May 29 06:21:56 2019 +0000
@@ -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 @@
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 @@
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);
diff -r 722ff32a6191 -r 015e069aa946 sys/arch/emips/ebus/if_le_ebus.c
--- a/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 06:17:27 2019 +0000
+++ b/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 06:21:56 2019 +0000
@@ -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 $ */
Home |
Main Index |
Thread Index |
Old Index