Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/i386 Remove pcvt tentacles.



details:   https://anonhg.NetBSD.org/src/rev/6daca1c34c8d
branches:  trunk
changeset: 487668:6daca1c34c8d
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sun Jun 11 02:41:10 2000 +0000

description:
Remove pcvt tentacles.

diffstat:

 sys/arch/i386/Makefile                      |   4 ++--
 sys/arch/i386/conf/BIKINI                   |   6 ++----
 sys/arch/i386/conf/BOAT_ANCHOR              |   3 +--
 sys/arch/i386/conf/CARDBUS                  |   6 ++----
 sys/arch/i386/conf/DISKLESS                 |   3 +--
 sys/arch/i386/conf/DR-EVIL                  |   6 ++----
 sys/arch/i386/conf/GENERIC                  |  11 ++++-------
 sys/arch/i386/conf/GENERIC_TINY             |   6 ++----
 sys/arch/i386/conf/HOMEWORLD                |   6 ++----
 sys/arch/i386/conf/INSTALL                  |   6 ++----
 sys/arch/i386/conf/INSTALL_SMALL            |   5 ++---
 sys/arch/i386/conf/INSTALL_TINY             |   5 ++---
 sys/arch/i386/conf/MINBAR                   |   6 ++----
 sys/arch/i386/conf/NBFTP                    |   6 ++----
 sys/arch/i386/conf/SUN_LAMP                 |   3 +--
 sys/arch/i386/conf/SWINGER                  |   8 +++-----
 sys/arch/i386/conf/TRINITY                  |   6 ++----
 sys/arch/i386/conf/UNDERWORLD               |   6 ++----
 sys/arch/i386/conf/ZHADUM                   |   3 +--
 sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS |   8 +++-----
 sys/arch/i386/conf/files.i386               |  12 +-----------
 sys/arch/i386/i386/conf.c                   |   5 ++---
 sys/arch/i386/i386/consinit.c               |  11 +++--------
 23 files changed, 46 insertions(+), 95 deletions(-)

diffs (truncated from 615 to 300 lines):

diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/Makefile
--- a/sys/arch/i386/Makefile    Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/Makefile    Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 1998/11/15 20:36:30 perry Exp $
+#      $NetBSD: Makefile,v 1.17 2000/06/11 02:41:47 mycroft Exp $
 
 # Makefile for i386 tags file and boot blocks
 
