[src/netbsd-1-5]: src/sys/dev/pci Pull up revision 1.106 (requested by bouyer):

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

details:   https://anonhg.NetBSD.org/src/rev/f57af1857cd2
branches:  netbsd-1-5
changeset: 490740:f57af1857cd2
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 26 21:49:16 2001 +0000

description:
Pull up revision 1.106 (requested by bouyer):
  Add support for the Intel 82801BAM IDE controller.

diffstat:

 sys/dev/pci/pciide.c |  21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diffs (72 lines):

diff -r 534a28d36845 -r f57af1857cd2 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Mon Feb 26 21:48:58 2001 +0000
+++ b/sys/dev/pci/pciide.c      Mon Feb 26 21:49:16 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.19 2001/02/04 18:55:05 he Exp $      */
+/*     $NetBSD: pciide.c,v 1.68.2.20 2001/02/26 21:49:16 he Exp $      */
 
 
 /*
@@ -260,6 +260,11 @@
          "Intel 82801BA IDE Controller (ICH2)",
          piix_chip_map,
        },
+       { PCI_PRODUCT_INTEL_82801BAM_IDE,
+         0,
+         "Intel 82801BAM IDE Controller (ICH2)",
+         piix_chip_map,
+       },
        { 0,
          0,
          NULL,
@@ -1349,6 +1354,7 @@
                case PCI_PRODUCT_INTEL_82801AA_IDE:
                case PCI_PRODUCT_INTEL_82801AB_IDE:
                case PCI_PRODUCT_INTEL_82801BA_IDE:
+               case PCI_PRODUCT_INTEL_82801BAM_IDE:
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                }
        }
@@ -1359,6 +1365,7 @@
                sc->sc_wdcdev.UDMA_cap = 4;
                break;
        case PCI_PRODUCT_INTEL_82801BA_IDE:
+       case PCI_PRODUCT_INTEL_82801BAM_IDE:
                sc->sc_wdcdev.UDMA_cap = 5;
                break;
        default:
@@ -1385,7 +1392,8 @@
                }
                if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AA_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AB_IDE ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE) {
                        WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
                            pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
                            DEBUG_PROBE);
@@ -1436,7 +1444,8 @@
                }
                if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AA_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AB_IDE ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE) {
                        WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
                            pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
                            DEBUG_PROBE);
@@ -1596,10 +1605,12 @@
 
                if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AA_IDE ||
                    sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AB_IDE ||
-                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE) {
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE) {
                        ideconf |= PIIX_CONFIG_PINGPONG;
                }
-               if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE) {
+               if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE ||
+                   sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE) {
                        /* setup Ultra/100 */
                        if (drvp->UDMA_mode > 2 &&
                            (ideconf & PIIX_CONFIG_CR(channel, drive)) == 0)