diff options
| author | briggs <briggs@cvs.openbsd.org> | 1997-05-01 03:36:52 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1997-05-01 03:36:52 +0000 |
| commit | 011536a18e5d2775bde6f24557b074726590b902 (patch) | |
| tree | ca52621828f1f1f303317cc9f140e8d86d41bf98 | |
| parent | 29258d0567026920e8f7a80fd0022422ddce776e (diff) | |
Clear the interrupts properly on an E-Machines Futura II LX and make a wild
guess at clearing them on a Futura II SX/DSP and RasterOps ColorBoard 364.
Thanks to Michel Chalufour <michelc@tiac.net> for loaning me the II LX.
| -rw-r--r-- | sys/arch/mac68k/dev/grf_mv.c | 11 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/grfvar.h | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c index 3a758dc6d71..e12e5fca56b 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.13 1997/04/17 17:46:39 gene Exp $ */ +/* $OpenBSD: grf_mv.c,v 1.14 1997/05/01 03:36:51 briggs Exp $ */ /* $NetBSD: grf_mv.c,v 1.17 1997/02/24 06:20:06 scottr Exp $ */ /* @@ -216,16 +216,25 @@ grfmv_attach(parent, self, aux) case NUBUS_DRHW_M2HRVC: case NUBUS_DRHW_TFB: sc->cli_offset = 0xa0000; + sc->cli_value = 0; add_nubus_intr(sc->sc_slot.slot, grfmv_intr_generic, sc); break; case NUBUS_DRHW_WVC: sc->cli_offset = 0xa00000; + sc->cli_value = 0; + add_nubus_intr(sc->sc_slot.slot, grfmv_intr_generic, sc); + break; + case NUBUS_DRHW_FIILX: + case NUBUS_DRHW_FIISXDSP: + sc->cli_offset = 0xF05000; + sc->cli_value = 0x80; add_nubus_intr(sc->sc_slot.slot, grfmv_intr_generic, sc); break; case NUBUS_DRHW_SAM768: add_nubus_intr(sc->sc_slot.slot, grfmv_intr_cti, sc); break; case NUBUS_DRHW_CB264: + case NUBUS_DRHW_CB364: add_nubus_intr(sc->sc_slot.slot, grfmv_intr_cb264, sc); break; case NUBUS_DRHW_SE30: diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h index 301a9c3fc98..f4ad26636d0 100644 --- a/sys/arch/mac68k/dev/grfvar.h +++ b/sys/arch/mac68k/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.7 1997/03/29 23:47:13 briggs Exp $ */ +/* $OpenBSD: grfvar.h,v 1.8 1997/05/01 03:36:51 briggs Exp $ */ /* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */ /* @@ -60,6 +60,7 @@ struct grfbus_softc { u_int32_t card_id; /* DrHW value for nubus cards */ u_int32_t cli_offset; /* Offset of byte to clear intr */ /* for cards where that's suff. */ + unsigned char cli_value; /* Value to write at cli_offset */ nubus_dir board_dir; /* Nubus dir for curr board */ }; |