diff options
Diffstat (limited to 'sys/arch/mac68k/dev')
| -rw-r--r-- | sys/arch/mac68k/dev/asc.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/grf.c | 12 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/grf_iv.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/grf_mv.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/nubus.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c index 5cd6ce22626..77c933e2395 100644 --- a/sys/arch/mac68k/dev/asc.c +++ b/sys/arch/mac68k/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.8 1998/11/20 23:57:24 deraadt Exp $ */ +/* $OpenBSD: asc.c,v 1.9 1999/04/24 06:39:40 downsj Exp $ */ /* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */ /* @@ -283,7 +283,7 @@ ascmmap(dev, off, prot) sc = asc_cd.cd_devs[unit]; if (off >= 0 && off < MAC68K_ASC_LEN) { pa = pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_handle); - return mac68k_btop(pa + off); + return m68k_btop(pa + off); } return (-1); diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index 694423e145d..8ed4a43d03e 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.8 1998/11/20 23:57:24 deraadt Exp $ */ +/* $OpenBSD: grf.c,v 1.9 1999/04/24 06:39:40 downsj Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -331,9 +331,9 @@ grfaddr(gp, off) register struct grfmode *gm = gp->sc_grfmode; u_long addr; - if (off >= 0 && off < mac68k_round_page(gm->fbsize + gm->fboff)) { + if (off >= 0 && off < m68k_round_page(gm->fbsize + gm->fboff)) { addr = (u_long)(*gp->sc_phys)(gp, (vm_offset_t)gm->fbbase)+off; - return mac68k_btop(addr); + return m68k_btop(addr); } /* bogus */ return (-1); @@ -357,13 +357,13 @@ grfmap(dev, addrp, p) if (grfdebug & GDB_MMAP) printf("grfmap(%d): addr %p\n", p->p_pid, *addrp); #endif - len = mac68k_round_page(gp->sc_grfmode->fbsize + gp->sc_grfmode->fboff); + len = m68k_round_page(gp->sc_grfmode->fbsize + gp->sc_grfmode->fboff); flags = MAP_SHARED | MAP_FIXED; if (gp->sc_slot == NULL) - *addrp = (caddr_t) mac68k_trunc_page(mac68k_vidphys); + *addrp = (caddr_t) m68k_trunc_page(mac68k_vidphys); else - *addrp = (caddr_t) mac68k_trunc_page( + *addrp = (caddr_t) m68k_trunc_page( NUBUS_SLOT2PA(gp->sc_slot->slot)); vn.v_type = VCHR; /* XXX */ diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c index 3c62606d8da..19ec1dd9703 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.18 1999/01/11 05:11:34 millert Exp $ */ +/* $OpenBSD: grf_iv.c,v 1.19 1999/04/24 06:39:40 downsj Exp $ */ /* $NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $ */ /* @@ -180,7 +180,7 @@ grfiv_attach(parent, self, aux) gm->hres = 80; /* XXX Hack */ gm->vres = 80; /* XXX Hack */ gm->fbsize = gm->rowbytes * gm->height; - gm->fbbase = (caddr_t) mac68k_trunc_page(mac68k_vidlog); + gm->fbbase = (caddr_t) m68k_trunc_page(mac68k_vidlog); gm->fboff = mac68k_vidlog & PGOFSET; /* Perform common video attachment. */ diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c index 6a01bf0164f..e54930c019f 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.16 1997/05/03 02:30:29 briggs Exp $ */ +/* $OpenBSD: grf_mv.c,v 1.17 1999/04/24 06:39:40 downsj Exp $ */ /* $NetBSD: grf_mv.c,v 1.24 1997/05/03 02:29:54 briggs Exp $ */ /* @@ -184,7 +184,7 @@ grfmv_attach(parent, self, aux) gm = &sc->curr_mode; gm->mode_id = mode; gm->fbbase = (caddr_t)(sc->sc_slot.virtual_base + - mac68k_trunc_page(image.offset)); + m68k_trunc_page(image.offset)); gm->fboff = image.offset & PGOFSET; gm->rowbytes = image.rowbytes; gm->width = image.right - image.left; diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index 8a10045ac9e..aa959045288 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.12 1997/04/24 02:10:15 gene Exp $ */ +/* $OpenBSD: nubus.c,v 1.13 1999/04/24 06:39:40 downsj Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -814,7 +814,7 @@ nubus_mapin(paddr, sz) off = paddr & PGOFSET; pa = paddr - off; sz += off; - sz = mac68k_round_page(sz); + sz = m68k_round_page(sz); /* Get some kernel virtual address space. */ va = kmem_alloc_wait(kernel_map, sz); |