diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-02-27 20:10:30 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-02-27 20:10:30 +0000 |
| commit | 35cc760cee037bf364de74e06d8919c0152f76c5 (patch) | |
| tree | 8ba3f6ca7fac1007e78b28b9bc47c8e2557be942 /sys | |
| parent | 0254e43800de1dfffe256c3dcb330c6a44773d3e (diff) | |
Add ICH8M SATA IDE support, and adjust for renamed ICH7 and ICH8 IDs.
tested by drahn@, "looks right to me" deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pciide.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 093b330112b..d94a0bcbd97 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.280 2008/02/05 20:22:22 blambert Exp $ */ +/* $OpenBSD: pciide.c,v 1.281 2008/02/27 20:10:29 kettenis Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -443,11 +443,11 @@ const struct pciide_product_desc pciide_intel_products[] = { IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801GR_SATA, /* Intel 82801GR (ICH7R) SATA */ + { PCI_PRODUCT_INTEL_82801GR_AHCI, /* Intel 82801GR (ICH7R) AHCI */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801GR_AHCI, /* Intel 82801GR (ICH7R) AHCI */ + { PCI_PRODUCT_INTEL_82801GR_RAID, /* Intel 82801GR (ICH7R) RAID */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, @@ -459,23 +459,23 @@ const struct pciide_product_desc pciide_intel_products[] = { IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801GHM_RAID, /* Intel 82801GHM (ICH7-M DH) SATA */ + { PCI_PRODUCT_INTEL_82801GHM_RAID, /* Intel 82801GHM (ICH7M DH) RAID */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801H_SATA_1_6P, /* Intel 82801H (ICH8) SATA */ + { PCI_PRODUCT_INTEL_82801H_SATA_1, /* Intel 82801H (ICH8) SATA */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801H_AHCI, /* Intel 82801H (ICH8) AHCI */ + { PCI_PRODUCT_INTEL_82801H_AHCI_6P, /* Intel 82801H (ICH8) AHCI */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801H_RAID, /* Intel 82801H (ICH8) SATA */ + { PCI_PRODUCT_INTEL_82801H_RAID, /* Intel 82801H (ICH8) RAID */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801H_SATA_1_4P, /* Intel 82801H (ICH8) SATA */ + { PCI_PRODUCT_INTEL_82801H_AHCI_4P, /* Intel 82801H (ICH8) AHCI */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, @@ -483,11 +483,15 @@ const struct pciide_product_desc pciide_intel_products[] = { IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801HBM_SATA_1, /* Intel 82801HBM (ICH8M) SATA */ + { PCI_PRODUCT_INTEL_82801HBM_SATA, /* Intel 82801HBM (ICH8M) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801HBM_AHCI, /* Intel 82801HBM (ICH8M) AHCI */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, - { PCI_PRODUCT_INTEL_82801HBM_SATA_2, /* Intel 82801HBM (ICH8M) SATA */ + { PCI_PRODUCT_INTEL_82801HBM_RAID, /* Intel 82801HBM (ICH8M) RAID */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, |