diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index 5985a954110d..a4d3a045441a 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.22 1995/07/01 23:40:38 briggs Exp $ */ +/* $NetBSD: grf.c,v 1.23 1995/07/02 00:30:25 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -385,7 +385,7 @@ grfmap(dev, addrp, p) 0); /* Offset into page: */ - *addrp += (unsigned long) gp->curr_mode.fbbase & 0xfff; + *addrp += (unsigned long) gp->curr_mode.fboff & 0xfff; return (error); } diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c index 41bcddc7f254..2595d6fdfc04 100644 --- a/sys/arch/mac68k/dev/grf_iv.c +++ b/sys/arch/mac68k/dev/grf_iv.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf_iv.c,v 1.2 1995/06/21 02:48:00 briggs Exp $ */ +/* $NetBSD: grf_iv.c,v 1.3 1995/07/02 00:30:30 briggs Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -93,6 +93,7 @@ grfiv_init(sc) gm->vres = 80; /* XXX Hack */ gm->fbsize = gm->width * gm->height; gm->fbbase = (caddr_t) 0; + gm->fboff = 0; return 1; } diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c index 083275b80c24..af8c94520842 100644 --- a/sys/arch/mac68k/dev/grf_mv.c +++ b/sys/arch/mac68k/dev/grf_mv.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf_mv.c,v 1.4 1995/06/30 05:21:33 briggs Exp $ */ +/* $NetBSD: grf_mv.c,v 1.5 1995/07/02 00:30:29 briggs Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -177,6 +177,7 @@ grfmv_init(sc) sc->curr_mode.mode_id = mode; sc->curr_mode.fbbase = (caddr_t) (base + image.offset); + sc->curr_mode.fboff = image.offset; sc->curr_mode.rowbytes = image.rowbytes; sc->curr_mode.width = image.right - image.left; sc->curr_mode.height = image.bottom - image.top; diff --git a/sys/arch/mac68k/nubus/grf_nubus.c b/sys/arch/mac68k/nubus/grf_nubus.c index 052a504f4748..52b9394b4116 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.4 1995/06/30 05:21:33 briggs Exp $ */ +/* $NetBSD: grf_nubus.c,v 1.5 1995/07/02 00:30:29 briggs Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -177,6 +177,7 @@ grfmv_init(sc) sc->curr_mode.mode_id = mode; sc->curr_mode.fbbase = (caddr_t) (base + image.offset); + sc->curr_mode.fboff = image.offset; sc->curr_mode.rowbytes = image.rowbytes; sc->curr_mode.width = image.right - image.left; sc->curr_mode.height = image.bottom - image.top; diff --git a/sys/arch/mac68k/obio/grf_obio.c b/sys/arch/mac68k/obio/grf_obio.c index 4ac878311c35..c512ad02943b 100644 --- a/sys/arch/mac68k/obio/grf_obio.c +++ b/sys/arch/mac68k/obio/grf_obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf_obio.c,v 1.2 1995/06/21 02:48:00 briggs Exp $ */ +/* $NetBSD: grf_obio.c,v 1.3 1995/07/02 00:30:30 briggs Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -93,6 +93,7 @@ grfiv_init(sc) gm->vres = 80; /* XXX Hack */ gm->fbsize = gm->width * gm->height; gm->fbbase = (caddr_t) 0; + gm->fboff = 0; return 1; }