Changes to comply with new syntax.

Noticed by:	bde, the Hawk Eye :-)

1 files changed, 17 insertions, 21 deletions

diff --git a/release/picobsd/dial/conf/PICOBSD b/release/picobsd/dial/conf/PICOBSD
index 5886e30..377c8f3 100644
--- a/release/picobsd/dial/conf/PICOBSD
+++ b/release/picobsd/dial/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: PICOBSD,v 1.2 1998/09/19 21:44:50 abial Exp $
 #
 machine		"i386"
 cpu		"I386_CPU"
@@ -12,6 +12,7 @@ maxusers	3
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
+options		FFS_ROOT
 options		MFS
 options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
@@ -30,16 +31,16 @@ config		kernel	root on fd0
 controller	isa0
 controller	pci0
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
 options		"CMD640"	# work around CMD640 chip deficiency
-controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
+controller	wdc0	at isa? port "IO_WD1" bio irq 14
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
 
-controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
+controller	wdc1	at isa? port "IO_WD2" bio irq 15
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
@@ -48,16 +49,16 @@ options		ATAPI_STATIC	#Don't do it as an LKM
 device		wcd0	#IDE CD-ROM
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
+device		sc0	at isa? port IO_KBD conflicts tty irq 1
 
-device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
+device		npx0	at isa? port IO_NPX irq 13
 
-device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr
-device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
-device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
+device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
+device		sio1	at isa? port "IO_COM2" tty irq 3
+device		sio2	at isa? disable port "IO_COM3" tty irq 5
+device		sio3	at isa? disable port "IO_COM4" tty irq 9
 
-device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
+device		psm0	at isa? port IO_KBD conflicts tty irq 12
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
@@ -67,16 +68,11 @@ device de0
 #device de1
 device fxp0
 
-device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
-#device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 vector edintr
-device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
-device ep0 at isa? port 0x300 net irq 10 vector epintr
-#device ex0 at isa? port? net irq? vector exintr
-#device fe0 at isa? port 0x300 net irq ? vector feintr
-device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
-device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
-#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
-#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
+device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000
+device ep0 at isa? port 0x300 net irq 10
+device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
+device lnc0 at isa? port 0x300 net irq 10
 
 pseudo-device	loop
 pseudo-device	ether