diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-11-05 20:27:43 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-11-05 20:27:43 +0000 |
| commit | 40478f28211a57fc39ac85ec664af7b66fbe2643 (patch) | |
| tree | c96fec712466672dda3f94447893de38ed67f632 | |
| parent | 7c43c460a417151d593c5d6f35aff1c0324831ea (diff) | |
add the MCP67 PATA and SATA PCI ids as well as fixing nforce_chip_map() to
set the proper UDMA capability for MCP61 and MCP65 chipsets.
ok jsg@
| -rw-r--r-- | sys/dev/pci/pciide.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index d45ff16e42a..733bb490e3f 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.259 2006/10/19 09:55:47 tom Exp $ */ +/* $OpenBSD: pciide.c,v 1.260 2006/11/05 20:27:42 brad Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -912,6 +912,10 @@ const struct pciide_product_desc pciide_nvidia_products[] = { 0, nforce_chip_map }, + { PCI_PRODUCT_NVIDIA_MCP67_IDE, + 0, + nforce_chip_map + }, { PCI_PRODUCT_NVIDIA_NFORCE2_400_SATA, 0, sata_chip_map @@ -983,6 +987,22 @@ const struct pciide_product_desc pciide_nvidia_products[] = { { PCI_PRODUCT_NVIDIA_MCP65_SATA4, 0, sata_chip_map + }, + { PCI_PRODUCT_NVIDIA_MCP67_SATA, + 0, + sata_chip_map + }, + { PCI_PRODUCT_NVIDIA_MCP67_SATA2, + 0, + sata_chip_map + }, + { PCI_PRODUCT_NVIDIA_MCP67_SATA3, + 0, + sata_chip_map + }, + { PCI_PRODUCT_NVIDIA_MCP67_SATA4, + 0, + sata_chip_map } }; @@ -7769,18 +7789,8 @@ nforce_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) case PCI_PRODUCT_NVIDIA_NFORCE_IDE: sc->sc_wdcdev.UDMA_cap = 5; break; - case PCI_PRODUCT_NVIDIA_NFORCE2_IDE: - case PCI_PRODUCT_NVIDIA_NFORCE2_400_IDE: - case PCI_PRODUCT_NVIDIA_NFORCE3_IDE: - case PCI_PRODUCT_NVIDIA_NFORCE3_250_IDE: - case PCI_PRODUCT_NVIDIA_NFORCE4_ATA133: - case PCI_PRODUCT_NVIDIA_MCP04_IDE: - case PCI_PRODUCT_NVIDIA_MCP51_IDE: - case PCI_PRODUCT_NVIDIA_MCP55_IDE: - sc->sc_wdcdev.UDMA_cap = 6; - break; default: - sc->sc_wdcdev.UDMA_cap = 0; + sc->sc_wdcdev.UDMA_cap = 6; } sc->sc_wdcdev.set_modes = nforce_setup_channel; sc->sc_wdcdev.channels = sc->wdc_chanarray; |