Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/macppc/dev Back out part of previous. OF_open() wo...



details:   https://anonhg.NetBSD.org/src/rev/a9ccdf8d8fec
branches:  trunk
changeset: 572085:a9ccdf8d8fec
user:      briggs <briggs%NetBSD.org@localhost>
date:      Fri Dec 17 05:44:12 2004 +0000

description:
Back out part of previous.  OF_open() works fine with /chaos/control, but
is a bit picky about interrupts.

diffstat:

 sys/arch/macppc/dev/ofb.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (34 lines):

diff -r 39eed00dd43d -r a9ccdf8d8fec sys/arch/macppc/dev/ofb.c
--- a/sys/arch/macppc/dev/ofb.c Fri Dec 17 05:42:30 2004 +0000
+++ b/sys/arch/macppc/dev/ofb.c Fri Dec 17 05:44:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofb.c,v 1.40 2004/12/15 04:52:05 briggs Exp $  */
+/*     $NetBSD: ofb.c,v 1.41 2004/12/17 05:44:12 briggs Exp $  */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.40 2004/12/15 04:52:05 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.41 2004/12/17 05:44:12 briggs Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -235,15 +235,6 @@
 
                memset(name, 0, 64);
                OF_package_to_path(node, name, sizeof(name));
-
-               /*
-                * /chaos/control on some boxes hangs up in OF_open.
-                * If we return here, we get "can't map frame buffer"
-                * which isn't really a big deal in these cases.
-                */
-               if (!strncmp(name, "/chaos@F0000000/control@B", sizeof(name)))
-                       return;
-
                dc->dc_ih = OF_open(name);
        }
 



Home | Main Index | Thread Index | Old Index