vm_offset_t -> {vaddr_t, bus_addr_t}

11 files changed, 40 insertions, 40 deletions

diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c
index 4904348891c..bf1bb50b386 100644
--- a/sys/arch/mac68k/dev/asc.c
+++ b/sys/arch/mac68k/dev/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.18 2005/04/24 22:25:12 martin Exp $	*/
+/*	$OpenBSD: asc.c,v 1.19 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $	*/
 
 /*
@@ -284,7 +284,7 @@ ascmmap(dev, off, prot)
 
 	sc = asc_cd.cd_devs[unit];
 	if (off >= 0 && off < MAC68K_ASC_LEN) {
-		pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_handle, &pa);
+		pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_handle, &pa);
 		return m68k_btop(pa + off);
 	}
 
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index be73ed02b77..6e84a03efb4 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.26 2005/05/26 16:35:56 miod Exp $	*/
+/*	$OpenBSD: grf.c,v 1.27 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $	*/
 
 /*
@@ -326,7 +326,7 @@ grfaddr(gp, off)
 	u_long	addr;
 
 	if (off >= 0 && off < m68k_round_page(gm->fbsize + gm->fboff)) {
-		addr = (u_long)(*gp->sc_phys)(gp, (vm_offset_t)gm->fbbase)+off;
+		addr = (u_long)(*gp->sc_phys)(gp, (vaddr_t)gm->fbbase)+off;
 		return m68k_btop(addr);
 	}
 	/* bogus */
@@ -364,7 +364,7 @@ grfmap(dev, addrp, p)
 	vn.v_specinfo = &si;	/* XXX */
 	vn.v_rdev = dev;	/* XXX */
 
-	error = uvm_mmap(&p->p_vmspace->vm_map, (vm_offset_t *)addrp,
+	error = uvm_mmap(&p->p_vmspace->vm_map, (vaddr_t *)addrp,
 	    (vm_size_t)len, UVM_PROT_RW, UVM_PROT_RW, flags, (caddr_t)&vn, 0,
 	    p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur, p);
 
@@ -400,8 +400,8 @@ grfunmap(dev, addr, p)
 
 	size = round_page(gp->sc_grfmode->fbsize);
 
-	uvm_unmap(&p->p_vmspace->vm_map, (vm_offset_t)addr,
-	    (vm_offset_t)addr + size);
+	uvm_unmap(&p->p_vmspace->vm_map, (vaddr_t)addr,
+	    (vaddr_t)addr + size);
 
 	return (0);
 }
diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c
index 0ce2f3ea2a8..cdc771d9282 100644
--- a/sys/arch/mac68k/dev/grf_iv.c
+++ b/sys/arch/mac68k/dev/grf_iv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_iv.c,v 1.22 2004/12/08 06:57:48 miod Exp $	*/
+/*	$OpenBSD: grf_iv.c,v 1.23 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ extern long		videobitdepth;
 extern unsigned long	videosize;
 
 static int	grfiv_mode(struct grf_softc *gp, int cmd, void *arg);
-static caddr_t	grfiv_phys(struct grf_softc *gp, vm_offset_t addr);
+static caddr_t	grfiv_phys(struct grf_softc *gp, vaddr_t addr);
 static int	grfiv_match(struct device *, void *, void *);
 static void	grfiv_attach(struct device *, struct device *, void *);
 
@@ -212,7 +212,7 @@ grfiv_mode(sc, cmd, arg)
 static caddr_t
 grfiv_phys(gp, addr)
 	struct grf_softc *gp;
-	vm_offset_t addr;
+	vaddr_t addr;
 {
 	/*
 	 * If we're using IIsi or similar, this will be 0.
diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c
index d4e66911792..fe08c3715e6 100644
--- a/sys/arch/mac68k/dev/grf_mv.c
+++ b/sys/arch/mac68k/dev/grf_mv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_mv.c,v 1.23 2005/06/12 20:51:29 martin Exp $	*/
+/*	$OpenBSD: grf_mv.c,v 1.24 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: grf_nubus.c,v 1.62 2001/01/22 20:27:02 briggs Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ static int	grfmv_intr_radius_gsc(void *vsc);
 static int	grfmv_intr_radius_gx(void *vsc);
 
 static int	grfmv_mode(struct grf_softc *gp, int cmd, void *arg);
-static caddr_t	grfmv_phys(struct grf_softc *gp, vm_offset_t addr);
+static caddr_t	grfmv_phys(struct grf_softc *gp, vaddr_t addr);
 static int	grfmv_match(struct device *, void *, void *);
 static void	grfmv_attach(struct device *, struct device *, void *);
 
@@ -400,7 +400,7 @@ grfmv_mode(gp, cmd, arg)
 static caddr_t
 grfmv_phys(gp, addr)
 	struct grf_softc *gp;
-	vm_offset_t addr;
+	vaddr_t addr;
 {
 	return (caddr_t)(NUBUS_SLOT2PA(gp->sc_slot->slot) +
 	    (addr - gp->sc_regh));	/* XXX evil hack */
