Module Name: src
Committed By: tsutsui
Date: Fri Sep 6 17:43:20 UTC 2013
Modified Files:
src/sys/arch/sun3/sun3x: bus_subr.c clock.c dvma.c enable.c enable.h
idprom.c iommu.c iommu.h locore2.c machdep.c mm_md.c obio.c pmap.c
pmap_pvt.h vme.c
Log Message:
Tab/whitespace cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sun3/sun3x/bus_subr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sun3/sun3x/clock.c \
src/sys/arch/sun3/sun3x/locore2.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun3/sun3x/dvma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun3/sun3x/enable.c \
src/sys/arch/sun3/sun3x/iommu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun3/sun3x/enable.h \
src/sys/arch/sun3/sun3x/mm_md.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun3/sun3x/idprom.c \
src/sys/arch/sun3/sun3x/pmap_pvt.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/sun3x/iommu.c
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun3/sun3x/obio.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sun3/sun3x/pmap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/sun3x/vme.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/sun3/sun3x/bus_subr.c
diff -u src/sys/arch/sun3/sun3x/bus_subr.c:1.32 src/sys/arch/sun3/sun3x/bus_subr.c:1.33
--- src/sys/arch/sun3/sun3x/bus_subr.c:1.32 Sat Nov 7 07:27:48 2009
+++ src/sys/arch/sun3/sun3x/bus_subr.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_subr.c,v 1.32 2009/11/07 07:27:48 cegger Exp $ */
+/* $NetBSD: bus_subr.c,v 1.33 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_subr.c,v 1.32 2009/11/07 07:27:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_subr.c,v 1.33 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ bus_tmapin(int bustype, int pa)
return ((void *)(pgva + off));
}
-void
+void
bus_tmapout(void *vp)
{
vaddr_t pgva;
@@ -165,7 +165,7 @@ done:
return ((void*)(va + off));
}
-void
+void
bus_mapout(void *ptr, int sz)
{
vaddr_t va;
Index: src/sys/arch/sun3/sun3x/clock.c
diff -u src/sys/arch/sun3/sun3x/clock.c:1.39 src/sys/arch/sun3/sun3x/clock.c:1.40
--- src/sys/arch/sun3/sun3x/clock.c:1.39 Mon Dec 20 00:25:45 2010
+++ src/sys/arch/sun3/sun3x/clock.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.39 2010/12/20 00:25:45 matt Exp $ */
+/* $NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.39 2010/12/20 00:25:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,7 +164,7 @@ CFATTACH_DECL_NEW(oclock, sizeof(struct
/*
* Is there an intersil clock?
*/
-static int
+static int
oclock_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -194,7 +194,7 @@ oclock_match(device_t parent, cfdata_t c
/*
* Attach the intersil clock.
*/
-static void
+static void
oclock_attach(device_t parent, device_t self, void *aux)
{
struct intersil7170_softc *sc = device_private(self);
@@ -255,7 +255,7 @@ oclock_attach(device_t parent, device_t
* Is there a Mostek clock? Hard to tell...
* (See comment at top of this file.)
*/
-static int
+static int
clock_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -279,7 +279,7 @@ clock_match(device_t parent, cfdata_t cf
/*
* Attach the mostek clock.
*/
-static void
+static void
clock_attach(device_t parent, device_t self, void *aux)
{
struct mk48txx_softc *sc = device_private(self);
@@ -399,7 +399,7 @@ cpu_initclocks(void)
* This doesn't need to do anything, as we have only one timer and
* profhz==stathz==hz.
*/
-void
+void
setstatclockrate(int newhz)
{
Index: src/sys/arch/sun3/sun3x/locore2.c
diff -u src/sys/arch/sun3/sun3x/locore2.c:1.39 src/sys/arch/sun3/sun3x/locore2.c:1.40
--- src/sys/arch/sun3/sun3x/locore2.c:1.39 Fri Aug 10 14:33:35 2012
+++ src/sys/arch/sun3/sun3x/locore2.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.39 2012/08/10 14:33:35 tsutsui Exp $ */
+/* $NetBSD: locore2.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.39 2012/08/10 14:33:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $");
#include "opt_ddb.h"
@@ -91,7 +91,7 @@ static void _save_symtab(void);
/*
* Preserve DDB symbols and strings by setting esym.
*/
-static void
+static void
_save_symtab(void)
{
int i;
@@ -141,7 +141,7 @@ _save_symtab(void)
* Once that is done, pmap_bootstrap() is called to do the
* usual preparations for our use of the MMU.
*/
-static void
+static void
_vm_init(void)
{
vaddr_t nextva;
@@ -191,7 +191,7 @@ _vm_init(void)
* hp300 port (and other m68k) but which we prefer to do in C code.
* Also do setup specific to the Sun PROM monitor and IDPROM here.
*/
-void
+void
_bootstrap(void)
{
extern struct consdev consdev_prom; /* XXX */
Index: src/sys/arch/sun3/sun3x/dvma.c
diff -u src/sys/arch/sun3/sun3x/dvma.c:1.41 src/sys/arch/sun3/sun3x/dvma.c:1.42
--- src/sys/arch/sun3/sun3x/dvma.c:1.41 Fri Jan 27 18:53:04 2012
+++ src/sys/arch/sun3/sun3x/dvma.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dvma.c,v 1.41 2012/01/27 18:53:04 para Exp $ */
+/* $NetBSD: dvma.c,v 1.42 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.41 2012/01/27 18:53:04 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.42 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.4
/* Number of slots in dvmamap. */
struct extent *dvma_extent;
-void
+void
dvma_init(void)
{
@@ -131,7 +131,7 @@ dvma_init(void)
* would be used by some OTHER bus-master besides the CPU.
* (Examples: on-board ie/le, VME xy board).
*/
-u_long
+u_long
dvma_kvtopa(void *kva, int bustype)
{
u_long addr, mask;
@@ -196,8 +196,8 @@ dvma_mapin(void *kmem_va, int len, int c
splx(s);
if (error)
return NULL;
-
- /*
+
+ /*
* Tva is the starting page to which the data buffer will be double
* mapped. Dvma_addr is the starting address of the buffer within
* that page and is the return value of the function.
@@ -233,7 +233,7 @@ dvma_mapin(void *kmem_va, int len, int c
* synchronization between the DVMA cache and central RAM
* on the 3/470.
*/
-void
+void
dvma_mapout(void *dvma_addr, int len)
{
u_long kva;
@@ -278,7 +278,7 @@ dvma_malloc(size_t bytes)
/*
* Free pages from dvma_malloc()
*/
-void
+void
dvma_free(void *addr, size_t size)
{
vsize_t sz = m68k_round_page(size);
@@ -288,7 +288,7 @@ dvma_free(void *addr, size_t size)
Oh well, we never call this anyway. */
}
-int
+int
_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs,
int nsegs, bus_size_t size, int flags)
{
@@ -363,7 +363,7 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dm
return 0;
}
-void
+void
_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
{
bus_dma_segment_t *segs;
Index: src/sys/arch/sun3/sun3x/enable.c
diff -u src/sys/arch/sun3/sun3x/enable.c:1.8 src/sys/arch/sun3/sun3x/enable.c:1.9
--- src/sys/arch/sun3/sun3x/enable.c:1.8 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/sun3x/enable.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: enable.c,v 1.8 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: enable.c,v 1.9 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: enable.c,v 1.8 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: enable.c,v 1.9 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: enable.c,v 1
volatile short *enable_reg;
-void
+void
enable_init(void)
{
vaddr_t va;
@@ -57,7 +57,7 @@ enable_init(void)
* External interfaces to the system enable register.
*/
-void
+void
enable_fpu(int on)
{
int s;
@@ -75,7 +75,7 @@ enable_fpu(int on)
splx(s);
}
-void
+void
enable_video(int on)
{
int s;
Index: src/sys/arch/sun3/sun3x/iommu.h
diff -u src/sys/arch/sun3/sun3x/iommu.h:1.8 src/sys/arch/sun3/sun3x/iommu.h:1.9
--- src/sys/arch/sun3/sun3x/iommu.h:1.8 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/sun3x/iommu.h Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.h,v 1.8 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: iommu.h,v 1.9 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -52,13 +52,13 @@
* within the I/O Mapper. This 2048 entry, page descriptor table is located
* at physical address 0x60000000 in the sun3x architecture and can be
* manipulated by the CPU with normal read and write cycles.
- *
+ *
* In addition to describing an address mapping, a page descriptor entry also
* indicates whether the DVMA page is read-only, should be inhibited from
* caching by system caches, and whether or not DMA write transfers to it will
* be completed in 16 byte aligned blocks. (This last item is used for cache
* optimization in sun3x systems with special DMA caches.)
- *
+ *
* Since not every DMA device is capable of addressing all 24 bits of the
* DVMA address space, each is wired so that the end of its address space is
* always flush against the end of the DVMA address space. That is, a device
Index: src/sys/arch/sun3/sun3x/enable.h
diff -u src/sys/arch/sun3/sun3x/enable.h:1.2 src/sys/arch/sun3/sun3x/enable.h:1.3
--- src/sys/arch/sun3/sun3x/enable.h:1.2 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/sun3x/enable.h Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: enable.h,v 1.2 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: enable.h,v 1.3 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
* |BT |FPP|DMA| 0 |VID|RES|FPA|DIA| 0 |CCH|IOC|LBK|DCH| UNUSED |
* +---+---+---+---+---+---+---+---+---+---+---+---+---+---.---.---+
*
- *
+ *
* Bits in the Enable Register defined.
*/
#define ENA_DBGCACHE 0x0008 /* Debug mode for system cache */
Index: src/sys/arch/sun3/sun3x/mm_md.c
diff -u src/sys/arch/sun3/sun3x/mm_md.c:1.2 src/sys/arch/sun3/sun3x/mm_md.c:1.3
--- src/sys/arch/sun3/sun3x/mm_md.c:1.2 Sun Jun 12 03:35:48 2011
+++ src/sys/arch/sun3/sun3x/mm_md.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mm_md.c,v 1.2 2011/06/12 03:35:48 rmind Exp $ */
+/* $NetBSD: mm_md.c,v 1.3 2013/09/06 17:43:19 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm_md.c,v 1.2 2011/06/12 03:35:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm_md.c,v 1.3 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -107,7 +107,7 @@ mm_md_readwrite(dev_t dev, struct uio *u
}
}
-paddr_t
+paddr_t
mm_md_mmap(dev_t dev, off_t off, int prot)
{
Index: src/sys/arch/sun3/sun3x/idprom.c
diff -u src/sys/arch/sun3/sun3x/idprom.c:1.15 src/sys/arch/sun3/sun3x/idprom.c:1.16
--- src/sys/arch/sun3/sun3x/idprom.c:1.15 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/sun3x/idprom.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: idprom.c,v 1.15 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: idprom.c,v 1.16 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: idprom.c,v 1.15 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idprom.c,v 1.16 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ static int idprom_hostid(void);
* verify the checksum,
* set the hostid...
*/
-void
+void
idprom_init(void)
{
@@ -94,7 +94,7 @@ idprom_cksum(u_char *p)
return (x);
}
-static int
+static int
idprom_hostid(void)
{
struct idprom *idp;
Index: src/sys/arch/sun3/sun3x/pmap_pvt.h
diff -u src/sys/arch/sun3/sun3x/pmap_pvt.h:1.15 src/sys/arch/sun3/sun3x/pmap_pvt.h:1.16
--- src/sys/arch/sun3/sun3x/pmap_pvt.h:1.15 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/sun3x/pmap_pvt.h Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.h,v 1.15 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: pmap_pvt.h,v 1.16 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ struct a_tmgr_struct {
* short format table descriptors (a 'B' table), a pointer to the level
* A table manager currently using it, the index of this B table
* within that parent A table, and the number of wired and active entries
- * it currently contains.
+ * it currently contains.
*/
struct b_tmgr_struct {
a_tmgr_t *bt_parent; /* Parent 'A' table manager */
@@ -97,8 +97,8 @@ struct c_tmgr_struct {
vaddr_t ct_va; /* starting va that this table maps */
};
-/* The Mach VM code requires that the pmap module be able to apply
- * several different operations on all page descriptors that map to a
+/* The Mach VM code requires that the pmap module be able to apply
+ * several different operations on all page descriptors that map to a
* given physical address. A few of these are:
* + invalidate all mappings to a page.
* + change the type of protection on all mappings to a page.
@@ -106,7 +106,7 @@ struct c_tmgr_struct {
* + determine if a physical page has been accessed (read from)
* + clear such information
* The collection of structures and tables which we used to make this
- * possible is known as the 'Physical to Virtual' or 'PV' system.
+ * possible is known as the 'Physical to Virtual' or 'PV' system.
*
* Every physical page of memory managed by the virtual memory system
* will have a structure which describes whether or not it has been
Index: src/sys/arch/sun3/sun3x/iommu.c
diff -u src/sys/arch/sun3/sun3x/iommu.c:1.17 src/sys/arch/sun3/sun3x/iommu.c:1.18
--- src/sys/arch/sun3/sun3x/iommu.c:1.17 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/sun3x/iommu.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.17 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: iommu.c,v 1.18 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.17 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.18 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,7 @@ CFATTACH_DECL_NEW(iommu, 0,
static iommu_pde_t *iommu_va;
-static int
+static int
iommu_match(device_t parent, cfdata_t cf, void *args)
{
/* This driver only supports one instance. */
@@ -69,7 +69,7 @@ iommu_match(device_t parent, cfdata_t cf
return 1;
}
-static void
+static void
iommu_attach(device_t parent, device_t self, void *args)
{
struct confargs *ca = args;
@@ -80,7 +80,7 @@ iommu_attach(device_t parent, device_t s
aprint_normal("\n");
}
-void
+void
iommu_enter(uint32_t sa, uint32_t pa)
{
int pn;
@@ -100,7 +100,7 @@ iommu_enter(uint32_t sa, uint32_t pa)
iommu_va[pn].addr.raw = pa;
}
-void
+void
iommu_remove(uint32_t sa, uint32_t len)
{
int pn;
Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.133 src/sys/arch/sun3/sun3x/machdep.c:1.134
--- src/sys/arch/sun3/sun3x/machdep.c:1.133 Sat Jul 28 19:08:26 2012
+++ src/sys/arch/sun3/sun3x/machdep.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.133 2012/07/28 19:08:26 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.134 2013/09/06 17:43:19 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.133 2012/07/28 19:08:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.134 2013/09/06 17:43:19 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -107,7 +107,7 @@ extern char etext[];
const vaddr_t kernbase = KERNBASE3X;
const vaddr_t kern_end = KERN_END3X;
-/* Our exported CPU info; we can have only one. */
+/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *phys_map = NULL;
@@ -134,7 +134,7 @@ static void initcpu(void);
* to use the console for output immediately (via PROM)
* but can not use it for input until after this point.
*/
-void
+void
consinit(void)
{
@@ -177,7 +177,7 @@ consinit(void)
* kernel memory allocator is ready for use, but before
* the creation of processes 1,2, and mountroot, etc.
*/
-void
+void
cpu_startup(void)
{
char *v;
@@ -256,7 +256,7 @@ char cpu_model[120];
*/
int delay_divisor = 62; /* assume the fastest (33 MHz) */
-void
+void
identifycpu(void)
{
u_char machtype;
@@ -370,7 +370,7 @@ reboot_sync(void)
/*
* Common part of the BSD and SunOS reboot system calls.
*/
-__dead void
+__dead void
cpu_reboot(int howto, char *user_boot_string)
{
/* Note: this string MUST be static! */
@@ -463,7 +463,7 @@ long dumplo = 0; /* blocks */
* If there is extra space, put dump at the end to
* reduce the chance that swapping trashes it.
*/
-void
+void
cpu_dumpconf(void)
{
int devblks; /* size of dump device in blocks */
@@ -506,7 +506,7 @@ struct pcb dumppcb;
* pagemap (2*PAGE_SIZE)
* physical memory...
*/
-void
+void
dumpsys(void)
{
const struct bdevsw *dsw;
@@ -618,7 +618,7 @@ fail:
printf(" dump error=%d\n", error);
}
-static void
+static void
initcpu(void)
{
/* XXX: Enable RAM parity/ECC checking? */
@@ -644,7 +644,7 @@ initcpu(void)
* Determine if the given exec package refers to something which we
* understand and, if so, set up the vmcmds for it.
*/
-int
+int
cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
{
return ENOEXEC;
@@ -662,7 +662,7 @@ mm_md_direct_mapped_phys(paddr_t paddr,
{
extern paddr_t avail_start;
- if (paddr >= avail_start)
+ if (paddr >= avail_start)
return false;
*vaddr = KERNBASE3X + paddr;
return true;
Index: src/sys/arch/sun3/sun3x/obio.c
diff -u src/sys/arch/sun3/sun3x/obio.c:1.33 src/sys/arch/sun3/sun3x/obio.c:1.34
--- src/sys/arch/sun3/sun3x/obio.c:1.33 Sat Oct 13 06:37:16 2012
+++ src/sys/arch/sun3/sun3x/obio.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.33 2012/10/13 06:37:16 tsutsui Exp $ */
+/* $NetBSD: obio.c,v 1.34 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.33 2012/10/13 06:37:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.34 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ static struct sun68k_bus_space_tag obio_
static struct sun68k_bus_dma_tag obio_dma_tag;
-static int
+static int
obio_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -156,7 +156,7 @@ static paddr_t obio_alist[] = {
};
#define OBIO_ALIST_LEN __arraycount(obio_alist)
-static void
+static void
obio_attach(device_t parent, device_t self, void *aux)
{
struct confargs *ca = aux;
@@ -199,7 +199,7 @@ obio_attach(device_t parent, device_t se
* Print out the confargs. The (parent) name is non-NULL
* when there was no match found by config_found().
*/
-static int
+static int
obio_print(void *args, const char *name)
{
@@ -211,7 +211,7 @@ obio_print(void *args, const char *name)
return bus_print(args, name);
}
-int
+int
obio_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct confargs *ca = aux;
@@ -368,7 +368,7 @@ make_required_mappings(void)
* normal autoconfiguration calls configure(). Warning: this is
* called before pmap_bootstrap, so no allocation allowed!
*/
-void
+void
obio_init(void)
{
Index: src/sys/arch/sun3/sun3x/pmap.c
diff -u src/sys/arch/sun3/sun3x/pmap.c:1.112 src/sys/arch/sun3/sun3x/pmap.c:1.113
--- src/sys/arch/sun3/sun3x/pmap.c:1.112 Fri Jun 3 17:03:53 2011
+++ src/sys/arch/sun3/sun3x/pmap.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.112 2011/06/03 17:03:53 tsutsui Exp $ */
+/* $NetBSD: pmap.c,v 1.113 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
* it maps. The number of levels of lookup is configurable from one
* to four. In this implementation, we use three, named 'A' through 'C'.
*
- * The MMU translates virtual addresses into physical addresses by
- * traversing these tables in a process called a 'table walk'. The most
- * significant 7 bits of the Virtual Address ('VA') being translated are
- * used as an index into the level A table, whose base in physical memory
- * is stored in a special MMU register, the 'CPU Root Pointer' or CRP. The
+ * The MMU translates virtual addresses into physical addresses by
+ * traversing these tables in a process called a 'table walk'. The most
+ * significant 7 bits of the Virtual Address ('VA') being translated are
+ * used as an index into the level A table, whose base in physical memory
+ * is stored in a special MMU register, the 'CPU Root Pointer' or CRP. The
* address found at that index in the A table is used as the base
- * address for the next table, the B table. The next six bits of the VA are
- * used as an index into the B table, which in turn gives the base address
+ * address for the next table, the B table. The next six bits of the VA are
+ * used as an index into the B table, which in turn gives the base address
* of the third and final C table.
*
* The next six bits of the VA are used as an index into the C table to
@@ -52,25 +52,25 @@
* to which the remaining 13 bits of the VA are added, producing the
* mapped physical address.
*
- * To map the entire memory space in this manner would require 2114296 bytes
- * of page tables per process - quite expensive. Instead we will
- * allocate a fixed but considerably smaller space for the page tables at
+ * To map the entire memory space in this manner would require 2114296 bytes
+ * of page tables per process - quite expensive. Instead we will
+ * allocate a fixed but considerably smaller space for the page tables at
* the time the VM system is initialized. When the pmap code is asked by
* the kernel to map a VA to a PA, it allocates tables as needed from this
* pool. When there are no more tables in the pool, tables are stolen
- * from the oldest mapped entries in the tree. This is only possible
+ * from the oldest mapped entries in the tree. This is only possible
* because all memory mappings are stored in the kernel memory map
* structures, independent of the pmap structures. A VA which references
* one of these invalidated maps will cause a page fault. The kernel
- * will determine that the page fault was caused by a task using a valid
+ * will determine that the page fault was caused by a task using a valid
* VA, but for some reason (which does not concern it), that address was
* not mapped. It will ask the pmap code to re-map the entry and then
* it will resume executing the faulting task.
*
* In this manner the most efficient use of the page table space is
- * achieved. Tasks which do not execute often will have their tables
+ * achieved. Tasks which do not execute often will have their tables
* stolen and reused by tasks which execute more frequently. The best
- * size for the page table pool will probably be determined by
+ * size for the page table pool will probably be determined by
* experimentation.
*
* You read all of the comments so far. Good for you.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.112 2011/06/03 17:03:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2013/09/06 17:43:19 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -391,7 +391,7 @@ mmu_ptov(paddr_t pa)
return (void *)va;
}
-static INLINE paddr_t
+static INLINE paddr_t
mmu_vtop(void *vva)
{
vaddr_t va;
@@ -516,7 +516,7 @@ pteidx(mmu_short_pte_t *pte)
* This just offers a place to put some debugging checks,
* and reduces the number of places "curlwp" appears...
*/
-static INLINE pmap_t
+static INLINE pmap_t
current_pmap(void)
{
struct vmspace *vm;
@@ -595,7 +595,7 @@ static INLINE void pmap_release(pmap_t);
* within the pmap module are labeled as 'INTERNAL' functions. *
* Functions that are internal, but are not (currently) used at all are *
* labeled 'INTERNAL_X'. *
- ************************************************************************/
+ ************************************************************************/
/* pmap_bootstrap INTERNAL
**
@@ -606,7 +606,7 @@ static INLINE void pmap_release(pmap_t);
* system implement pmap_steal_memory() is redundant.
* Don't release this code without removing one or the other!
*/
-void
+void
pmap_bootstrap(vaddr_t nextva)
{
struct physmemory *membank;
@@ -714,7 +714,7 @@ pmap_bootstrap(vaddr_t nextva)
* mmuCbase below. XXX: Should do this as one allocation, and
* then compute a pointer for mmuCbase instead of this...
*
- * Allocate user MMU tables.
+ * Allocate user MMU tables.
* These must be contiguous with the preceding.
*/
@@ -745,7 +745,7 @@ pmap_bootstrap(vaddr_t nextva)
* For simplicity, the kernel's mappings will be editable as a
* flat array of page table entries at kernCbase. The
* higher level 'A' and 'B' tables must be initialized to point
- * to this lower one.
+ * to this lower one.
*/
b = c = 0;
@@ -904,7 +904,7 @@ pmap_bootstrap(vaddr_t nextva)
* Called from pmap_bootstrap() to allocate MMU tables that will
* eventually be used for user mappings.
*/
-void
+void
pmap_alloc_usermmu(void)
{
@@ -917,7 +917,7 @@ pmap_alloc_usermmu(void)
* to virtual mapping list. Each physical page of memory
* in the system has a corresponding element in this list.
*/
-void
+void
pmap_alloc_pv(void)
{
int i;
@@ -954,7 +954,7 @@ pmap_alloc_pv(void)
* facilitate management of user MMU tables. Each user MMU table
* in the system has one such structure associated with it.
*/
-void
+void
pmap_alloc_usertmgr(void)
{
/* Allocate user MMU table managers */
@@ -980,7 +980,7 @@ pmap_alloc_usertmgr(void)
* Copy the PROM mappings into our own tables. Note, we
* can use physical addresses until __bootstrap returns.
*/
-void
+void
pmap_bootstrap_copyprom(void)
{
struct sunromvec *romp;
@@ -1021,14 +1021,14 @@ pmap_bootstrap_copyprom(void)
kpte[i].attr.raw = mon_ctbl[i];
}
}
-
+
/* pmap_takeover_mmu INTERNAL
**
* Called from pmap_bootstrap() after it has copied enough of the
* PROM mappings into the kernel map so that we can use our own
* MMU table.
*/
-void
+void
pmap_takeover_mmu(void)
{
@@ -1042,7 +1042,7 @@ pmap_takeover_mmu(void)
* we can get away with because this runs with the
* low 1GB set for transparent translation.
*/
-void
+void
pmap_bootstrap_setprom(void)
{
mmu_long_dte_t *mon_dte;
@@ -1064,7 +1064,7 @@ pmap_bootstrap_setprom(void)
* should be already done by now, so this should just do things
* needed for user-level pmaps to work.
*/
-void
+void
pmap_init(void)
{
@@ -1093,7 +1093,7 @@ pmap_init(void)
* Initializes all A managers, their MMU A tables, and inserts
* them into the A manager pool for use by the system.
*/
-void
+void
pmap_init_a_tables(void)
{
int i;
@@ -1126,7 +1126,7 @@ pmap_init_a_tables(void)
* making it ready to be used by the system.
*/
TAILQ_INSERT_TAIL(&a_pool, a_tbl, at_link);
- }
+ }
}
/* pmap_init_b_tables() INTERNAL
@@ -1134,7 +1134,7 @@ pmap_init_a_tables(void)
* Initializes all B table managers, their MMU B tables, and
* inserts them into the B manager pool for use by the system.
*/
-void
+void
pmap_init_b_tables(void)
{
int i, j;
@@ -1166,7 +1166,7 @@ pmap_init_b_tables(void)
* Initializes all C table managers, their MMU C tables, and
* inserts them into the C manager pool for use by the system.
*/
-void
+void
pmap_init_c_tables(void)
{
int i, j;
@@ -1183,7 +1183,7 @@ pmap_init_c_tables(void)
c_tbl->ct_pmap = NULL; /* parent pmap, */
c_tbl->ct_va = 0; /* base of managed range */
- /* Assign it the next available MMU C table from the pool */
+ /* Assign it the next available MMU C table from the pool */
c_tbl->ct_dtbl = &mmuCbase[i * MMU_C_TBL_SIZE];
for (j = 0; j < MMU_C_TBL_SIZE; j++)
@@ -1197,7 +1197,7 @@ pmap_init_c_tables(void)
**
* Initializes the Physical to Virtual mapping system.
*/
-void
+void
pmap_init_pv(void)
{
int i;
@@ -1216,15 +1216,15 @@ pmap_init_pv(void)
* addresses which lie in-between the memory banks on the 3/80. If they
* do so, it will falsely report that it is managed.
*
- * Note: A "managed" address is one that was reported to the VM system as
+ * Note: A "managed" address is one that was reported to the VM system as
* a "usable page" during system startup. As such, the VM system expects the
* pmap module to keep an accurate track of the useage of those pages.
- * Any page not given to the VM system at startup does not exist (as far as
+ * Any page not given to the VM system at startup does not exist (as far as
* the VM system is concerned) and is therefore "unmanaged." Examples are
* those pages which belong to the ROM monitor and the memory allocated before
* the VM system was started.
*/
-static INLINE bool
+static INLINE bool
is_managed(paddr_t pa)
{
if (pa >= avail_start && pa < avail_end)
@@ -1356,7 +1356,7 @@ get_c_table(void)
* Note note: We are using an MC68030 - there is no
* PFLUSHR.
*/
-int
+int
free_a_table(a_tmgr_t *a_tbl, bool relink)
{
int i, removed_cnt;
@@ -1441,7 +1441,7 @@ free_a_table(a_tmgr_t *a_tbl, bool relin
* mappings. Returns the number of pages that were invalidated.
* (For comments, see 'free_a_table()').
*/
-int
+int
free_b_table(b_tmgr_t *b_tbl, bool relink)
{
int i, removed_cnt;
@@ -1483,11 +1483,11 @@ free_b_table(b_tmgr_t *b_tbl, bool relin
* Unmaps the given C table from use and returns it to the pool for
* re-use. Returns the number of pages that were invalidated.
*
- * This function preserves any physical page modification information
+ * This function preserves any physical page modification information
* contained in the page descriptors within the C table by calling
* 'pmap_remove_pte().'
*/
-int
+int
free_c_table(c_tmgr_t *c_tbl, bool relink)
{
mmu_short_pte_t *c_pte;
@@ -1544,7 +1544,7 @@ pmap_remove_pte(mmu_short_pte_t *pte)
* If the PTE being removed is the first (or only) PTE in
* the list of PTEs currently mapped to this page, remove the
* PTE by changing the index found on the PV head. Otherwise
- * a linear search through the list will have to be executed
+ * a linear search through the list will have to be executed
* in order to find the PVE which points to the PTE being
* removed, so that it may be modified to point to its new
* neighbor.
@@ -1639,21 +1639,21 @@ pmap_stroll(pmap_t pmap, vaddr_t va, a_t
*c_tbl = mmuC2tmgr(mmu_ptov(MMU_DTE_PA(*b_dte)));
*pte_idx = MMU_TIC(va);
*pte = &((*c_tbl)->ct_dtbl[*pte_idx]);
-
+
return true;
}
-
+
/* pmap_enter INTERFACE
**
* Called by the kernel to map a virtual address
- * to a physical address in the given process map.
+ * to a physical address in the given process map.
*
* Note: this function should apply an exclusive lock
* on the pmap system for its duration. (it certainly
* would save my hair!!)
* This function ought to be easier to read.
*/
-int
+int
pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
bool insert, managed; /* Marks the need for PV insertion.*/
@@ -1697,7 +1697,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
* extracted and stored in the temporary variable 'mapflags'.
*
* Extract sun3x specific flags from the physical address.
- */
+ */
mapflags = (pa & ~MMU_PAGE_MASK);
pa &= MMU_PAGE_MASK;
@@ -2035,7 +2035,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
}
/* Move any allocated or unwired tables back into the active pool. */
-
+
switch (llevel) {
case NEWA:
TAILQ_INSERT_TAIL(&a_pool, a_tbl, at_link);
@@ -2059,14 +2059,14 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
* kernel address space. This function exists because the kernel map does
* not do dynamic table allocation. It consists of a contiguous array of ptes
* and can be edited directly without the need to walk through any tables.
- *
+ *
* XXX: "Danger, Will Robinson!"
* Note that the kernel should never take a fault on any page
* between [ KERNBASE .. virtual_avail ] and this is checked in
* trap.c for kernel-mode MMU faults. This means that mappings
* created in that range must be implicily wired. -gwr
*/
-void
+void
pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
{
bool was_valid, insert;
@@ -2080,7 +2080,7 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa
pa &= MMU_PAGE_MASK;
if (is_managed(pa))
- insert = true;
+ insert = true;
else
insert = false;
@@ -2141,7 +2141,7 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa
}
}
-void
+void
pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
mmu_short_pte_t *pte;
@@ -2155,7 +2155,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
pte->attr.raw |= MMU_SHORT_PTE_WP;
}
-void
+void
pmap_kremove(vaddr_t va, vsize_t len)
{
int idx, eidx;
@@ -2183,7 +2183,7 @@ pmap_kremove(vaddr_t va, vsize_t len)
* Used for device mappings and early mapping of the kernel text/data/bss.
* Returns the first virtual address beyond the end of the range.
*/
-vaddr_t
+vaddr_t
pmap_map(vaddr_t va, paddr_t pa, paddr_t endpa, int prot)
{
int sz;
@@ -2203,7 +2203,7 @@ pmap_map(vaddr_t va, paddr_t pa, paddr_t
**
* Apply the given protection code to a kernel address range.
*/
-static INLINE void
+static INLINE void
pmap_protect_kernel(vaddr_t startva, vaddr_t endva, vm_prot_t prot)
{
vaddr_t va;
@@ -2251,7 +2251,7 @@ pmap_protect_kernel(vaddr_t startva, vad
* XXX - This function could be speeded up by using pmap_stroll() for inital
* setup, and then manual scrolling in the for() loop.
*/
-void
+void
pmap_protect(pmap_t pmap, vaddr_t startva, vaddr_t endva, vm_prot_t prot)
{
bool iscurpmap;
@@ -2371,7 +2371,7 @@ pmap_protect(pmap_t pmap, vaddr_t startv
* This function is called from vm_fault.c to unwire
* a mapping.
*/
-void
+void
pmap_unwire(pmap_t pmap, vaddr_t va)
{
int a_idx, b_idx, c_idx;
@@ -2379,7 +2379,7 @@ pmap_unwire(pmap_t pmap, vaddr_t va)
b_tmgr_t *b_tbl;
c_tmgr_t *c_tbl;
mmu_short_pte_t *pte;
-
+
/* Kernel mappings always remain wired. */
if (pmap == pmap_kernel())
return;
@@ -2404,7 +2404,7 @@ pmap_unwire(pmap_t pmap, vaddr_t va)
/*
* Decrement the wired entry count in the C table.
* If it reaches zero the following things happen:
- * 1. The table no longer has any wired entries and is considered
+ * 1. The table no longer has any wired entries and is considered
* unwired.
* 2. It is placed on the available queue.
* 3. The parent table's wired entry count is decremented.
@@ -2448,7 +2448,7 @@ pmap_copy(pmap_t pmap_a, pmap_t pmap_b,
* Note: We could use the transparent translation registers to make the
* mappings. If we do so, be sure to disable interrupts before using them.
*/
-void
+void
pmap_copy_page(paddr_t srcpa, paddr_t dstpa)
{
vaddr_t srcva, dstva;
@@ -2486,7 +2486,7 @@ pmap_copy_page(paddr_t srcpa, paddr_t ds
* Uses one of the virtual pages allocated in pmap_boostrap()
* to map the specified page into the kernel address space.
*/
-void
+void
pmap_zero_page(paddr_t dstpa)
{
vaddr_t dstva;
@@ -2516,7 +2516,7 @@ pmap_zero_page(paddr_t dstpa)
**
* Initialize a pmap structure.
*/
-static INLINE void
+static INLINE void
pmap_pinit(pmap_t pmap)
{
@@ -2530,7 +2530,7 @@ pmap_pinit(pmap_t pmap)
**
* Create and return a pmap structure.
*/
-pmap_t
+pmap_t
pmap_create(void)
{
pmap_t pmap;
@@ -2548,7 +2548,7 @@ pmap_create(void)
* necessarily mean for the pmap structure to be deallocated,
* as in pmap_destroy.
*/
-static INLINE void
+static INLINE void
pmap_release(pmap_t pmap)
{
@@ -2591,7 +2591,7 @@ pmap_release(pmap_t pmap)
**
* Increment the reference count of a pmap.
*/
-void
+void
pmap_reference(pmap_t pmap)
{
@@ -2603,7 +2603,7 @@ pmap_reference(pmap_t pmap)
* Decrease the reference count on the given pmap
* by one and return the current count.
*/
-static INLINE int
+static INLINE int
pmap_dereference(pmap_t pmap)
{
int rtn;
@@ -2612,14 +2612,14 @@ pmap_dereference(pmap_t pmap)
return rtn;
}
-
+
/* pmap_destroy INTERFACE
**
* Decrement a pmap's reference count and delete
* the pmap if it becomes zero. Will be called
* only after all mappings have been removed.
*/
-void
+void
pmap_destroy(pmap_t pmap)
{
@@ -2697,7 +2697,7 @@ pmap_is_modified(struct vm_page *pg)
* Applies the given protection to all mappings to the given
* physical page.
*/
-void
+void
pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
{
paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -2782,7 +2782,7 @@ pmap_page_protect(struct vm_page *pg, vm
* Returns the pmap in the argument provided, and the virtual address
* by return value.
*/
-vaddr_t
+vaddr_t
pmap_get_pteinfo(u_int idx, pmap_t *pmap, c_tmgr_t **tbl)
{
vaddr_t va = 0;
@@ -2815,7 +2815,7 @@ pmap_get_pteinfo(u_int idx, pmap_t *pmap
va = m68k_ptob(idx);
va += KERNBASE3X;
}
-
+
return va;
}
@@ -2851,7 +2851,7 @@ pmap_clear_reference(struct vm_page *pg)
pmap_clear_pv(pa, PV_FLAGS_USED);
return rv;
}
-
+
/* pmap_clear_pv INTERNAL
**
* Clears the specified flag from the specified physical address.
@@ -2865,7 +2865,7 @@ pmap_clear_reference(struct vm_page *pg)
* head. It must also clear the bit on every pte in the pv
* list associated with the address.
*/
-void
+void
pmap_clear_pv(paddr_t pa, int flag)
{
pv_t *pv;
@@ -2906,7 +2906,7 @@ pmap_clear_pv(paddr_t pa, int flag)
**
* Extract a translation from the kernel address space.
*/
-static INLINE bool
+static INLINE bool
pmap_extract_kernel(vaddr_t va, paddr_t *pap)
{
mmu_short_pte_t *pte;
@@ -2927,7 +2927,7 @@ pmap_extract_kernel(vaddr_t va, paddr_t
* Note: this function should also apply an exclusive lock
* on the pmap system during its duration.
*/
-bool
+bool
pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
{
int a_idx, b_idx, pte_idx;
@@ -2956,7 +2956,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
* Remove the mapping of a range of virtual addresses from the kernel map.
* The arguments are already page-aligned.
*/
-static INLINE void
+static INLINE void
pmap_remove_kernel(vaddr_t sva, vaddr_t eva)
{
int idx, eidx;
@@ -2981,7 +2981,7 @@ pmap_remove_kernel(vaddr_t sva, vaddr_t
* Remove the mapping of a range of virtual addresses from the given pmap.
*
*/
-void
+void
pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
{
@@ -3003,7 +3003,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
* in the pmap and freed its A table. If this happened to the
* currently loaded pmap, the MMU root pointer must be reloaded
* with the default 'kernel' map.
- */
+ */
if (pmap_remove_a(pmap->pm_a_tmgr, sva, eva)) {
if (kernel_crp.rp_addr == pmap->pm_a_phys) {
kernel_crp.rp_addr = kernAphys;
@@ -3039,7 +3039,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
*
* It's ugly but will do for now.
*/
-bool
+bool
pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
{
bool empty;
@@ -3068,7 +3068,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t s
* range between 1 and 2, the nearest granularity boundary. This
* job is handled by the section of code governed by the
* 'if (start < nstart)' statement.
- *
+ *
* A range will always encompass zero or more intergral granules,
* illustrated by points 2 and 3. Integral granules are easy to
* remove. The removal of these granules is the second step, and
@@ -3263,7 +3263,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t s
*
* If the operation results in an empty B table, the function returns true.
*/
-bool
+bool
pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t sva, vaddr_t eva)
{
bool empty;
@@ -3273,7 +3273,7 @@ pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t s
mmu_short_dte_t *b_dte;
mmu_short_pte_t *c_dte;
uint8_t bt_wired, ct_wired;
-
+
nstart = MMU_ROUND_UP_B(sva);
nend = MMU_ROUND_B(eva);
@@ -3381,14 +3381,14 @@ pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t s
**
* Remove a range of addresses from the given C table.
*/
-bool
+bool
pmap_remove_c(c_tmgr_t *c_tbl, vaddr_t sva, vaddr_t eva)
{
bool empty;
int idx;
mmu_short_pte_t *c_pte;
uint8_t ct_wired;
-
+
ct_wired = c_tbl->ct_wcnt;
idx = MMU_TIC(sva);
@@ -3463,7 +3463,7 @@ pmap_bootstrap_alloc(int size)
* Note: This function will only support alignment sizes that are powers
* of two.
*/
-void
+void
pmap_bootstrap_aalign(int size)
{
int off;
@@ -3479,7 +3479,7 @@ pmap_bootstrap_aalign(int size)
* Used by the /dev/mem driver to see if a given PA is memory
* that can be mapped. (The PA is not in a hole.)
*/
-int
+int
pmap_pa_exists(paddr_t pa)
{
int i;
@@ -3509,7 +3509,7 @@ void _pmap_switch(pmap_t pmap);
* need our own context for user-space mappings in
* pmap_enter_user(). [ s/context/mmu A table/ ]
*/
-void
+void
_pmap_switch(pmap_t pmap)
{
u_long rootpa;
@@ -3535,7 +3535,7 @@ _pmap_switch(pmap_t pmap)
* If (p == curlwp) do like cpu_switch would do; otherwise just
* take this as notification that the process has a new pmap.
*/
-void
+void
pmap_activate(struct lwp *l)
{
@@ -3549,7 +3549,7 @@ pmap_activate(struct lwp *l)
**
* This is called to deactivate the specified process's address space.
*/
-void
+void
pmap_deactivate(struct lwp *l)
{
@@ -3560,7 +3560,7 @@ pmap_deactivate(struct lwp *l)
* Fill in the sun3x-specific part of the kernel core header
* for dumpsys(). (See machdep.c for the rest.)
*/
-void
+void
pmap_kcore_hdr(struct sun3x_kcore_hdr *sh)
{
u_long spa, len;
@@ -3586,7 +3586,7 @@ pmap_kcore_hdr(struct sun3x_kcore_hdr *s
* Return the current available range of virtual addresses in the
* arguuments provided. Only really called once.
*/
-void
+void
pmap_virtual_space(vaddr_t *vstart, vaddr_t *vend)
{
@@ -3600,7 +3600,7 @@ pmap_virtual_space(vaddr_t *vstart, vadd
* Assume avail_start is always in the
* first segment as pmap_bootstrap does.
*/
-static void
+static void
pmap_page_upload(void)
{
paddr_t a, b; /* memory range */
@@ -3630,7 +3630,7 @@ pmap_page_upload(void)
* that it has no mappings. Hopefully the VM system won't ask for kernel
* map statistics.
*/
-segsz_t
+segsz_t
pmap_count(pmap_t pmap, int type)
{
u_int count;
@@ -3685,7 +3685,7 @@ pmap_count(pmap_t pmap, int type)
* of the given virtual address.
*/
extern u_long ptest_addr(u_long); /* XXX: locore.s */
-u_int
+u_int
get_pte(vaddr_t va)
{
u_long pte_pa;
@@ -3712,7 +3712,7 @@ get_pte(vaddr_t va)
* Set the page descriptor that describes the kernel mapping
* of the given virtual address.
*/
-void
+void
set_pte(vaddr_t va, u_int pte)
{
u_long idx;
@@ -3727,11 +3727,11 @@ set_pte(vaddr_t va, u_int pte)
/*
* Routine: pmap_procwr
- *
+ *
* Function:
* Synchronize caches corresponding to [addr, addr+len) in p.
- */
-void
+ */
+void
pmap_procwr(struct proc *p, vaddr_t va, size_t len)
{
@@ -3752,7 +3752,7 @@ pmap_procwr(struct proc *p, vaddr_t va,
* To avoid endless loops, the listing will stop at the end of the list
* or after 'n' entries - whichever comes first.
*/
-void
+void
pv_list(paddr_t pa, int n)
{
int idx;
@@ -3760,7 +3760,7 @@ pv_list(paddr_t pa, int n)
pv_t *pv;
c_tmgr_t *c_tbl;
pmap_t pmap;
-
+
pv = pa2pv(pa);
idx = pv->pv_idx;
for (; idx != PVE_EOL && n > 0; idx = pvebase[idx].pve_next, n--) {
@@ -3784,7 +3784,7 @@ pv_list(paddr_t pa, int n)
* (CRP), or 'A' table as it is known here, from the 68851's automatic
* cache.
*/
-void
+void
flush_atc_crp(int a_tbl)
{
mmu_long_rp_t rp;
Index: src/sys/arch/sun3/sun3x/vme.c
diff -u src/sys/arch/sun3/sun3x/vme.c:1.16 src/sys/arch/sun3/sun3x/vme.c:1.17
--- src/sys/arch/sun3/sun3x/vme.c:1.16 Sat Oct 13 06:37:17 2012
+++ src/sys/arch/sun3/sun3x/vme.c Fri Sep 6 17:43:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.16 2012/10/13 06:37:17 tsutsui Exp $ */
+/* $NetBSD: vme.c,v 1.17 2013/09/06 17:43:19 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.16 2012/10/13 06:37:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17 2013/09/06 17:43:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@ static struct sun68k_bus_space_tag vme_s
static struct sun68k_bus_dma_tag vme_dma_tag;
-static int
+static int
vme_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -124,7 +124,7 @@ vme_match(device_t parent, cfdata_t cf,
return 1;
}
-static void
+static void
vme_attach(device_t parent, device_t self, void *args)
{
struct confargs *ca = aux;
