--- Net2/arch/i386/conf/genericisa	2018/04/24 18:07:16	1.1
+++ Net2/arch/i386/conf/genericisa	2018/04/24 18:12:12	1.1.1.2
@@ -1,45 +1,58 @@
 #
 # GENERICISA -- Generic ISA machine -- distribution floppy
 #
+
 machine		"i386"
 cpu		"i386"
 ident		GENERICISA
 timezone	8 dst
 maxusers	10
-options		INET,ISOFS,NFS
+options		INET,ISOFS,NFSCLIENT
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
+options		XSERVER,UCONSOLE
+options		PCFS,KERNFS
+options		SCSI
 
-config		"386bsd"	root on wd0 swap on wd0 and as0
+config		"386bsd"	root on wd0 swap on wd0 and sd0
 
 controller	isa0
-controller	wd0	at isa? port "IO_WD1" bio irq 14 vector wdintr
-disk		wd0	at wd0 drive 0
-disk		wd0	at wd0 drive 1
-
-controller	fd0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
-disk		fd0	at fd0 drive 0
-disk		fd1	at fd0 drive 1
-
-controller	as0	at isa? port 0x330 bio irq 11 drq 5 vector asintr
-disk		as0	at as0 drive 0
-disk		as1	at as0 drive 1
+controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
+disk		wd0	at wdc0 drive 0
+disk		wd1	at wdc0 drive 1
+
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+disk		fd0	at fdc0 drive 0
+disk		fd1	at fdc0 drive 1
+
+controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	bt0	at isa? port "IO_BT0" bio irq 12  vector btintr
+controller	uha0	at isa? port "IO_UHA0" bio irq 11 drq 5 vector uhaintr
+
+device		sd0
+device		sd1
+device		sd2
+
+device		st0
+device		st1
+
+device 		cd0
 
 device		pc0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
-device		com1	at isa? port "IO_COM1" tty irq 4 vector comintr
-device		com2	at isa? port "IO_COM2" tty irq 3 vector comintr
+device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
+device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
 
 device we0 at isa? port 0x280 net irq 2 iomem 0xd0000 iosiz 8192 vector weintr
 device ne0 at isa? port 0x300 net irq 2 vector neintr
 device ec0 at isa? port 0x250 net irq 2 iomem 0xd8000 iosiz 8192 vector ecintr
-device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
+device is0 at isa? port 0x320 net irq 10 drq 7 vector isintr
 
 device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 
 pseudo-device	loop
 pseudo-device	ether
-pseudo-device	sl	2
+#pseudo-device	sl	1
 pseudo-device	log
 pseudo-device	pty	4