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

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

details:   https://anonhg.NetBSD.org/src/rev/76db9cc1ccf0
branches:  netbsd-1-5
changeset: 490378:76db9cc1ccf0
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 04:30:47 2000 +0000

description:
Pull up revision 1.93 (requested by bouyer):
  Add support for Intel ICH2 IDE controller.

diffstat:

 sys/dev/pci/pciide.c |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 67b9d8eaec43 -r 76db9cc1ccf0 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Fri Dec 15 04:28:51 2000 +0000
+++ b/sys/dev/pci/pciide.c      Fri Dec 15 04:30:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.14 2000/10/04 17:07:44 bouyer Exp $  */
+/*     $NetBSD: pciide.c,v 1.68.2.15 2000/12/15 04:30:47 he Exp $      */
 
 
 /*
@@ -255,6 +255,11 @@
          "Intel 82801AB IDE Controller (ICH0)",
          piix_chip_map,
        },
+       { PCI_PRODUCT_INTEL_82801BA_IDE,
+         0,
+         "Intel 82801BA IDE Controller (ICH2)",
+         piix_chip_map,
+       },
        { 0,
          0,
          NULL,
@@ -1330,13 +1335,20 @@
                case PCI_PRODUCT_INTEL_82371AB_IDE:
                case PCI_PRODUCT_INTEL_82801AA_IDE:
                case PCI_PRODUCT_INTEL_82801AB_IDE:
+               case PCI_PRODUCT_INTEL_82801BA_IDE:
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                }
        }
        sc->sc_wdcdev.PIO_cap = 4;
        sc->sc_wdcdev.DMA_cap = 2;
-       sc->sc_wdcdev.UDMA_cap =
-           (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801AA_IDE) ? 4 : 2;
+       switch(sc->sc_pp->ide_product) {
+       case PCI_PRODUCT_INTEL_82801AA_IDE:
+       case PCI_PRODUCT_INTEL_82801BA_IDE:
+               sc->sc_wdcdev.UDMA_cap = 4;
+               break;
+       default:
+               sc->sc_wdcdev.UDMA_cap = 2;
+       }
        if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82371FB_IDE)
                sc->sc_wdcdev.set_modes = piix_setup_channel;
        else