diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-08-23 18:53:18 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-08-23 18:53:18 +0000 |
| commit | 4480a114041b55db8e1866c53fcdc234e5314cde (patch) | |
| tree | 56130a121a4199651dfb0a31465c6fb77ad090b0 /sys/arch/amiga/dev/grf_rt.c | |
| parent | 52f16f85700c22cbcd144b996d4cf636eac43b6f (diff) | |
Merge to late July NetBSD, more to come...
Diffstat (limited to 'sys/arch/amiga/dev/grf_rt.c')
| -rw-r--r-- | sys/arch/amiga/dev/grf_rt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c index 0a28eed7381..92213360164 100644 --- a/sys/arch/amiga/dev/grf_rt.c +++ b/sys/arch/amiga/dev/grf_rt.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_rt.c,v 1.6 1996/05/29 10:15:15 niklas Exp $ */ -/* $NetBSD: grf_rt.c,v 1.27 1996/05/19 21:05:45 veego Exp $ */ +/* $OpenBSD: grf_rt.c,v 1.7 1996/08/23 18:52:50 niklas Exp $ */ +/* $NetBSD: grf_rt.c,v 1.27.4.1 1996/05/26 17:26:43 is Exp $ */ /* * Copyright (c) 1993 Markus Wild @@ -1460,12 +1460,12 @@ rt_blank(gp, on) struct grf_softc *gp; int *on; { + struct MonDef *md = (struct MonDef *)gp->g_data; int r; - r = RSeq(gp->g_regkva, SEQ_ID_CLOCKING_MODE); - r &= 0xdf; /* set Bit 5 to 0 */ + r = 0x01 | ((md->FLG & MDF_CLKDIV2)/ MDF_CLKDIV2 * 8); - WSeq(gp->g_regkva, SEQ_ID_CLOCKING_MODE, r | (*on ? 0x00 : 0x20)); + WSeq(gp->g_regkva, SEQ_ID_CLOCKING_MODE, *on ? r : 0x21); return(0); } |