sysbeep + com->pccom

4 files changed, 33 insertions, 21 deletions

diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 5f7ad8d79c6..bb90b7bd07c 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.30 1999/01/02 00:32:55 niklas Exp $
+#	$OpenBSD: NETTAN,v 1.31 1999/01/02 00:38:15 niklas Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -142,18 +142,21 @@ isadma0	at isa?
 #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
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
+pcppi0	at isa?
+sysbeep0	at pcppi?
+
+pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+pccom1	at isa? port 0x2f8 irq 3
+pccom2	at isa? port 0x3e8 irq 5
+#pccom3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
 ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial card
 #ast1	at isa? port 0x2a0 irq 6	# 2nd AST 4-port serial card
-com*	at ast? slave ?
+pccom*	at ast? slave ?
 #boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
+#pccom*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-com*    at pcmcia? function ?		# PCMCIA modem cards
+#pccom*	at rtfps? slave ?
+pccom*    at pcmcia? function ?		# PCMCIA modem cards
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index 95dc60b9a3a..39ba32deb22 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -1,4 +1,4 @@
-#	$OpenBSD: OPRAH,v 1.22 1999/01/02 00:32:54 niklas Exp $
+#	$OpenBSD: OPRAH,v 1.23 1999/01/02 00:38:15 niklas Exp $
 #
 #	OPRAH -- Niklas Hallqvist's test machine
 #
@@ -84,8 +84,11 @@ isadma0	at isa?
 
 vt0	at isa? port 0x60 irq 1
 
-com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-com1	at isa? port 0x2f8 irq 3
+pcppi0	at isa?
+sysbeep0	at pcppi?
+
+pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+pccom1	at isa? port 0x2f8 irq 3
 
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index d8e4bbf7de5..ec9d9b96a2d 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PETRA,v 1.15 1999/01/02 00:32:54 niklas Exp $
+#	$OpenBSD: PETRA,v 1.16 1999/01/02 00:38:16 niklas Exp $
 #
 #	PETRA -- everything that's currently supported with certain
 #		 changes for Applitron's fileserver petra, a 128 MB
@@ -75,6 +75,9 @@ isapnp0	at isa?
 #pc0	at isa? port 0x60 irq 1		# generic PC console device
 vt0	at isa? port 0x60 irq 1
 
+pcppi0	at isa?
+sysbeep0	at pcppi?
+
 pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 pccom1	at isa? port 0x2f8 irq 3
 pccom2	at isa? port 0x3e8 irq 5
diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF
index 47560b34029..9def5d8b79b 100644
--- a/sys/arch/i386/conf/WALDORF
+++ b/sys/arch/i386/conf/WALDORF
@@ -1,4 +1,4 @@
-#	$OpenBSD: WALDORF,v 1.18 1999/01/02 00:32:53 niklas Exp $
+#	$OpenBSD: WALDORF,v 1.19 1999/01/02 00:38:15 niklas Exp $
 #
 #	WALDORF -- a 486 kernel config Applitron use for some gateway
 #		   machines (waldorf and neuro).
@@ -92,16 +92,19 @@ isadma0	at isa?
 #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
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
+pcppi0	at isa?
+sysbeep0	at pcppi?
+
+pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+pccom1	at isa? port 0x2f8 irq 3
+pccom2	at isa? port 0x3e8 irq 5
+#pccom3	at isa? port 0x2e8 irq 9
 #ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast? slave ? flags 1
+#pccom*	at ast? slave ? flags 1
 #boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
+#pccom*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
+#pccom*	at rtfps? slave ?
 
 #cy0	at isa? ...