--- Net2/arch/i386/conf/genericaha	2018/04/24 18:12:14	1.1.1.1
+++ Net2/arch/i386/conf/genericaha	2018/04/24 18:20:18	1.1.1.2
@@ -1,20 +1,26 @@
 #
-# GENERICISA -- Generic ISA machine -- distribution floppy
+# GENERICAHA -- Generic machine w/aha driver -- distribution floppy
+#
+#	GENERICAHA,v 1.20.2.3 1993/08/05 02:45:02 cgd Exp
 #
 
 machine		"i386"
-cpu		"i386"
-ident		GENERICISA
+cpu		"I386_CPU"
+cpu		"I486_CPU"
+ident		GENERICAHA
 timezone	8 dst
 maxusers	10
 options		INET,ISOFS,NFSCLIENT
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
-options		PCFS,KERNFS
+options		MSDOSFS
+options		KERNFS
 options		SCSI
+options		"MATH_EMULATE"
+options		"COMPAT_NOMID"
 
-config		"386bsd"	root on wd0 swap on wd0 and sd0
+config		netbsd	root on wd0 swap on wd0 and sd0
 
 controller	isa0
 controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
@@ -26,35 +32,51 @@ 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
+disk		sd0	at aha0 flags 0 drive ?
+disk		sd1	at aha0 flags 0 drive ?
+disk		sd2	at aha0 flags 0 drive ?
+disk		sd3	at aha0 flags 0 drive ?
+tape		st0	at aha0 flags 1 drive ?
+tape		st1	at aha0 flags 1 drive ?
+disk		cd0	at aha0	flags 2 drive ?
+disk		cd1	at aha0	flags 2 drive ?
 
-device		st0
-device		st1
+controller	uha0	at isa? port "IO_UHA0" bio irq 11 drq 5 vector uhaintr
+disk		sd0	at uha0 flags 0 drive ?
+disk		sd1	at uha0 flags 0 drive ?
+disk		sd2	at uha0 flags 0 drive ?
+disk		sd3	at uha0 flags 0 drive ?
+tape		st0	at uha0 flags 1 drive ?
+tape		st1	at uha0 flags 1 drive ?
+disk		cd0	at uha0	flags 2 drive ?
+disk		cd1	at uha0	flags 2 drive ?
 
-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		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
 device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
+device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
+device		com3	at isa? port "IO_COM4" tty irq 9 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		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
+device		lpa0	at isa? port "IO_LPT1" tty
+device		lpa1	at isa? port "IO_LPT2" tty
+
+device ed0 at isa? port 0x280 net irq 9 iomem 0xd0000 vector edintr
+#device we0 at isa? port 0x280 net irq 9 iomem 0xd0000 iosiz 8192 vector weintr
+#device ec0 at isa? port 0x250 net irq 9 iomem 0xd8000 iosiz 8192 vector ecintr
+device ne0 at isa? port 0x300 net irq 9 vector neintr
 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	1
 pseudo-device	log
+pseudo-device	loop
 pseudo-device	pty	4
+pseudo-device	sl	1
+pseudo-device	speaker
 
 pseudo-device	swappager
 pseudo-device	vnodepager