diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-10-26 21:07:39 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-10-26 21:07:39 +0000 |
| commit | 836b6a8a9579be321afbb2a847edeaf28a53ace9 (patch) | |
| tree | 9ca72f0976c2795e2c896e48237a701971e9b281 /sys/dev/pci | |
| parent | 73c8d1c8723690019e14610ce8b93423efca3b65 (diff) | |
revert 82801FBM SATA controller back to being configured as an IDE controller
until someone can figure out why it works on some systems and not on others.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/pciide.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 1398568dce1..b0d1536165e 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.216 2005/10/22 23:13:26 brad Exp $ */ +/* $OpenBSD: pciide.c,v 1.217 2005/10/26 21:07:38 brad Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -1998,7 +1998,6 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) 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_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_SATA_1) { @@ -2018,7 +2017,6 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) 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_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_SATA_1) @@ -2047,6 +2045,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_IDE) { WDCDEBUG_PRINT((", IDE_CONTROL 0x%x", pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)), @@ -2063,7 +2062,6 @@ chansetup: /* SATA setup */ 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_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA || sc->sc_pp->ide_product == @@ -2113,7 +2111,6 @@ next: 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_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FR_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_SATA_1) @@ -2142,6 +2139,7 @@ next: sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_IDE) { WDCDEBUG_PRINT((", IDE_CONTROL 0x%x", pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)), @@ -2309,6 +2307,7 @@ piix3_4_setup_channel(struct channel_softc *chp) sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_IDE) { ideconf |= PIIX_CONFIG_PINGPONG; } @@ -2321,6 +2320,7 @@ piix3_4_setup_channel(struct channel_softc *chp) sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_SATA || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801GB_IDE) { /* setup Ultra/100 */ if (drvp->UDMA_mode > 2 && |