Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/0dfc1a0ac7a2
branches: trunk
changeset: 359782:0dfc1a0ac7a2
user: skrll <skrll%NetBSD.org@localhost>
date: Sat Jan 22 15:08:10 2022 +0000
description:
Trailing whitespace
diffstat:
sys/arch/emips/emips/bus_dma.c | 14 +++---
sys/arch/evbmips/malta/pci/pcib.c | 6 +-
sys/arch/mips/mips/bus_dma.c | 14 +++---
sys/arch/mips/rmi/rmixl_obio.c | 12 ++--
sys/arch/mips/rmi/rmixl_pcix.c | 58 ++++++++++++++--------------
sys/arch/mips/sibyte/pci/sbbrz.c | 28 ++++++------
sys/arch/newsmips/newsmips/bus.c | 12 ++--
sys/arch/playstation2/playstation2/bus_dma.c | 6 +-
sys/arch/pmax/pmax/bus_dma.c | 10 ++--
9 files changed, 80 insertions(+), 80 deletions(-)
diffs (truncated from 549 to 300 lines):
diff -r 11a2b5a11fbe -r 0dfc1a0ac7a2 sys/arch/emips/emips/bus_dma.c
--- a/sys/arch/emips/emips/bus_dma.c Sat Jan 22 14:08:19 2022 +0000
+++ b/sys/arch/emips/emips/bus_dma.c Sat Jan 22 15:08:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.6 2021/12/05 03:07:15 msaitoh Exp $ */
+/* $NetBSD: bus_dma.c,v 1.7 2022/01/22 15:08:10 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.6 2021/12/05 03:07:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.7 2022/01/22 15:08:10 skrll Exp $");
#include "opt_cputype.h"
@@ -88,9 +88,9 @@
#endif
}
-static size_t
+static size_t
_bus_dmamap_mapsize(int const nsegments)
-{
+{
KASSERT(nsegments > 0);
return sizeof(struct emips_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
@@ -488,11 +488,11 @@
}
/*
- * Now at the first segment to sync; nail
+ * Now at the first segment to sync; nail
* each segment until we have exhausted the
* length.
*/
- minlen = len < map->dm_segs[i].ds_len - offset ?
+ minlen = len < map->dm_segs[i].ds_len - offset ?
len : map->dm_segs[i].ds_len - offset;
addr = map->dm_segs[i].ds_addr;
@@ -736,6 +736,6 @@
rv = _bus_dmamem_mmap_common(t, segs, nsegs, off, prot, flags);
if (rv == (bus_addr_t)-1)
return (-1);
-
+
return (mips_btop((char *)rv));
}
diff -r 11a2b5a11fbe -r 0dfc1a0ac7a2 sys/arch/evbmips/malta/pci/pcib.c
--- a/sys/arch/evbmips/malta/pci/pcib.c Sat Jan 22 14:08:19 2022 +0000
+++ b/sys/arch/evbmips/malta/pci/pcib.c Sat Jan 22 15:08:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.22 2021/08/07 16:18:51 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.23 2022/01/22 15:08:10 skrll Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.22 2021/08/07 16:18:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.23 2022/01/22 15:08:10 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,7 +426,7 @@
* From YAMON source code:
*
* IRQ7 is used to detect spurious interrupts.
- * The interrupt acknowledge cycle returns IRQ7, if no
+ * The interrupt acknowledge cycle returns IRQ7, if no
* interrupts is requested.
* We can differentiate between this situation and a
* "Normal" IRQ7 by reading the ISR.
diff -r 11a2b5a11fbe -r 0dfc1a0ac7a2 sys/arch/mips/mips/bus_dma.c
--- a/sys/arch/mips/mips/bus_dma.c Sat Jan 22 14:08:19 2022 +0000
+++ b/sys/arch/mips/mips/bus_dma.c Sat Jan 22 15:08:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.44 2021/01/07 17:28:20 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.45 2022/01/22 15:08:10 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.44 2021/01/07 17:28:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.45 2022/01/22 15:08:10 skrll Exp $");
#define _MIPS_BUS_DMA_PRIVATE
@@ -285,9 +285,9 @@
}
#endif /* _MIPS_NEED_BUS_DMA_BOUNCE */
-static size_t
+static size_t
_bus_dmamap_mapsize(int const nsegments)
-{
+{
KASSERT(nsegments > 0);
return sizeof(struct mips_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
@@ -862,7 +862,7 @@
for (; offset >= seg->ds_len; seg++) {
offset -= seg->ds_len;
}
-
+
for (; seg < lastseg && len != 0; seg++, offset = 0, len -= minlen) {
/*
* Now at the first segment to sync; nail each segment until we
@@ -949,7 +949,7 @@
break;
case _BUS_DMA_BUFTYPE_MBUF:
- m_copyback(cookie->id_origmbuf, offset, len,
+ m_copyback(cookie->id_origmbuf, offset, len,
(char *)cookie->id_bouncebuf + offset);
break;
@@ -1006,7 +1006,7 @@
int flags, paddr_t low, paddr_t high)
{
paddr_t curaddr, lastaddr;
- struct vm_page *m;
+ struct vm_page *m;
struct pglist mlist;
int curseg, error;
diff -r 11a2b5a11fbe -r 0dfc1a0ac7a2 sys/arch/mips/rmi/rmixl_obio.c
--- a/sys/arch/mips/rmi/rmixl_obio.c Sat Jan 22 14:08:19 2022 +0000
+++ b/sys/arch/mips/rmi/rmixl_obio.c Sat Jan 22 15:08:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.7 2021/08/07 16:18:59 thorpej Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.8 2022/01/22 15:08:11 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.7 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.8 2022/01/22 15:08:11 skrll Exp $");
#include "locators.h"
#include "pci.h"
@@ -242,8 +242,8 @@
r |= ~(__BITS(19,16) | __BITS(10,9) | __BITS(7,5));
RMIXL_IOREG_WRITE(RMIXL_ADDR_ERR_DEVICE_MASK, r);
- /*
- * enable the address error interrupts
+ /*
+ * enable the address error interrupts
* "upgrade" cache and CPU errors to A1
*/
#define _ADDR_ERR_DEVSTAT_A1 (__BIT(8) | __BIT(1) | __BIT(0))
@@ -268,8 +268,8 @@
r = RMIXL_IOREG_READ(RMIXL_ADDR_ERR_AERR1_CLEAR);
RMIXL_IOREG_WRITE(RMIXL_ADDR_ERR_AERR1_CLEAR, r);
- /*
- * enable the double bit error interrupts
+ /*
+ * enable the double bit error interrupts
* (assume reserved bits, which are read-only, are ignored)
*/
r = RMIXL_IOREG_READ(RMIXL_ADDR_ERR_BITERR_INT_EN);
diff -r 11a2b5a11fbe -r 0dfc1a0ac7a2 sys/arch/mips/rmi/rmixl_pcix.c
--- a/sys/arch/mips/rmi/rmixl_pcix.c Sat Jan 22 14:08:19 2022 +0000
+++ b/sys/arch/mips/rmi/rmixl_pcix.c Sat Jan 22 15:08:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.17 2021/08/07 16:18:59 thorpej Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.18 2022/01/22 15:08:11 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.17 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.18 2022/01/22 15:08:11 skrll Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -261,15 +261,15 @@
CFATTACH_DECL_NEW(rmixl_pcix, sizeof(rmixl_pcix_softc_t),
- rmixl_pcix_match, rmixl_pcix_attach, NULL, NULL);
+ rmixl_pcix_match, rmixl_pcix_attach, NULL, NULL);
static int rmixl_pcix_found;
-static int
+static int
rmixl_pcix_match(device_t parent, cfdata_t cf, void *aux)
-{
+{
uint32_t r;
/*
@@ -294,9 +294,9 @@
return 0; /* strapped for Device Mode */
return 1;
-}
+}
-static void
+static void
rmixl_pcix_attach(device_t parent, device_t self, void *aux)
{
rmixl_pcix_softc_t *sc = device_private(self);
@@ -323,12 +323,12 @@
/*
* check XLR Control Register
*/
- DPRINTF(("%s: XLR_CONTROL=%#x\n", __func__,
+ DPRINTF(("%s: XLR_CONTROL=%#x\n", __func__,
RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_XLR_CONTROL)));
/*
* HBAR[0] if a 32 bit BAR, or
- * HBAR[0,1] if a 64 bit BAR pair
+ * HBAR[0,1] if a 64 bit BAR pair
* must cover all RAM
*/
extern u_quad_t mem_cluster_maxaddr;
@@ -496,8 +496,8 @@
* read-to-clear any pre-existing interrupts
* XXX MSI bits in STATUS are also documented as write 1 to clear in PRM
*/
- (void)RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_STATUS);
- (void)RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_ERR_STATUS);
+ (void)RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_STATUS);
+ (void)RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_ERR_STATUS);
/* initialize the (non-error interrupt) dispatch handles */
sc->sc_intr = NULL;
@@ -906,12 +906,12 @@
mutex_enter(&sc->sc_mutex);
- pip = rmixl_pcix_pip_add_1(sc, irq, ipl);
+ pip = rmixl_pcix_pip_add_1(sc, irq, ipl);
if (pip == NULL)
return NULL;
/*
- * initializae our new interrupt, the last element in dispatch_data[]
+ * initializae our new interrupt, the last element in dispatch_data[]
*/
dip = &pip->dispatch_data[pip->dispatch_count - 1];
dip->bitno = bitno;
@@ -934,9 +934,9 @@
uint32_t bit = 1 << (bitno + 2);
uint32_t r;
- r = RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_CONTROL);
+ r = RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_INTR_CONTROL);
r &= ~bit; /* clear mask */
- RMIXL_PCIXREG_WRITE(RMIXL_PCIX_ECFG_INTR_CONTROL, r);
+ RMIXL_PCIXREG_WRITE(RMIXL_PCIX_ECFG_INTR_CONTROL, r);
pip->sc = sc;
pip->ipl = ipl;
@@ -993,13 +993,13 @@
*/
KASSERT(sc == pip_old->sc);
if (sc != pip_old->sc) {
- printf("%s: sc %p mismatch\n", __func__, sc);
+ printf("%s: sc %p mismatch\n", __func__, sc);
free(pip_new, M_DEVBUF);
return NULL;
}
KASSERT (ipl == pip_old->ipl);
if (ipl != pip_old->ipl) {
- printf("%s: ipl %d mismatch\n", __func__, ipl);
+ printf("%s: ipl %d mismatch\n", __func__, ipl);
free(pip_new, M_DEVBUF);
return NULL;
}
@@ -1036,11 +1036,11 @@
{
callout_init(&pip->callout, 0);
callout_reset(&pip->callout, 2 * hz, rmixl_pcix_pip_free, pip);
-}
-
Home |
Main Index |
Thread Index |
Old Index