[src/netbsd-1-6]: src/sys/arch/amiga/dev Pull up revision 1.8 (requested by a...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/16c8bd9a50a1
branches:  netbsd-1-6
changeset: 529066:16c8bd9a50a1
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Sep 04 14:03:34 2002 +0000

description:
Pull up revision 1.8 (requested by aymeric in ticket #762):
call grfcc_probe() and viewprobe(), even when we are not the console.
This fixes a panic when using a serial console and wsconscfg.
(The monitors list wouldn't be initialized in grfabs.c)

diffstat:

 sys/arch/amiga/dev/amidisplaycc.c |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (47 lines):

diff -r 5e168eeaffcd -r 16c8bd9a50a1 sys/arch/amiga/dev/amidisplaycc.c
--- a/sys/arch/amiga/dev/amidisplaycc.c Wed Sep 04 14:01:41 2002 +0000
+++ b/sys/arch/amiga/dev/amidisplaycc.c Wed Sep 04 14:03:34 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amidisplaycc.c,v 1.6 2002/03/17 19:40:27 atatat Exp $ */
+/*     $NetBSD: amidisplaycc.c,v 1.6.6.1 2002/09/04 14:03:34 lukem Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.6 2002/03/17 19:40:27 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.6.6.1 2002/09/04 14:03:34 lukem Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
@@ -386,15 +386,7 @@
         */
        config_console();
 
-       /*
-        * Call the init function in grfabs.c if we have
-        * no grfcc to do it.
-        * If grfcc is present it will call grfcc_probe()
-        * during config_console() above.
-        */
-#if NGRFCC==0
        grfcc_probe();
-#endif
 
 #if NVIEW>0
        viewprobe();
@@ -440,6 +432,12 @@
 
        adp = (struct amidisplaycc_softc*)dp;
 
+       grfcc_probe();
+
+#if NVIEW>0
+       viewprobe();
+#endif
+
        /*
         * Attach only at real configuration time. Console init is done at
         * the amidisplaycc_cninit function above.