[src/trunk]: src/sys/arch/mac68k/obio Fixup for bogus assumptions about bus_s...

[briggs <briggs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e0c45a56b1eb
branches:  trunk
changeset: 495529:e0c45a56b1eb
user:      briggs <briggs%NetBSD.org@localhost>
date:      Sun Jul 30 21:40:49 2000 +0000

description:
Fixup for bogus assumptions about bus_space_handle_t.

diffstat:

 sys/arch/mac68k/obio/asc.c      |  5 +++--
 sys/arch/mac68k/obio/grf_obio.c |  6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r b78e332c863d -r e0c45a56b1eb sys/arch/mac68k/obio/asc.c
--- a/sys/arch/mac68k/obio/asc.c        Sun Jul 30 21:40:09 2000 +0000
+++ b/sys/arch/mac68k/obio/asc.c        Sun Jul 30 21:40:49 2000 +0000
@@ -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 @@
 
        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);
        }
 
diff -r b78e332c863d -r e0c45a56b1eb sys/arch/mac68k/obio/grf_obio.c
--- a/sys/arch/mac68k/obio/grf_obio.c   Sun Jul 30 21:40:09 2000 +0000
+++ b/sys/arch/mac68k/obio/grf_obio.c   Sun Jul 30 21:40:49 2000 +0000
@@ -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 @@
 
        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 @@
        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. */