Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup for bogus assumptions about bus_space_handle_t.

This commit is contained in:
briggs 2000-07-30 21:40:49 +00:00
parent c131e0d1b7
commit d13747524c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/mac68k/obio/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.38 2000/07/02 21:10:14 scottr Exp $ */
/* $NetBSD: asc.c,v 1.39 2000/07/30 21:40:49 briggs Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@ -298,7 +298,8 @@ ascmmap(dev, off, prot)
sc = asc_cd.cd_devs[unit];
if ((u_int)off < MAC68K_ASC_LEN) {
(void) pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_handle, &pa);
(void) pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_handle.base,
&pa);
return m68k_btop(pa + off);
}

6
sys/arch/mac68k/obio/grf_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_obio.c,v 1.44 2000/02/14 07:01:49 scottr Exp $ */
/* $NetBSD: grf_obio.c,v 1.45 2000/07/30 21:40:49 briggs Exp $ */
/*
* Copyright (C) 1998 Scott Reynolds
@ -328,7 +328,7 @@ grfiv_attach(parent, self, aux)
if (sc->sc_basepa <= mac68k_vidphys &&
mac68k_vidphys < (sc->sc_basepa + length))
videoaddr = sc->sc_handle + sc->sc_fbofs; /* XXX big ol' hack */
videoaddr = sc->sc_handle.base + sc->sc_fbofs; /* XXX hack */
gm = &(sc->curr_mode);
gm->mode_id = 0;
@ -340,7 +340,7 @@ grfiv_attach(parent, self, aux)
gm->hres = 80; /* XXX hack */
gm->vres = 80; /* XXX hack */
gm->fbsize = gm->height * gm->rowbytes;
gm->fbbase = (caddr_t)sc->sc_handle; /* XXX yet another hack */
gm->fbbase = (caddr_t)sc->sc_handle.base; /* XXX yet another hack */
gm->fboff = sc->sc_fbofs;
/* Perform common video attachment. */