Module Name: src
Committed By: thorpej
Date: Tue Apr 27 23:37:02 UTC 2021
Modified Files:
src/sys/arch/shark/conf: GENERIC INSTALL files.shark
Removed Files:
src/sys/arch/shark/ofw: ofisapc.c
src/sys/arch/shark/shark: kbdreg.h opms.c
Log Message:
Garbage-collect the old Shark-specific "pccons" stuff. Shark has
been wscons for some time now.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/conf/files.shark
cvs rdiff -u -r1.12 -r0 src/sys/arch/shark/ofw/ofisapc.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/shark/shark/kbdreg.h
cvs rdiff -u -r1.31 -r0 src/sys/arch/shark/shark/opms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.137 src/sys/arch/shark/conf/GENERIC:1.138
--- src/sys/arch/shark/conf/GENERIC:1.137 Tue Apr 27 21:39:39 2021
+++ src/sys/arch/shark/conf/GENERIC Tue Apr 27 23:37:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.137 2021/04/27 21:39:39 thorpej Exp $
+# $NetBSD: GENERIC,v 1.138 2021/04/27 23:37:01 thorpej Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.137 $"
+#ident "GENERIC-$Revision: 1.138 $"
# estimated number of users
maxusers 32
@@ -216,17 +216,6 @@ atapibus* at atabus?
cd* at atapibus? drive?
sd* at atapibus? drive?
-# PCCONS@OFW
-#ofisapc* at ofbus?
-#pc* at ofisapc?
-#options FRENCH_KBD
-#options FINNISH_KBD
-#options GERMAN_KBD
-#options NORWEGIAN_KBD
-
-# PS/2 Mouse
-#opms0 at spckbd? irq 12
-
# wscons
pckbc* at ofisa?
pckbd* at pckbc?
Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.66 src/sys/arch/shark/conf/INSTALL:1.67
--- src/sys/arch/shark/conf/INSTALL:1.66 Tue Apr 27 21:39:40 2021
+++ src/sys/arch/shark/conf/INSTALL Tue Apr 27 23:37:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.66 2021/04/27 21:39:40 thorpej Exp $
+# $NetBSD: INSTALL,v 1.67 2021/04/27 23:37:01 thorpej Exp $
#
# Shark installation kernel
#
@@ -185,13 +185,6 @@ atapibus* at atabus?
cd* at atapibus? drive?
sd* at atapibus? drive?
-# PCCONS@OFW
-#ofisapc* at ofbus?
-#pc* at ofisapc?
-
-# PS/2 Mouse
-#opms0 at spckbd? irq 12
-
# wscons
pckbc* at ofisa?
pckbd* at pckbc?
Index: src/sys/arch/shark/conf/files.shark
diff -u src/sys/arch/shark/conf/files.shark:1.21 src/sys/arch/shark/conf/files.shark:1.22
--- src/sys/arch/shark/conf/files.shark:1.21 Mon Dec 18 15:53:39 2017
+++ src/sys/arch/shark/conf/files.shark Tue Apr 27 23:37:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.shark,v 1.21 2017/12/18 15:53:39 skrll Exp $
+# $NetBSD: files.shark,v 1.22 2021/04/27 23:37:01 thorpej Exp $
#
# First try for arm-specific configuration info
#
@@ -57,9 +57,6 @@ file arch/shark/ofw/lpt_ofisa_machdep.c
file arch/shark/ofw/wdc_ofisa_machdep.c wdc_ofisa
# Glue for OFW ISA device attachment
-device ofisapc {}
-attach ofisapc at ofbus
-file arch/shark/ofw/ofisapc.c ofisapc
device ofisascr {}
attach ofisascr at ofisa
file arch/shark/ofw/ofisascr.c scr
@@ -71,16 +68,6 @@ file arch/shark/ofw/ofrom.c ofrom need
# Memory disk driver
file dev/md_root.c md & memory_disk_hooks
-# attribute used to represent the "keyboard controller" on the shark
-# XXX should be a real device
-define spckbd { [irq = -1], [port = -1] }
-
-# PS/2 mouse device
-device opms: tty
-file arch/shark/shark/opms.c opms needs-flag
-
-attach opms at spckbd with opms
-
device todclock
attach todclock at todservice
file arch/shark/dev/todclock.c todclock needs-count
