Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/e6851fe8c053
branches: trunk
changeset: 744508:e6851fe8c053
user: skrll <skrll%NetBSD.org@localhost>
date: Tue Feb 04 07:40:34 2020 +0000
description:
Trailing whitespace
diffstat:
sys/arch/acorn32/podulebus/if_ie.c | 36 ++++++++++++++++----------------
sys/arch/arm/gemini/gemini_gmac.c | 28 ++++++++++++------------
sys/arch/mac68k/nubus/if_netdock_nubus.c | 8 +++---
sys/arch/newsmips/apbus/if_sn.c | 30 +++++++++++++-------------
sys/dev/pci/if_rge.c | 26 +++++++++++-----------
5 files changed, 64 insertions(+), 64 deletions(-)
diffs (truncated from 549 to 300 lines):
diff -r 02739d267006 -r e6851fe8c053 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c Tue Feb 04 07:35:21 2020 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c Tue Feb 04 07:40:34 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.45 2020/02/04 07:35:21 skrll Exp $ */
+/* $NetBSD: if_ie.c,v 1.46 2020/02/04 07:40:34 skrll Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.45 2020/02/04 07:35:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.46 2020/02/04 07:40:34 skrll Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -206,7 +206,7 @@
WriteByte(sc->sc_fastbase + (IE_CONTROL<<2), IE_CONT_CLI);
}
-/*
+/*
* Wake the i82586 chip up and get it to do something
*/
@@ -297,7 +297,7 @@
/*
* Attach our driver to the interfaces it uses
*/
-
+
void
ieattach(device_t parent, device_t self, void *aux)
{
@@ -429,7 +429,7 @@
crc32(idrom,28), *(u_long *)(idrom+28));
for ( i=0; i<32; i+=8 ) {
printf ( "IDROM: %02x %02x %02x %02x %02x %02x %02x %02x\n",
- idrom[0+i], idrom[1+i], idrom[2+i], idrom[3+i],
+ idrom[0+i], idrom[1+i], idrom[2+i], idrom[3+i],
idrom[4+i], idrom[5+i], idrom[6+i], idrom[7+i] );
}
printf ( "ie: I'll ignore this fact for now!\n" );
@@ -448,14 +448,14 @@
ifp->if_ioctl = ieioctl;
ifp->if_watchdog = iewatchdog;
ifp->if_flags = IFF_BROADCAST;
-
+
/* Signed, dated then sent */
if_attach (ifp);
if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, hwaddr);
/* "Hmm," said nuts, "what if the attach fails" */
-
+
/* Write some pretty things on the annoucement line */
printf ( ": %s using %dk card ram",
ether_sprintf(hwaddr),
@@ -479,8 +479,8 @@
printf("\n");
}
-
-
+
+
/*
* Oh no!! Where's my shorts!!! I'm sure I put them on this morning
*/
@@ -683,7 +683,7 @@
iereset(sc);
}
-/*
+/*
* Start the time-domain-refloctometer running
*/
@@ -789,7 +789,7 @@
host2ie(sc, &rbd, ptr, sizeof rbd);
ptr+=sizeof rbd;
- sc->cbuffs[i] = ptr;
+ sc->cbuffs[i] = ptr;
ptr+=IE_RXBUF_SIZE;
}
rbd.ie_rbd_next = sc->rbuffs[0];
@@ -1131,7 +1131,7 @@
void *newdata = (void *)
ALIGN(m->m_data + sizeof(struct ether_header)) -
sizeof(struct ether_header);
- len -= newdata - m->m_data;
+ len -= newdata - m->m_data;
m->m_data = newdata;
}
@@ -1415,7 +1415,7 @@
struct ie_xmit_cmd xc;
struct ie_xmit_buf xb;
-
+
ie2host(sc, sc->xmit_buffs[sc->xctail], (char *)&xb, sizeof xb );
xb.ie_xmit_flags |= IE_XMIT_LAST;
xb.ie_xmit_next = 0xffff;
@@ -1491,7 +1491,7 @@
len = ETHER_MIN_LEN - ETHER_CRC_LEN;
buffer += ETHER_MIN_LEN - ETHER_CRC_LEN;
}
-
+
/* When we write directly to the card we dont need this */
if (len&1)
host2ie(sc, txbuf, sc->xmit_cbuffs[sc->xchead], len+1 );
@@ -1499,7 +1499,7 @@
host2ie(sc, txbuf, sc->xmit_cbuffs[sc->xchead], len );
/* sc->xmit_buffs[sc->xchead]->ie_xmit_flags = len; */
-
+
WRITE_MEMBER(sc,struct ie_xmit_buf, ie_xmit_flags,
sc->xmit_buffs[sc->xchead], len)
@@ -1521,13 +1521,13 @@
ifp->if_timer=0;
ifp->if_flags &= ~IFF_OACTIVE;
-
+
READ_MEMBER(sc,struct ie_xmit_cmd, ie_xmit_status,
sc->xmit_cmds[sc->xctail], status );
if (!(status&IE_STAT_COMPL) || (status & IE_STAT_BUSY) )
printf ( "ietint: command still busy!\n" );
-
+
if ( status & IE_STAT_OK ) {
if_statinc(ifp, if_opackets);
if_statadd(ifp, if_collisions, status & IE_XS_MAXCOLL);
@@ -1550,7 +1550,7 @@
/* Done with the buffer */
sc->xmit_free++;
sc->xctail = (sc->xctail + 1 ) % NTXBUF;
-
+
/* Start the next packet transmitting, if any */
if ( sc->xmit_free<NTXBUF )
iexmit(sc);
diff -r 02739d267006 -r e6851fe8c053 sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Tue Feb 04 07:35:21 2020 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Tue Feb 04 07:40:34 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.19 2020/02/04 07:35:34 skrll Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.20 2020/02/04 07:40:45 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -49,7 +49,7 @@
#include <sys/gpio.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.19 2020/02/04 07:35:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.20 2020/02/04 07:40:45 skrll Exp $");
#define SWFREEQ_DESCS 256 /* one page worth */
#define HWFREEQ_DESCS 256 /* one page worth */
@@ -127,7 +127,7 @@
&global_ioh);
KASSERT(error == 0);
aprint_normal_dev(sc->sc_dev, "gmac_init: global_ioh=%#zx\n", global_ioh);
- bus_space_write_4(sc->sc_iot, global_ioh, GEMINI_GLOBAL_RESET_CTL,
+ bus_space_write_4(sc->sc_iot, global_ioh, GEMINI_GLOBAL_RESET_CTL,
GLOBAL_RESET_GMAC0|GLOBAL_RESET_GMAC1);
do {
v = bus_space_read_4(sc->sc_iot, global_ioh,
@@ -524,7 +524,7 @@
i += hwq->hwq_wptr;
if (i >= hwq->hwq_size)
i -= hwq->hwq_size;
- return hwq->hwq_base + i;
+ return hwq->hwq_base + i;
}
static void
@@ -584,14 +584,14 @@
rptr = (rptr + 1) & (hwq->hwq_size - 1)) {
gmac_desc_t * const d = hwq->hwq_base + rptr;
if (hqm->hqm_flags & HQM_TX) {
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + rptr]),
sizeof(gmac_desc_t),
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
if (d->d_desc3 & htole32(DESC3_EOF))
gmac_hwqueue_txconsume(hwq, d);
} else {
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + rptr]),
sizeof(gmac_desc_t),
BUS_DMASYNC_POSTWRITE);
@@ -599,7 +599,7 @@
aprint_debug("gmac_hwqueue_sync(%p): %zu@%p=%#x/%#x/%#x/%#x\n",
hwq, rptr, d, d->d_desc0, d->d_desc1,
d->d_bufaddr, d->d_desc3);
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + rptr]),
sizeof(gmac_desc_t),
BUS_DMASYNC_PREWRITE);
@@ -631,7 +631,7 @@
count > 0;
count--, wptr = (wptr + 1) & (hwq->hwq_size - 1)) {
KASSERT(((wptr + 1) & (hwq->hwq_size - 1)) != hwq->hwq_rptr);
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + wptr]),
sizeof(gmac_desc_t),
BUS_DMASYNC_PREWRITE);
@@ -640,7 +640,7 @@
hwq->hwq_wptr = wptr;
#else
if (hwq->hwq_wptr + count >= hwq->hwq_size) {
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + hwq->hwq_wptr]),
sizeof(gmac_desc_t [hwq->hwq_size - hwq->hwq_wptr]),
BUS_DMASYNC_PREWRITE);
@@ -648,7 +648,7 @@
hwq->hwq_wptr = 0;
}
if (count > 0) {
- bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
+ bus_dmamap_sync(hqm->hqm_dmat, hqm->hqm_dmamap,
sizeof(gmac_desc_t [hwq->hwq_qoff + hwq->hwq_wptr]),
sizeof(gmac_desc_t [count]),
BUS_DMASYNC_PREWRITE);
@@ -884,8 +884,8 @@
v = bus_space_read_4(hwq->hwq_iot, hwq->hwq_qrwptr_ioh, 0);
- rptr = (v >> 0) & 0xffff;
- hwq->hwq_wptr = (v >> 16) & 0xffff;
+ rptr = (v >> 0) & 0xffff;
+ hwq->hwq_wptr = (v >> 16) & 0xffff;
KASSERT(rptr == hwq->hwq_rptr);
if (rptr == hwq->hwq_wptr)
return 0;
@@ -956,7 +956,7 @@
gmac_hwqmem_t *
gmac_hwqmem_create(gmac_mapcache_t *mc, size_t ndesc, size_t nqueue, int flags)
{
- gmac_hwqmem_t *hqm;
+ gmac_hwqmem_t *hqm;
int error;
KASSERT(ndesc > 0 && ndesc <= 2048);
@@ -992,7 +992,7 @@
}
error = bus_dmamap_load(hqm->hqm_dmat, hqm->hqm_dmamap, hqm->hqm_base,
hqm->hqm_memsize, NULL,
- BUS_DMA_WAITOK|BUS_DMA_WRITE|BUS_DMA_READ|BUS_DMA_COHERENT);
+ BUS_DMA_WAITOK|BUS_DMA_WRITE|BUS_DMA_READ|BUS_DMA_COHERENT);
if (error) {
aprint_debug("gmac_hwqmem_create: ds_addr=%zu ds_len=%zu\n",
hqm->hqm_segs->ds_addr, hqm->hqm_segs->ds_len);
diff -r 02739d267006 -r e6851fe8c053 sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c Tue Feb 04 07:35:21 2020 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c Tue Feb 04 07:40:34 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $ */
+/* $NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $ */
/*
* Copyright (C) 2000,2002 Daishi Kato <daishi%axlight.com@localhost>
@@ -43,7 +43,7 @@
/***********************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -91,7 +91,7 @@
#define REG_DATA 0x0008
#define REG_EFD00 0xefd00
-#define ISR_ALL 0x3300
+#define ISR_ALL 0x3300
#define ISR_TX 0x0200
#define ISR_RX 0x0100
#define ISR_READY 0x0800
@@ -518,7 +518,7 @@
/* 1382 */
savetmp = NIC_GET_2(sc, REG_000E);
Home |
Main Index |
Thread Index |
Old Index