From 2bb296de775aa437d6488b12e61ac24beb70738d Mon Sep 17 00:00:00 2001 From: briggs Date: Sun, 30 Jul 2000 21:39:16 +0000 Subject: [PATCH] Update hack to point to bus_space_handle base address. --- sys/arch/mac68k/nubus/grf_nubus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/mac68k/nubus/grf_nubus.c b/sys/arch/mac68k/nubus/grf_nubus.c index f25ca1ed6d41..08f68f59f26a 100644 --- a/sys/arch/mac68k/nubus/grf_nubus.c +++ b/sys/arch/mac68k/nubus/grf_nubus.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf_nubus.c,v 1.58 2000/07/26 04:35:46 briggs Exp $ */ +/* $NetBSD: grf_nubus.c,v 1.59 2000/07/30 21:39:16 briggs Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -206,7 +206,7 @@ bad: gm->hres = image.hRes; gm->vres = image.vRes; gm->fbsize = gm->height * gm->rowbytes; - gm->fbbase = (caddr_t)sc->sc_handle; /* XXX evil hack */ + gm->fbbase = (caddr_t)(sc->sc_handle.base); /* XXX evil hack */ gm->fboff = image.offset; strncpy(cardname, nubus_get_card_name(sc->sc_tag, sc->sc_handle, @@ -479,7 +479,7 @@ grfmv_intr_cb264(vsc) volatile char *slotbase; sc = (struct grfbus_softc *)vsc; - slotbase = (volatile char *)sc->sc_handle; /* XXX evil hack */ + slotbase = (volatile char *)(sc->sc_handle.base); /* XXX evil hack */ asm volatile(" movl %0,a0 movl a0@(0xff6028),d0 andl #0x2,d0 @@ -533,7 +533,7 @@ grfmv_intr_cb364(vsc) volatile char *slotbase; sc = (struct grfbus_softc *)vsc; - slotbase = (volatile char *)sc->sc_handle; /* XXX evil hack */ + slotbase = (volatile char *)(sc->sc_handle.base); /* XXX evil hack */ asm volatile(" movl %0,a0 movl a0@(0xfe6028),d0 andl #0x2,d0