Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arc/arc Call vga_isa_cnattach() in c_jazz_eisa_cons...



details:   https://anonhg.NetBSD.org/src/rev/b7f55a880622
branches:  trunk
changeset: 542522:b7f55a880622
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Jan 31 22:01:13 2003 +0000

description:
Call vga_isa_cnattach() in c_jazz_eisa_cons_init() if NVGA_ISA > 0.

diffstat:

 sys/arch/arc/arc/c_jazz_eisa.c |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r ff15cde564ed -r b7f55a880622 sys/arch/arc/arc/c_jazz_eisa.c
--- a/sys/arch/arc/arc/c_jazz_eisa.c    Fri Jan 31 21:57:23 2003 +0000
+++ b/sys/arch/arc/arc/c_jazz_eisa.c    Fri Jan 31 22:01:13 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: c_jazz_eisa.c,v 1.3 2003/01/27 15:33:36 tsutsui Exp $  */
+/*     $NetBSD: c_jazz_eisa.c,v 1.4 2003/01/31 22:01:13 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1998
@@ -52,6 +52,11 @@
 #include <arc/jazz/pccons_jazziovar.h>
 #endif
 
+#include "vga_isa.h"
+#if NVGA_ISA > 0
+#include <dev/isa/vga_isavar.h>
+#endif
+
 #include "vga_jazzio.h"
 #if NVGA_JAZZIO > 0
 #include <arc/jazz/vga_jazziovar.h>
@@ -155,6 +160,17 @@
                        return;
                }
 #endif
+
+#if NVGA_ISA > 0
+               if (vga_isa_cnattach(&arc_bus_io, &arc_bus_mem) == 0) {
+#if NPCKBC_JAZZIO > 0
+                       pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
+                           JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+#endif
+                       return;
+               }
+#endif
+
 #if NPC_JAZZIO > 0
                if (pccons_jazzio_cnattach(arc_displayc_id, &jazzio_bus) == 0)
                        return;



Home | Main Index | Thread Index | Old Index