[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.193 via patch (requested...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5044188ca24c
branches:  netbsd-1-6
changeset: 530573:5044188ca24c
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Aug 16 15:53:03 2003 +0000

description:
Pull up revision 1.193 via patch (requested by bouyer in ticket #1367):
Add support for ICH5, from Quentin Garnier in private mail.

diffstat:

 sys/dev/pci/pciide.c |  23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diffs (85 lines):

diff -r fd396e17a232 -r 5044188ca24c sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Fri Aug 15 19:34:06 2003 +0000
+++ b/sys/dev/pci/pciide.c      Sat Aug 16 15:53:03 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.153.2.12 2003/06/16 21:13:25 grant Exp $  */
+/*     $NetBSD: pciide.c,v 1.153.2.13 2003/08/16 15:53:03 tron Exp $   */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.12 2003/06/16 21:13:25 grant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.13 2003/08/16 15:53:03 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -306,6 +306,11 @@
          "Intel 82801DB IDE Controller (ICH4)",
          piix_chip_map,
        },
+       { PCI_PRODUCT_INTEL_82801EB_IDE,
+         0,
+         "Intel 82801EB IDE Controller (ICH5)",
+          piix_chip_map,
+       },
        { 0,
          0,
          NULL,
@@ -1537,6 +1542,7 @@
                case PCI_PRODUCT_INTEL_82801CA_IDE_1:
                case PCI_PRODUCT_INTEL_82801CA_IDE_2:
                case PCI_PRODUCT_INTEL_82801DB_IDE:
+               case PCI_PRODUCT_INTEL_82801EB_IDE:
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                }
        }
@@ -1551,6 +1557,7 @@
        case PCI_PRODUCT_INTEL_82801CA_IDE_1:
        case PCI_PRODUCT_INTEL_82801CA_IDE_2:
        case PCI_PRODUCT_INTEL_82801DB_IDE:
+       case PCI_PRODUCT_INTEL_82801EB_IDE:
                sc->sc_wdcdev.UDMA_cap = 5;
                break;
        default:
@@ -1581,7 +1588,8 @@
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_1 ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_2 ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ) {
                        WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
                            pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
                            DEBUG_PROBE);
@@ -1636,7 +1644,8 @@
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_1 ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_2 ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ) {
                        WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
                            pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
                            DEBUG_PROBE);
@@ -1800,14 +1809,16 @@
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_1 ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_2 ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE) {
                        ideconf |= PIIX_CONFIG_PINGPONG;
                }
                if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_1 ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE_2 ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE) {
                        /* setup Ultra/100 */
                        if (drvp->UDMA_mode > 2 &&
                            (ideconf & PIIX_CONFIG_CR(channel, drive)) == 0)