[src/trunk]: src/sys/arch/pmax Added console initalization glue to allow `px'...

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

details:   https://anonhg.NetBSD.org/src/rev/b98f13584e29
branches:  trunk
changeset: 471858:b98f13584e29
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Apr 13 18:50:51 1999 +0000

description:
Added console initalization glue to allow `px' device to function as the
console.

diffstat:

 sys/arch/pmax/dev/findcons.c |   8 +++++---
 sys/arch/pmax/tc/tc_subr.c   |  25 ++++++++++---------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diffs (97 lines):

diff -r 8b08194be611 -r b98f13584e29 sys/arch/pmax/dev/findcons.c
--- a/sys/arch/pmax/dev/findcons.c      Tue Apr 13 18:45:40 1999 +0000
+++ b/sys/arch/pmax/dev/findcons.c      Tue Apr 13 18:50:51 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: findcons.c,v 1.8 1998/11/15 11:21:52 jonathan Exp $    */
+/*     $NetBSD: findcons.c,v 1.9 1999/04/13 18:50:51 ad Exp $  */
 
 /*
  * Copyright (c) 1998 Jonathan Stone
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.8 1998/11/15 11:21:52 jonathan Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.9 1999/04/13 18:50:51 ad Exp $$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,6 +58,7 @@
 /*
  * Kernel configuration dependencies.
  */
+#include "px.h"
 #include "pm.h"
 #include "cfb.h"
 #include "mfb.h"
@@ -117,7 +118,8 @@
 #include <pmax/dev/xcfbvar.h>
 #endif
 
-#define NWS     (NXCFB + NPM + NMFB + NSFB + NCFB)
+/* PixelStamp based TURBOchannel option boards */
+#define NWS     (NXCFB + NPM + NMFB + NSFB + NCFB + NPX)
 /*
  *  XXX Major device numbers for possible console devices.
  */
diff -r 8b08194be611 -r b98f13584e29 sys/arch/pmax/tc/tc_subr.c
--- a/sys/arch/pmax/tc/tc_subr.c        Tue Apr 13 18:45:40 1999 +0000
+++ b/sys/arch/pmax/tc/tc_subr.c        Tue Apr 13 18:50:51 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tc_subr.c,v 1.21 1998/05/22 21:14:40 thorpej Exp $     */
+/*     $NetBSD: tc_subr.c,v 1.22 1999/04/13 18:50:52 ad Exp $  */
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_subr.c,v 1.21 1998/05/22 21:14:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_subr.c,v 1.22 1999/04/13 18:50:52 ad Exp $");
 
 
 #include <sys/types.h>
@@ -69,11 +69,7 @@
 #include "cfb.h"
 #include "mfb.h"
 #include "sfb.h"
-
-#ifdef notyet
 #include "px.h"
-#include "pxg.h"
-#endif
 
 /*
  * Tables for table-driven TC and console configuration.
@@ -84,6 +80,8 @@
        int (*fbsw_initfn) __P((struct fbinfo*, char*, int, int));
 };
 
+extern int px_init __P((struct fbinfo*, char*, int, int));
+
 #define tcfbsw_entry(tcname, initfn) { tcname, initfn }
 
 const struct tcfbsw tcfbsw[] = {
@@ -101,15 +99,12 @@
 #endif
 
 #if NPX > 0
-  tcfbsw_entry("PMAG-CA", pxinit),
-  tcfbsw_entry("PMAG-C ", pxinit),
-#endif
-
-#if NPXG > 0
-  tcfbsw_entry("PMAG-DA", pxginit),
-  tcfbsw_entry("PMAG-E ", pxginit),
-  tcfbsw_entry("PMAG-F ", pxginit),
-  tcfbsw_entry("PMAG-FA", pxginit),
+  tcfbsw_entry("PMAG-CA ", px_init),
+  tcfbsw_entry("PMAG-DA ", px_init),
+  tcfbsw_entry("PMAG-E  ", px_init),   /* ??? */
+  tcfbsw_entry("PMAG-EA ", px_init),
+  tcfbsw_entry("PMAG-F  ", px_init),   /* ??? */
+  tcfbsw_entry("PMAG-FA ", px_init),   
 #endif
 };
 const int ntcfbsw = sizeof(tcfbsw) / sizeof(tcfbsw[0]);