diff options
| author | sos <sos@FreeBSD.org> | 1999-12-08 09:19:37 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1999-12-08 09:19:37 +0000 |
| commit | 224ba89395ce157c152e89a1113bab7205c0dcf9 (patch) | |
| tree | 6bced2be223692f5eefb3d32816c41c586a6b47a /sys/i386 | |
| parent | 989c4095edbff73ed97a7a64c9e73afd29ae9079 (diff) | |
| download | FreeBSD-src-224ba89395ce157c152e89a1113bab7205c0dcf9.zip FreeBSD-src-224ba89395ce157c152e89a1113bab7205c0dcf9.tar.gz | |
Finally use the new ata driver.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 33 | ||||
| -rw-r--r-- | sys/i386/conf/PCCARD | 23 |
2 files changed, 19 insertions, 37 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 4c4dcb1..8ffe394 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -67,30 +67,15 @@ 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) - -# The 'ATA' driver supports all ATA and ATAPI devices. -# It can reuse the majors of wd.c for booting purposes. -# You only need one "controller ata0" for it to find all -# PCI ATA/ATAPI devices on modern machines. -#controller ata0 -#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 dev number like old `wd' driver +# 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 diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index 311bece..148ce23 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -68,19 +68,16 @@ 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 |
