Module Name: src
Committed By: christos
Date: Fri Dec 9 02:25:47 UTC 2016
Modified Files:
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC INSTALL
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/prep/conf: GENERIC
Log Message:
kill PCPPISPEAKER
To generate a diff of this commit:
cvs rdiff -u -r1.372 -r1.373 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/bebox/conf/INSTALL
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/prep/conf/GENERIC
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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.372 src/sys/arch/alpha/conf/GENERIC:1.373
--- src/sys/arch/alpha/conf/GENERIC:1.372 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/alpha/conf/GENERIC Thu Dec 8 21:25:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.372 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.373 2016/12/09 02:25:46 christos Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.372 $"
+ident "GENERIC-$Revision: 1.373 $"
maxusers 32
@@ -440,7 +440,6 @@ pckbd* at pckbc? # PC keyboard (kbd p
pms* at pckbc? # PS/2-style mouse (aux port)
attimer* at isa? # AT Timer
pcppi* at isa? # PC prog. periph. interface
-options PCPPISPEAKER
spkr0 at pcppi? # IBM BASIC emulation
isabeep0 at pcppi? # "keyboard" beep
com* at isa? port 0x3f8 irq 4 # standard serial ports
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.148 src/sys/arch/bebox/conf/GENERIC:1.149
--- src/sys/arch/bebox/conf/GENERIC:1.148 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/bebox/conf/GENERIC Thu Dec 8 21:25:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.149 2016/12/09 02:25:46 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.148 $"
+#ident "GENERIC-$Revision: 1.149 $"
maxusers 32
@@ -202,7 +202,6 @@ lpt0 at isa? port 0x378 irq 7 # standard
mcclock0 at isa? port 0x70 # time-of-day clock
attimer0 at isa?
#pcppi0 at isa?
-#options PCPPISPEAKER
#spkr0 at pcppi?
wss0 at isa? port 0x82c irq 30 drq 6 drq2 7 # Windows Sound System
Index: src/sys/arch/bebox/conf/INSTALL
diff -u src/sys/arch/bebox/conf/INSTALL:1.57 src/sys/arch/bebox/conf/INSTALL:1.58
--- src/sys/arch/bebox/conf/INSTALL:1.57 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/bebox/conf/INSTALL Thu Dec 8 21:25:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.57 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: INSTALL,v 1.58 2016/12/09 02:25:46 christos Exp $
#
# First try for BeBox config file
#
@@ -179,7 +179,6 @@ tlp* at pci? dev ? function ? # DECchip
ukphy* at mii? phy ? # generic unknown PHYs
#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
-#options PCPPISPEAKER
#spkr0 at pcppi?
# Joystick driver. Probe is a little strange; add only if you have one.
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.158 src/sys/arch/cats/conf/GENERIC:1.159
--- src/sys/arch/cats/conf/GENERIC:1.158 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/cats/conf/GENERIC Thu Dec 8 21:25:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.158 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.159 2016/12/09 02:25:46 christos Exp $
#
# GENERIC machine description file
#
@@ -502,7 +502,6 @@ lpt1 at isa? port 0x278 irq 5
#ep* at isa? port ? irq ?
# The spkr driver provides a simple tone interface to the built in speaker.
-options PCPPISPEAKER
spkr0 at pcppi? # PC speaker
#options VAUDIOSPEAKER
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.98 src/sys/arch/cats/conf/INSTALL:1.99
--- src/sys/arch/cats/conf/INSTALL:1.98 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/cats/conf/INSTALL Thu Dec 8 21:25:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.98 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: INSTALL,v 1.99 2016/12/09 02:25:46 christos Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -398,7 +398,6 @@ lpt1 at isa? port 0x278 irq 5
#ep* at isa? port ? irq ?
# The spkr driver provides a simple tone interface to the built in speaker.
-#options PCPPISPEAKER
#spkr0 at pcppi? # PC speaker
#options VAUDIOSPEAKER
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.177 src/sys/arch/prep/conf/GENERIC:1.178
--- src/sys/arch/prep/conf/GENERIC:1.177 Thu Dec 8 06:31:12 2016
+++ src/sys/arch/prep/conf/GENERIC Thu Dec 8 21:25:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: GENERIC,v 1.178 2016/12/09 02:25:47 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.177 $"
+#ident "GENERIC-$Revision: 1.178 $"
maxusers 32
@@ -506,7 +506,6 @@ ukphy* at mii? phy ? # generic unknown
#midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-#options PCPPISPEAKER
#spkr0 at pcppi? # PC speaker
#options VAUDIOSPEAKER
