diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a6b431d7aabe..9fa75e7201a8 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1057,24 +1057,34 @@ controller mlx0 # Mylex DAC960 controller amr0 # AMI MegaRAID # -# ATA and ATAPI devices -# This is work in progress, use at your own risk. -# It currently reuses the majors of wd.c and friends. -# It cannot co-exist with the old system in one kernel. +# 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 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 +# 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 + +#The folliwing options are valid on the ATA driver: # -# If you need ISA only devices, this is the lines to add: -#controller ata1 at isa? port IO_WD1 irq 14 -#controller ata2 at isa? port IO_WD2 irq 15 +# ATA_STATIC_ID: controller numbering is static (like the old driver) +# else the device numbers are dynamically allocated. +# ATA_ENABLE_ATAPI_DMA: enable DMA on ATAPI device, since many ATAPI devices +# claim to support DMA but doesn't actually work, this +# is not enabled as default. +# ATA_16BIT_ONLY: for older HW that doesn't support 32bit transfers on +# the ATA channels (mostly old ISA boards). + +options ATA_STATIC_ID +options ATA_ENABLE_ATAPI_DMA +#options ATA_16BIT_ONLY + # -# All the controller lines can coexist, the driver will -# find out which ones are there. +# For older non-PCI systems, this is the lines to use: +#controller ata0 at isa? port IO_WD1 irq 14 +#controller ata1 at isa? port IO_WD2 irq 15 # # ST-506, ESDI, and IDE hard disks: `wdc' and `wd' @@ -1138,13 +1148,13 @@ device wd3 at wdc1 drive 1 options IDE_DELAY=8000 # Be optimistic about Joe IDE device # IDE CD-ROM & CD-R/RW driver - requires wdc controller -device wcd0 +#device wcd0 # IDE floppy driver - requires wdc controller -device wfd0 +#device wfd0 # IDE tape driver - requires wdc controller -device wst0 +#device wst0 # diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index a6b431d7aabe..9fa75e7201a8 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1057,24 +1057,34 @@ controller mlx0 # Mylex DAC960 controller amr0 # AMI MegaRAID # -# ATA and ATAPI devices -# This is work in progress, use at your own risk. -# It currently reuses the majors of wd.c and friends. -# It cannot co-exist with the old system in one kernel. +# 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 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 +# 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 + +#The folliwing options are valid on the ATA driver: # -# If you need ISA only devices, this is the lines to add: -#controller ata1 at isa? port IO_WD1 irq 14 -#controller ata2 at isa? port IO_WD2 irq 15 +# ATA_STATIC_ID: controller numbering is static (like the old driver) +# else the device numbers are dynamically allocated. +# ATA_ENABLE_ATAPI_DMA: enable DMA on ATAPI device, since many ATAPI devices +# claim to support DMA but doesn't actually work, this +# is not enabled as default. +# ATA_16BIT_ONLY: for older HW that doesn't support 32bit transfers on +# the ATA channels (mostly old ISA boards). + +options ATA_STATIC_ID +options ATA_ENABLE_ATAPI_DMA +#options ATA_16BIT_ONLY + # -# All the controller lines can coexist, the driver will -# find out which ones are there. +# For older non-PCI systems, this is the lines to use: +#controller ata0 at isa? port IO_WD1 irq 14 +#controller ata1 at isa? port IO_WD2 irq 15 # # ST-506, ESDI, and IDE hard disks: `wdc' and `wd' @@ -1138,13 +1148,13 @@ device wd3 at wdc1 drive 1 options IDE_DELAY=8000 # Be optimistic about Joe IDE device # IDE CD-ROM & CD-R/RW driver - requires wdc controller -device wcd0 +#device wcd0 # IDE floppy driver - requires wdc controller -device wfd0 +#device wfd0 # IDE tape driver - requires wdc controller -device wst0 +#device wst0 # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index a6b431d7aabe..9fa75e7201a8 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1057,24 +1057,34 @@ controller mlx0 # Mylex DAC960 controller amr0 # AMI MegaRAID # -# ATA and ATAPI devices -# This is work in progress, use at your own risk. -# It currently reuses the majors of wd.c and friends. -# It cannot co-exist with the old system in one kernel. +# 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 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 +# 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 + +#The folliwing options are valid on the ATA driver: # -# If you need ISA only devices, this is the lines to add: -#controller ata1 at isa? port IO_WD1 irq 14 -#controller ata2 at isa? port IO_WD2 irq 15 +# ATA_STATIC_ID: controller numbering is static (like the old driver) +# else the device numbers are dynamically allocated. +# ATA_ENABLE_ATAPI_DMA: enable DMA on ATAPI device, since many ATAPI devices +# claim to support DMA but doesn't actually work, this +# is not enabled as default. +# ATA_16BIT_ONLY: for older HW that doesn't support 32bit transfers on +# the ATA channels (mostly old ISA boards). + +options ATA_STATIC_ID +options ATA_ENABLE_ATAPI_DMA +#options ATA_16BIT_ONLY + # -# All the controller lines can coexist, the driver will -# find out which ones are there. +# For older non-PCI systems, this is the lines to use: +#controller ata0 at isa? port IO_WD1 irq 14 +#controller ata1 at isa? port IO_WD2 irq 15 # # ST-506, ESDI, and IDE hard disks: `wdc' and `wd' @@ -1138,13 +1148,13 @@ device wd3 at wdc1 drive 1 options IDE_DELAY=8000 # Be optimistic about Joe IDE device # IDE CD-ROM & CD-R/RW driver - requires wdc controller -device wcd0 +#device wcd0 # IDE floppy driver - requires wdc controller -device wfd0 +#device wfd0 # IDE tape driver - requires wdc controller -device wst0 +#device wst0 #