diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD index e1994e4e5522..56d8fd81bfc9 100644 --- a/release/picobsd/isp/conf/PICOBSD +++ b/release/picobsd/isp/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.3 1998/09/19 21:44:57 abial Exp $ +# $Id: PICOBSD,v 1.4 1998/09/26 17:27:20 abial Exp $ # machine "i386" @@ -13,6 +13,7 @@ maxusers 20 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem +options FFS_ROOT options NFS #Network Filesystem #options BOOTP options MFS @@ -38,16 +39,16 @@ config kernel root on fd0a 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 @@ -56,36 +57,36 @@ 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? port "IO_COM3" tty irq 5 vector siointr -device sio3 at isa? 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? port "IO_COM3" tty irq 5 +device sio3 at isa? port "IO_COM4" tty irq 9 # Support for multiport serial cards -options "COM_MULTIPORT" +options COM_MULTIPORT # AST device sio4 at isa? port 0x2a0 tty flags 0x701 device sio5 at isa? port 0x2a8 tty flags 0x701 device sio6 at isa? port 0x2b0 tty flags 0x701 -device sio7 at isa? port 0x2b8 tty flags 0x701 irq 12 vector siointr +device sio7 at isa? port 0x2b8 tty flags 0x701 irq 12 # Boca Board. You must configure the ports above with -c to change the flags. device sio8 at isa? port 0x120 tty flags 0xb05 device sio9 at isa? port 0x128 tty flags 0xb05 device sio10 at isa? port 0x130 tty flags 0xb05 -device sio11 at isa? port 0x138 tty flags 0xb05 irq 12 vector siointr +device sio11 at isa? port 0x138 tty flags 0xb05 irq 12 # Hayes ESP boards -options "COM_ESP" +options COM_ESP # Comtrol Rocketport # The PCI versions @@ -96,30 +97,24 @@ device rp0 at isa? port 0x100 tty device rp1 at isa? port 0x180 tty # Cyclades Cyclom-Y serial driver -device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr -device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 vector cyintr +device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 +device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 -device lpt0 at isa? port? tty irq 7 vector lptintr +device lpt0 at isa? port? tty irq 7 # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. 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 ep1 at isa? port 0x280 net irq 5 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 ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 +device ep0 at isa? port 0x300 net irq 10 +device ep1 at isa? port 0x280 net irq 5 +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 +device lnc0 at isa? port 0x300 net irq 10 drq 0 pseudo-device loop pseudo-device ether diff --git a/release/picobsd/net/conf/PICOBSD b/release/picobsd/net/conf/PICOBSD index 24ebe4e08356..d8931aa26922 100644 --- a/release/picobsd/net/conf/PICOBSD +++ b/release/picobsd/net/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.2 1998/09/02 14:16:03 abial Exp $ +# $Id: PICOBSD,v 1.3 1998/09/19 21:45:04 abial Exp $ # machine "i386" @@ -13,6 +13,7 @@ maxusers 10 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem +options FFS_ROOT options NFS #Network Filesystem options MFS options MSDOSFS #MSDOS Filesystem @@ -32,21 +33,21 @@ options NO_LKM #options DUMMYNET #options BRIDGE -config kernel root on fd0 +config kernel root on fd0a 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 @@ -55,39 +56,30 @@ 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 lpt0 at isa? port? tty irq 7 vector lptintr +device lpt0 at isa? port? tty irq 7 # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. device de0 -device de1 device fxp0 -device fxp1 -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 0x280 net irq 10 iomem 0xd0000 vector ieintr -device ie1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector ieintr -device ep0 at isa? port 0x300 net irq 10 vector epintr -device ep1 at isa? port 0x280 net irq 5 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 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 ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 +device ep0 at isa? port 0x300 net irq 10 +device ep1 at isa? port 0x280 net irq 5 +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 pseudo-device loop pseudo-device ether diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD index 0a8d652c1d9f..6184fe8d7d89 100644 --- a/release/picobsd/router/conf/PICOBSD +++ b/release/picobsd/router/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.5 1998/09/23 15:20:55 abial Exp $ +# $Id: PICOBSD,v 1.6 1998/09/24 16:39:55 abial Exp $ # machine "i386" @@ -13,6 +13,7 @@ maxusers 10 #options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem +options FFS_ROOT #options NFS #Network Filesystem options MFS #options MSDOSFS #MSDOS Filesystem @@ -33,21 +34,21 @@ options NO_SWAPPING #options DUMMYNET #options BRIDGE -config kernel root on fd0 +config kernel root on fd0a 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 @@ -56,16 +57,16 @@ disk fd0 at fdc0 drive 0 #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 sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 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 sio2 at isa? disable port "IO_COM3" tty irq 5 +device sio3 at isa? disable port "IO_COM4" tty irq 9 -#device lpt0 at isa? port? tty irq 7 vector lptintr +#device lpt0 at isa? port? tty irq 7 # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. @@ -74,23 +75,16 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr device de0 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 0x280 net irq 10 iomem 0xd0000 vector ieintr -device ie1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector ieintr -device ep0 at isa? port 0x300 net irq 10 vector epintr -device ep1 at isa? port 0x280 net irq 5 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 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 ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 +device ep0 at isa? port 0x300 net irq 10 +device ep1 at isa? port 0x280 net irq 5 +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 pseudo-device loop pseudo-device ether -#pseudo-device tun 4 +#pseudo-device tun 2 #pseudo-device vn #pseudo-device bpfilter 4 pseudo-device ppp 4