Module Name: src
Committed By: msaitoh
Date: Wed May 29 05:06:40 UTC 2019
Modified Files:
src/sys/arch/amiga/dev: if_es.c
src/sys/arch/emips/ebus: if_le_ebus.c
src/sys/arch/evbppc/virtex/dev: if_temac.c
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/next68k/dev: mb8795.c
src/sys/arch/playstation2/dev: if_smap.c
src/sys/arch/sun2/dev: if_ec.c
src/sys/dev/ic: ax88190.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/virtex/dev/if_temac.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/ralink/ralink_eth.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/playstation2/dev/if_smap.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sun2/dev/if_ec.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/ax88190.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/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.61 src/sys/arch/amiga/dev/if_es.c:1.62
--- src/sys/arch/amiga/dev/if_es.c:1.61 Tue Feb 5 06:17:00 2019
+++ src/sys/arch/amiga/dev/if_es.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.61 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $NetBSD: if_es.c,v 1.62 2019/05/29 05:06:39 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.61 2019/02/05 06:17:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.62 2019/05/29 05:06:39 msaitoh Exp $");
#include <sys/param.h>
@@ -129,7 +129,7 @@ esmatch(device_t parent, cfdata_t cf, vo
/* Ameristar A4066 ethernet card */
if (zap->manid == 1053 && zap->prodid == 10)
- return(1);
+ return (1);
return (0);
}
@@ -847,7 +847,7 @@ esstart(struct ifnet *ifp)
lbuf = (u_long *)(pktbuf);
ldata = (u_long *)data;
cnt = pktlen / 4;
- while(cnt--)
+ while (cnt--)
*ldata = *lbuf++;
if (pktlen & 2) {
buf = (u_short *)lbuf;
Index: src/sys/arch/emips/ebus/if_le_ebus.c
diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.17 src/sys/arch/emips/ebus/if_le_ebus.c:1.18
--- src/sys/arch/emips/ebus/if_le_ebus.c:1.17 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ebus.c,v 1.17 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: if_le_ebus.c,v 1.18 2019/05/29 05:06:39 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.17 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.18 2019/05/29 05:06:39 msaitoh Exp $");
#include "opt_inet.h"
@@ -240,7 +240,7 @@ static int enic_gethwinfo(struct enic_so
/*
* First thing first, get the MAC address
*/
- memset(buffer,0,sizeof buffer);
+ memset(buffer, 0, sizeof buffer);
buffer[0] = ENIC_CMD_GET_ADDRESS;
buffer[3] = ENIC_CMD_GET_ADDRESS; /* bswap bug */
sc->sc_regs->SizeAndFlags = (sizeof buffer) | ES_F_CMD;
@@ -266,7 +266,7 @@ static int enic_gethwinfo(struct enic_so
/*
* Next get the HW parameters
*/
- memset(buffer,0,sizeof buffer);
+ memset(buffer, 0, sizeof buffer);
buffer[0] = ENIC_CMD_GET_INFO;
buffer[3] = ENIC_CMD_GET_INFO; /* bswap bug */
sc->sc_regs->SizeAndFlags = (sizeof buffer) | ES_F_CMD;
@@ -524,7 +524,7 @@ enic_init(struct ifnet *ifp)
enic_kill_xmit(sc);
/* Re-post all recv buffers */
- enic_post_recv(sc,NULL);
+ enic_post_recv(sc, NULL);
}
/* Start the eNIC */
@@ -535,7 +535,7 @@ enic_init(struct ifnet *ifp)
ctl &= ~EC_RXDIS;
sc->sc_regs->Control = ctl;
#if 0
- printf("enic_init <- %x\n",ctl);
+ printf("enic_init <- %x\n", ctl);
#endif
if_schedule_deferred_start(ifp);
@@ -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
Index: src/sys/arch/evbppc/virtex/dev/if_temac.c
diff -u src/sys/arch/evbppc/virtex/dev/if_temac.c:1.13 src/sys/arch/evbppc/virtex/dev/if_temac.c:1.14
--- src/sys/arch/evbppc/virtex/dev/if_temac.c:1.13 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/evbppc/virtex/dev/if_temac.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_temac.c,v 1.13 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: if_temac.c,v 1.14 2019/05/29 05:06:39 msaitoh Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.13 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.14 2019/05/29 05:06:39 msaitoh Exp $");
#include <sys/param.h>
@@ -234,11 +234,11 @@ static inline void hif_wait_stat(uint32
#define cdmac_rx_stat(sc) \
bus_space_read_4((sc)->sc_dma_rxt, (sc)->sc_dma_rsh, 0 /* XXX hack */)
-
-#define cdmac_rx_reset(sc) \
+
+#define cdmac_rx_reset(sc) \
bus_space_write_4((sc)->sc_dma_rxt, (sc)->sc_dma_rsh, 0, CDMAC_STAT_RESET)
-
-#define cdmac_rx_start(sc, val) \
+
+#define cdmac_rx_start(sc, val) \
bus_space_write_4((sc)->sc_dma_rxt, (sc)->sc_dma_rxh, CDMAC_CURDESC, (val))
#define cdmac_tx_stat(sc) \
@@ -246,8 +246,8 @@ static inline void hif_wait_stat(uint32
#define cdmac_tx_reset(sc) \
bus_space_write_4((sc)->sc_dma_txt, (sc)->sc_dma_tsh, 0, CDMAC_STAT_RESET)
-
-#define cdmac_tx_start(sc, val) \
+
+#define cdmac_tx_start(sc, val) \
bus_space_write_4((sc)->sc_dma_txt, (sc)->sc_dma_txh, CDMAC_CURDESC, (val))
Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.15 src/sys/arch/mips/ralink/ralink_eth.c:1.16
--- src/sys/arch/mips/ralink/ralink_eth.c:1.15 Tue Jan 22 03:42:26 2019
+++ src/sys/arch/mips/ralink/ralink_eth.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_eth.c,v 1.15 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: ralink_eth.c,v 1.16 2019/05/29 05:06:39 msaitoh Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_eth.c -- Ralink Ethernet Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.15 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.16 2019/05/29 05:06:39 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1469,7 +1469,7 @@ ralink_eth_rxintr(ralink_eth_softc_t *sc
sc->sc_evcnt_rxintr.ev_count++;
rx_cpu_idx = fe_read(sc, RA_FE_PDMA_RX0_CPU_IDX);
- for (;;) {
+ for (;;) {
rx_cpu_idx = (rx_cpu_idx + 1) % RALINK_ETH_NUM_RX_DESC;
rxs = &sc->sc_rxstate[rx_cpu_idx];
@@ -1803,7 +1803,7 @@ ralink_eth_mii_write(device_t self, int
return 0;
}
#else
- if ((fe_read(sc, RA_FE_MDIO_ACCESS) & MDIO_ACCESS_TRG) == 0){
+ if ((fe_read(sc, RA_FE_MDIO_ACCESS) & MDIO_ACCESS_TRG) == 0) {
ralink_eth_mdio_enable(sc, false);
return 0;
}
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.62 src/sys/arch/next68k/dev/mb8795.c:1.63
--- src/sys/arch/next68k/dev/mb8795.c:1.62 Wed Apr 24 07:32:50 2019
+++ src/sys/arch/next68k/dev/mb8795.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.62 2019/04/24 07:32:50 msaitoh Exp $ */
+/* $NetBSD: mb8795.c,v 1.63 2019/05/29 05:06:39 msaitoh Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,13 +25,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.62 2019/04/24 07:32:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.63 2019/05/29 05:06:39 msaitoh Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/device.h>
@@ -188,7 +188,7 @@ void
mb8795_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct mb8795_softc *sc = ifp->if_softc;
-
+
if (turbo)
return;
@@ -215,19 +215,19 @@ mb8795_hex_dump(unsigned char *pkt, size
size_t i, j;
printf("00000000 ");
- for(i=0; i<len; i++) {
+ for (i=0; i<len; i++) {
printf("%c%c ", XCHR(pkt[i]>>4), XCHR(pkt[i]));
if ((i+1) % 16 == 8) {
printf(" ");
}
if ((i+1) % 16 == 0) {
printf(" %c", '|');
- for(j=0; j<16; j++) {
+ for (j=0; j<16; j++) {
printf("%c",
(pkt[i-15+j] >= 32 && pkt[i-15+j] < 127)
? pkt[i-15+j] : '.');
}
- printf("%c\n%c%c%c%c%c%c%c%c ", '|',
+ printf("%c\n%c%c%c%c%c%c%c%c ", '|',
XCHR((i+1)>>28), XCHR((i+1)>>24), XCHR((i+1)>>20),
XCHR((i+1)>>16), XCHR((i+1)>>12), XCHR((i+1)>>8),
XCHR((i+1)>>4), XCHR(i+1));
@@ -296,7 +296,7 @@ mb8795_rint(struct mb8795_softc *sc)
/* CRC is included with the packet; trim it. */
m->m_pkthdr.len = m->m_len = m->m_len - ETHER_CRC_LEN;
m_set_rcvif(m, ifp);
-
+
/* Find receive length, keep crc */
/* enable DMA interrupts while we process the packet */
splx(s);
@@ -336,7 +336,7 @@ mb8795_rint(struct mb8795_softc *sc)
snprintb(sbuf, sizeof(sbuf), MB8795_RXSTAT_BITS,
MB_READ_REG(sc, MB8795_RXSTAT));
-
+
printf("rxstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), MB8795_RXMASK_BITS,
@@ -438,18 +438,18 @@ mb8795_reset(struct mb8795_softc *sc)
MB_WRITE_REG(sc, MB8795_RESET, MB8795_RESET_MODE);
mb8795_mediachange(&sc->sc_ethercom.ec_if);
-
+
#if 0 /* This interrupt was sometimes failing to ack correctly
* causing a loop @@@
*/
- MB_WRITE_REG(sc, MB8795_TXMASK,
+ MB_WRITE_REG(sc, MB8795_TXMASK,
MB8795_TXMASK_UNDERFLOWIE | MB8795_TXMASK_COLLIE
| MB8795_TXMASK_COLL16IE | MB8795_TXMASK_PARERRIE);
#else
MB_WRITE_REG(sc, MB8795_TXMASK, 0);
#endif
MB_WRITE_REG(sc, MB8795_TXSTAT, MB8795_TXSTAT_CLEAR);
-
+
#if 0
MB_WRITE_REG(sc, MB8795_RXMASK,
MB8795_RXMASK_OKIE | MB8795_RXMASK_RESETIE | MB8795_RXMASK_SHORTIE
@@ -460,20 +460,20 @@ mb8795_reset(struct mb8795_softc *sc)
MB8795_RXMASK_OKIE | MB8795_RXMASK_RESETIE
| MB8795_RXMASK_SHORTIE);
#endif
-
+
MB_WRITE_REG(sc, MB8795_RXSTAT, MB8795_RXSTAT_CLEAR);
-
- for(i=0;i<sizeof(sc->sc_enaddr);i++)
+
+ for (i=0;i<sizeof(sc->sc_enaddr);i++)
MB_WRITE_REG(sc, MB8795_ENADDR+i, sc->sc_enaddr[i]);
-
+
DPRINTF(("%s: initializing ethernet %02x:%02x:%02x:%02x:%02x:%02x, "
"size=%d\n", device_xname(sc->sc_dev),
sc->sc_enaddr[0],sc->sc_enaddr[1],sc->sc_enaddr[2],
sc->sc_enaddr[3],sc->sc_enaddr[4],sc->sc_enaddr[5],
sizeof(sc->sc_enaddr)));
-
+
MB_WRITE_REG(sc, MB8795_RESET, 0);
-
+
splx(s);
}
@@ -518,12 +518,12 @@ mb8795_init(struct mb8795_softc *sc)
/* XXX add support for multicast */
if (turbo)
rxmode |= MB8795_RXMODE_TEST;
-
+
/* switching mode probably borken now with turbo */
MB_WRITE_REG(sc, MB8795_TXMODE,
turbo ? MB8795_TXMODE_TURBO1 : MB8795_TXMODE_LB_DISABLE);
MB_WRITE_REG(sc, MB8795_RXMODE, rxmode);
-
+
if ((ifp->if_flags & IFF_RUNNING) == 0) {
MBDMA_RX_SETUP(sc);
MBDMA_TX_SETUP(sc);
@@ -531,7 +531,7 @@ mb8795_init(struct mb8795_softc *sc)
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
ifp->if_timer = 0;
-
+
MBDMA_RX_GO(sc);
}
splx(s);
Index: src/sys/arch/playstation2/dev/if_smap.c
diff -u src/sys/arch/playstation2/dev/if_smap.c:1.28 src/sys/arch/playstation2/dev/if_smap.c:1.29
--- src/sys/arch/playstation2/dev/if_smap.c:1.28 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/playstation2/dev/if_smap.c Wed May 29 05:06:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smap.c,v 1.28 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: if_smap.c,v 1.29 2019/05/29 05:06:39 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.28 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.29 2019/05/29 05:06:39 msaitoh Exp $");
#include "debug_playstation2.h"
@@ -70,10 +70,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v
int smap_debug = 0;
#define DPRINTF(fmt, args...) \
if (smap_debug) \
- printf("%s: " fmt, __func__ , ##args)
+ printf("%s: " fmt, __func__ , ##args)
#define DPRINTFN(n, arg) \
if (smap_debug > (n)) \
- printf("%s: " fmt, __func__ , ##args)
+ printf("%s: " fmt, __func__ , ##args)
#define STATIC
struct smap_softc *__sc;
void __smap_status(int);
@@ -195,7 +195,7 @@ smap_attach(struct device *parent, struc
txbuf = malloc(ETHER_MAX_LEN - ETHER_CRC_LEN + SMAP_FIFO_ALIGN + 16,
M_DEVBUF, M_NOWAIT);
if (txbuf == NULL) {
- printf("%s: no memory.\n", DEVNAME);
+ printf("%s: no memory.\n", DEVNAME);
return;
}
@@ -210,8 +210,8 @@ smap_attach(struct device *parent, struc
sc->tx_buf = (u_int32_t *)ROUND16((vaddr_t)txbuf);
sc->rx_buf = (u_int32_t *)ROUND16((vaddr_t)rxbuf);
- /*
- * setup MI layer
+ /*
+ * setup MI layer
*/
strcpy(ifp->if_xname, DEVNAME);
ifp->if_softc = sc;
@@ -232,7 +232,7 @@ smap_attach(struct device *parent, struc
ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus);
mii_attach(&emac3->dev, mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
-
+
/* Choose a default media. */
if (LIST_FIRST(&mii->mii_phys) == NULL) {
ifmedia_add(&mii->mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
@@ -244,7 +244,7 @@ smap_attach(struct device *parent, struc
if_attach(ifp);
if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, emac3->eaddr);
-
+
spd_intr_establish(SPD_NIC, smap_intr, sc);
rnd_attach_source(&sc->rnd_source, DEVNAME,
@@ -315,7 +315,7 @@ smap_intr(void *arg)
if (cause & SPD_INTR_EMAC3)
emac3_intr(arg);
-
+
/* if transmission is pending, start here */
ifp = &sc->ethercom.ec_if;
if_schedule_deferred_start(ifp);
@@ -397,7 +397,7 @@ smap_rxeof(void *arg)
d->ptr = 0;
d->stat = SMAP_RXDESC_EMPTY;
_wbflush();
-
+
if (m != NULL)
if_percpuq_enqueue(ifp->if_percpuq, m);
}
@@ -446,7 +446,7 @@ smap_txeof(void *arg)
if (sc->tx_desc_cnt == 0)
break;
-
+
sc->tx_buf_freesize += ROUND4(d->sz);
sc->tx_desc_cnt--;
@@ -556,7 +556,7 @@ smap_watchdog(struct ifnet *ifp)
{
struct smap_softc *sc = ifp->if_softc;
- printf("%s: watchdog timeout\n",DEVNAME);
+ printf("%s: watchdog timeout\n", DEVNAME);
sc->ethercom.ec_if.if_oerrors++;
smap_fifo_init(sc);
@@ -598,7 +598,7 @@ smap_init(struct ifnet *ifp)
ifp->if_flags |= IFF_RUNNING;
- return (0);
+ return (0);
}
void
@@ -658,7 +658,7 @@ smap_desc_init(struct smap_softc *sc)
sc->tx_desc = (void *)SMAP_TXDESC_BASE;
sc->rx_desc = (void *)SMAP_RXDESC_BASE;
-
+
sc->tx_buf_freesize = SMAP_TXBUF_SIZE;
sc->tx_fifo_ptr = 0;
sc->tx_start_index = 0;
@@ -673,7 +673,7 @@ smap_desc_init(struct smap_softc *sc)
d->sz = 0;
d->ptr = 0;
}
-
+
d = sc->rx_desc;
for (i = 0; i < SMAP_DESC_MAX; i++, d++) {
d->stat = SMAP_RXDESC_EMPTY;
Index: src/sys/arch/sun2/dev/if_ec.c
diff -u src/sys/arch/sun2/dev/if_ec.c:1.31 src/sys/arch/sun2/dev/if_ec.c:1.32
--- src/sys/arch/sun2/dev/if_ec.c:1.31 Tue Feb 5 06:17:02 2019
+++ src/sys/arch/sun2/dev/if_ec.c Wed May 29 05:06:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.31 2019/02/05 06:17:02 msaitoh Exp $ */
+/* $NetBSD: if_ec.c,v 1.32 2019/05/29 05:06:40 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.31 2019/02/05 06:17:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.32 2019/05/29 05:06:40 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -136,7 +136,7 @@ CFATTACH_DECL_NEW(ec, sizeof(struct ec_s
/*
* Copy board memory to kernel.
*/
-void
+void
ec_copyin(struct ec_softc *sc, void *p, int offset, size_t size)
{
@@ -146,14 +146,14 @@ ec_copyin(struct ec_softc *sc, void *p,
/*
* Copy from kernel space to board memory.
*/
-void
+void
ec_copyout(struct ec_softc *sc, const void *p, int offset, size_t size)
{
bus_space_copyout(sc->sc_iot, sc->sc_ioh, offset, p, size);
}
-int
+int
ec_match(device_t parent, cfdata_t cf, void *aux)
{
struct mbmem_attach_args *mbma = aux;
@@ -165,7 +165,7 @@ ec_match(device_t parent, cfdata_t cf, v
return 0;
/* Make sure there is something there... */
- if (bus_space_map(mbma->mbma_bustag, mbma->mbma_paddr, ECREG_BANK_SZ,
+ if (bus_space_map(mbma->mbma_bustag, mbma->mbma_paddr, ECREG_BANK_SZ,
0, &bh))
return 0;
matched = (bus_space_peek_2(mbma->mbma_bustag, bh, 0, NULL) == 0);
@@ -180,7 +180,7 @@ ec_match(device_t parent, cfdata_t cf, v
return 1;
}
-void
+void
ec_attach(device_t parent, device_t self, void *aux)
{
struct ec_softc *sc = device_private(self);
@@ -243,8 +243,8 @@ ec_attach(device_t parent, device_t self
/*
* Reset interface.
- */
-void
+ */
+void
ec_reset(struct ifnet *ifp)
{
int s;
@@ -258,7 +258,7 @@ ec_reset(struct ifnet *ifp)
/*
* Initialize interface.
*/
-int
+int
ec_init(struct ifnet *ifp)
{
struct ec_softc *sc = ifp->if_softc;
@@ -291,7 +291,7 @@ ec_init(struct ifnet *ifp)
/*
* Start output on interface.
*/
-void
+void
ec_start(struct ifnet *ifp)
{
struct ec_softc *sc = ifp->if_softc;
@@ -342,7 +342,7 @@ ec_start(struct ifnet *ifp)
/*
* Controller interrupt.
*/
-int
+int
ec_intr(void *arg)
{
struct ec_softc *sc = arg;
@@ -446,7 +446,7 @@ ec_intr(void *arg)
/*
* Read in a packet from the board.
*/
-void
+void
ec_recv(struct ec_softc *sc, int intbit)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -535,27 +535,27 @@ ec_recv(struct ec_softc *sc, int intbit)
EC_CSR_INT_BSW(intbit) | intbit);
}
-int
+int
ec_mediachange(struct ifnet *ifp)
-{
+{
return 0;
}
-void
+void
ec_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
+{
if ((ifp->if_flags & IFF_UP) == 0)
return;
-
+
ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE;
}
/*
* Process an ioctl request. This code needs some work - it looks pretty ugly.
*/
-int
+int
ec_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct ifaddr *ifa = (struct ifaddr *)data;
@@ -628,7 +628,7 @@ ec_ioctl(struct ifnet *ifp, u_long cmd,
/*
* Collision routine.
*/
-void
+void
ec_coll(struct ec_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -658,7 +658,7 @@ ec_coll(struct ec_softc *sc)
/*
* Device timeout routine.
*/
-void
+void
ec_watchdog(struct ifnet *ifp)
{
struct ec_softc *sc = ifp->if_softc;
Index: src/sys/dev/ic/ax88190.c
diff -u src/sys/dev/ic/ax88190.c:1.13 src/sys/dev/ic/ax88190.c:1.14
--- src/sys/dev/ic/ax88190.c:1.13 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/ax88190.c Wed May 29 05:06:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,6 @@ static int
ax88190_mii_readreg(device_t self, int phy, int reg, uint16_t *val)
{
-
return mii_bitbang_readreg(self, &ax88190_mii_bitbang_ops, phy, reg,
val);
}
