Get rid of vm_offset_t in bktr.

3 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index f9daede0692..73b5cf7d5a6 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_core.c,v 1.7 2003/01/05 02:05:58 mickey Exp $	*/
+/*	$OpenBSD: bktr_core.c,v 1.8 2003/01/15 06:30:35 art Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -472,7 +472,7 @@ static int      i2c_read_byte( bktr_ptr_t bktr, unsigned char *data, int last );
 void
 common_bktr_attach( bktr_ptr_t bktr, int unit, u_long pci_id, u_int rev )
 {
-	vm_offset_t	buf = 0;
+	vaddr_t	buf = 0;
 
 /***************************************/
 /* *** OS Specific memory routines *** */
@@ -1286,7 +1286,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 	struct meteor_counts	*counts;
 	struct meteor_video	*video;
 	struct bktr_capture_area *cap_area;
-	vm_offset_t		buf;
+	vaddr_t			buf;
 	int                     i;
 	char                    char_temp;
 
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index ff02757776c..68b81df239f 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_os.c,v 1.14 2003/01/05 01:24:53 mickey Exp $	*/
+/*	$OpenBSD: bktr_os.c,v 1.15 2003/01/15 06:30:35 art Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
 
 /*
@@ -1310,12 +1310,12 @@ int	bktr_ioctl(dev_t, ioctl_cmd_t, caddr_t, int, struct proc *);
 paddr_t	bktr_mmap(dev_t, off_t, int);
 #endif
 
-vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t,
-                                 vm_offset_t, vm_offset_t);
-
 #if defined(__OpenBSD__)
 static int      bktr_probe(struct device *, void *, void *);
 #else
+vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t,
+                                 vm_offset_t, vm_offset_t);
+
 static int      bktr_probe(struct device *, struct cfdata *, void *);
 #endif
 static void     bktr_attach(struct device *, struct device *, void *);
@@ -1490,7 +1490,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux)
 /*
  * Special Memory Allocation
  */
-vm_offset_t
+vaddr_t
 get_bktr_mem(bktr, dmapp, size)
         bktr_ptr_t bktr;
         bus_dmamap_t *dmapp;
@@ -1541,14 +1541,14 @@ get_bktr_mem(bktr, dmapp, size)
                 bus_dmamap_destroy(dmat, *dmapp);
                 return 0;
         }
-        return (vm_offset_t)kva;
+        return (vaddr_t)kva;
 }
 
 void
 free_bktr_mem(bktr, dmap, kva)
         bktr_ptr_t bktr;
         bus_dmamap_t dmap;
-        vm_offset_t kva;
+        vaddr_t kva;
 {
         bus_dma_tag_t dmat = bktr->dmat;
 
diff --git a/sys/dev/pci/bktr/bktr_os.h b/sys/dev/pci/bktr/bktr_os.h
index a20a4a35cfb..20a38767db3 100644
--- a/sys/dev/pci/bktr/bktr_os.h
+++ b/sys/dev/pci/bktr/bktr_os.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_os.h,v 1.1 2001/03/28 03:27:09 fgsch Exp $	*/
+/*	$OpenBSD: bktr_os.h,v 1.2 2003/01/15 06:30:35 art Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.4 2000/04/16 07:56:58 roger Exp $ */
 
 /*
@@ -53,8 +53,8 @@ vm_offset_t     get_bktr_mem( int unit, unsigned size );
 #endif
 
 #if (defined(__NetBSD__) || defined(__OpenBSD__))
-vm_offset_t     get_bktr_mem(bktr_ptr_t, bus_dmamap_t *, unsigned size);
-void            free_bktr_mem(bktr_ptr_t, bus_dmamap_t, vm_offset_t);
+vaddr_t		get_bktr_mem(bktr_ptr_t, bus_dmamap_t *, unsigned size);
+void            free_bktr_mem(bktr_ptr_t, bus_dmamap_t, vaddr_t);
 #endif 
 
 /************************************/