diff --git a/sys/arch/mac68k/dev/grf_subr.c b/sys/arch/mac68k/dev/grf_subr.c
index cab2542f520..cb25065a4f8 100644
--- a/sys/arch/mac68k/dev/grf_subr.c
+++ b/sys/arch/mac68k/dev/grf_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_subr.c,v 1.5 2002/03/14 01:26:35 millert Exp $	*/
+/*	$OpenBSD: grf_subr.c,v 1.6 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: grf_subr.c,v 1.6 1997/02/20 00:23:28 scottr Exp $	*/
 
 /*-
@@ -52,7 +52,7 @@ grf_establish(sc, sp, g_mode, g_phys)
 	struct grfbus_softc *sc;
 	nubus_slot *sp;
 	int (*g_mode)(struct grf_softc *, int, void *);
-	caddr_t (*g_phys)(struct grf_softc *, vm_offset_t);
+	caddr_t (*g_phys)(struct grf_softc *, vaddr_t);
 {
 	struct grfmode *gm = &sc->curr_mode;
 	struct grfbus_attach_args ga;
diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h
index 712b59c3cee..42b6e382194 100644
--- a/sys/arch/mac68k/dev/grfvar.h
+++ b/sys/arch/mac68k/dev/grfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfvar.h,v 1.14 2005/04/26 21:09:35 martin Exp $	*/
+/*	$OpenBSD: grfvar.h,v 1.15 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $	*/
 
 /*
@@ -75,7 +75,7 @@ struct grf_softc {
 					/* mode-change on/off/mode function */
 	int	(*sc_mode)(struct grf_softc *, int, void *);
 					/* map virtual addr to physical addr */
-	caddr_t	(*sc_phys)(struct grf_softc *, vm_offset_t);
+	caddr_t	(*sc_phys)(struct grf_softc *, vaddr_t);
 };
 
 /*
@@ -86,10 +86,10 @@ struct grfbus_attach_args {
 	struct	grfmode *ga_grfmode;	/* forwarded ... */
 	nubus_slot	*ga_slot;
 	int	(*ga_mode)(struct grf_softc *, int, void *);
-	caddr_t	(*ga_phys)(struct grf_softc *, vm_offset_t);
+	caddr_t	(*ga_phys)(struct grf_softc *, vaddr_t);
 };
 
-typedef	caddr_t (*grf_phys_t)(struct grf_softc *gp, vm_offset_t addr);
+typedef	caddr_t (*grf_phys_t)(struct grf_softc *gp, vaddr_t addr);
 
 /* flags */
 #define	GF_ALIVE	0x01
