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

instead; looked at millert@

7 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 6818f5bc9a8..98e00e115a7 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_pci.c,v 1.24 2005/11/23 11:30:14 mickey Exp $	*/
+/*	$OpenBSD: if_le_pci.c,v 1.25 2005/12/17 07:31:27 miod Exp $	*/
 /*	$NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $	*/
 
 /*-
@@ -71,7 +71,7 @@
 #ifdef __alpha__			/* XXX */
 /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ 
 #undef vtophys
-#define	vtophys(va)	alpha_XXX_dmamap((vm_offset_t)(va))
+#define	vtophys(va)	alpha_XXX_dmamap((vaddr_t)(va))
 #endif
 
 int le_pci_match(struct device *, void *, void *);
diff --git a/sys/dev/pci/if_lgereg.h b/sys/dev/pci/if_lgereg.h
index 65daf1b0537..5a88edfcc52 100644
--- a/sys/dev/pci/if_lgereg.h
+++ b/sys/dev/pci/if_lgereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lgereg.h,v 1.4 2004/09/28 04:37:33 brad Exp $	*/
+/*	$OpenBSD: if_lgereg.h,v 1.5 2005/12/17 07:31:27 miod Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -593,5 +593,5 @@ struct lge_softc {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif
diff --git a/sys/dev/pci/if_ngereg.h b/sys/dev/pci/if_ngereg.h
index 7d9c8e09ee8..a726a6cedd1 100644
--- a/sys/dev/pci/if_ngereg.h
+++ b/sys/dev/pci/if_ngereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ngereg.h,v 1.6 2004/09/28 04:57:48 brad Exp $	*/
+/*	$OpenBSD: if_ngereg.h,v 1.7 2005/12/17 07:31:27 miod Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -718,5 +718,5 @@ struct nge_softc {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif
diff --git a/sys/dev/pci/if_sfreg.h b/sys/dev/pci/if_sfreg.h
index a10454d5810..889d29fc4a9 100644
--- a/sys/dev/pci/if_sfreg.h
+++ b/sys/dev/pci/if_sfreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sfreg.h,v 1.8 2004/06/01 02:43:28 tedu Exp $	*/
+/*	$OpenBSD: if_sfreg.h,v 1.9 2005/12/17 07:31:27 miod Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1053,5 +1053,5 @@ struct sf_softc {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif
diff --git a/sys/dev/pci/if_stereg.h b/sys/dev/pci/if_stereg.h
index 77d0e8651b1..2e6db9ad0a3 100644
--- a/sys/dev/pci/if_stereg.h
+++ b/sys/dev/pci/if_stereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stereg.h,v 1.9 2005/04/21 06:48:05 fgsch Exp $ */
+/*	$OpenBSD: if_stereg.h,v 1.10 2005/12/17 07:31:27 miod Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -539,5 +539,5 @@ struct ste_mii_frame {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif
diff --git a/sys/dev/pci/if_tlreg.h b/sys/dev/pci/if_tlreg.h
index d871e50ad67..7765a284a88 100644
--- a/sys/dev/pci/if_tlreg.h
+++ b/sys/dev/pci/if_tlreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tlreg.h,v 1.8 2003/06/30 02:52:51 avsm Exp $	*/
+/*	$OpenBSD: if_tlreg.h,v 1.9 2005/12/17 07:31:27 miod Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -597,5 +597,5 @@ struct tl_stats {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif
diff --git a/sys/dev/pci/if_wbreg.h b/sys/dev/pci/if_wbreg.h
index 6bd85dc4b65..4cb6cff01bf 100644
--- a/sys/dev/pci/if_wbreg.h
+++ b/sys/dev/pci/if_wbreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wbreg.h,v 1.7 2004/05/19 11:37:00 brad Exp $	*/
+/*	$OpenBSD: if_wbreg.h,v 1.8 2005/12/17 07:31:27 miod Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -459,5 +459,5 @@ struct wb_softc {
 
 #ifdef __alpha__
 #undef vtophys
-#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#define vtophys(va)		alpha_XXX_dmamap((vaddr_t)va)
 #endif