diff options
| -rw-r--r-- | sys/i386/conf/NEWCARD | 84 | ||||
| -rw-r--r-- | sys/i386/conf/PCCARD | 26 |
2 files changed, 61 insertions, 49 deletions
diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 143940e..dcf45cd 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -40,8 +40,8 @@ options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] +options MD_ROOT #MD is a potential root device options MFS #Memory Filesystem -options MFS_ROOT #MFS usable as root device, "MFS" req'ed options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, "NFS" req'ed options MSDOSFS #MSDOS Filesystem @@ -54,9 +54,9 @@ options UCONSOLE #Allow users to grab the console options USERCONFIG #boot -c editor options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) syscall trace support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores +options SYSVSHM #SYSV-style shared memory +options SYSVMSG #SYSV-style message queues +options SYSVSEM #SYSV-style semaphores # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -78,33 +78,33 @@ controller fdc0 at isa? port IO_FD1 irq 6 drq 2 device fd0 at fdc0 drive 0 device fd1 at fdc0 drive 1 -# IDE controller and disks -controller wdc0 at isa? port IO_WD1 irq 14 -device wd0 at wdc0 drive 0 -device wd1 at wdc0 drive 1 - -controller wdc1 at isa? port IO_WD2 irq 15 -device wd2 at wdc1 drive 0 -device wd3 at wdc1 drive 1 - -# ATAPI devices on wdc? -device wcd0 #IDE CD-ROM -device wfd0 #IDE Floppy (e.g. LS-120) -device wst0 #IDE Tape (e.g. Travan) +# ATA and ATAPI devices +controller ata0 at isa? port IO_WD1 irq 14 +controller ata1 at isa? port IO_WD2 irq 15 +controller ata2 +device atadisk0 # ATA disk drives +device atapicd0 # ATAPI CDROM drives +device atapifd0 # ATAPI floppy drives +device atapist0 # ATAPI tape drives +options ATA_STATIC_ID #Static device numbering +#options ATA_ENABLE_ATAPI_DMA #Enable DMA on ATAPI devices # SCSI Controllers -# A single entry for any of these controllers (ncr, ahb, ahc) is +# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is # sufficient for any number of installed devices. -controller ncr0 # NCR/Symbios Logic controller ahb0 # EISA AHA1742 family controller ahc0 # AHA2940 and onboard AIC7xxx devices +controller amd0 # AMD 53C974 (Teckram DC-390(T)) +controller dpt0 # DPT Smartcache - See LINT for options! controller isp0 # Qlogic family -controller dpt0 # DPT Smartcache - See LINT for options! +controller ncr0 # NCR/Symbios Logic +#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts) controller adv0 at isa? port ? irq ? controller adw0 controller bt0 at isa? port ? irq ? controller aha0 at isa? port ? irq ? +controller aic0 at isa? port ? irq ? # SCSI peripherals # Only one of each of these is needed, they are dynamically allocated. @@ -114,11 +114,15 @@ device sa0 # Sequential Access (tape etc) device cd0 # CD device pass0 # Passthrough device (direct SCSI access) +# RAID controllers +#device amr0 # AMI MegaRAID +#device mlx0 # Mylex DAC960 family + # Proprietary or custom CD-ROM Interfaces -device wt0 at isa? port 0x300 irq 5 drq 1 -device mcd0 at isa? port 0x300 irq 10 -device matcd0 at isa? port 0x230 -device scd0 at isa? port 0x230 +#device wt0 at isa? port 0x300 irq 5 drq 1 +#device mcd0 at isa? port 0x300 irq 10 +#device matcd0 at isa? port 0x230 +#device scd0 at isa? port 0x230 # atkbdc0 controls both the keyboard and the PS/2 mouse controller atkbdc0 at isa? port IO_KBD @@ -144,7 +148,7 @@ device sc0 at isa? device npx0 at nexus? port IO_NPX irq 13 # Power management support (see LINT for more options) -device apm0 at nexus? disable flags 0x31 # Advanced Power Management +device apm0 at nexus? flags 0x20 # Advanced Power Management # PCCARD (PCMCIA) support controller pcic0 at isa? port 0x3e0 irq 10 iomem 0xd0000 @@ -164,37 +168,41 @@ device plip0 # TCP/IP over parallel device ppi0 # Parallel port interface device #controller vpo0 # Requires scbus and da0 -# MII bus support, required for some 10/100 NICs -controller miibus0 - # PCI Ethernet NICs. device de0 # DEC/Intel DC21x4x (``Tulip'') -device dc0 # DEC/Intel 21143 and various workalikes device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) +device tx0 # SMC 9432TX (83c170 ``EPIC'') +device vx0 # 3Com 3c590, 3c595 (``Vortex'') + +# PCI Ethernet NICs that use the common MII bus controller code. +controller miibus0 # MII bus support +device dc0 # DEC/Intel 21143 and various workalikes device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device sis0 # Silicon Integrated Systems SiS 900/SiS 7016 device ste0 # Sundance ST201 (D-Link DFE-550TX) device tl0 # Texas Instruments ThunderLAN -device tx0 # SMC 9432TX (83c170 ``EPIC'') device vr0 # VIA Rhine, Rhine II -device vx0 # 3Com 3c590, 3c595 (``Vortex'') device wb0 # Winbond W89C840F device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. -# The probe order of these is presently determined by i386/isa/isa_compat.c. device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 -# device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 -# NOTE: This removes the isa attachment so that the pccard unit numbers -# come out right. -device ep0 device ex0 at isa? port? irq? +device ep0 +# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really +# exists only as a PCMCIA device, so there is no ISA attatement needed +# and resources will always be dynamically assigned by the pccard code. +device wi0 +# The probe order of these is presently determined by i386/isa/isa_compat.c. +#device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 device fe0 at isa? port 0x300 irq ? -# device le0 at isa? port 0x300 irq 5 iomem 0xd0000 +#device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 device cs0 at isa? port 0x300 irq ? +device sn0 at ias? port 0x300 irq 10 # requires PCCARD (PCMCIA) support to be activated +# XXX BROKEN #device xe0 at isa? port? irq ? # Pseudo devices - the number indicates how many units to allocated. @@ -204,7 +212,7 @@ pseudo-device sl 1 # Kernel SLIP pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) -pseudo-device gzip # Exec gzipped a.out's +pseudo-device md # Memory "disks" # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index ee1b016..b5fe705 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -32,8 +32,8 @@ options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] -options MFS #Memory Filesystem options MD_ROOT #MD is a potential root device +options MFS #Memory Filesystem options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, "NFS" req'ed options MSDOSFS #MSDOS Filesystem @@ -80,19 +80,21 @@ options ATA_STATIC_ID #Static device numbering #options ATA_ENABLE_ATAPI_DMA #Enable DMA on ATAPI devices # SCSI Controllers -# A single entry for any of these controllers (ncr, ahb, ahc) is +# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is # sufficient for any number of installed devices. -controller ncr0 # NCR/Symbios Logic controller ahb0 # EISA AHA1742 family controller ahc0 # AHA2940 and onboard AIC7xxx devices controller amd0 # AMD 53C974 (Teckram DC-390(T)) -controller isp0 # Qlogic family controller dpt0 # DPT Smartcache - See LINT for options! +controller isp0 # Qlogic family +controller ncr0 # NCR/Symbios Logic +#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts) controller adv0 at isa? port ? irq ? controller adw0 controller bt0 at isa? port ? irq ? controller aha0 at isa? port ? irq ? +controller aic0 at isa? port ? irq ? # SCSI peripherals # Only one of each of these is needed, they are dynamically allocated. @@ -102,6 +104,10 @@ device sa0 # Sequential Access (tape etc) device cd0 # CD device pass0 # Passthrough device (direct SCSI access) +# RAID controllers +#device amr0 # AMI MegaRAID +#device mlx0 # Mylex DAC960 family + # Proprietary or custom CD-ROM Interfaces device wt0 at isa? port 0x300 irq 5 drq 1 device mcd0 at isa? port 0x300 irq 10 @@ -132,12 +138,12 @@ device sc0 at isa? device npx0 at nexus? port IO_NPX irq 13 # Power management support (see LINT for more options) -device apm0 at nexus? disable flags 0x31 # Advanced Power Management +device apm0 at nexus? flags 0x20 # Advanced Power Management # PCCARD (PCMCIA) support controller card0 -controller pcic0 at isa? -controller pcic1 at isa? +device pcic0 at isa? +device pcic1 at isa? # Serial (COM) ports device sio0 at isa? port IO_COM1 flags 0x10 irq 4 @@ -162,7 +168,7 @@ device vx0 # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. controller miibus0 # MII bus support -device dc0 # DEC/Intrl 21143 and various workalikes +device dc0 # DEC/Intel 21143 and various workalikes device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device sis0 # Silicon Integrated Systems SiS 900/SiS 7016 @@ -175,8 +181,6 @@ device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 device ex0 at isa? port? irq? -# NOTE: This removes the isa attachment so that the pccard unit numbers -# come out right. device ep0 # WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really # exists only as a PCMCIA device, so there is no ISA attatement needed @@ -188,6 +192,7 @@ device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 device cs0 at isa? port 0x300 irq ? +device sn0 at ias? port 0x300 irq 10 # requires PCCARD (PCMCIA) support to be activated device xe0 at isa? port? irq ? @@ -198,7 +203,6 @@ pseudo-device sl 1 # Kernel SLIP pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) -pseudo-device gzip # Exec gzipped a.out's pseudo-device md # Memory "disks" # The `bpf' pseudo-device enables the Berkeley Packet Filter. |
