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

instead; looked at millert@

5 files changed, 15 insertions, 18 deletions

diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 41ed3499b84..14b512a0a64 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.18 2005/01/04 21:14:35 espie Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.19 2005/12/17 07:31:23 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -44,7 +44,7 @@ struct opcode {
 extern struct opcode opcode[];
 
 /* types the generic ddb module needs */
-typedef	vm_offset_t db_addr_t;
+typedef	vaddr_t db_addr_t;
 typedef	long db_expr_t;
 typedef struct trapframe db_regs_t;
 
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index 1dc17772230..03012b5e792 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.16 2005/12/14 21:46:30 millert Exp $	*/
+/*	$OpenBSD: types.h,v 1.17 2005/12/17 07:31:23 miod Exp $	*/
 /*	$NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $	*/
 
 /*-
@@ -44,9 +44,6 @@ typedef struct label_t {
 #endif
 
 #if __BSD_VISIBLE
-typedef	unsigned long	vm_offset_t;
-typedef	unsigned long	vm_size_t;
-
 typedef unsigned long	vaddr_t;
 typedef unsigned long	paddr_t;
 typedef unsigned long	vsize_t;
diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c
index 4b49d756230..c058c3f7f5e 100644
--- a/sys/arch/alpha/stand/netboot/netboot.c
+++ b/sys/arch/alpha/stand/netboot/netboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netboot.c,v 1.6 2004/07/05 19:59:20 deraadt Exp $	*/
+/*	$OpenBSD: netboot.c,v 1.7 2005/12/17 07:31:25 miod Exp $	*/
 /*	$NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $	*/
 
 /*
@@ -55,7 +55,7 @@ char boot_flags[128];
 
 extern char bootprog_name[], bootprog_rev[];
 
-vm_offset_t ffp_save, ptbr_save;
+vaddr_t ffp_save, ptbr_save;
 
 int debug;
 
diff --git a/sys/arch/alpha/tc/cfbvar.h b/sys/arch/alpha/tc/cfbvar.h
index 05081b2f8be..567df97081b 100644
--- a/sys/arch/alpha/tc/cfbvar.h
+++ b/sys/arch/alpha/tc/cfbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $	*/
+/*	$OpenBSD: cfbvar.h,v 1.7 2005/12/17 07:31:25 miod Exp $	*/
 /*	$NetBSD: cfbvar.h,v 1.1 1996/05/01 23:25:04 cgd Exp $	*/
 
 /*
@@ -38,16 +38,16 @@ struct fbcursor;
 struct fbcurpos;
 
 struct cfb_devconfig {
-	vm_offset_t dc_vaddr;		/* memory space virtual base address */
-	vm_offset_t dc_paddr;		/* memory space physical base address */
-	vm_offset_t dc_size;		/* size of slot memory */
+	vaddr_t dc_vaddr;		/* memory space virtual base address */
+	paddr_t dc_paddr;		/* memory space physical base address */
+	vsize_t dc_size;		/* size of slot memory */
 
 	int	    dc_wid;		/* width of frame buffer */
 	int	    dc_ht;		/* height of frame buffer */
 	int	    dc_depth;		/* depth, bits per pixel */
 	int	    dc_rowbytes;	/* bytes in a FB scan line */
 
-	vm_offset_t dc_videobase;	/* base of flat frame buffer */
+	vaddr_t	dc_videobase;		/* base of flat frame buffer */
 
 	struct raster	dc_raster;	/* raster description */
 	struct rcons	dc_rcons;	/* raster blitter control info */
diff --git a/sys/arch/alpha/tc/sfbvar.h b/sys/arch/alpha/tc/sfbvar.h
index f30a3da9b00..6674c2cfcf1 100644
--- a/sys/arch/alpha/tc/sfbvar.h
+++ b/sys/arch/alpha/tc/sfbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $	*/
+/*	$OpenBSD: sfbvar.h,v 1.7 2005/12/17 07:31:25 miod Exp $	*/
 /*	$NetBSD: sfbvar.h,v 1.1 1996/05/01 21:15:51 cgd Exp $	*/
 
 /*
@@ -38,16 +38,16 @@ struct fbcursor;
 struct fbcurpos;
 
 struct sfb_devconfig {
-	vm_offset_t dc_vaddr;		/* memory space virtual base address */
-	vm_offset_t dc_paddr;		/* memory space physical base address */
-	vm_offset_t dc_size;		/* size of slot memory */
+	vaddr_t dc_vaddr;		/* memory space virtual base address */
+	paddr_t dc_paddr;		/* memory space physical base address */
+	vsize_t dc_size;		/* size of slot memory */
 
 	int	    dc_wid;		/* width of frame buffer */
 	int	    dc_ht;		/* height of frame buffer */
 	int	    dc_depth;		/* depth, bits per pixel */
 	int	    dc_rowbytes;	/* bytes in a FB scan line */
 
-	vm_offset_t dc_videobase;	/* base of flat frame buffer */
+	vaddr_t dc_videobase;		/* base of flat frame buffer */
 
 	struct raster	dc_raster;	/* raster description */
 	struct rcons	dc_rcons;	/* raster blitter control info */