@@ -27,6 +27,6 @@
            (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=        include stand isa/pcvt
+SUBDIR=        include stand
 
 .include <bsd.subdir.mk>
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/BIKINI
--- a/sys/arch/i386/conf/BIKINI Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/BIKINI Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: BIKINI,v 1.27 2000/04/19 08:44:32 haya Exp $
+#      $NetBSD: BIKINI,v 1.28 2000/06/11 02:41:10 mycroft Exp $
 #      From: GENERIC,v 1.260 1999/09/28 18:07:29 thorpej Exp
 #
 #      BIKINI -- Mycroft's development machine
@@ -228,9 +228,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
@@ -639,7 +638,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/BOAT_ANCHOR
--- a/sys/arch/i386/conf/BOAT_ANCHOR    Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/BOAT_ANCHOR    Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: BOAT_ANCHOR,v 1.82 1999/07/29 10:37:17 augustss Exp $
+#      $NetBSD: BOAT_ANCHOR,v 1.83 2000/06/11 02:41:10 mycroft Exp $
 #
 #      BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing
 #
@@ -51,7 +51,6 @@
 npx0   at isa? port 0xf0 irq 13        # math coprocessor
 
 pc0    at isa? port 0x60 irq 1         # generic PC console device
-#vt0   at isa? port 0x60 irq 1
 
 com0   at isa? port 0x3f8 irq 4        # standard PC serial ports
 ast0   at isa? port 0x1a0 irq 3        # AST 4-port serial cards
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.13 2000/04/13 11:21:18 joda Exp $
+#      $NetBSD: CARDBUS,v 1.14 2000/06/11 02:41:10 mycroft Exp $
 #
 #      CARDBUS -- GENERIC + CardBus support
 #
@@ -230,9 +230,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
@@ -615,7 +614,6 @@
 omms0  at isa? port 0x23c irq 5        # Microsoft InPort mouse
 omms1  at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS       Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/DISKLESS       Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DISKLESS,v 1.70 2000/03/22 00:58:20 cgd Exp $
+#      $NetBSD: DISKLESS,v 1.71 2000/06/11 02:41:10 mycroft Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -120,7 +120,6 @@
 npx0   at isa? port 0xf0 irq 13        # math coprocessor
 
 pc0    at isa? port 0x60 irq 1         # generic PC console device
-#vt0   at isa? port 0x60 irq 1
 
 #pcppi0        at isa?
 #sysbeep0      at pcppi?
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL        Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/DR-EVIL        Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DR-EVIL,v 1.18 2000/06/05 23:18:51 gmcgarry Exp $
+#      $NetBSD: DR-EVIL,v 1.19 2000/06/11 02:41:10 mycroft Exp $
 #
 #      DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
 #
@@ -300,9 +300,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
@@ -791,7 +790,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Jun 11 02:41:10 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.351 2000/06/11 00:21:01 augustss Exp $
+#      $NetBSD: GENERIC,v 1.352 2000/06/11 02:41:10 mycroft Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.351 $"
+#ident                 "GENERIC-$Revision: 1.352 $"
 
 maxusers       32              # estimated number of users
 
@@ -298,17 +298,15 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
 #options       FINNISH_KBD
 #options       GERMAN_KBD
 #options       NORWEGIAN_KBD
-# pccons-specific option:
+# pccons-specific options:
 #options       XSERVER_DDB     # PF12 gets you into DDB when X is running
-# pccons/pcvt -specific option:
 #options       XSERVER         # X server support
 
 
@@ -797,7 +795,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY   Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY   Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_TINY,v 1.15 2000/04/03 00:03:30 augustss Exp $
+#      $NetBSD: GENERIC_TINY,v 1.16 2000/06/11 02:41:10 mycroft Exp $
 #
 #      GENERIC_TINY -- suitable default for 4M machines
 #                      No EISA, PCI, PCMCIA or SCSI.
@@ -193,9 +193,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 pc0    at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 #pcppi0        at isa?
 #sysbeep0      at pcppi?
@@ -478,7 +477,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/HOMEWORLD
--- a/sys/arch/i386/conf/HOMEWORLD      Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/HOMEWORLD      Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: HOMEWORLD,v 1.47 2000/03/22 00:58:20 cgd Exp $
+#      $NetBSD: HOMEWORLD,v 1.48 2000/06/11 02:41:10 mycroft Exp $
 #      From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
 #
 #      HOMEWORLD - Mail, CVS, and GNATS server
@@ -202,9 +202,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
@@ -565,7 +564,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 
 # Joysticks
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL        Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.146 2000/06/08 21:42:14 fvdl Exp $
+#      $NetBSD: INSTALL,v 1.147 2000/06/11 02:41:10 mycroft Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -212,9 +212,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 pc0    at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
@@ -614,7 +613,6 @@
 #omms0 at isa? port 0x23c irq 5        # Microsoft InPort mouse
 #omms1 at isa? port 0x238 irq 5
 #opms0 at pc? irq 12           # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12           # PS/2 auxiliary port mouse
 
 # Joysticks
 
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/INSTALL_SMALL
--- a/sys/arch/i386/conf/INSTALL_SMALL  Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL_SMALL  Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_SMALL,v 1.48 2000/06/07 19:29:45 thorpej Exp $
+#      $NetBSD: INSTALL_SMALL,v 1.49 2000/06/11 02:41:10 mycroft Exp $
 #
 #      INSTALL_SMALL - Small Installation kernel.
 #
@@ -199,9 +199,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 pc0    at isa? port 0x60 irq 1         # pccons generic PC console driver
-#vt0   at isa? port 0x60 irq 1         # PCVT console driver
 
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
diff -r 15c66d2ebe0a -r 6daca1c34c8d sys/arch/i386/conf/INSTALL_TINY
--- a/sys/arch/i386/conf/INSTALL_TINY   Sun Jun 11 02:34:23 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL_TINY   Sun Jun 11 02:41:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_TINY,v 1.17 2000/03/22 00:58:20 cgd Exp $
+#      $NetBSD: INSTALL_TINY,v 1.18 2000/06/11 02:41:10 mycroft Exp $
 #
 #      INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -204,9 +204,8 @@
 
 # Console Devices
 
-# ISA console.  You can only configure one of these!
+# ISA console
 pc0    at isa? port 0x60 irq 1         # pccons generic PC console driver



Home | Main Index | Thread Index | Old Index