Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Whitespace fix. No functional change.
details: https://anonhg.NetBSD.org/src/rev/a4d23d122b0f
branches: trunk
changeset: 451620:a4d23d122b0f
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed May 29 05:06:39 2019 +0000
description:
Whitespace fix. No functional change.
diffstat:
sys/arch/amiga/dev/if_es.c | 8 +++---
sys/arch/emips/ebus/if_le_ebus.c | 16 ++++++------
sys/arch/evbppc/virtex/dev/if_temac.c | 16 ++++++------
sys/arch/mips/ralink/ralink_eth.c | 8 +++---
sys/arch/next68k/dev/mb8795.c | 42 +++++++++++++++++-----------------
sys/arch/playstation2/dev/if_smap.c | 32 +++++++++++++-------------
sys/arch/sun2/dev/if_ec.c | 42 +++++++++++++++++-----------------
sys/dev/ic/ax88190.c | 5 +--
8 files changed, 84 insertions(+), 85 deletions(-)
diffs (truncated from 650 to 300 lines):
diff -r f69a8207f0fd -r a4d23d122b0f sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c Wed May 29 05:05:24 2019 +0000
+++ b/sys/arch/amiga/dev/if_es.c Wed May 29 05:06:39 2019 +0000
@@ -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 @@
/* Ameristar A4066 ethernet card */
if (zap->manid == 1053 && zap->prodid == 10)
- return(1);
+ return (1);
return (0);
}
@@ -847,7 +847,7 @@
lbuf = (u_long *)(pktbuf);
ldata = (u_long *)data;
cnt = pktlen / 4;
- while(cnt--)
+ while (cnt--)
*ldata = *lbuf++;
if (pktlen & 2) {
buf = (u_short *)lbuf;
diff -r f69a8207f0fd -r a4d23d122b0f sys/arch/emips/ebus/if_le_ebus.c
--- a/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 05:05:24 2019 +0000
+++ b/sys/arch/emips/ebus/if_le_ebus.c Wed May 29 05:06:39 2019 +0000
@@ -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 @@
/*
* 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 @@
/*
* 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_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 @@
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 @@
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
diff -r f69a8207f0fd -r a4d23d122b0f sys/arch/evbppc/virtex/dev/if_temac.c
--- a/sys/arch/evbppc/virtex/dev/if_temac.c Wed May 29 05:05:24 2019 +0000
+++ b/sys/arch/evbppc/virtex/dev/if_temac.c Wed May 29 05:06:39 2019 +0000
@@ -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 @@
#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 @@
#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))
diff -r f69a8207f0fd -r a4d23d122b0f sys/arch/mips/ralink/ralink_eth.c
--- a/sys/arch/mips/ralink/ralink_eth.c Wed May 29 05:05:24 2019 +0000
+++ b/sys/arch/mips/ralink/ralink_eth.c Wed May 29 05:06:39 2019 +0000
@@ -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 @@
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 @@
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;
}
diff -r f69a8207f0fd -r a4d23d122b0f sys/arch/next68k/dev/mb8795.c
--- a/sys/arch/next68k/dev/mb8795.c Wed May 29 05:05:24 2019 +0000
+++ b/sys/arch/next68k/dev/mb8795.c Wed May 29 05:06:39 2019 +0000
@@ -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 @@
mb8795_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct mb8795_softc *sc = ifp->if_softc;
-
+
if (turbo)
return;
@@ -215,19 +215,19 @@
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 @@
/* 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 @@
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 @@
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_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)));
-
Home |
Main Index |
Thread Index |
Old Index