diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2005-02-21 19:55:51 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2005-02-21 19:55:51 +0000 |
| commit | 586ae9e1e4b565096b314b10bc5c99a2ab8b8d74 (patch) | |
| tree | 7a8a7be2c4cc4eeace13f41fded2d9091660d296 /sys/dev | |
| parent | 2670d23c20f98aa0a8a1760709dfa26cb3995ea1 (diff) | |
Support another Intel 6300ESB SATA.
Tested by Marc Wirth <MarcWirth@mac.com>.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pcidevs | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 68af833756d..d877875f822 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.834 2005/02/19 13:35:48 damien Exp $ +$OpenBSD: pcidevs,v 1.835 2005/02/21 19:55:50 grange Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1475,6 +1475,7 @@ product INTEL 6300ESB_WDT 0x25ab 6300ESB WDT product INTEL 6300ESB_APIC 0x25ac 6300ESB APIC product INTEL 6300ESB_USB2 0x25ad 6300ESB USB product INTEL 6300ESB_PCIX 0x25ae 6300ESB PCIX +product INTEL 6300ESB_SATA2 0x25b0 6300ESB SATA product INTEL 82801FB_LPC 0x2640 82801FB LPC product INTEL 82801FB_SATA 0x2651 82801FB SATA product INTEL 82801FR_SATA 0x2652 82801FR SATA diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index d0b00fdaddc..c99291ec66f 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.185 2005/02/01 21:53:55 grange Exp $ */ +/* $OpenBSD: pciide.c,v 1.186 2005/02/21 19:55:50 grange Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -359,6 +359,10 @@ const struct pciide_product_desc pciide_intel_products[] = { IDE_PCI_CLASS_OVERRIDE, piix_chip_map }, + { PCI_PRODUCT_INTEL_6300ESB_SATA2, /* Intel 6300ESB SATA */ + IDE_PCI_CLASS_OVERRIDE, + piix_chip_map + }, { PCI_PRODUCT_INTEL_82801FB_IDE, /* Intel 82801FB (ICH6) IDE */ IDE_PCI_CLASS_OVERRIDE, piix_chip_map @@ -1733,6 +1737,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) case PCI_PRODUCT_INTEL_82801ER_SATA: case PCI_PRODUCT_INTEL_6300ESB_IDE: case PCI_PRODUCT_INTEL_6300ESB_SATA: + case PCI_PRODUCT_INTEL_6300ESB_SATA2: case PCI_PRODUCT_INTEL_82801FB_IDE: case PCI_PRODUCT_INTEL_82801FB_SATA: case PCI_PRODUCT_INTEL_82801FR_SATA: @@ -1757,6 +1762,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) case PCI_PRODUCT_INTEL_82801ER_SATA: case PCI_PRODUCT_INTEL_6300ESB_IDE: case PCI_PRODUCT_INTEL_6300ESB_SATA: + case PCI_PRODUCT_INTEL_6300ESB_SATA2: case PCI_PRODUCT_INTEL_82801FB_IDE: case PCI_PRODUCT_INTEL_82801FB_SATA: case PCI_PRODUCT_INTEL_82801FR_SATA: @@ -1769,6 +1775,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801ER_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA2 || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA) { sc->sc_wdcdev.cap |= WDC_CAPABILITY_SATA; @@ -1786,6 +1793,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801ER_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA2 || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA) goto chansetup; @@ -1874,6 +1882,7 @@ next: if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801ER_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_SATA2 || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA) return; |