Module Name: src
Committed By: msaitoh
Date: Thu May 23 10:30:36 UTC 2019
Modified Files:
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/macppc/dev: am79c950.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: lance.c
src/sys/dev/pci: if_txp.c
src/sys/dev/scsipi: if_se.c
Log Message:
No functional change:
- Change ac(was arpcom) to ec(ethercom)
- Simplify MII structure initialization.
- u_int*_t -> uint*_t.
- KNF
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/lance.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/scsipi/if_se.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/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.40 src/sys/arch/arm/ep93xx/epe.c:1.41
--- src/sys/arch/arm/ep93xx/epe.c:1.40 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/arm/ep93xx/epe.c Thu May 23 10:30:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.40 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: epe.c,v 1.41 2019/05/23 10:30:35 msaitoh Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.40 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.41 2019/05/23 10:30:35 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.40
#include <arm/cpufunc.h>
-#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <net/if.h>
@@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.40
#endif
#include <arm/ep93xx/ep93xxreg.h>
-#include <arm/ep93xx/epereg.h>
-#include <arm/ep93xx/epevar.h>
+#include <arm/ep93xx/epereg.h>
+#include <arm/ep93xx/epevar.h>
#define DEFAULT_MDCDIV 32
@@ -131,7 +131,7 @@ epe_attach(device_t parent, device_t sel
sc->sc_intr = sa->sa_intr;
sc->sc_dmat = sa->sa_dmat;
- if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size,
+ if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size,
0, &sc->sc_ioh))
panic("%s: Cannot map registers", device_xname(self));
@@ -161,20 +161,19 @@ epe_gctx(struct epe_softc *sc)
cur = (uint32_t *)(EPE_READ(TXStsQCurAdd) -
sc->ctrlpage_dsaddr + (char*)sc->ctrlpage);
- if (sc->TXStsQ_cur != cur) {
- CTRLPAGE_DMASYNC(TX_QLEN * 2 * sizeof(uint32_t),
+ if (sc->TXStsQ_cur != cur) {
+ CTRLPAGE_DMASYNC(TX_QLEN * 2 * sizeof(uint32_t),
TX_QLEN * sizeof(uint32_t), BUS_DMASYNC_PREREAD);
- } else {
+ } else
return 0;
- }
do {
uint32_t tbi = *sc->TXStsQ_cur & 0x7fff;
struct mbuf *m = sc->txq[tbi].m;
- if ((*sc->TXStsQ_cur & TXStsQ_TxWE) == 0) {
+ if ((*sc->TXStsQ_cur & TXStsQ_TxWE) == 0)
ifp->if_oerrors++;
- }
+
bus_dmamap_unload(sc->sc_dmat, sc->txq[tbi].m_dmamap);
m_freem(m);
do {
@@ -188,7 +187,7 @@ epe_gctx(struct epe_softc *sc)
if (sc->TXStsQ_cur >= sc->TXStsQ + TX_QLEN) {
sc->TXStsQ_cur = sc->TXStsQ;
}
- } while (sc->TXStsQ_cur != cur);
+ } while (sc->TXStsQ_cur != cur);
sc->TXDQ_avail += ndq;
if (ifp->if_flags & IFF_OACTIVE) {
@@ -211,11 +210,11 @@ begin:
cur = (uint32_t *)(EPE_READ(RXStsQCurAdd) -
sc->ctrlpage_dsaddr + (char*)sc->ctrlpage);
CTRLPAGE_DMASYNC(TX_QLEN * 3 * sizeof(uint32_t),
- RX_QLEN * 4 * sizeof(uint32_t),
+ RX_QLEN * 4 * sizeof(uint32_t),
BUS_DMASYNC_PREREAD);
while (sc->RXStsQ_cur != cur) {
- if ((sc->RXStsQ_cur[0] & (RXStsQ_RWE|RXStsQ_RFP|RXStsQ_EOB)) ==
- (RXStsQ_RWE|RXStsQ_RFP|RXStsQ_EOB)) {
+ if ((sc->RXStsQ_cur[0] & (RXStsQ_RWE | RXStsQ_RFP |RXStsQ_EOB))
+ == (RXStsQ_RWE | RXStsQ_RFP | RXStsQ_EOB)) {
uint32_t bi = (sc->RXStsQ_cur[1] >> 16) & 0x7fff;
uint32_t fl = sc->RXStsQ_cur[1] & 0xffff;
struct mbuf *m;
@@ -223,46 +222,44 @@ begin:
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m != NULL) MCLGET(m, M_DONTWAIT);
if (m != NULL && (m->m_flags & M_EXT)) {
- bus_dmamap_unload(sc->sc_dmat,
+ bus_dmamap_unload(sc->sc_dmat,
sc->rxq[bi].m_dmamap);
m_set_rcvif(sc->rxq[bi].m, ifp);
- sc->rxq[bi].m->m_pkthdr.len =
+ sc->rxq[bi].m->m_pkthdr.len =
sc->rxq[bi].m->m_len = fl;
if_percpuq_enqueue(ifp->if_percpuq,
sc->rxq[bi].m);
sc->rxq[bi].m = m;
- bus_dmamap_load(sc->sc_dmat,
- sc->rxq[bi].m_dmamap,
+ bus_dmamap_load(sc->sc_dmat,
+ sc->rxq[bi].m_dmamap,
m->m_ext.ext_buf, MCLBYTES,
NULL, BUS_DMA_NOWAIT);
- sc->RXDQ[bi * 2] =
+ sc->RXDQ[bi * 2] =
sc->rxq[bi].m_dmamap->dm_segs[0].ds_addr;
} else {
/* Drop packets until we can get replacement
* empty mbufs for the RXDQ.
*/
- if (m != NULL) {
+ if (m != NULL)
m_freem(m);
- }
+
ifp->if_ierrors++;
- }
- } else {
+ }
+ } else
ifp->if_ierrors++;
- }
ndq++;
sc->RXStsQ_cur += 2;
- if (sc->RXStsQ_cur >= sc->RXStsQ + (RX_QLEN * 2)) {
+ if (sc->RXStsQ_cur >= sc->RXStsQ + (RX_QLEN * 2))
sc->RXStsQ_cur = sc->RXStsQ;
- }
}
if (ndq > 0) {
ifp->if_ipackets += ndq;
CTRLPAGE_DMASYNC(TX_QLEN * 3 * sizeof(uint32_t),
- RX_QLEN * 4 * sizeof(uint32_t),
- BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+ RX_QLEN * 4 * sizeof(uint32_t),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
EPE_WRITE(RXStsEnq, ndq);
EPE_WRITE(RXDEnq, ndq);
ndq = 0;
@@ -270,13 +267,13 @@ begin:
if (epe_gctx(sc) > 0 && IFQ_IS_EMPTY(&ifp->if_snd) == 0) {
if_schedule_deferred_start(ifp);
- }
+ }
irq = EPE_READ(IntStsC);
- if ((irq & (IntSts_RxSQ|IntSts_ECI)) != 0)
+ if ((irq & (IntSts_RxSQ | IntSts_ECI)) != 0)
goto begin;
- return (1);
+ return 1;
}
@@ -296,12 +293,13 @@ epe_init(struct epe_softc *sc)
/* Read ethernet MAC, should already be set by bootrom */
bus_space_read_region_1(sc->sc_iot, sc->sc_ioh, EPE_IndAd,
sc->sc_enaddr, ETHER_ADDR_LEN);
- aprint_normal_dev(sc->sc_dev, "MAC address %s\n",
+ aprint_normal_dev(sc->sc_dev, "MAC address %s\n",
ether_sprintf(sc->sc_enaddr));
/* Soft Reset the MAC */
EPE_WRITE(SelfCtl, SelfCtl_RESET);
- while(EPE_READ(SelfCtl) & SelfCtl_RESET);
+ while (EPE_READ(SelfCtl) & SelfCtl_RESET)
+ ;
/* suggested magic initialization values from datasheet */
EPE_WRITE(RXBufThrshld, 0x800040);
@@ -312,11 +310,11 @@ epe_init(struct epe_softc *sc)
EPE_WRITE(TXDThrshld, 0x40002);
/* Allocate a page of memory for descriptor and status queues */
- err = bus_dmamem_alloc(sc->sc_dmat, PAGE_SIZE, 0, PAGE_SIZE,
+ err = bus_dmamem_alloc(sc->sc_dmat, PAGE_SIZE, 0, PAGE_SIZE,
&segs, 1, &rsegs, BUS_DMA_WAITOK);
if (err == 0) {
- err = bus_dmamem_map(sc->sc_dmat, &segs, 1, PAGE_SIZE,
- &sc->ctrlpage, (BUS_DMA_WAITOK|BUS_DMA_COHERENT));
+ err = bus_dmamem_map(sc->sc_dmat, &segs, 1, PAGE_SIZE,
+ &sc->ctrlpage, (BUS_DMA_WAITOK | BUS_DMA_COHERENT));
}
if (err == 0) {
err = bus_dmamap_create(sc->sc_dmat, PAGE_SIZE, 1, PAGE_SIZE,
@@ -331,7 +329,7 @@ epe_init(struct epe_softc *sc)
}
sc->ctrlpage_dsaddr = sc->ctrlpage_dmamap->dm_segs[0].ds_addr;
memset(sc->ctrlpage, 0, PAGE_SIZE);
-
+
/* Set up pointers to start of each queue in kernel addr space.
* Each descriptor queue or status queue entry uses 2 words
*/
@@ -345,12 +343,12 @@ epe_init(struct epe_softc *sc)
sc->RXStsQ_cur = sc->RXStsQ;
/* Program each queue's start addr, cur addr, and len registers
- * with the physical addresses.
+ * with the physical addresses.
*/
addr = (char *)sc->ctrlpage_dmamap->dm_segs[0].ds_addr;
EPE_WRITE(TXDQBAdd, (uint32_t)addr);
EPE_WRITE(TXDQCurAdd, (uint32_t)addr);
- EPE_WRITE(TXDQBLen, TX_QLEN * 2 * sizeof(uint32_t));
+ EPE_WRITE(TXDQBLen, TX_QLEN * 2 * sizeof(uint32_t));
addr += (sc->TXStsQ - sc->TXDQ) * sizeof(uint32_t);
EPE_WRITE(TXStsQBAdd, (uint32_t)addr);
@@ -361,24 +359,23 @@ epe_init(struct epe_softc *sc)
EPE_WRITE(RXDQBAdd, (uint32_t)addr);
EPE_WRITE(RXDCurAdd, (uint32_t)addr);
EPE_WRITE(RXDQBLen, RX_QLEN * 2 * sizeof(uint32_t));
-
+
addr += (sc->RXStsQ - sc->RXDQ) * sizeof(uint32_t);
EPE_WRITE(RXStsQBAdd, (uint32_t)addr);
EPE_WRITE(RXStsQCurAdd, (uint32_t)addr);
EPE_WRITE(RXStsQBLen, RX_QLEN * 2 * sizeof(uint32_t));
/* Populate the RXDQ with mbufs */
- for(i = 0; i < RX_QLEN; i++) {
+ for (i = 0; i < RX_QLEN; i++) {
struct mbuf *m;
- bus_dmamap_create(sc->sc_dmat, MCLBYTES, TX_QLEN/4, MCLBYTES, 0,
- BUS_DMA_WAITOK, &sc->rxq[i].m_dmamap);
+ bus_dmamap_create(sc->sc_dmat, MCLBYTES, TX_QLEN/4, MCLBYTES,
+ 0, BUS_DMA_WAITOK, &sc->rxq[i].m_dmamap);
MGETHDR(m, M_WAIT, MT_DATA);
MCLGET(m, M_WAIT);
sc->rxq[i].m = m;
- bus_dmamap_load(sc->sc_dmat, sc->rxq[i].m_dmamap,
- m->m_ext.ext_buf, MCLBYTES, NULL,
- BUS_DMA_WAITOK);
+ bus_dmamap_load(sc->sc_dmat, sc->rxq[i].m_dmamap,
+ m->m_ext.ext_buf, MCLBYTES, NULL, BUS_DMA_WAITOK);
sc->RXDQ[i * 2] = sc->rxq[i].m_dmamap->dm_segs[0].ds_addr;
sc->RXDQ[i * 2 + 1] = (i << 16) | MCLBYTES;
@@ -386,9 +383,9 @@ epe_init(struct epe_softc *sc)
MCLBYTES, BUS_DMASYNC_PREREAD);
}
- for(i = 0; i < TX_QLEN; i++) {
+ for (i = 0; i < TX_QLEN; i++) {
bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, 0,
- (BUS_DMA_WAITOK|BUS_DMA_ALLOCNOW),
+ (BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW),
&sc->txq[i].m_dmamap);
sc->txq[i].m = NULL;
sc->TXDQ[i * 2 + 1] = (i << 16);
@@ -397,7 +394,7 @@ epe_init(struct epe_softc *sc)
/* Divide HCLK by 32 for MDC clock */
if (device_cfdata(sc->sc_dev)->cf_flags)
mdcdiv = device_cfdata(sc->sc_dev)->cf_flags;
- EPE_WRITE(SelfCtl, (SelfCtl_MDCDIV(mdcdiv)|SelfCtl_PSPRS));
+ EPE_WRITE(SelfCtl, (SelfCtl_MDCDIV(mdcdiv) | SelfCtl_PSPRS));
sc->sc_mii.mii_ifp = ifp;
sc->sc_mii.mii_readreg = epe_mii_readreg;
@@ -408,18 +405,18 @@ epe_init(struct epe_softc *sc)
ether_mediastatus);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO);
- EPE_WRITE(BMCtl, BMCtl_RxEn|BMCtl_TxEn);
+ EPE_WRITE(BMCtl, BMCtl_RxEn | BMCtl_TxEn);
EPE_WRITE(IntEn, IntEn_REOFIE);
/* maximum valid max frame length */
- EPE_WRITE(MaxFrmLen, (0x7ff << 16)|MHLEN);
+ EPE_WRITE(MaxFrmLen, (0x7ff << 16) | MHLEN);
/* wait for receiver ready */
- while((EPE_READ(BMSts) & BMSts_RxAct) == 0)
+ while ((EPE_READ(BMSts) & BMSts_RxAct) == 0)
continue;
/* enqueue the entries in RXStsQ and RXDQ */
- CTRLPAGE_DMASYNC(0, sc->ctrlpage_dmamap->dm_mapsize,
- BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+ CTRLPAGE_DMASYNC(0, sc->ctrlpage_dmamap->dm_mapsize,
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
EPE_WRITE(RXDEnq, RX_QLEN - 1);
EPE_WRITE(RXStsEnq, RX_QLEN - 1);
@@ -448,7 +445,7 @@ epe_mediachange(struct ifnet *ifp)
{
if (ifp->if_flags & IFF_UP)
epe_ifinit(ifp);
- return (0);
+ return 0;
}
int
@@ -459,7 +456,8 @@ epe_mii_readreg(device_t self, int phy,
d = EPE_READ(SelfCtl);
EPE_WRITE(SelfCtl, d & ~SelfCtl_PSPRS); /* no preamble suppress */
EPE_WRITE(MIICmd, (MIICmd_READ | (phy << 5) | reg));
- while(EPE_READ(MIISts) & MIISts_BUSY);
+ while (EPE_READ(MIISts) & MIISts_BUSY)
+ ;
*val = EPE_READ(MIIData) & 0xffff;
EPE_WRITE(SelfCtl, d); /* restore old value */
return 0;
@@ -474,13 +472,13 @@ epe_mii_writereg(device_t self, int phy,
EPE_WRITE(SelfCtl, d & ~SelfCtl_PSPRS); /* no preamble suppress */
EPE_WRITE(MIIData, val);
EPE_WRITE(MIICmd, (MIICmd_WRITE | (phy << 5) | reg));
- while(EPE_READ(MIISts) & MIISts_BUSY);
+ while (EPE_READ(MIISts) & MIISts_BUSY)
+ ;
EPE_WRITE(SelfCtl, d); /* restore old value */
return 0;
}
-
void
epe_statchg(struct ifnet *ifp)
{
@@ -510,9 +508,9 @@ epe_tick(void *arg)
ifp->if_collisions += EPE_READ(TXCollCnt);
/* These misses are ok, they will happen if the RAM/CPU can't keep up */
misses = EPE_READ(RXMissCnt);
- if (misses > 0)
+ if (misses > 0)
printf("%s: %d rx misses\n", device_xname(sc->sc_dev), misses);
-
+
s = splnet();
if (epe_gctx(sc) > 0 && IFQ_IS_EMPTY(&ifp->if_snd) == 0) {
epe_ifstart(ifp);
@@ -548,21 +546,21 @@ epe_ifstart(struct ifnet *ifp)
bus_dma_segment_t *segs;
int s, bi, err, nsegs, ndq;
- s = splnet();
+ s = splnet();
start:
ndq = 0;
if (sc->TXDQ_avail == 0) {
if (epe_gctx(sc) == 0) {
/* Enable End-Of-TX-Chain interrupt */
- EPE_WRITE(IntEn, IntEn_REOFIE|IntEn_ECIE);
+ EPE_WRITE(IntEn, IntEn_REOFIE | IntEn_ECIE);
ifp->if_flags |= IFF_OACTIVE;
ifp->if_timer = 10;
splx(s);
return;
}
- }
+ }
- bi = sc->TXDQ_cur - sc->TXDQ;
+ bi = sc->TXDQ_cur - sc->TXDQ;
IFQ_POLL(&ifp->if_snd, m);
if (m == NULL) {
@@ -571,13 +569,13 @@ start:
}
more:
if ((err = bus_dmamap_load_mbuf(sc->sc_dmat, sc->txq[bi].m_dmamap, m,
- BUS_DMA_NOWAIT)) ||
+ BUS_DMA_NOWAIT)) ||
sc->txq[bi].m_dmamap->dm_segs[0].ds_addr & 0x3 ||
sc->txq[bi].m_dmamap->dm_nsegs > (sc->TXDQ_avail - ndq)) {
/* Copy entire mbuf chain to new and 32-bit aligned storage */
struct mbuf *mn;
- if (err == 0)
+ if (err == 0)
bus_dmamap_unload(sc->sc_dmat, sc->txq[bi].m_dmamap);
MGETHDR(mn, M_DONTWAIT, MT_DATA);
@@ -589,7 +587,7 @@ more:
goto stop;
}
}
- mn->m_data = (void *)(((uint32_t)mn->m_data + 0x3) & (~0x3));
+ mn->m_data = (void *)(((uint32_t)mn->m_data + 0x3) & (~0x3));
m_copydata(m, 0, m->m_pkthdr.len, mtod(mn, void *));
mn->m_pkthdr.len = mn->m_len = m->m_pkthdr.len;
IFQ_DEQUEUE(&ifp->if_snd, m);
@@ -605,9 +603,9 @@ more:
nsegs = sc->txq[bi].m_dmamap->dm_nsegs;
segs = sc->txq[bi].m_dmamap->dm_segs;
- bus_dmamap_sync(sc->sc_dmat, sc->txq[bi].m_dmamap, 0,
- sc->txq[bi].m_dmamap->dm_mapsize,
- BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ bus_dmamap_sync(sc->sc_dmat, sc->txq[bi].m_dmamap, 0,
+ sc->txq[bi].m_dmamap->dm_mapsize,
+ BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* XXX: This driver hasn't been tested w/nsegs > 1 */
while (nsegs > 0) {
@@ -631,16 +629,15 @@ more:
*/
if ((sc->TXDQ_avail - ndq) > 0 && ndq < TX_QLEN / 2) {
IFQ_POLL(&ifp->if_snd, m);
- if (m != NULL) {
+ if (m != NULL)
goto more;
- }
- }
+ }
stop:
if (ndq > 0) {
sc->TXDQ_avail -= ndq;
sc->TXDQ_cur = &sc->TXDQ[bi];
CTRLPAGE_DMASYNC(0, TX_QLEN * 2 * sizeof(uint32_t),
- BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
EPE_WRITE(TXDEnq, ndq);
}
@@ -658,7 +655,7 @@ epe_ifwatchdog(struct ifnet *ifp)
if ((ifp->if_flags & IFF_RUNNING) == 0)
return;
- printf("%s: device timeout, BMCtl = 0x%08x, BMSts = 0x%08x\n",
+ printf("%s: device timeout, BMCtl = 0x%08x, BMSts = 0x%08x\n",
device_xname(sc->sc_dev), EPE_READ(BMCtl), EPE_READ(BMSts));
}
@@ -669,7 +666,7 @@ epe_ifinit(struct ifnet *ifp)
int rc, s = splnet();
callout_stop(&sc->epe_tick_ch);
- EPE_WRITE(RXCtl, RXCtl_IA0|RXCtl_BA|RXCtl_RCRCA|RXCtl_SRxON);
+ EPE_WRITE(RXCtl, RXCtl_IA0 | RXCtl_BA | RXCtl_RCRCA | RXCtl_SRxON);
EPE_WRITE(TXCtl, TXCtl_STxON);
EPE_WRITE(GIIntMsk, GIIntMsk_INT); /* start interrupting */
@@ -708,7 +705,7 @@ static void
epe_setaddr(struct ifnet *ifp)
{
struct epe_softc *sc = ifp->if_softc;
- struct ethercom *ac = &sc->sc_ec;
+ struct ethercom *ec = &sc->sc_ec;
struct ether_multi *enm;
struct ether_multistep step;
uint8_t ias[2][ETHER_ADDR_LEN];
@@ -717,16 +714,15 @@ epe_setaddr(struct ifnet *ifp)
/* disable receiver temporarily */
EPE_WRITE(RXCtl, rxctl & ~RXCtl_SRxON);
-
- rxctl &= ~(RXCtl_MA|RXCtl_PA|RXCtl_IA2|RXCtl_IA3);
- if (ifp->if_flags & IFF_PROMISC) {
+ rxctl &= ~(RXCtl_MA | RXCtl_PA | RXCtl_IA2 | RXCtl_IA3);
+
+ if (ifp->if_flags & IFF_PROMISC)
rxctl |= RXCtl_PA;
- }
ifp->if_flags &= ~IFF_ALLMULTI;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
/*
@@ -737,7 +733,7 @@ epe_setaddr(struct ifnet *ifp)
* ranges is for IP multicast routing, for which the
* range is big enough to require all bits set.)
*/
- rxctl &= ~(RXCtl_IA2|RXCtl_IA3);
+ rxctl &= ~(RXCtl_IA2 | RXCtl_IA3);
rxctl |= RXCtl_MA;
hashes[0] = 0xffffffffUL;
hashes[1] = 0xffffffffUL;
@@ -747,7 +743,7 @@ epe_setaddr(struct ifnet *ifp)
if (nma < 2) {
/* We can program 2 perfect address filters for mcast */
- memcpy(ias[nma], enm->enm_addrlo, ETHER_ADDR_LEN);
+ memcpy(ias[nma], enm->enm_addrlo, ETHER_ADDR_LEN);
rxctl |= (1 << (nma + 2));
} else {
/*
@@ -765,9 +761,9 @@ epe_setaddr(struct ifnet *ifp)
ETHER_NEXT_MULTI(step, enm);
nma++;
}
-
+
EPE_WRITE(AFP, 0);
- bus_space_write_region_1(sc->sc_iot, sc->sc_ioh, EPE_IndAd,
+ bus_space_write_region_1(sc->sc_iot, sc->sc_ioh, EPE_IndAd,
sc->sc_enaddr, ETHER_ADDR_LEN);
if (rxctl & RXCtl_IA2) {
EPE_WRITE(AFP, 2);
Index: src/sys/arch/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.49 src/sys/arch/mac68k/dev/if_mc.c:1.50
--- src/sys/arch/mac68k/dev/if_mc.c:1.49 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/mac68k/dev/if_mc.c Thu May 23 10:30:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.49 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: if_mc.c,v 1.50 2019/05/23 10:30:35 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.49 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.50 2019/05/23 10:30:35 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -81,8 +81,8 @@ integrate u_int maceput(struct mc_softc
integrate void mc_tint(struct mc_softc *);
integrate void mace_read(struct mc_softc *, void *, int);
integrate struct mbuf *mace_get(struct mc_softc *, void *, int);
-static void mace_calcladrf(struct ethercom *, u_int8_t *);
-static inline u_int16_t ether_cmp(void *, void *);
+static void mace_calcladrf(struct ethercom *, uint8_t *);
+static inline uint16_t ether_cmp(void *, void *);
/*
@@ -99,12 +99,12 @@ static inline u_int16_t ether_cmp(void *
* Please do NOT tweak this without looking at the actual
* assembly code generated before and after your tweaks!
*/
-static inline u_int16_t
+static inline uint16_t
ether_cmp(void *one, void *two)
{
- u_int16_t *a = (u_short *) one;
- u_int16_t *b = (u_short *) two;
- u_int16_t diff;
+ uint16_t *a = (u_short *) one;
+ uint16_t *b = (u_short *) two;
+ uint16_t diff;
#ifdef m68k
/*
@@ -124,7 +124,7 @@ ether_cmp(void *one, void *two)
diff = (a[0] - b[0]) | (a[1] - b[1]) | (a[2] - b[2]);
#endif
- return (diff);
+ return diff;
}
#define ETHER_CMP ether_cmp
@@ -135,7 +135,7 @@ ether_cmp(void *one, void *two)
* to accept packets.
*/
int
-mcsetup(struct mc_softc *sc, u_int8_t *lladdr)
+mcsetup(struct mc_softc *sc, uint8_t *lladdr)
{
struct ifnet *ifp = &sc->sc_if;
@@ -158,7 +158,7 @@ mcsetup(struct mc_softc *sc, u_int8_t *l
if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, lladdr);
- return (0);
+ return 0;
}
hide int
@@ -231,7 +231,7 @@ mcioctl(struct ifnet *ifp, u_long cmd, v
err = ether_ioctl(ifp, cmd, data);
}
splx(s);
- return (err);
+ return err;
}
/*
@@ -285,11 +285,11 @@ hide int
mcinit(struct mc_softc *sc)
{
int s;
- u_int8_t maccc, ladrf[8];
+ uint8_t maccc, ladrf[8];
if (sc->sc_if.if_flags & IFF_RUNNING)
/* already running */
- return (0);
+ return 0;
s = splnet();
@@ -346,7 +346,7 @@ mcinit(struct mc_softc *sc)
sc->sc_if.if_flags &= ~IFF_OACTIVE;
splx(s);
- return (0);
+ return 0;
}
/*
@@ -358,7 +358,7 @@ hide int
mcstop(struct mc_softc *sc)
{
int s;
-
+
s = splnet();
NIC_PUT(sc, MACE_BIUCC, SWRST);
@@ -368,7 +368,7 @@ mcstop(struct mc_softc *sc)
sc->sc_if.if_flags &= ~IFF_RUNNING;
splx(s);
- return (0);
+ return 0;
}
/*
@@ -420,14 +420,14 @@ maceput(struct mc_softc *sc, struct mbuf
(*sc->sc_putpacket)(sc, totlen);
sc->sc_if.if_timer = 5; /* 5 seconds to watch for failing to transmit */
- return (totlen);
+ return totlen;
}
void
mcintr(void *arg)
{
struct mc_softc *sc = arg;
- u_int8_t ir;
+ uint8_t ir;
ir = NIC_GET(sc, MACE_IR) & ~NIC_GET(sc, MACE_IMR);
if (ir & JAB) {
@@ -467,7 +467,7 @@ struct mc_softc *sc = arg;
integrate void
mc_tint(struct mc_softc *sc)
{
- u_int8_t /* xmtrc,*/ xmtfs;
+ uint8_t /* xmtrc,*/ xmtfs;
/* xmtrc = */ NIC_GET(sc, MACE_XMTRC);
xmtfs = NIC_GET(sc, MACE_XMTFS);
@@ -594,7 +594,7 @@ mace_get(struct mc_softc *sc, void *pkt,
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == 0)
- return (0);
+ return 0;
m_set_rcvif(m, &sc->sc_if);
m->m_pkthdr.len = totlen;
len = MHLEN;
@@ -627,7 +627,7 @@ mace_get(struct mc_softc *sc, void *pkt,
mp = &m->m_next;
}
- return (top);
+ return top;
}
/*
@@ -635,13 +635,13 @@ mace_get(struct mc_softc *sc, void *pkt,
* address filter.
*/
void
-mace_calcladrf(struct ethercom *ac, u_int8_t *af)
+mace_calcladrf(struct ethercom *ec, uint8_t *af)
{
- struct ifnet *ifp = &ac->ec_if;
+ struct ifnet *ifp = &ec->ec_if;
struct ether_multi *enm;
u_char *cp;
- u_int32_t crc;
- static const u_int32_t crctab[] = {
+ uint32_t crc;
+ static const uint32_t crctab[] = {
0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c,
@@ -658,8 +658,8 @@ mace_calcladrf(struct ethercom *ac, u_in
* the word.
*/
- *((u_int32_t *)af) = *((u_int32_t *)af + 1) = 0;
- ETHER_FIRST_MULTI(step, ac, enm);
+ *((uint32_t *)af) = *((uint32_t *)af + 1) = 0;
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (ETHER_CMP(enm->enm_addrlo, enm->enm_addrhi)) {
/*
@@ -693,7 +693,7 @@ mace_calcladrf(struct ethercom *ac, u_in
allmulti:
ifp->if_flags |= IFF_ALLMULTI;
- *((u_int32_t *)af) = *((u_int32_t *)af + 1) = 0xffffffff;
+ *((uint32_t *)af) = *((uint32_t *)af + 1) = 0xffffffff;
}
static u_char bbr4[] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
Index: src/sys/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.43 src/sys/arch/macppc/dev/am79c950.c:1.44
--- src/sys/arch/macppc/dev/am79c950.c:1.43 Fri Apr 26 06:33:33 2019
+++ src/sys/arch/macppc/dev/am79c950.c Thu May 23 10:30:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.43 2019/04/26 06:33:33 msaitoh Exp $ */
+/* $NetBSD: am79c950.c,v 1.44 2019/05/23 10:30:35 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@bga.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.43 2019/04/26 06:33:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.44 2019/05/23 10:30:35 msaitoh Exp $");
#include "opt_inet.h"
@@ -155,8 +155,8 @@ mcsetup(struct mc_softc *sc, uint8_t *ll
/* Initialize ifmedia structures */
ifmedia_init(&sc->sc_media, 0, mc_mediachange, mc_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);
if_attach(ifp);
if_deferred_start_init(ifp, NULL);
@@ -646,9 +646,9 @@ mace_get(struct mc_softc *sc, uint8_t *p
* address filter.
*/
void
-mace_calcladrf(struct ethercom *ac, uint8_t *af)
+mace_calcladrf(struct ethercom *ec, uint8_t *af)
{
- struct ifnet *ifp = &ac->ec_if;
+ struct ifnet *ifp = &ec->ec_if;
struct ether_multi *enm;
register u_char *cp, c;
register uint32_t crc;
@@ -665,7 +665,7 @@ mace_calcladrf(struct ethercom *ac, uint
*((uint32_t *)af) = *((uint32_t *)af + 1) = 0;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (ETHER_CMP(enm->enm_addrlo, enm->enm_addrhi)) {
/*
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.18 src/sys/dev/cadence/if_cemac.c:1.19
--- src/sys/dev/cadence/if_cemac.c:1.18 Sun May 19 13:32:35 2019
+++ src/sys/dev/cadence/if_cemac.c Thu May 23 10:30:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.18 2019/05/19 13:32:35 alnsn Exp $ */
+/* $NetBSD: if_cemac.c,v 1.19 2019/05/23 10:30:35 msaitoh Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.18 2019/05/19 13:32:35 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.19 2019/05/23 10:30:35 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -147,9 +147,9 @@ static void cemac_setaddr(struct ifnet *
#ifdef CEMAC_DEBUG
int cemac_debug = CEMAC_DEBUG;
-#define DPRINTFN(n,fmt) if (cemac_debug >= (n)) printf fmt
+#define DPRINTFN(n, fmt) if (cemac_debug >= (n)) printf fmt
#else
-#define DPRINTFN(n,fmt)
+#define DPRINTFN(n, fmt)
#endif
CFATTACH_DECL_NEW(cemac, sizeof(struct cemac_softc),
@@ -200,9 +200,9 @@ cemac_attach_common(device_t self, bus_s
u = CEMAC_READ(ETH_TSR);
CEMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ
| ETH_TSR_IDLE | ETH_TSR_RLE
- | ETH_TSR_COL|ETH_TSR_OVR)));
+ | ETH_TSR_COL | ETH_TSR_OVR)));
u = CEMAC_READ(ETH_RSR);
- CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA)));
+ CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA)));
/* Fetch the Ethernet address from property if set. */
enaddr = prop_dictionary_get(device_properties(self), "mac-address");
@@ -282,7 +282,8 @@ cemac_intr(void *arg)
int bi;
imr = ~CEMAC_READ(ETH_IMR);
- if (!(imr & (ETH_ISR_RCOM|ETH_ISR_TBRE|ETH_ISR_TIDLE|ETH_ISR_RBNA|ETH_ISR_ROVR|ETH_ISR_TCOM))) {
+ if (!(imr & (ETH_ISR_RCOM | ETH_ISR_TBRE | ETH_ISR_TIDLE |
+ ETH_ISR_RBNA | ETH_ISR_ROVR | ETH_ISR_TCOM))) {
// interrupt not enabled, can't be us
return 0;
}
@@ -382,7 +383,7 @@ cemac_intr(void *arg)
if_schedule_deferred_start(ifp);
#if 0 // reloop
irq = CEMAC_READ(IntStsC);
- if ((irq & (IntSts_RxSQ|IntSts_ECI)) != 0)
+ if ((irq & (IntSts_RxSQ | IntSts_ECI)) != 0)
goto begin;
#endif
@@ -396,6 +397,7 @@ cemac_init(struct cemac_softc *sc)
bus_dma_segment_t segs;
int rsegs, err, i;
struct ifnet * ifp = &sc->sc_ethercom.ec_if;
+ struct mii_data * const mii = &sc->sc_mii;
uint32_t u;
#if 0
int mdcdiv = DEFAULT_MDCDIV;
@@ -427,9 +429,9 @@ cemac_init(struct cemac_softc *sc)
u = CEMAC_READ(ETH_TSR);
CEMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ
| ETH_TSR_IDLE | ETH_TSR_RLE
- | ETH_TSR_COL|ETH_TSR_OVR)));
+ | ETH_TSR_COL | ETH_TSR_OVR)));
u = CEMAC_READ(ETH_RSR);
- CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA)));
+ CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA)));
#if 0
if (device_cfdata(sc->sc_dev)->cf_flags)
@@ -459,7 +461,7 @@ cemac_init(struct cemac_softc *sc)
if (err == 0) {
DPRINTFN(1,("%s: -> bus_dmamem_map\n", __FUNCTION__));
err = bus_dmamem_map(sc->sc_dmat, &segs, 1, sc->rbqlen,
- &sc->rbqpage, (BUS_DMA_WAITOK|BUS_DMA_COHERENT));
+ &sc->rbqpage, (BUS_DMA_WAITOK | BUS_DMA_COHERENT));
}
if (err == 0) {
DPRINTFN(1,("%s: -> bus_dmamap_create\n", __FUNCTION__));
@@ -489,7 +491,7 @@ cemac_init(struct cemac_softc *sc)
if (err == 0) {
DPRINTFN(1,("%s: -> bus_dmamem_map\n", __FUNCTION__));
err = bus_dmamem_map(sc->sc_dmat, &segs, 1, sc->tbqlen,
- &sc->tbqpage, (BUS_DMA_WAITOK|BUS_DMA_COHERENT));
+ &sc->tbqpage, (BUS_DMA_WAITOK | BUS_DMA_COHERENT));
}
if (err == 0) {
DPRINTFN(1,("%s: -> bus_dmamap_create\n", __FUNCTION__));
@@ -523,7 +525,7 @@ cemac_init(struct cemac_softc *sc)
/* Populate the RXQ with mbufs */
sc->rxqi = 0;
- for(i = 0; i < RX_QLEN; i++) {
+ for (i = 0; i < RX_QLEN; i++) {
struct mbuf *m;
err = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, PAGE_SIZE,
@@ -567,16 +569,16 @@ cemac_init(struct cemac_softc *sc)
CEMAC_WRITE(ETH_TBQP, (uint32_t)sc->tbqpage_dsaddr);
/* Divide HCLK by 32 for MDC clock */
- sc->sc_ethercom.ec_mii = &sc->sc_mii;
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = cemac_mii_readreg;
- sc->sc_mii.mii_writereg = cemac_mii_writereg;
- sc->sc_mii.mii_statchg = cemac_statchg;
- ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, cemac_mediachange,
+ sc->sc_ethercom.ec_mii = mii;
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = cemac_mii_readreg;
+ mii->mii_writereg = cemac_mii_writereg;
+ mii->mii_statchg = cemac_statchg;
+ ifmedia_init(&mii->mii_media, IFM_IMASK, cemac_mediachange,
cemac_mediastatus);
- mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
#if 0
// enable / disable interrupts
@@ -593,7 +595,7 @@ cemac_init(struct cemac_softc *sc)
* We can support hardware checksumming.
*/
ifp->if_capabilities |=
- IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx |
+ IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx |
IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx |
IFCAP_CSUM_TCPv6_Tx | IFCAP_CSUM_TCPv6_Rx |
@@ -649,7 +651,8 @@ cemac_mii_readreg(device_t self, int phy
| ((phy << ETH_MAN_PHYA_SHIFT) & ETH_MAN_PHYA)
| ((reg << ETH_MAN_REGA_SHIFT) & ETH_MAN_REGA)
| ETH_MAN_CODE_IEEE802_3));
- while (!(CEMAC_READ(ETH_SR) & ETH_SR_IDLE));
+ while (!(CEMAC_READ(ETH_SR) & ETH_SR_IDLE))
+ ;
*val = CEMAC_READ(ETH_MAN) & ETH_MAN_DATA;
return 0;
@@ -667,7 +670,8 @@ cemac_mii_writereg(device_t self, int ph
| ((reg << ETH_MAN_REGA_SHIFT) & ETH_MAN_REGA)
| ETH_MAN_CODE_IEEE802_3
| (val & ETH_MAN_DATA)));
- while (!(CEMAC_READ(ETH_SR) & ETH_SR_IDLE)) ;
+ while (!(CEMAC_READ(ETH_SR) & ETH_SR_IDLE))
+ ;
return 0;
}
@@ -742,7 +746,7 @@ cemac_ifioctl(struct ifnet *ifp, u_long
int s, error;
s = splnet();
- switch(cmd) {
+ switch (cmd) {
default:
error = ether_ioctl(ifp, cmd, data);
if (error != ENETRESET)
@@ -943,9 +947,9 @@ cemac_ifstop(struct ifnet *ifp, int disa
u = CEMAC_READ(ETH_TSR);
CEMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ
| ETH_TSR_IDLE | ETH_TSR_RLE
- | ETH_TSR_COL|ETH_TSR_OVR)));
+ | ETH_TSR_COL | ETH_TSR_OVR)));
u = CEMAC_READ(ETH_RSR);
- CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA)));
+ CEMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA)));
#endif
callout_stop(&sc->cemac_tick_ch);
@@ -961,7 +965,7 @@ static void
cemac_setaddr(struct ifnet *ifp)
{
struct cemac_softc *sc = ifp->if_softc;
- struct ethercom *ac = &sc->sc_ethercom;
+ struct ethercom *ec = &sc->sc_ethercom;
struct ether_multi *enm;
struct ether_multistep step;
uint8_t ias[3][ETHER_ADDR_LEN];
@@ -984,7 +988,7 @@ cemac_setaddr(struct ifnet *ifp)
ifp->if_flags &= ~IFF_ALLMULTI;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
/*
Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.55 src/sys/dev/ic/lance.c:1.56
--- src/sys/dev/ic/lance.c:1.55 Tue Feb 5 06:17:02 2019
+++ src/sys/dev/ic/lance.c Thu May 23 10:30:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.55 2019/02/05 06:17:02 msaitoh Exp $ */
+/* $NetBSD: lance.c,v 1.56 2019/05/23 10:30:36 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.55 2019/02/05 06:17:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.56 2019/05/23 10:30:36 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ hide bool lance_shutdown(device_t, int);
int lance_mediachange(struct ifnet *);
void lance_mediastatus(struct ifnet *, struct ifmediareq *);
-static inline u_int16_t ether_cmp(void *, void *);
+static inline uint16_t ether_cmp(void *, void *);
void lance_stop(struct ifnet *, int);
int lance_ioctl(struct ifnet *, u_long, void *);
@@ -189,8 +189,8 @@ lance_config(struct lance_softc *sc)
0, NULL);
ifmedia_set(&sc->sc_media, sc->sc_defaultmedia);
} else {
- 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);
}
switch (sc->sc_memsize) {
@@ -562,9 +562,9 @@ lance_shutdown(device_t self, int howto)
* Set up the logical address filter.
*/
void
-lance_setladrf(struct ethercom *ac, uint16_t *af)
+lance_setladrf(struct ethercom *ec, uint16_t *af)
{
- struct ifnet *ifp = &ac->ec_if;
+ struct ifnet *ifp = &ec->ec_if;
struct ether_multi *enm;
uint32_t crc;
struct ether_multistep step;
@@ -581,7 +581,7 @@ lance_setladrf(struct ethercom *ac, uint
goto allmulti;
af[0] = af[1] = af[2] = af[3] = 0x0000;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (ETHER_CMP(enm->enm_addrlo, enm->enm_addrhi)) {
/*
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.54 src/sys/dev/pci/if_txp.c:1.55
--- src/sys/dev/pci/if_txp.c:1.54 Tue May 7 15:23:32 2019
+++ src/sys/dev/pci/if_txp.c Thu May 23 10:30:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.54 2019/05/07 15:23:32 msaitoh Exp $ */
+/* $NetBSD: if_txp.c,v 1.55 2019/05/23 10:30:36 msaitoh Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.54 2019/05/07 15:23:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.55 2019/05/23 10:30:36 msaitoh Exp $");
#include "opt_inet.h"
@@ -313,7 +313,7 @@ txp_attach(device_t parent, device_t sel
ifmedia_add(&sc->sc_ifmedia, IFM_ETHER | IFM_100_TX | IFM_FDX,
0, NULL);
}
- ifmedia_add(&sc->sc_ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL);
+ ifmedia_add(&sc->sc_ifmedia, IFM_ETHER | IFM_AUTO, 0, NULL);
sc->sc_xcvr = TXP_XCVR_AUTO;
txp_command(sc, TXP_CMD_XCVR_SELECT, TXP_XCVR_AUTO, 0, 0,
@@ -352,7 +352,7 @@ txp_attach(device_t parent, device_t sel
return;
cleanupintr:
- pci_intr_disestablish(pc,sc->sc_ih);
+ pci_intr_disestablish(pc, sc->sc_ih);
return;
@@ -1262,7 +1262,7 @@ txp_ioctl(struct ifnet *ifp, u_long comm
}
#endif
- switch(command) {
+ switch (command) {
case SIOCINITIFADDR:
ifp->if_flags |= IFF_UP;
txp_init(sc);
@@ -1314,7 +1314,7 @@ txp_ioctl(struct ifnet *ifp, u_long comm
splx(s);
- return(error);
+ return (error);
}
void
@@ -1927,7 +1927,7 @@ txp_show_descriptor(void *d)
void
txp_set_filter(struct txp_softc *sc)
{
- struct ethercom *ac = &sc->sc_arpcom;
+ struct ethercom *ec = &sc->sc_arpcom;
struct ifnet *ifp = &sc->sc_arpcom.ec_if;
uint32_t crc, carry, hashbit, hash[2];
uint16_t filter;
@@ -1952,7 +1952,7 @@ again:
else {
hash[0] = hash[1] = 0;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
ETHER_ADDR_LEN)) {
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.99 src/sys/dev/scsipi/if_se.c:1.100
--- src/sys/dev/scsipi/if_se.c:1.99 Tue Feb 5 06:17:03 2019
+++ src/sys/dev/scsipi/if_se.c Thu May 23 10:30:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.99 2019/02/05 06:17:03 msaitoh Exp $ */
+/* $NetBSD: if_se.c,v 1.100 2019/05/23 10:30:36 msaitoh Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.99 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.100 2019/05/23 10:30:36 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -151,7 +151,7 @@ int se_max_received = 0; /* Instrumentat
static const struct scsi_ctron_ether_generic name
#define PROTOCMD_DECL_SPECIAL(name) \
- static const struct __CONCAT(scsi_,name) name
+ static const struct __CONCAT(scsi_, name) name
/* Command initializers for commands using scsi_ctron_ether_generic */
PROTOCMD_DECL(ctron_ether_send) = {CTRON_ETHER_SEND, 0, {0,0}, 0};
@@ -202,18 +202,18 @@ static int se_ioctl(struct ifnet *, u_lo
static void sewatchdog(struct ifnet *);
#if 0
-static inline u_int16_t ether_cmp(void *, void *);
+static inline uint16_t ether_cmp(void *, void *);
#endif
static void se_recv(void *);
static struct mbuf *se_get(struct se_softc *, char *, int);
static int se_read(struct se_softc *, char *, int);
static int se_reset(struct se_softc *);
static int se_add_proto(struct se_softc *, int);
-static int se_get_addr(struct se_softc *, u_int8_t *);
+static int se_get_addr(struct se_softc *, uint8_t *);
static int se_set_media(struct se_softc *, int);
static int se_init(struct se_softc *);
-static int se_set_multi(struct se_softc *, u_int8_t *);
-static int se_remove_multi(struct se_softc *, u_int8_t *);
+static int se_set_multi(struct se_softc *, uint8_t *);
+static int se_remove_multi(struct se_softc *, uint8_t *);
#if 0
static int sc_set_all_multi(struct se_softc *, int);
#endif
@@ -273,12 +273,12 @@ const struct scsipi_inquiry_pattern se_p
* unrolled for speed.
* Note: use this like memcmp()
*/
-static inline u_int16_t
+static inline uint16_t
ether_cmp(void *one, void *two)
{
- u_int16_t *a = (u_int16_t *) one;
- u_int16_t *b = (u_int16_t *) two;
- u_int16_t diff;
+ uint16_t *a = (uint16_t *) one;
+ uint16_t *b = (uint16_t *) two;
+ uint16_t diff;
diff = (a[0] - b[0]) | (a[1] - b[1]) | (a[2] - b[2]);
@@ -311,7 +311,7 @@ seattach(device_t parent, device_t self,
struct scsipibus_attach_args *sa = aux;
struct scsipi_periph *periph = sa->sa_periph;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
- u_int8_t myaddr[ETHER_ADDR_LEN];
+ uint8_t myaddr[ETHER_ADDR_LEN];
int rv;
sc->sc_dev = self;
@@ -322,7 +322,6 @@ seattach(device_t parent, device_t self,
callout_init(&sc->sc_ifstart_ch, 0);
callout_init(&sc->sc_recv_ch, 0);
-
/*
* Store information needed to contact our base driver
*/
@@ -426,7 +425,7 @@ se_ifstart(struct ifnet *ifp)
u_char *cp;
/* Don't transmit if interface is busy or not running */
- if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
return;
IFQ_DEQUEUE(&ifp->if_snd, m0);
@@ -470,7 +469,7 @@ se_ifstart(struct ifnet *ifp)
error = se_scsipi_cmd(sc->sc_periph,
(void *)&send_cmd, sizeof(send_cmd),
sc->sc_tbuf, len, SERETRIES,
- SETIMEOUT, NULL, XS_CTL_NOSLEEP|XS_CTL_ASYNC|XS_CTL_DATA_OUT);
+ SETIMEOUT, NULL, XS_CTL_NOSLEEP | XS_CTL_ASYNC | XS_CTL_DATA_OUT);
if (error) {
aprint_error_dev(sc->sc_dev, "not queued, error %d\n", error);
ifp->if_oerrors++;
@@ -496,7 +495,7 @@ sedone(struct scsipi_xfer *xs, int error
int s;
s = splnet();
- if(IS_SEND(cmd)) {
+ if (IS_SEND(cmd)) {
if (xs->error == XS_BUSY) {
printf("se: busy, retry txmit\n");
callout_reset(&sc->sc_ifstart_ch, hz,
@@ -507,7 +506,7 @@ sedone(struct scsipi_xfer *xs, int error
* sestart (through scsipi_free_xs).
*/
}
- } else if(IS_RECV(cmd)) {
+ } else if (IS_RECV(cmd)) {
/* RECV complete */
/* pass data up. reschedule a recv */
/* scsipi_free_xs will call start. Harmless. */
@@ -563,7 +562,7 @@ se_recv(void *v)
error = se_scsipi_cmd(sc->sc_periph,
(void *)&recv_cmd, sizeof(recv_cmd),
sc->sc_rbuf, RBUF_LEN, SERETRIES, SETIMEOUT, NULL,
- XS_CTL_NOSLEEP|XS_CTL_ASYNC|XS_CTL_DATA_IN);
+ XS_CTL_NOSLEEP | XS_CTL_ASYNC | XS_CTL_DATA_IN);
if (error)
callout_reset(&sc->sc_recv_ch, se_poll, se_recv, (void *)sc);
}
@@ -719,7 +718,7 @@ se_add_proto(struct se_softc *sc, int pr
{
int error;
struct scsi_ctron_ether_generic add_proto_cmd;
- u_int8_t data[2];
+ uint8_t data[2];
_lto2b(proto, data);
#ifdef SEDEBUG
if (sc->sc_debug)
@@ -736,7 +735,7 @@ se_add_proto(struct se_softc *sc, int pr
}
static int
-se_get_addr(struct se_softc *sc, u_int8_t *myaddr)
+se_get_addr(struct se_softc *sc, uint8_t *myaddr)
{
int error;
struct scsi_ctron_ether_generic get_addr_cmd;
@@ -828,7 +827,7 @@ se_init(struct se_softc *sc)
return (error);
#endif
- if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) == IFF_UP) {
+ if ((ifp->if_flags & (IFF_RUNNING | IFF_UP)) == IFF_UP) {
ifp->if_flags |= IFF_RUNNING;
se_recv(sc);
ifp->if_flags &= ~IFF_OACTIVE;
@@ -838,7 +837,7 @@ se_init(struct se_softc *sc)
}
static int
-se_set_multi(struct se_softc *sc, u_int8_t *addr)
+se_set_multi(struct se_softc *sc, uint8_t *addr)
{
struct scsi_ctron_ether_generic set_multi_cmd;
int error;
@@ -859,7 +858,7 @@ se_set_multi(struct se_softc *sc, u_int8
}
static int
-se_remove_multi(struct se_softc *sc, u_int8_t *addr)
+se_remove_multi(struct se_softc *sc, uint8_t *addr)
{
struct scsi_ctron_ether_generic remove_multi_cmd;
int error;
@@ -884,12 +883,12 @@ static int
sc_set_all_multi(struct se_softc *sc, int set)
{
int error = 0;
- u_int8_t *addr;
- struct ethercom *ac = &sc->sc_ethercom;
+ uint8_t *addr;
+ struct ethercom *ec = &sc->sc_ethercom;
struct ether_multi *enm;
struct ether_multistep step;
- ETHER_FIRST_MULTI(step, ac, enm);
+ ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
if (ETHER_CMP(enm->enm_addrlo, enm->enm_addrhi)) {
/*
@@ -981,7 +980,7 @@ se_ioctl(struct ifnet *ifp, u_long cmd,
if ((error = ifioctl_common(ifp, cmd, data)) != 0)
break;
/* XXX re-use ether_ioctl() */
- 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
