Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha Remove the TCWSCONS config now that zstty can...
details: https://anonhg.NetBSD.org/src/rev/13eaaefa971d
branches: trunk
changeset: 536936:13eaaefa971d
user: ad <ad%NetBSD.org@localhost>
date: Tue Sep 24 13:30:39 2002 +0000
description:
Remove the TCWSCONS config now that zstty can do flow control on IOASIC
machines.
diffstat:
sys/arch/alpha/alpha/dec_3000_300.c | 34 +-
sys/arch/alpha/alpha/dec_3000_500.c | 35 +-
sys/arch/alpha/alpha/pmap.c | 11 +-
sys/arch/alpha/conf/ALPHA | 34 +-
sys/arch/alpha/conf/GENERIC | 34 +-
sys/arch/alpha/conf/INSTALL | 28 +-
sys/arch/alpha/conf/Makefile.alpha | 4 +-
sys/arch/alpha/conf/TCWSCONS | 190 -----
sys/arch/alpha/conf/files.alpha | 10 +-
sys/arch/alpha/conf/majors.alpha | 3 +-
sys/arch/alpha/include/pmap.h | 13 +-
sys/arch/alpha/tc/scc.c | 1280 -----------------------------------
sys/arch/alpha/tc/sccreg.h | 176 ----
sys/arch/alpha/tc/sccvar.h | 121 ---
14 files changed, 98 insertions(+), 1875 deletions(-)
diffs (truncated from 2276 to 300 lines):
diff -r b77b2f41bf5c -r 13eaaefa971d sys/arch/alpha/alpha/dec_3000_300.c
--- a/sys/arch/alpha/alpha/dec_3000_300.c Tue Sep 24 13:29:44 2002 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_300.c Tue Sep 24 13:30:39 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.35 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.36 2002/09/24 13:30:39 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,9 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.35 2002/09/06 13:18:43 gehenna Exp $");
-
-#include "opt_new_scc_driver.h"
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.36 2002/09/24 13:30:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,9 +48,6 @@
#include <dev/tc/tcvar.h>
#include <dev/tc/tcdsvar.h>
#include <alpha/tc/tc_3000_300.h>
-#ifndef NEW_SCC_DRIVER
-#include <alpha/tc/sccvar.h>
-#endif
#include <machine/z8530var.h>
#include <dev/tc/zs_ioasicvar.h>
@@ -101,17 +96,6 @@
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
-#ifndef NEW_SCC_DRIVER
- switch (ctb->ctb_term_type) {
- case CTB_GRAPHICS:
- alpha_donot_kludge_scc = 1;
- return;
- case CTB_PRINTERPORT:
- return;
- default:
- goto badconsole;
- }
-#else
switch (ctb->ctb_term_type) {
case CTB_GRAPHICS:
#if NWSDISPLAY > 0
@@ -150,16 +134,12 @@
}
default:
- goto badconsole;
+ printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+ printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+ panic("consinit: unknown console type %lu\n",
+ ctb->ctb_term_type);
+ /* NOTREACHED */
}
-#endif
- return;
-badconsole:
- printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
- printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
-
- panic("consinit: unknown console type %lu\n",
- ctb->ctb_term_type);
}
static void
diff -r b77b2f41bf5c -r 13eaaefa971d sys/arch/alpha/alpha/dec_3000_500.c
--- a/sys/arch/alpha/alpha/dec_3000_500.c Tue Sep 24 13:29:44 2002 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_500.c Tue Sep 24 13:30:39 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_500.c,v 1.34 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: dec_3000_500.c,v 1.35 2002/09/24 13:30:39 ad Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,9 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.34 2002/09/06 13:18:43 gehenna Exp $");
-
-#include "opt_new_scc_driver.h"
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.35 2002/09/24 13:30:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,9 +48,6 @@
#include <dev/tc/tcvar.h>
#include <dev/tc/tcdsvar.h>
#include <alpha/tc/tc_3000_500.h>
-#ifndef NEW_SCC_DRIVER
-#include <alpha/tc/sccvar.h>
-#endif
#include <machine/z8530var.h>
#include <dev/tc/zs_ioasicvar.h>
@@ -121,18 +116,6 @@
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
-#ifndef NEW_SCC_DRIVER
- switch (ctb->ctb_term_type) {
- case CTB_GRAPHICS:
- alpha_donot_kludge_scc = 1;
- return;
- case CTB_PRINTERPORT:
- return;
- default:
- goto badconsole;
- }
-#else
-
switch (ctb->ctb_term_type) {
case CTB_GRAPHICS:
#if NWSDISPLAY > 0
@@ -171,16 +154,12 @@
}
default:
- goto badconsole;
+ printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+ printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+ panic("consinit: unknown console type %lu\n",
+ ctb->ctb_term_type);
+ /* NOTREACHED */
}
-#endif
- return;
-badconsole:
- printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
- printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
-
- panic("consinit: unknown console type %lu\n",
- ctb->ctb_term_type);
}
static void
diff -r b77b2f41bf5c -r 13eaaefa971d sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c Tue Sep 24 13:29:44 2002 +0000
+++ b/sys/arch/alpha/alpha/pmap.c Tue Sep 24 13:30:39 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.192 2002/08/24 03:10:52 mhitch Exp $ */
+/* $NetBSD: pmap.c,v 1.193 2002/09/24 13:30:39 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -148,13 +148,12 @@
*/
#include "opt_lockdebug.h"
-#include "opt_new_scc_driver.h"
#include "opt_sysv.h"
#include "opt_multiprocessor.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.192 2002/08/24 03:10:52 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.193 2002/09/24 13:30:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1010,13 +1009,7 @@
pmap_uses_prom_console(void)
{
-#if defined(NEW_SCC_DRIVER)
return (cputype == ST_DEC_21000);
-#else
- return (cputype == ST_DEC_21000
- || cputype == ST_DEC_3000_300
- || cputype == ST_DEC_3000_500);
-#endif /* NEW_SCC_DRIVER */
}
#endif /* _PMAP_MAY_USE_PROM_CONSOLE */
diff -r b77b2f41bf5c -r 13eaaefa971d sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Tue Sep 24 13:29:44 2002 +0000
+++ b/sys/arch/alpha/conf/ALPHA Tue Sep 24 13:30:39 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.169 2002/09/20 10:39:48 martti Exp $
+# $NetBSD: ALPHA,v 1.170 2002/09/24 13:30:41 ad Exp $
#
# Alpha kernel with all the options you'd want, and more.
@@ -6,7 +6,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "ALPHA-$Revision: 1.169 $"
+ident "ALPHA-$Revision: 1.170 $"
maxusers 32
@@ -136,6 +136,7 @@
#options NO_KERNEL_RCSIDS # don't include kernel file RCS IDs
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options FONT_GALLANT12x22 # Console font for TC devices
# The Alpha console firmware network boots using the BOOTP
# protocol, so we ask the NFS code to use BOOTP/DHCP as well,
@@ -192,17 +193,27 @@
ioasic* at tc? slot ? offset ?
mcclock* at ioasic? offset ?
le* at ioasic? offset ?
-scc0 at ioasic? offset ?
-scc1 at ioasic? offset ?
+zsc0 at ioasic? offset 0x100000
+zsc1 at ioasic? offset 0x180000
bba0 at ioasic? offset ?
audio* at bba?
tcds* at tc? slot ? offset ?
asc* at tcds? chip ?
asc* at tc? slot ? offset ?
-#cfb* at tc? slot ? offset ?
-#sfb* at tc? slot ? offset ?
le* at tc? slot ? offset ?
fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
+cfb* at tc? slot ? offset ?
+mfb* at tc? slot ? offset ?
+tfb* at tc? slot ? offset ?
+sfb* at tc? slot ? offset ?
+#sfbp* at tc? slot ? offset ?
+px* at tc? slot ? offset ?
+pxg* at tc? slot ? offset ?
+
+# TurboChannel serial attachments
+zstty* at zsc? channel ? # serial ports on B channels
+lkkbd0 at zsc1 channel ? # keyboard port on A channels
+vsms0 at zsc0 channel ? # mouse port on A channels
# PCI host bus adapter support
apecs* at mainbus?
@@ -508,10 +519,17 @@
ugen* at uhub? port ?
# Workstation Console attachments
-#wsdisplay* at cfb?
+wsdisplay* at cfb?
+wsdisplay* at mfb?
+wsdisplay* at tfb?
+wsdisplay* at sfb?
+#wsdisplay* at sfbp?
+wsdisplay* at px?
+wsdisplay* at pxg?
wsdisplay* at vga?
-#wsdisplay* at sfb?
wsdisplay* at tga?
+wskbd* at lkkbd? console ?
+wsmouse* at vsms?
wskbd* at pckbd?
wsmouse* at pms?
diff -r b77b2f41bf5c -r 13eaaefa971d sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Tue Sep 24 13:29:44 2002 +0000
+++ b/sys/arch/alpha/conf/GENERIC Tue Sep 24 13:30:39 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.214 2002/09/24 09:34:39 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.215 2002/09/24 13:30:41 ad Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.214 $"
+#ident "GENERIC-$Revision: 1.215 $"
maxusers 32
@@ -137,6 +137,7 @@
#options PCMCIAVERBOSE
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options FONT_GALLANT12x22 # Console font for TC devices
# The Alpha console firmware network boots using the BOOTP
# protocol, so we ask the NFS code to use BOOTP/DHCP as well,
@@ -193,17 +194,27 @@
ioasic* at tc? slot ? offset ?
mcclock* at ioasic? offset ?
le* at ioasic? offset ?
-scc0 at ioasic? offset ?
-scc1 at ioasic? offset ?
+zsc0 at ioasic? offset 0x100000
+zsc1 at ioasic? offset 0x180000
bba0 at ioasic? offset ?
audio* at bba?
tcds* at tc? slot ? offset ?
asc* at tcds? chip ?
asc* at tc? slot ? offset ?
-#cfb* at tc? slot ? offset ?
-#sfb* at tc? slot ? offset ?
le* at tc? slot ? offset ?
fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
Home |
Main Index |
Thread Index |
Old Index