Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Nix trailing whitespace.
details: https://anonhg.NetBSD.org/src/rev/5f7a47045a2b
branches: trunk
changeset: 973111:5f7a47045a2b
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sat Jun 20 18:44:17 2020 +0000
description:
Nix trailing whitespace.
diffstat:
sys/arch/mips/cavium/octeon_intr.c | 6 +++---
sys/arch/sun68k/stand/libsa/idprom.c | 10 +++++-----
sys/arch/sun68k/stand/libsa/sun2.c | 28 ++++++++++++++--------------
sys/arch/sun68k/stand/libsa/sun3.c | 8 ++++----
sys/arch/sun68k/stand/libsa/sun3x.c | 10 +++++-----
5 files changed, 31 insertions(+), 31 deletions(-)
diffs (260 lines):
diff -r c54dfbf9ea9e -r 5f7a47045a2b sys/arch/mips/cavium/octeon_intr.c
--- a/sys/arch/mips/cavium/octeon_intr.c Sat Jun 20 18:30:53 2020 +0000
+++ b/sys/arch/mips/cavium/octeon_intr.c Sat Jun 20 18:44:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_intr.c,v 1.12 2020/06/19 02:23:43 simonb Exp $ */
+/* $NetBSD: octeon_intr.c,v 1.13 2020/06/20 18:48:28 riastradh Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.12 2020/06/19 02:23:43 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.13 2020/06/20 18:48:28 riastradh Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -529,7 +529,7 @@
while (hwpend != 0) {
const int irq = ffs64(hwpend) - 1;
hwpend &= ~__BIT(irq);
-
+
struct octeon_intrhand * const ih = octciu_intrs[irq];
cpu->cpu_intr_evs[irq].ev_count++;
if (__predict_true(ih != NULL)) {
diff -r c54dfbf9ea9e -r 5f7a47045a2b sys/arch/sun68k/stand/libsa/idprom.c
--- a/sys/arch/sun68k/stand/libsa/idprom.c Sat Jun 20 18:30:53 2020 +0000
+++ b/sys/arch/sun68k/stand/libsa/idprom.c Sat Jun 20 18:44:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: idprom.c,v 1.7 2020/06/18 17:59:05 tsutsui Exp $ */
+/* $NetBSD: idprom.c,v 1.8 2020/06/20 18:44:17 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
}
/* Fetch a copy of the idprom. */
-void
+void
idprom_init(void)
{
@@ -100,7 +100,7 @@
* Sun2 version:
* Just copy it from control space.
*/
-static void
+static void
idprom_init2(void)
{
@@ -114,7 +114,7 @@
* Sun3 version:
* Just copy it from control space.
*/
-static void
+static void
idprom_init3(void)
{
@@ -135,7 +135,7 @@
* to search was determined from some "insider" info. about
* the layout of the PROM data area.
*/
-static void
+static void
idprom_init3x(void)
{
u_char *p;
diff -r c54dfbf9ea9e -r 5f7a47045a2b sys/arch/sun68k/stand/libsa/sun2.c
--- a/sys/arch/sun68k/stand/libsa/sun2.c Sat Jun 20 18:30:53 2020 +0000
+++ b/sys/arch/sun68k/stand/libsa/sun2.c Sat Jun 20 18:44:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun2.c,v 1.12 2020/06/18 17:59:05 tsutsui Exp $ */
+/* $NetBSD: sun2.c,v 1.13 2020/06/20 18:45:06 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
/*
- * We need to get the sun2 NBSG definition, even if we're
+ * We need to get the sun2 NBSG definition, even if we're
* building this with a different sun68k target.
*/
#include <arch/sun2/include/pmap.h>
@@ -171,7 +171,7 @@
/* This points to the end of the free DVMA space. */
u_int dvma2_end = DVMA_BASE + DVMA_MAPLEN;
-static void
+static void
dvma2_init(void)
{
int segva, dmava, sme;
@@ -195,7 +195,7 @@
/* Make sure the address is in the DVMA map. */
if ((va < SA_MIN_VA) || (va >= SA_MAX_VA))
- panic("dvma2_mapin: 0x%x outside 0x%x..0x%x",
+ panic("dvma2_mapin: 0x%x outside 0x%x..0x%x",
va, SA_MIN_VA, SA_MAX_VA);
va -= SA_MIN_VA;
@@ -240,7 +240,7 @@
pte = get_control_word(CONTROL_ADDR_BUILD(PGMAP_BASE, va));
if (pte & PG_VALID) {
- /*
+ /*
* This clears bit 30 (the kernel readable bit, which
* should always be set), bit 28 (which should always
* be set) and bit 26 (the user writable bit, which we
@@ -325,8 +325,8 @@
*/
/*
- * For booting, the PROM in fredette's Sun 2/120 doesn't map
- * much main memory, and what is mapped is mapped strangely.
+ * For booting, the PROM in fredette's Sun 2/120 doesn't map
+ * much main memory, and what is mapped is mapped strangely.
* Low virtual memory is mapped like:
*
* 0x000000 - 0x0bffff virtual -> 0x000000 - 0x0bffff physical
@@ -348,7 +348,7 @@
* 0x400000 - 0x4bffff virtual -> 0x000000 - 0x0bffff physical
* 0x4c0000 - 0x600000 virtual -> 0x2c0000 - 0x3fffff physical
*
- * And then we load starting at virtual 0x400000. We will do
+ * And then we load starting at virtual 0x400000. We will do
* all of this mapping just by copying PMEGs.
*
* After the load is done, but before we enter the kernel, we're
@@ -375,7 +375,7 @@
#define MEM_CHUNK1_COPY_VIRT MEM_CHUNK1_COPY_PHYS
/* Maps memory for loading. */
-u_long
+u_long
sun2_map_mem_load(void)
{
vaddr_t off;
@@ -424,20 +424,20 @@
/* Set the PTEs in this new PMEG. */
for(off_end = off + NBSG; off < off_end; off += NBPG)
- sun2_set_pte(MEM_CHUNK1_COPY_VIRT + off,
+ sun2_set_pte(MEM_CHUNK1_COPY_VIRT + off,
pte | PA_PGNUM(MEM_CHUNK1_COPY_PHYS + off));
-
+
/* Copy this segment. */
memcpy((void *)(MEM_CHUNK1_COPY_VIRT + (off - NBSG)),
(void *)(MEM_CHUNK1_LOAD_VIRT + (off - NBSG)),
NBSG);
}
-
+
/* Tell our caller where in virtual space to enter. */
return ((char *)entry) - MEM_CHUNK0_LOAD_VIRT;
}
-void
+void
sun2_init(void)
{
/* Set the function pointers. */
@@ -446,7 +446,7 @@
dvma_free_p = dvma2_free;
dvma_mapin_p = dvma2_mapin;
dvma_mapout_p = dvma2_mapout;
-
+
/* Prepare DVMA segment. */
dvma2_init();
}
diff -r c54dfbf9ea9e -r 5f7a47045a2b sys/arch/sun68k/stand/libsa/sun3.c
--- a/sys/arch/sun68k/stand/libsa/sun3.c Sat Jun 20 18:30:53 2020 +0000
+++ b/sys/arch/sun68k/stand/libsa/sun3.c Sat Jun 20 18:44:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun3.c,v 1.10 2020/06/18 17:59:05 tsutsui Exp $ */
+/* $NetBSD: sun3.c,v 1.11 2020/06/20 18:46:14 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#define _SUN3_ XXX
-/*
+/*
* We need to get the sun3 NBSG definition, even if we're
* building this with a different sun68k target.
*/
@@ -160,7 +160,7 @@
/* This points to the end of the free DVMA space. */
u_int dvma3_end = DVMA_BASE + DVMA_MAPLEN;
-static void
+static void
dvma3_init(void)
{
int segva, dmava, sme;
@@ -273,7 +273,7 @@
* Init our function pointers, etc.
*/
-void
+void
sun3_init(void)
{
diff -r c54dfbf9ea9e -r 5f7a47045a2b sys/arch/sun68k/stand/libsa/sun3x.c
--- a/sys/arch/sun68k/stand/libsa/sun3x.c Sat Jun 20 18:30:53 2020 +0000
+++ b/sys/arch/sun68k/stand/libsa/sun3x.c Sat Jun 20 18:44:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun3x.c,v 1.13 2020/06/18 17:59:05 tsutsui Exp $ */
+/* $NetBSD: sun3x.c,v 1.14 2020/06/20 18:46:14 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
/* This points to the end of the free DVMA space. */
u_int dvma3x_end = MON_DVMA_BASE + MON_DVMA_MAPLEN;
-static void
+static void
dvma3x_init(void)
{
u_int va, pa;
@@ -274,14 +274,14 @@
mmu_atc_flush(va);
}
-static void
+static void
mmu_atc_flush(vaddr_t va)
{
__asm volatile ("pflush #0,#0,%0@" : : "a" (va));
}
-static void
+static void
set_iommupte(vaddr_t va, paddr_t pa)
{
iommu_pde_t *iommu_va;
@@ -302,7 +302,7 @@
* Init our function pointers, etc.
*/
-void
+void
sun3x_init(void)
{
Home |
Main Index |
Thread Index |
Old Index