Kill deprecated vm_offset_t and vm_size_t types on vax.

4 files changed, 17 insertions, 20 deletions

diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index 6ac6e275d12..0355545a562 100644
--- a/sys/arch/vax/include/db_machdep.h
+++ b/sys/arch/vax/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.10 2005/01/04 21:14:35 espie Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.11 2005/11/06 22:21:30 miod Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $	*/
 
 /* 
@@ -40,7 +40,7 @@
 #include <machine/trap.h>
 #include <machine/psl.h>
 
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
+typedef	vaddr_t	db_addr_t;		/* address - unsigned */
 typedef	long		db_expr_t;	/* expression - signed */
 
 typedef struct trapframe db_regs_t;
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index d1d483686d3..159a98a2759 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.25 2005/06/29 06:07:04 deraadt Exp $     */
+/*      $OpenBSD: pmap.h,v 1.26 2005/11/06 22:21:30 miod Exp $     */
 /*	$NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $	   */
 
 /* 
@@ -91,11 +91,11 @@ struct pv_entry {
 
 /* Mapping macros used when allocating SPT */
 #define MAPVIRT(ptr, count)					\
-	(vm_offset_t)ptr = virtual_avail;			\
+	(vaddr_t)ptr = virtual_avail;				\
 	virtual_avail += (count) * VAX_NBPG;
 
 #define MAPPHYS(ptr, count, perm)				\
-	(vm_offset_t)ptr = avail_start + KERNBASE;		\
+	(paddr_t)ptr = avail_start + KERNBASE;			\
 	avail_start += (count) * VAX_NBPG;
 
 #ifdef	_KERNEL
@@ -148,7 +148,7 @@ extern	struct pmap kernel_pmap_store;
 
 /* Prototypes */
 void	pmap_bootstrap(void);
-vaddr_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int);
+vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, int);
 void	pmap_pinit(pmap_t);
 
 #endif	/* _KERNEL */
diff --git a/sys/arch/vax/include/types.h b/sys/arch/vax/include/types.h
index 448661fd32d..c6c9d65e4b7 100644
--- a/sys/arch/vax/include/types.h
+++ b/sys/arch/vax/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.14 2004/11/26 21:23:06 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.15 2005/11/06 22:21:30 miod Exp $	*/
 /*	$NetBSD: types.h,v 1.14 1998/08/13 02:10:49 eeh Exp $	*/
 
 /*-
@@ -43,13 +43,10 @@ typedef struct label_t {
 } label_t;
 #endif
 
-typedef	unsigned long	vm_offset_t;
-typedef	unsigned long	vm_size_t;
-
-typedef vm_offset_t	paddr_t;
-typedef vm_size_t	psize_t;
-typedef vm_offset_t	vaddr_t;
-typedef vm_size_t	vsize_t;
+typedef unsigned long	paddr_t;
+typedef	unsigned long	psize_t;
+typedef unsigned long	vaddr_t;
+typedef	unsigned long	vsize_t;
 
 /*
  * Basic integral types.  Omit the typedef if
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 1c48b37d7ae..66fed2bd658 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.24 2005/06/30 21:53:13 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.25 2005/11/06 22:21:30 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $	*/
 
 /*-
@@ -102,11 +102,11 @@ struct pmap_physseg {
 #define	vax_trunc_page(x) ((vaddr_t)(x) & ~VAX_PGOFSET)
 
 /* user/kernel map constants */
-#define VM_MIN_ADDRESS		((vm_offset_t)0)
-#define VM_MAXUSER_ADDRESS	((vm_offset_t)KERNBASE)
-#define VM_MAX_ADDRESS		((vm_offset_t)KERNBASE)
-#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)KERNBASE)
-#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)(0xC0000000))
+#define VM_MIN_ADDRESS		((vaddr_t)0)
+#define VM_MAXUSER_ADDRESS	((vaddr_t)KERNBASE)
+#define VM_MAX_ADDRESS		((vaddr_t)KERNBASE)
+#define VM_MIN_KERNEL_ADDRESS	((vaddr_t)KERNBASE)
+#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)(0xC0000000))
 
 #define	USRIOSIZE		(8 * VAX_NPTEPG)	/* 512MB */
 #define	VM_PHYS_SIZE		(USRIOSIZE*VAX_NBPG)