Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/dev Resurrect a chunk of code from the ite d...



details:   https://anonhg.NetBSD.org/src/rev/c7658c790d4a
branches:  trunk
changeset: 483751:c7658c790d4a
user:      scottr <scottr%NetBSD.org@localhost>
date:      Fri Mar 17 04:46:32 2000 +0000

description:
Resurrect a chunk of code from the ite driver that we lost along the way.
This code is necessary for SE/30 internal video, at a minimum.

diffstat:

 sys/arch/mac68k/dev/macfb.c |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 33a6c73672df -r c7658c790d4a sys/arch/mac68k/dev/macfb.c
--- a/sys/arch/mac68k/dev/macfb.c       Fri Mar 17 02:23:17 2000 +0000
+++ b/sys/arch/mac68k/dev/macfb.c       Fri Mar 17 04:46:32 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: macfb.c,v 1.2 2000/02/14 07:01:47 scottr Exp $ */
+/* $NetBSD: macfb.c,v 1.3 2000/03/17 04:46:32 scottr Exp $ */
 /*
  * Copyright (c) 1998 Matt DeBergalis
  * All rights reserved.
@@ -129,6 +129,19 @@
 static int
 macfb_is_console(paddr_t addr)
 {
+       if (addr != macfb_consaddr &&
+           (addr >= 0xf9000000 && addr <= 0xfeffffff)) {
+               /*
+                * This is in the NuBus standard slot space range, so we
+                * may well have to look at 0xFssxxxxx, too.  Mask off the
+                * slot number and duplicate it in bits 20-23, per IM:V
+                * pp 459, 463, and IM:VI ch 30 p 17.
+                * Note:  this is an ugly hack and I wish I knew what
+                * to do about it.  -- sr
+                */
+               addr = (paddr_t)(((u_long)addr & 0xff0fffff) |
+                   (((u_long)addr & 0x0f000000) >> 4));
+       }
        return ((mac68k_machine.serial_console & 0x03) == 0
            && (addr == macfb_consaddr));
 }



Home | Main Index | Thread Index | Old Index