[src/trunk]: src/sys/arch/alpha Hook in px & pxg devices.

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

details:   https://anonhg.NetBSD.org/src/rev/6c9a7bd6b9e5
branches:  trunk
changeset: 504518:6c9a7bd6b9e5
user:      ad <ad%NetBSD.org@localhost>
date:      Sun Mar 04 13:36:19 2001 +0000

description:
Hook in px & pxg devices.

diffstat:

 sys/arch/alpha/conf/TCWSCONS    |   8 ++++++--
 sys/arch/alpha/conf/files.alpha |  16 +++++++++++++++-
 sys/arch/alpha/tc/tcasic.c      |  10 +++-------
 3 files changed, 24 insertions(+), 10 deletions(-)

diffs (118 lines):

diff -r f26fd28e4663 -r 6c9a7bd6b9e5 sys/arch/alpha/conf/TCWSCONS
--- a/sys/arch/alpha/conf/TCWSCONS      Sun Mar 04 13:32:25 2001 +0000
+++ b/sys/arch/alpha/conf/TCWSCONS      Sun Mar 04 13:36:19 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: TCWSCONS,v 1.19 2001/02/23 07:21:41 nisimura Exp $
+# $NetBSD: TCWSCONS,v 1.20 2001/03/04 13:36:20 ad Exp $
 #
 # TURBOchannel Alpha DEC3000
 
 include        "arch/alpha/conf/std.alpha"
 
-#ident                 "TCWSCONS-$Revision: 1.19 $"
+#ident                 "TCWSCONS-$Revision: 1.20 $"
 
 maxusers 32
 
@@ -133,6 +133,8 @@
 #cfb*  at      tc? slot ? offset ?
 sfb*   at      tc? slot ? offset ?
 #sfbp* at      tc? slot ? offset ?
+#px    at      tc? slot ? offset ?
+#pxg   at      tc? slot ? offset ?
 le*    at      tc? slot ? offset ?
 fta*   at      tc? slot ? offset ?             # DEC DEFTA FDDI cards
 
@@ -152,6 +154,8 @@
 # Workstation Console attachments
 #wsdisplay*    at      cfb?
 wsdisplay*     at      sfb?
+#wsdisplay*    at      px?
+#wsdisplay*    at      pxg?
 wskbd*         at      lkkbd? console ?
 wsmouse*       at      vsms?
 
diff -r f26fd28e4663 -r 6c9a7bd6b9e5 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha   Sun Mar 04 13:32:25 2001 +0000
+++ b/sys/arch/alpha/conf/files.alpha   Sun Mar 04 13:36:19 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.133 2001/02/23 07:21:41 nisimura Exp $
+# $NetBSD: files.alpha,v 1.134 2001/03/04 13:36:19 ad Exp $
 #
 # alpha-specific configuration info
 
@@ -181,6 +181,20 @@
 attach sfbp at tc
 file   dev/tc/sfbplus.c                sfbp            needs-flag
 
+# XXX: STIC (stamp interface chip) for PX and PXG
+define stic
+file   dev/tc/stic.c                   stic
+
+# XXX: PX PMAG-C
+device px: wsemuldisplaydev, stic
+attach px at tc
+file   dev/tc/px.c                     px needs-flag
+
+# XXX: PXG PMAG-D, PMAG-E, PMAG-F
+device pxg: wsemuldisplaydev, stic
+attach pxg at tc
+file   dev/tc/pxg.c                    pxg needs-flag
+
 # 8530 UARTs
 device scc: tty
 attach scc at ioasic
diff -r f26fd28e4663 -r 6c9a7bd6b9e5 sys/arch/alpha/tc/tcasic.c
--- a/sys/arch/alpha/tc/tcasic.c        Sun Mar 04 13:32:25 2001 +0000
+++ b/sys/arch/alpha/tc/tcasic.c        Sun Mar 04 13:36:19 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.33 2001/02/22 07:46:01 nisimura Exp $ */
+/* $NetBSD: tcasic.c,v 1.34 2001/03/04 13:36:20 ad Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.33 2001/02/22 07:46:01 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.34 2001/03/04 13:36:20 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -174,10 +174,8 @@
 #include "cfb.h"
 #include "sfb.h"
 #include "sfbp.h"
-#ifdef notyet
 #include "px.h"
 #include "pxg.h"
-#endif
 
 extern void    sfb_cnattach __P((tc_addr_t));
 extern void    cfb_cnattach __P((tc_addr_t));
@@ -189,7 +187,7 @@
 struct cnboards {
        const char      *cb_tcname;
        void    (*cb_cnattach)(tc_addr_t);
-} static cnboards[] = {
+} static const cnboards[] = {
 #if NSFB > 0
        { "PMAGB-BA", sfb_cnattach },
 #endif
@@ -199,7 +197,6 @@
 #if NSFBP > 0
        { "PMAGD   ", sfbp_cnattach },
 #endif
-#ifdef notyet
 #if NPX > 0
        { "PMAG-CA ", px_cnattach },
 #endif
@@ -210,7 +207,6 @@
        { "PMAGB-FA", pxg_cnattach },
        { "PMAGB-FB", pxg_cnattach },
 #endif
-#endif
 };
 
 /*