diff options
| author | thorpej <thorpej@NetBSD.org> | 2003-12-14 01:32:01 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2003-12-14 01:32:01 +0000 |
| commit | 2f2ca9e66b4d76404a87dc0b37d8aa0cd74663bb (patch) | |
| tree | 50e9ac04580b00483676bdde0e85ed6d47542ba7 /sys | |
| parent | 188f029f3fb3658d4ddd27245e70342f8d20c51a (diff) | |
Split the Intel i31244 SATA controller ("Artisea") driver out of piixide
into its own driver (artsata).
Diffstat (limited to 'sys')
47 files changed, 259 insertions, 127 deletions
diff --git a/sys/arch/algor/conf/P4032 b/sys/arch/algor/conf/P4032 index d4ea735625b..ce64ad62b9e 100644 --- a/sys/arch/algor/conf/P4032 +++ b/sys/arch/algor/conf/P4032 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.20 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: P4032,v 1.21 2003/12/14 01:32:01 thorpej Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P4032-$Revision: 1.20 $" +#ident "P4032-$Revision: 1.21 $" maxusers 32 @@ -150,6 +150,7 @@ pci* at vtpbc? #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver #acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #cypide* at pci? dev ? function ? # Cypress IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/algor/conf/P5064 b/sys/arch/algor/conf/P5064 index 8ed150a8fca..812b45445ea 100644 --- a/sys/arch/algor/conf/P5064 +++ b/sys/arch/algor/conf/P5064 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.25 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: P5064,v 1.26 2003/12/14 01:32:01 thorpej Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P5064-$Revision: 1.25 $" +#ident "P5064-$Revision: 1.26 $" maxusers 32 @@ -146,6 +146,7 @@ siop* at pci? dev ? function ? # Symbios 53c8xx SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/algor/conf/P6032 b/sys/arch/algor/conf/P6032 index 01a4d4cfa43..cc0482b44ca 100644 --- a/sys/arch/algor/conf/P6032 +++ b/sys/arch/algor/conf/P6032 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.19 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: P6032,v 1.20 2003/12/14 01:32:01 thorpej Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P6032-$Revision: 1.19 $" +#ident "P6032-$Revision: 1.20 $" maxusers 32 @@ -138,6 +138,7 @@ pcib* at pci? dev ? function ? # Intel PCI-ISA Bridges pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index 09e87410476..1867aa2507a 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,4 +1,4 @@ -# $NetBSD: ALPHA,v 1.189 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: ALPHA,v 1.190 2003/12/14 01:32:01 thorpej Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "ALPHA-$Revision: 1.189 $" +ident "ALPHA-$Revision: 1.190 $" maxusers 32 @@ -302,6 +302,7 @@ pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide*at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/alpha/conf/BASIL b/sys/arch/alpha/conf/BASIL index e9ff072e6ea..7ba2983b65f 100644 --- a/sys/arch/alpha/conf/BASIL +++ b/sys/arch/alpha/conf/BASIL @@ -1,4 +1,4 @@ -# $NetBSD: BASIL,v 1.22 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: BASIL,v 1.23 2003/12/14 01:32:01 thorpej Exp $ # # basil.shagadelic.org -- thorpej's API UP1000 @@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "BASIL-$Revision: 1.22 $" +#ident "BASIL-$Revision: 1.23 $" maxusers 64 @@ -230,6 +230,7 @@ ohci* at pci? dev ? function ? # USB Open Host Controller pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/alpha/conf/FRAU-FARBISSINA b/sys/arch/alpha/conf/FRAU-FARBISSINA index 507fcfcefcd..800501d8feb 100644 --- a/sys/arch/alpha/conf/FRAU-FARBISSINA +++ b/sys/arch/alpha/conf/FRAU-FARBISSINA @@ -1,4 +1,4 @@ -# $NetBSD: FRAU-FARBISSINA,v 1.27 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: FRAU-FARBISSINA,v 1.28 2003/12/14 01:32:01 thorpej Exp $ # # frau-farbissina.shagadelic.org -- thorpej's AlphaServer 1200 MP hacking # box @@ -7,7 +7,7 @@ include "arch/alpha/conf/std.alpha" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "FRAU-FARBISSINA-$Revision: 1.27 $" +#ident "FRAU-FARBISSINA-$Revision: 1.28 $" maxusers 64 @@ -204,6 +204,7 @@ pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver #acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #cypide* at pci? dev ? function ? # Cypress IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 8921a8c341c..0f9f37fd3be 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.237 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: GENERIC,v 1.238 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -25,7 +25,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.237 $" +#ident "GENERIC-$Revision: 1.238 $" maxusers 32 @@ -303,6 +303,7 @@ pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide*at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/alpha/conf/INSTALL b/sys/arch/alpha/conf/INSTALL index 68cf853e9de..f194bf5e10b 100644 --- a/sys/arch/alpha/conf/INSTALL +++ b/sys/arch/alpha/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.77 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: INSTALL,v 1.78 2003/12/14 01:32:01 thorpej Exp $ # # Alpha INSTALL kernel. @@ -202,6 +202,7 @@ pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 7842ba3a623..5c0fbd1e18e 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.19 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: GENERIC,v 1.20 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.19 $" +#ident "GENERIC-$Revision: 1.20 $" maxusers 32 # estimated number of users @@ -394,6 +394,7 @@ icpsp* at icp? unit ? # SCSI pass-through pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/amd64/conf/INSTALL b/sys/arch/amd64/conf/INSTALL index 8420cb12ecf..b46958262b0 100644 --- a/sys/arch/amd64/conf/INSTALL +++ b/sys/arch/amd64/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.12 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: INSTALL,v 1.13 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -20,7 +20,7 @@ include "arch/amd64/conf/std.amd64" -#ident "INSTALL-$Revision: 1.12 $" +#ident "INSTALL-$Revision: 1.13 $" maxusers 32 # estimated number of users @@ -328,6 +328,7 @@ icpsp* at icp? unit ? # SCSI pass-through pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/amd64/conf/INSTALL_ACPI b/sys/arch/amd64/conf/INSTALL_ACPI index 93aba9e8c97..83b227fc795 100644 --- a/sys/arch/amd64/conf/INSTALL_ACPI +++ b/sys/arch/amd64/conf/INSTALL_ACPI @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_ACPI,v 1.6 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: INSTALL_ACPI,v 1.7 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -20,7 +20,7 @@ include "arch/amd64/conf/std.amd64" -#ident "INSTALL-$Revision: 1.6 $" +#ident "INSTALL-$Revision: 1.7 $" maxusers 32 # estimated number of users @@ -328,6 +328,7 @@ icpsp* at icp? unit ? # SCSI pass-through pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/amd64/conf/SIMICS b/sys/arch/amd64/conf/SIMICS index 09f5cc2fcc7..704d8efac39 100644 --- a/sys/arch/amd64/conf/SIMICS +++ b/sys/arch/amd64/conf/SIMICS @@ -1,4 +1,4 @@ -# $NetBSD: SIMICS,v 1.6 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: SIMICS,v 1.7 2003/12/14 01:32:01 thorpej Exp $ # # INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines. # @@ -339,6 +339,7 @@ wskbd* at pckbd? console ? pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index b0ac8640feb..68d70d913eb 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.96 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: GENERIC,v 1.97 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.96 $" +#ident "GENERIC-$Revision: 1.97 $" maxusers 32 # estimated number of users @@ -285,6 +285,7 @@ trm* at pci? dev ? function ? # Tekram DC-395/315 SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI index 7d8fec5b39f..e7e4a6ed611 100644 --- a/sys/arch/arc/conf/MIMORI +++ b/sys/arch/arc/conf/MIMORI @@ -1,4 +1,4 @@ -# $NetBSD: MIMORI,v 1.25 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: MIMORI,v 1.26 2003/12/14 01:32:01 thorpej Exp $ # NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp # # MIMORI -- My NEC RISCstation 2250 (ur) @@ -175,6 +175,7 @@ ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/arc/conf/PCCONS b/sys/arch/arc/conf/PCCONS index 1303cd88214..96b1eb2c84d 100644 --- a/sys/arch/arc/conf/PCCONS +++ b/sys/arch/arc/conf/PCCONS @@ -1,4 +1,4 @@ -# $NetBSD: PCCONS,v 1.33 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: PCCONS,v 1.34 2003/12/14 01:32:01 thorpej Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # # PCCONS -- generic but pccons rather than wscons @@ -249,6 +249,7 @@ trm* at pci? dev ? function ? # Tekram DC-395/315 SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK index cb3231c9ad0..847f5a9a58c 100644 --- a/sys/arch/arc/conf/RAMDISK +++ b/sys/arch/arc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.46 2003/12/13 23:13:40 thorpej Exp $ +# $NetBSD: RAMDISK,v 1.47 2003/12/14 01:32:01 thorpej Exp $ # # memory disk based configuration file for MIPS R4x00 ARC Systems # @@ -7,7 +7,7 @@ include "arch/arc/conf/std.arc" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.46 $" +#ident "GENERIC-$Revision: 1.47 $" maxusers 32 # estimated number of users @@ -277,6 +277,7 @@ trm* at pci? dev ? function ? # Tekram DC-395/315 SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/atari/conf/MILAN-PCIIDE b/sys/arch/atari/conf/MILAN-PCIIDE index 65632ad2322..5278db2d297 100644 --- a/sys/arch/atari/conf/MILAN-PCIIDE +++ b/sys/arch/atari/conf/MILAN-PCIIDE @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.29 2003/12/13 23:24:47 thorpej Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.30 2003/12/14 01:32:01 thorpej Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -280,6 +280,7 @@ fdisa0 at fdcisa0 drive 0 pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/atari/conf/MILAN.in b/sys/arch/atari/conf/MILAN.in index 3b2ab46d396..9508f20893d 100644 --- a/sys/arch/atari/conf/MILAN.in +++ b/sys/arch/atari/conf/MILAN.in @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN.in,v 1.15 2003/12/13 23:24:47 thorpej Exp $ +# $NetBSD: MILAN.in,v 1.16 2003/12/14 01:32:01 thorpej Exp $ # # Milan # @@ -79,6 +79,7 @@ wdc1 at isa? port 0x170 irq 15 flags 0x04 # 2nd IDE controller pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 71480692ba1..3df867b0a27 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.58 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC,v 1.59 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -253,6 +253,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL index c77d4916b49..270913a8a45 100644 --- a/sys/arch/cats/conf/INSTALL +++ b/sys/arch/cats/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.35 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: INSTALL,v 1.36 2003/12/14 01:32:01 thorpej Exp $ # # CATSINST -- CHALTECH CATS Install kernel # @@ -217,6 +217,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC index cb9d2316edf..16a0d05a950 100644 --- a/sys/arch/cobalt/conf/GENERIC +++ b/sys/arch/cobalt/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.52 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC,v 1.53 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.52 $" +#ident "GENERIC-$Revision: 1.53 $" maxusers 32 @@ -189,6 +189,7 @@ st* at scsibus? target ? lun ? # SCSI tape drives pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH index e58670a86dd..734d5435481 100644 --- a/sys/arch/evbarm/conf/ADI_BRH +++ b/sys/arch/evbarm/conf/ADI_BRH @@ -1,4 +1,4 @@ -# $NetBSD: ADI_BRH,v 1.15 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: ADI_BRH,v 1.16 2003/12/14 01:32:01 thorpej Exp $ # # ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board # @@ -168,6 +168,7 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR index 99e0371aa04..69838b28eba 100644 --- a/sys/arch/evbarm/conf/INTEGRATOR +++ b/sys/arch/evbarm/conf/INTEGRATOR @@ -1,4 +1,4 @@ -# $NetBSD: INTEGRATOR,v 1.22 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: INTEGRATOR,v 1.23 2003/12/14 01:32:01 thorpej Exp $ # # GENERIC -- ARM Integrator board Generic kernel # @@ -162,6 +162,7 @@ pci0 at ifpga? # PCI bus # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers #piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244 index 07aa0abcebe..4dc29fa7b70 100644 --- a/sys/arch/evbarm/conf/IQ31244 +++ b/sys/arch/evbarm/conf/IQ31244 @@ -1,4 +1,4 @@ -# $NetBSD: IQ31244,v 1.11 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: IQ31244,v 1.12 2003/12/14 01:32:01 thorpej Exp $ # # IQ31244 -- Intel IQ31244 Evaluation Board Kernel # @@ -165,6 +165,7 @@ pci* at ppb? bus ? # Storage devices # pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310 index 4b174b82347..90e4ba4a9ca 100644 --- a/sys/arch/evbarm/conf/IQ80310 +++ b/sys/arch/evbarm/conf/IQ80310 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80310,v 1.33 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: IQ80310,v 1.34 2003/12/14 01:32:01 thorpej Exp $ # # IQ80310 -- Intel IQ80310 Evaluation Board Kernel # @@ -176,6 +176,7 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321 index f56b51d64dc..a1d2d2f39c5 100644 --- a/sys/arch/evbarm/conf/IQ80321 +++ b/sys/arch/evbarm/conf/IQ80321 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80321,v 1.28 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: IQ80321,v 1.29 2003/12/14 01:32:01 thorpej Exp $ # # IQ80321 -- Intel IQ80321 Evaluation Board Kernel # @@ -169,6 +169,7 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800 index de01aecd02e..1fdce53d044 100644 --- a/sys/arch/evbarm/conf/SMDK2800 +++ b/sys/arch/evbarm/conf/SMDK2800 @@ -1,4 +1,4 @@ -# $NetBSD: SMDK2800,v 1.10 2003/12/13 23:31:21 thorpej Exp $ +# $NetBSD: SMDK2800,v 1.11 2003/12/14 01:32:01 thorpej Exp $ # # SMDK2800 -- Samsung's S3C2800 evaluation board. # @@ -165,6 +165,7 @@ pci0 at sspci0 # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers #piixide* at pci? dev ? function ? # Intel IDE controllers diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA index 488d6467798..d8635a5a905 100644 --- a/sys/arch/evbmips/conf/MALTA +++ b/sys/arch/evbmips/conf/MALTA @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.18 2003/12/13 23:24:47 thorpej Exp $ +# $NetBSD: MALTA,v 1.19 2003/12/14 01:32:02 thorpej Exp $ include "arch/evbmips/conf/std.malta" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.18 $" +#ident "GENERIC-$Revision: 1.19 $" maxusers 32 @@ -187,6 +187,7 @@ com1 at isa? port 0x2f8 irq 3 pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260 index 07fe237b483..80f191a9a69 100644 --- a/sys/arch/evbppc/conf/EV64260 +++ b/sys/arch/evbppc/conf/EV64260 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.11 2003/12/13 23:24:47 thorpej Exp $ +# $NetBSD: EV64260,v 1.12 2003/12/14 01:32:02 thorpej Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -228,6 +228,7 @@ cd* at scsibus? target ? lun ? pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266 index b1673da5be2..c38ecd96285 100644 --- a/sys/arch/evbppc/conf/OPENBLOCKS266 +++ b/sys/arch/evbppc/conf/OPENBLOCKS266 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266,v 1.7 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: OPENBLOCKS266,v 1.8 2003/12/14 01:32:02 thorpej Exp $ # # GENERIC -- everything that's currently supported # @@ -153,6 +153,7 @@ ppb* at pci? dev ? function ? # PCI-PCI bridges pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT index b6c6be47f41..34ae8de5def 100644 --- a/sys/arch/evbppc/conf/WALNUT +++ b/sys/arch/evbppc/conf/WALNUT @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.10 2003/12/13 23:24:47 thorpej Exp $ +# $NetBSD: WALNUT,v 1.11 2003/12/14 01:32:02 thorpej Exp $ # # GENERIC -- everything that's currently supported # @@ -166,6 +166,7 @@ pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/hpcmips/conf/LROUTER b/sys/arch/hpcmips/conf/LROUTER index 59d4a643603..84de375ec12 100644 --- a/sys/arch/hpcmips/conf/LROUTER +++ b/sys/arch/hpcmips/conf/LROUTER @@ -1,5 +1,5 @@ # -# $NetBSD: LROUTER,v 1.15 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: LROUTER,v 1.16 2003/12/14 01:32:01 thorpej Exp $ # From: NetBSD: MPC303,v 1.4 2001/11/21 11:28:09 uch Exp # # Kernel configuration file for LASER5 L-Router @@ -142,6 +142,7 @@ inphy* at mii? phy ? # Intel 82555 PHYs pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/DELPHI b/sys/arch/i386/conf/DELPHI index da86a8d3197..c229ab1b29c 100644 --- a/sys/arch/i386/conf/DELPHI +++ b/sys/arch/i386/conf/DELPHI @@ -1,4 +1,4 @@ -# $NetBSD: DELPHI,v 1.32 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: DELPHI,v 1.33 2003/12/14 01:32:02 thorpej Exp $ # # DELPHI -- one of thorpej@zembu.com's devel machines # @@ -7,7 +7,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "DELPHI-$Revision: 1.32 $" +ident "DELPHI-$Revision: 1.33 $" maxusers 64 # estimated number of users @@ -405,6 +405,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index c2da55545f4..1ae34c87e50 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.584 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC,v 1.585 2003/12/14 01:32:02 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.584 $" +#ident "GENERIC-$Revision: 1.585 $" maxusers 32 # estimated number of users @@ -604,6 +604,7 @@ icpsp* at icp? unit ? # SCSI pass-through pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index 668fdcd53f3..cc6357da42f 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.84 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.85 2003/12/14 01:32:02 thorpej Exp $ # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.84 $" +#ident "GENERIC-$Revision: 1.85 $" maxusers 32 # estimated number of users @@ -448,6 +448,7 @@ uk* at scsibus? target ? lun ? # SCSI unknown pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL index a56fcae4468..b613cfaed39 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.234 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: INSTALL,v 1.235 2003/12/14 01:32:02 thorpej Exp $ # # INSTALL - Installation kernel. # @@ -406,6 +406,7 @@ icpsp* at icp? unit ? # SCSI pass-through pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP index cebbd0d9724..c3272c0ba82 100644 --- a/sys/arch/i386/conf/INSTALL_LAPTOP +++ b/sys/arch/i386/conf/INSTALL_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_LAPTOP,v 1.54 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: INSTALL_LAPTOP,v 1.55 2003/12/14 01:32:02 thorpej Exp $ # # INSTALL - Installation kernel. # @@ -348,6 +348,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/i386/conf/IOPENER b/sys/arch/i386/conf/IOPENER index e9008fa7ce8..96e8eb128c7 100644 --- a/sys/arch/i386/conf/IOPENER +++ b/sys/arch/i386/conf/IOPENER @@ -1,4 +1,4 @@ -# $NetBSD: IOPENER,v 1.42 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: IOPENER,v 1.43 2003/12/14 01:32:02 thorpej Exp $ # # IOPENER -- GENERIC-like kernel for the Netpliance i-opener # from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "IOPENER-$Revision: 1.42 $" +#ident "IOPENER-$Revision: 1.43 $" maxusers 32 # estimated number of users @@ -259,6 +259,7 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index f8403ec2fa7..f1abe1e6fb7 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.167 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC,v 1.168 2003/12/14 01:32:02 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.167 $" +#ident "GENERIC-$Revision: 1.168 $" maxusers 32 @@ -234,6 +234,7 @@ ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL index 060daf9a9d9..79e9c0c222c 100644 --- a/sys/arch/macppc/conf/INSTALL +++ b/sys/arch/macppc/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.72 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: INSTALL,v 1.73 2003/12/14 01:32:02 thorpej Exp $ # # config file for INSTALL FLOPPY # @@ -94,6 +94,7 @@ ohci* at pci? dev ? function ? # Open Host Controller pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/sandpoint/conf/GENERIC.sandpoint b/sys/arch/sandpoint/conf/GENERIC.sandpoint index 2b8f36523f2..1635a099864 100644 --- a/sys/arch/sandpoint/conf/GENERIC.sandpoint +++ b/sys/arch/sandpoint/conf/GENERIC.sandpoint @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.sandpoint,v 1.10 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC.sandpoint,v 1.11 2003/12/14 01:32:02 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpoint" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.10 $" +#ident "GENERIC-$Revision: 1.11 $" maxusers 32 @@ -122,6 +122,7 @@ isa* at pcib? # ISA on PCI-ISA bridge #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver #acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #cypide* at pci? dev ? function ? # Cypress IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32 index 933043f9e5c..fd9ba4cfd36 100644 --- a/sys/arch/sparc64/conf/GENERIC32 +++ b/sys/arch/sparc64/conf/GENERIC32 @@ -1,10 +1,10 @@ -# $NetBSD: GENERIC32,v 1.76 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: GENERIC32,v 1.77 2003/12/14 01:32:02 thorpej Exp $ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.76 $" +#ident "GENERIC-$Revision: 1.77 $" maxusers 64 @@ -319,6 +319,7 @@ uk* at scsibus? target ? lun ? # unknown SCSI pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/sparc64/conf/POWEROFSEVEN.inc b/sys/arch/sparc64/conf/POWEROFSEVEN.inc index 2afcb1f209b..a7b7f0ff0cf 100644 --- a/sys/arch/sparc64/conf/POWEROFSEVEN.inc +++ b/sys/arch/sparc64/conf/POWEROFSEVEN.inc @@ -1,4 +1,4 @@ -# $NetBSD: POWEROFSEVEN.inc,v 1.23 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: POWEROFSEVEN.inc,v 1.24 2003/12/14 01:32:02 thorpej Exp $ # # from: NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp # @@ -293,6 +293,7 @@ ms0 at com? # mouse pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/arch/sparc64/conf/SPLODE b/sys/arch/sparc64/conf/SPLODE index 0d4a3f304ec..671261bdb16 100644 --- a/sys/arch/sparc64/conf/SPLODE +++ b/sys/arch/sparc64/conf/SPLODE @@ -1,4 +1,4 @@ -# $NetBSD: SPLODE,v 1.22 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: SPLODE,v 1.23 2003/12/14 01:32:02 thorpej Exp $ # # Configuration for Ultra1, 32 bit mode. @@ -6,7 +6,7 @@ include "arch/sparc64/conf/std.sparc64" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.22 $" +#ident "GENERIC-$Revision: 1.23 $" maxusers 256 @@ -288,6 +288,7 @@ uk* at scsibus? target ? lun ? # unknown SCSI #pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver #acardide* at pci? dev ? function ? # Acard IDE controllers #aceride* at pci? dev ? function ? # Acer Lab IDE controllers +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller #cmdide* at pci? dev ? function ? # CMD tech IDE controllers #cypide* at pci? dev ? function ? # Cypress IDE controllers #hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers diff --git a/sys/dev/pci/artsata.c b/sys/dev/pci/artsata.c new file mode 100644 index 00000000000..ee2e1513da7 --- /dev/null +++ b/sys/dev/pci/artsata.c @@ -0,0 +1,142 @@ +/* $NetBSD: artsata.c,v 1.1 2003/12/14 01:32:02 thorpej Exp $ */ + +/*- + * Copyright (c) 2003 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of Wasabi Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/param.h> +#include <sys/systm.h> + +#include <dev/pci/pcivar.h> +#include <dev/pci/pcidevs.h> +#include <dev/pci/pciidereg.h> +#include <dev/pci/pciidevar.h> + +static void artisea_chip_map(struct pciide_softc*, struct pci_attach_args *); + +static int artsata_match(struct device *, struct cfdata *, void *); +static void artsata_attach(struct device *, struct device *, void *); + +static const struct pciide_product_desc pciide_artsata_products[] = { + { PCI_PRODUCT_INTEL_31244, + 0, + "Intel 31244 Serial ATA Controller", + artisea_chip_map, + }, + { 0, + 0, + NULL, + NULL + } +}; + +CFATTACH_DECL(artsata, sizeof(struct pciide_softc), + artsata_match, artsata_attach, NULL, NULL); + +static int +artsata_match(struct device *parent, struct cfdata *match, void *aux) +{ + struct pci_attach_args *pa = aux; + + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL) { + if (pciide_lookup_product(pa->pa_id, pciide_artsata_products)) + return (2); + } + return (0); +} + +static void +artsata_attach(struct device *parent, struct device *self, void *aux) +{ + struct pci_attach_args *pa = aux; + struct pciide_softc *sc = (struct pciide_softc *)self; + + pciide_common_attach(sc, pa, + pciide_lookup_product(pa->pa_id, pciide_artsata_products)); + +} + +static void +artisea_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) +{ + struct pciide_channel *cp; + bus_size_t cmdsize, ctlsize; + pcireg_t interface; + int channel; + + if (pciide_chipen(sc, pa) == 0) + return; + + aprint_normal("%s: bus-master DMA support present", + sc->sc_wdcdev.sc_dev.dv_xname); +#ifndef PCIIDE_I31244_ENABLEDMA + if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_31244 && + PCI_REVISION(pa->pa_class) == 0) { + aprint_normal(" but disabled due to rev. 0"); + sc->sc_dma_ok = 0; + } else +#endif + pciide_mapreg_dma(sc, pa); + aprint_normal("\n"); + + /* + * XXX Configure LEDs to show activity. + */ + + sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32 | + WDC_CAPABILITY_MODE; + sc->sc_wdcdev.PIO_cap = 4; + if (sc->sc_dma_ok) { + sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA; + sc->sc_wdcdev.cap |= WDC_CAPABILITY_IRQACK; + sc->sc_wdcdev.irqack = pciide_irqack; + sc->sc_wdcdev.DMA_cap = 2; + sc->sc_wdcdev.UDMA_cap = 6; + } + sc->sc_wdcdev.set_modes = sata_setup_channel; + + sc->sc_wdcdev.channels = sc->wdc_chanarray; + sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS; + + interface = PCI_INTERFACE(pa->pa_class); + + for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) { + cp = &sc->pciide_channels[channel]; + if (pciide_chansetup(sc, channel, interface) == 0) + continue; + pciide_mapchan(pa, cp, interface, &cmdsize, &ctlsize, + pciide_pci_intr); + } +} diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index 5d321cda3fc..de69448b24e 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.203 2003/12/13 23:13:41 thorpej Exp $ +# $NetBSD: files.pci,v 1.204 2003/12/14 01:32:02 thorpej Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -210,6 +210,11 @@ device aceride {[channel = -1]}: ata, pciide_common attach aceride at pci file dev/pci/aceride.c aceride +# Intel i31244 SATA controller +device artsata {[channel = -1]}: ata, pciide_common +attach artsata at pci +file dev/pci/artsata.c artsata + # CMD tech IDE controllers device cmdide {[channel = -1]}: ata, pciide_common attach cmdide at pci diff --git a/sys/dev/pci/piixide.c b/sys/dev/pci/piixide.c index f9cf0cb2e4e..e489c3450f2 100644 --- a/sys/dev/pci/piixide.c +++ b/sys/dev/pci/piixide.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixide.c,v 1.5 2003/12/06 22:40:03 bouyer Exp $ */ +/* $NetBSD: piixide.c,v 1.6 2003/12/14 01:32:02 thorpej Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -44,7 +44,6 @@ static void piix3_4_setup_channel(struct channel_softc *); static u_int32_t piix_setup_idetim_timings(u_int8_t, u_int8_t, u_int8_t); static u_int32_t piix_setup_idetim_drvs(struct ata_drive_datas *); static u_int32_t piix_setup_sidetim_timings(u_int8_t, u_int8_t, u_int8_t); -static void artisea_chip_map(struct pciide_softc*, struct pci_attach_args *); static void piixsata_chip_map(struct pciide_softc*, struct pci_attach_args *); static int piixide_match(struct device *, struct cfdata *, void *); @@ -121,11 +120,6 @@ static const struct pciide_product_desc pciide_intel_products[] = { "Intel 82801EB IDE Controller (ICH5)", piix_chip_map, }, - { PCI_PRODUCT_INTEL_31244, - 0, - "Intel 31244 Serial ATA Controller", - artisea_chip_map, - }, { PCI_PRODUCT_INTEL_82801EB_SATA, 0, "Intel 82801EB Serial ATA Controller", @@ -641,59 +635,6 @@ piix_setup_sidetim_timings(mode, dma, channel) } static void -artisea_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) -{ - struct pciide_channel *cp; - bus_size_t cmdsize, ctlsize; - pcireg_t interface; - int channel; - - if (pciide_chipen(sc, pa) == 0) - return; - - aprint_normal("%s: bus-master DMA support present", - sc->sc_wdcdev.sc_dev.dv_xname); -#ifndef PCIIDE_I31244_ENABLEDMA - if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_31244 && - PCI_REVISION(pa->pa_class) == 0) { - aprint_normal(" but disabled due to rev. 0"); - sc->sc_dma_ok = 0; - } else -#endif - pciide_mapreg_dma(sc, pa); - aprint_normal("\n"); - - /* - * XXX Configure LEDs to show activity. - */ - - sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32 | - WDC_CAPABILITY_MODE; - sc->sc_wdcdev.PIO_cap = 4; - if (sc->sc_dma_ok) { - sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA; - sc->sc_wdcdev.cap |= WDC_CAPABILITY_IRQACK; - sc->sc_wdcdev.irqack = pciide_irqack; - sc->sc_wdcdev.DMA_cap = 2; - sc->sc_wdcdev.UDMA_cap = 6; - } - sc->sc_wdcdev.set_modes = sata_setup_channel; - - sc->sc_wdcdev.channels = sc->wdc_chanarray; - sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS; - - interface = PCI_INTERFACE(pa->pa_class); - - for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) { - cp = &sc->pciide_channels[channel]; - if (pciide_chansetup(sc, channel, interface) == 0) - continue; - pciide_mapchan(pa, cp, interface, &cmdsize, &ctlsize, - pciide_pci_intr); - } -} - -static void piixsata_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) { struct pciide_channel *cp; |