@@ -152,5 +152,5 @@ int	grfunmap(dev_t dev, caddr_t addr, struct proc *p);
 
 void	grf_establish(struct grfbus_softc *, nubus_slot *,
 	    int (*)(struct grf_softc *, int, void *),
-	    caddr_t (*)(struct grf_softc *, vm_offset_t));
+	    caddr_t (*)(struct grf_softc *, vaddr_t));
 int	grfbusprint(void *, const char *);
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index 271fb8e7967..54c85c55b60 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_sn.c,v 1.36 2005/05/22 19:40:51 art Exp $        */
+/*    $OpenBSD: if_sn.c,v 1.37 2005/07/23 23:28:58 martin Exp $        */
 /*    $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $        */
 
 /*
@@ -1183,7 +1183,7 @@ void
 sn_get_enaddr(t, h, o, dst)
 	bus_space_tag_t	t;
 	bus_space_handle_t h;
-	vm_offset_t o;
+	bus_addr_t o;
 	u_char *dst;
 {
 	int	i, do_bbr;
diff --git a/sys/arch/mac68k/dev/if_snvar.h b/sys/arch/mac68k/dev/if_snvar.h
index 5e8ab1395cb..90c23200412 100644
--- a/sys/arch/mac68k/dev/if_snvar.h
+++ b/sys/arch/mac68k/dev/if_snvar.h
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_snvar.h,v 1.12 2004/11/26 21:21:24 miod Exp $      */
+/*    $OpenBSD: if_snvar.h,v 1.13 2005/07/23 23:28:58 martin Exp $      */
 /*    $NetBSD: if_snvar.h,v 1.8 1997/04/25 03:40:09 briggs Exp $      */
 
 /*
@@ -218,4 +218,4 @@ typedef struct sn_softc {
 int	snsetup(struct sn_softc *sc, u_int8_t *);
 int	snintr(void *);
 void	sn_get_enaddr(bus_space_tag_t t, bus_space_handle_t h,
-	    vm_offset_t o, u_char *dst);
+	    bus_addr_t o, u_char *dst);
diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c
index 7990e5f6ef4..30917bd4cfd 100644
--- a/sys/arch/mac68k/dev/ite.c
+++ b/sys/arch/mac68k/dev/ite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite.c,v 1.24 2004/11/26 21:21:24 miod Exp $	*/
+/*	$OpenBSD: ite.c,v 1.25 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: ite.c,v 1.32 1997/02/20 00:23:25 scottr Exp $	*/
 
 /*
@@ -935,9 +935,9 @@ itematch(parent, vcf, aux)
 
 	if (strcmp(ga->ga_name, "ite"))
 		return 0;
-	pmap_extract(pmap_kernel(), (vm_offset_t) gm->fbbase + gm->fboff, &pa);
+	pmap_extract(pmap_kernel(), (vaddr_t) gm->fbbase + gm->fboff, &pa);
 
-	return (pa == (vm_offset_t) mac68k_vidphys);
+	return (pa == (vaddr_t) mac68k_vidphys);
 }
 
 static void 
diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c
index 6051a2c2076..3b9761dbae8 100644
--- a/sys/arch/mac68k/dev/sbc_obio.c
+++ b/sys/arch/mac68k/dev/sbc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbc_obio.c,v 1.11 2004/12/08 06:59:43 miod Exp $	*/
+/*	$OpenBSD: sbc_obio.c,v 1.12 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ sbc_obio_attach(parent, self, args)
 {
 	struct sbc_softc *sc = (struct sbc_softc *) self;
 	struct ncr5380_softc *ncr_sc = (struct ncr5380_softc *) sc;
-	extern vm_offset_t SCSIBase;
+	extern vaddr_t SCSIBase;
 
 	/* Pull in the options flags. */ 
 	sc->sc_options = ((ncr_sc->sc_dev.dv_cfdata->cf_flags | sbc_options)
@@ -130,14 +130,14 @@ sbc_obio_attach(parent, self, args)
 	switch (current_mac_model->machineid) {
 	case MACH_MACIIFX:	/* Note: the IIfx isn't (yet) supported. */
 		sc->sc_regs = (struct sbc_regs *)(SCSIBase + SBC_REG_OFS_IIFX);
-		sc->sc_drq_addr = (vm_offset_t)(SCSIBase + SBC_HSK_OFS_IIFX);
-		sc->sc_nodrq_addr = (vm_offset_t)(SCSIBase + SBC_DMA_OFS_IIFX);
+		sc->sc_drq_addr = (vaddr_t)(SCSIBase + SBC_HSK_OFS_IIFX);
+		sc->sc_nodrq_addr = (vaddr_t)(SCSIBase + SBC_DMA_OFS_IIFX);
 		sc->sc_options &= ~(SBC_INTR | SBC_RESELECT);
 		break;
 	case MACH_MACPB500:
 		sc->sc_regs = (struct sbc_regs *)(SCSIBase + SBC_REG_OFS);
-		sc->sc_drq_addr = (vm_offset_t)(SCSIBase + SBC_HSK_OFS); /*??*/
-		sc->sc_nodrq_addr = (vm_offset_t)(SCSIBase + SBC_DMA_OFS_PB500);
+		sc->sc_drq_addr = (vaddr_t)(SCSIBase + SBC_HSK_OFS); /*??*/
+		sc->sc_nodrq_addr = (vaddr_t)(SCSIBase + SBC_DMA_OFS_PB500);
 		sc->sc_options &= ~(SBC_INTR | SBC_RESELECT);
 		break;
 	case MACH_MACPB210:
@@ -148,15 +148,15 @@ sbc_obio_attach(parent, self, args)
 	case MACH_MACPB280C:
 		if (ncr_sc->sc_dev.dv_unit == 1) {
 			sc->sc_regs = (struct sbc_regs *)(0xfee00000 + SBC_REG_OFS_DUO2);
-			sc->sc_drq_addr = (vm_offset_t)(0xfee00000 + SBC_HSK_OFS_DUO2);
-			sc->sc_nodrq_addr = (vm_offset_t)(0xfee00000 + SBC_DMA_OFS_DUO2);
+			sc->sc_drq_addr = (vaddr_t)(0xfee00000 + SBC_HSK_OFS_DUO2);
+			sc->sc_nodrq_addr = (vaddr_t)(0xfee00000 + SBC_DMA_OFS_DUO2);
 			break;
 		}
 		/*FALLTHROUGH*/
 	default:
 		sc->sc_regs = (struct sbc_regs *)(SCSIBase + SBC_REG_OFS);
-		sc->sc_drq_addr = (vm_offset_t)(SCSIBase + SBC_HSK_OFS);
-		sc->sc_nodrq_addr = (vm_offset_t)(SCSIBase + SBC_DMA_OFS);
+		sc->sc_drq_addr = (vaddr_t)(SCSIBase + SBC_HSK_OFS);
+		sc->sc_nodrq_addr = (vaddr_t)(SCSIBase + SBC_DMA_OFS);
 		break;
 	}
 
diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h
index 96551d234dc..ca943c3e5f5 100644
--- a/sys/arch/mac68k/dev/sbcvar.h
+++ b/sys/arch/mac68k/dev/sbcvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbcvar.h,v 1.5 2004/12/08 06:59:43 miod Exp $	*/
+/*	$OpenBSD: sbcvar.h,v 1.6 2005/07/23 23:28:58 martin Exp $	*/
 /*	$NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $	*/
 
 /*
@@ -77,8 +77,8 @@ struct sbc_softc {
 	struct ncr5380_softc ncr_sc;
 	struct via2hand	sc_ih_drq, sc_ih_irq;
 	volatile struct sbc_regs *sc_regs;
-	volatile vm_offset_t	sc_drq_addr;
-	volatile vm_offset_t	sc_nodrq_addr;
+	volatile vaddr_t	sc_drq_addr;
+	volatile vaddr_t	sc_nodrq_addr;
 	void			(*sc_clrintr)(struct ncr5380_softc *);
 	int			sc_options;	/* options for this instance. */
 	struct sbc_pdma_handle sc_pdma[SCI_OPENINGS];