apm0 at bios0; i have sb and scd now

4 files changed, 16 insertions, 14 deletions

diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index 435ffb80abb..60c70bc2762 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.21 1997/09/26 16:42:59 kstailey Exp $
+#	$OpenBSD: LAP,v 1.22 1997/09/29 03:52:19 mickey Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -167,7 +167,7 @@ option		APM_NOIDLE
 #option		PCMCIA_DEBUG
 #option		PCMCIA_ISA_DEBUG
 
-#apm0	at mainbus?
+#apm0	at bios0
 pcmcia* at pcic?
 
 # Multiple controllers need some testing.  Some laptops have multiple PCIC
diff --git a/sys/arch/i386/conf/LUCIFIER b/sys/arch/i386/conf/LUCIFIER
index ece5e82b935..7f00f863449 100644
--- a/sys/arch/i386/conf/LUCIFIER
+++ b/sys/arch/i386/conf/LUCIFIER
@@ -1,4 +1,4 @@
-#	$OpenBSD: LUCIFIER,v 1.3 1997/09/20 20:18:28 kstailey Exp $
+#	$OpenBSD: LUCIFIER,v 1.4 1997/09/29 03:52:20 mickey Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -95,7 +95,7 @@ config		bsd	swap generic
 mainbus0 at root
 
 bios0	at mainbus0
-apm0	at mainbus0
+apm0	at bios0
 option	APM_NOIDLE
 
 isa0	at mainbus0
@@ -142,7 +142,7 @@ com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
 #cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
 #cy*	at pci?				# PCI cyclom card
 
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+lpt0	at isa? port 0x378 irq 5	# standard PC parallel ports
 lpt1	at isa? port 0x278
 lpt2	at isa? port 0x3bc
 
@@ -192,6 +192,8 @@ fd*	at fdc? drive ?
 
 #mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
 
+scd0	at isa? port 0x300 irq 10	# Sony CD-ROM drives
+
 wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
 wdc1	at isa? port 0x170 irq 15
 wd*	at wdc? drive ?
@@ -228,7 +230,7 @@ ed2	at isa? port 0x300 iomem 0xcc000 irq 10
 #pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
 #sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
 
-#sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
+sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 #wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
 #pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
 #gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record drq)
diff --git a/sys/arch/i386/conf/THREADWAY b/sys/arch/i386/conf/THREADWAY
index a5d08c517c8..0161bb08111 100644
--- a/sys/arch/i386/conf/THREADWAY
+++ b/sys/arch/i386/conf/THREADWAY
@@ -1,7 +1,7 @@
 #
 #	THREADWAY: threadway.teeny.org
 #
-#	$OpenBSD: THREADWAY,v 1.21 1997/09/28 08:58:50 downsj Exp $
+#	$OpenBSD: THREADWAY,v 1.22 1997/09/29 03:52:20 mickey Exp $
 #
 
 machine		i386
@@ -73,7 +73,7 @@ config		bsd root on sd0 swap on sd0 and wd0
 mainbus0 at root
 
 bios0	at mainbus0
-apm0	at mainbus0
+apm0	at bios0
 isa0	at mainbus0
 eisa0	at mainbus0
 pci0	at mainbus0 bus ?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 1cb36de3b37..8a318f28429 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.33 1997/09/21 04:27:34 mickey Exp $
+#	$OpenBSD: files.i386,v 1.34 1997/09/29 03:52:21 mickey Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -215,11 +215,11 @@ include "../../../compat/bsdos/files.bsdos"
 include "../../../compat/freebsd/files.freebsd"
 file	arch/i386/i386/freebsd_machdep.c	compat_freebsd
 
-device apm
-attach apm at mainbus
-file	arch/i386/i386/apm.c		apm needs-count
-
-device bios
+device bios {}
 attach bios at mainbus
 file	arch/i386/i386/bios.c		bios needs-count
 
+device apm
+attach apm at bios
+file	arch/i386/i386/apm.c		apm needs-count
+