[src/trunk]: src/sys/arch/arm32 It looks like cninit() is necessary on Risc P...

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

details:   https://anonhg.NetBSD.org/src/rev/d5d95485c2ac
branches:  trunk
changeset: 511643:d5d95485c2ac
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Jun 23 16:47:41 2001 +0000

description:
It looks like cninit() is necessary on Risc PCs using the old console
drivers.  At least, putting it back in stops my Risc PC crashing at startup.

diffstat:

 sys/arch/arm32/conf/files.arm32        |  5 +++--
 sys/arch/arm32/vidc/console/consinit.c |  8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r b74cf642e90b -r d5d95485c2ac sys/arch/arm32/conf/files.arm32
--- a/sys/arch/arm32/conf/files.arm32   Sat Jun 23 16:36:22 2001 +0000
+++ b/sys/arch/arm32/conf/files.arm32   Sat Jun 23 16:47:41 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm32,v 1.119 2001/06/20 22:20:42 chris Exp $
+#      $NetBSD: files.arm32,v 1.120 2001/06/23 16:47:41 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -62,7 +62,8 @@
 
 # OFW console initialization
 file   arch/arm32/ofw/consinit.c               ofw
-file   dev/cninit.c                            ofw
+file   dev/cninit.c                            ofw |
+                                               (vidc & (!rpckbd | !vidcvideo))
 
 # ISA DMA glue
 file   arch/arm32/isa/isadma_machdep.c         isadma
diff -r b74cf642e90b -r d5d95485c2ac sys/arch/arm32/vidc/console/consinit.c
--- a/sys/arch/arm32/vidc/console/consinit.c    Sat Jun 23 16:36:22 2001 +0000
+++ b/sys/arch/arm32/vidc/console/consinit.c    Sat Jun 23 16:47:41 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.1 2001/06/11 11:56:58 rearnsha Exp $ */
+/*     $NetBSD: consinit.c,v 1.2 2001/06/23 16:47:42 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -49,6 +49,8 @@
 
 #include <machine/bus.h>
 
+#include <dev/cons.h>
+
 #include <arm32/iomd/iomdreg.h>
 #include <arm32/dev/rpckbdvar.h>
 #include <machine/vidc.h>
@@ -96,6 +98,10 @@
        rpckbd_cnattach((struct device *) ksc);
        vidcvideo_cnattach(videomemory.vidm_vbase);
        return;
+#else
+       /* XXX For old VIDC console. */
+       cninit();
+       return;
 #endif
        panic("No console");    /* Will we ever see this?  */
 }