diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-04-17 01:51:38 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-04-17 01:51:38 +0000 |
| commit | c37d81c76358b03b29bb7de701386539136a9863 (patch) | |
| tree | e9c470c2acd09bc0b9a0a2ca51e020c5042749a2 | |
| parent | a7cbd18620c03f4aa75049def0c8740d1faa8ad9 (diff) | |
Match ICH7R SATA which while untested should work.
| -rw-r--r-- | share/man/man4/pciide.4 | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4 index ce2f82b58e2..29f6bc80001 100644 --- a/share/man/man4/pciide.4 +++ b/share/man/man4/pciide.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pciide.4,v 1.60 2006/04/15 00:15:12 jsg Exp $ +.\" $OpenBSD: pciide.4,v 1.61 2006/04/17 01:51:37 jsg Exp $ .\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. @@ -84,7 +84,7 @@ Intel PIIX, PIIX3, and PIIX4 .It Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/\& -ICH6/ICH6M/ICH6R/ICH7/ICH7M) +ICH6/ICH6M/ICH6R/ICH7/ICH7M/ICH7R) .It Intel 6300ESB .It diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 3eba6a80982..d54ca3f1c9f 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.233 2006/04/15 00:15:12 jsg Exp $ */ +/* $OpenBSD: pciide.c,v 1.234 2006/04/17 01:51:37 jsg Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -434,7 +434,11 @@ const struct pciide_product_desc pciide_intel_products[] = { IDE_PCI_CLASS_OVERRIDE, piix_chip_map }, - { PCI_PRODUCT_INTEL_82801GB_SATA_1, /* Intel 82801GB (ICH7) SATA */ + { PCI_PRODUCT_INTEL_82801GB_SATA, /* Intel 82801GB (ICH7) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801GR_SATA, /* Intel 82801GR (ICH7R) SATA */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map }, @@ -2226,8 +2230,8 @@ piixsata_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) case PCI_PRODUCT_INTEL_82801FR_SATA: case PCI_PRODUCT_INTEL_82801FBM_SATA: /* ICH 7 */ - case PCI_PRODUCT_INTEL_82801GB_SATA_1: - case PCI_PRODUCT_INTEL_82801GB_SATA_3: + case PCI_PRODUCT_INTEL_82801GB_SATA: + case PCI_PRODUCT_INTEL_82801GR_SATA: case PCI_PRODUCT_INTEL_82801GBM_SATA: reg = pciide_pci_read(sc->sc_pc, sc->sc_tag, ICH5_SATA_MAP) & ICH6_SATA_MAP_CMB_MASK; |