Get rid of deprecated vm_{offset,size}_t types for good, use {p,v}{addr,size}_t

instead; looked at millert@

5 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/mvmeppc/dev/mem.c b/sys/arch/mvmeppc/dev/mem.c
index 323a6ae37bb..0f466ec6ab6 100644
--- a/sys/arch/mvmeppc/dev/mem.c
+++ b/sys/arch/mvmeppc/dev/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.7 2003/06/02 23:27:53 millert Exp $	*/
+/*	$OpenBSD: mem.c,v 1.8 2005/12/17 07:31:26 miod Exp $	*/
 /*	$NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
 
 /*
@@ -88,7 +88,7 @@ mmrw(dev, uio, flags)
 	struct uio *uio;
 	int flags;
 {
-	vm_offset_t v;
+	vaddr_t v;
 	u_int c;
 	struct iovec *iov;
 	int error = 0;
@@ -110,7 +110,7 @@ mmrw(dev, uio, flags)
 			v = uio->uio_offset;
 			c = uio->uio_resid;
 			/* This doesn't allow device mapping!	XXX */
-			pmap_real_memory(&v, (vm_size_t *)&c);
+			pmap_real_memory(&v, (vsize_t *)&c);
 			error = uiomove((caddr_t)v, c, uio);
 			continue;
 
diff --git a/sys/arch/mvmeppc/include/powerpc.h b/sys/arch/mvmeppc/include/powerpc.h
index 4b13a038867..2505e197b5e 100644
--- a/sys/arch/mvmeppc/include/powerpc.h
+++ b/sys/arch/mvmeppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powerpc.h,v 1.4 2004/01/28 23:50:18 miod Exp $	*/
+/*	$OpenBSD: powerpc.h,v 1.5 2005/12/17 07:31:26 miod Exp $	*/
 /*	$NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
 #define	_MACHINE_POWERPC_H_
 
 struct mem_region {
-	vm_offset_t start;
-	vm_size_t size;
+	vaddr_t start;
+	vsize_t size;
 };
 
 void mem_regions(struct mem_region **, struct mem_region **);
diff --git a/sys/arch/mvmeppc/include/vmparam.h b/sys/arch/mvmeppc/include/vmparam.h
index 0304094be49..3f078c85b13 100644
--- a/sys/arch/mvmeppc/include/vmparam.h
+++ b/sys/arch/mvmeppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.14 2005/04/11 15:13:01 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.15 2005/12/17 07:31:26 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
@@ -75,15 +75,15 @@
 /*
  * Would like to have MAX addresses = 0, but this doesn't (currently) work
  */
-#define	VM_MIN_ADDRESS		((vm_offset_t)0)
-#define	VM_MAXUSER_ADDRESS	((vm_offset_t)0xfffff000)
+#define	VM_MIN_ADDRESS		((vaddr_t)0)
+#define	VM_MAXUSER_ADDRESS	((vaddr_t)0xfffff000)
 #define VM_MAX_ADDRESS		VM_MAXUSER_ADDRESS
-#define	VM_MIN_KERNEL_ADDRESS	((vm_offset_t)(PPC_KERNEL_SR << ADDR_SR_SHIFT))
+#define	VM_MIN_KERNEL_ADDRESS	((vaddr_t)(PPC_KERNEL_SR << ADDR_SR_SHIFT))
 
 /* ppc_kvm_size is so that vm space can be stolen before vm is fully
  * initialized.
  */
-extern vm_offset_t ppc_kvm_stolen;
+extern vaddr_t ppc_kvm_stolen;
 #define VM_KERN_ADDRESS_SIZE	(PPC_SEGMENT_LENGTH - (32 * 1024 * 1024))
 #define	VM_MAX_KERNEL_ADDRESS	(VM_MIN_KERNEL_ADDRESS + VM_KERN_ADDRESS_SIZE)
 
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index 97a65ac357d..136a530f58b 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.47 2004/11/17 20:26:02 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.48 2005/12/17 07:31:26 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -395,7 +395,7 @@ cpu_startup()
 {
 	int sz, i;
 	caddr_t v;
-	vm_offset_t minaddr, maxaddr;
+	vaddr_t minaddr, maxaddr;
 	int base, residual;
 
 	proc0.p_addr = proc0paddr;
@@ -435,11 +435,11 @@ cpu_startup()
 		residual = 0;
 	}
 	for (i = 0; i < nbuf; i++) {
-		vm_size_t curbufsize;
-		vm_offset_t curbuf;
+		vsize_t curbufsize;
+		vaddr_t curbuf;
 		struct vm_page *pg;
 		
-		curbuf = (vm_offset_t)buffers + i * MAXBSIZE;
+		curbuf = (vaddr_t)buffers + i * MAXBSIZE;
 		curbufsize = PAGE_SIZE * (i < residual ? base + 1 : base);
 		while (curbufsize) {
 			pg = uvm_pagealloc(NULL, 0, NULL, 0);
diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
index 539fcbe996a..f0ec63c34a3 100644
--- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppc1_machdep.c,v 1.15 2004/11/17 20:24:44 miod Exp $	*/
+/*	$OpenBSD: ppc1_machdep.c,v 1.16 2005/12/17 07:31:26 miod Exp $	*/
 /*	$NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $	*/
 
 /*
@@ -59,7 +59,7 @@ unsigned long PPC1_tps(void);
 int PPC1_clock_read(int *sec, int *min, int *hour, int *day, int *mon, int *yr);
 int PPC1_clock_write(int sec, int min, int hour, int day, int mon, int yr);
 
-vm_offset_t size_memory(void);
+vsize_t size_memory(void);
 
 struct firmware ppc1_firmware = {
 	PPC1_mem_regions,
@@ -85,20 +85,20 @@ struct mem_region PPC1mem[PPC1_REGIONS + 1], PPC1avail[PPC1_REGIONS + 3];
  */
 #define MAXPHYSMEM	0x10000000	/* max physical memory */
 
-vm_offset_t
+vsize_t
 size_memory(void)
 {
 	volatile unsigned int *look;
 	unsigned int *max;
 	extern char *end;
-	vm_offset_t total_mem;
+	vsize_t total_mem;
 #ifdef USE_BUG
-	vm_offset_t local_mem;
+	vsize_t local_mem;
 #endif
 
 #ifdef USE_BUG
 	bugenvrd();	/* read the bug environment */
-	local_mem = (vm_offset_t)bug_localmemsize();
+	local_mem = (vsize_t)bug_localmemsize();
 #endif 
 #define PATTERN   0x5a5a5a5a
 #define STRIDE    (4*1024) 	/* 4k at a time */