[src/netbsd-3]: src/sys/dev/pci Pull up following revision(s) (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/97c6448d5649
branches:  netbsd-3
changeset: 577808:97c6448d5649
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Feb 05 17:13:57 2006 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #1156):
        sys/dev/pci/pdcsata.c: revision 1.6
Add support for Promise PDC2057x SATA/150 Ide controllers.
>From FreeBSD, tested by Douglas Wade Needham.

diffstat:

 sys/dev/pci/pdcsata.c |  31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diffs (73 lines):

diff -r 8d00422b6f6c -r 97c6448d5649 sys/dev/pci/pdcsata.c
--- a/sys/dev/pci/pdcsata.c     Sun Feb 05 17:11:00 2006 +0000
+++ b/sys/dev/pci/pdcsata.c     Sun Feb 05 17:13:57 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pdcsata.c,v 1.3.2.1 2006/01/21 06:33:15 snj Exp $      */
+/*     $NetBSD: pdcsata.c,v 1.3.2.2 2006/02/05 17:13:57 riz Exp $      */
 
 /*
  * Copyright (c) 2004, Manuel Bouyer.
@@ -44,6 +44,7 @@
 
 #define PDC203xx_NCHANNELS 4
 #define PDC40718_NCHANNELS 4
+#define PDC20575_NCHANNELS 3
 
 #define PDC203xx_BAR_IDEREGS 0x1c /* BAR where the IDE registers are mapped */
 
@@ -117,6 +118,21 @@
          "Promise PDC40719 SATA300 controller",
          pdcsata_chip_map,
        },
+       { PCI_PRODUCT_PROMISE_PDC20571,
+         0,
+         "Promise PDC20571 SATA150 controller",
+         pdcsata_chip_map,
+       },
+       { PCI_PRODUCT_PROMISE_PDC20575,
+         0,
+         "Promise PDC20575 SATA150 controller",
+         pdcsata_chip_map,
+       },
+       { PCI_PRODUCT_PROMISE_PDC20579,
+         0,
+         "Promise PDC20579 SATA150 controller",
+         pdcsata_chip_map,
+       },
        { 0,
          0,
          NULL,
@@ -184,6 +200,9 @@
 
        case PCI_PRODUCT_PROMISE_PDC40718:
        case PCI_PRODUCT_PROMISE_PDC40719:
+       case PCI_PRODUCT_PROMISE_PDC20571:
+       case PCI_PRODUCT_PROMISE_PDC20575:
+       case PCI_PRODUCT_PROMISE_PDC20579:
                sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
                    intrhandle, IPL_BIO, pdc205xx_pci_intr, sc);
                break;
@@ -258,6 +277,7 @@
 
        case PCI_PRODUCT_PROMISE_PDC40718:
        case PCI_PRODUCT_PROMISE_PDC40719:
+       case PCI_PRODUCT_PROMISE_PDC20571:
                bus_space_write_4(sc->sc_ba5_st, sc->sc_ba5_sh, 0x60, 0x00ff00ff);
                sc->sc_wdcdev.sc_atac.atac_nchannels = PDC40718_NCHANNELS;
 
@@ -265,6 +285,15 @@
                sc->sc_wdcdev.sc_atac.atac_probe = pdc205xx_drv_probe;
 
                break;
+       case PCI_PRODUCT_PROMISE_PDC20575:
+       case PCI_PRODUCT_PROMISE_PDC20579:
+               bus_space_write_4(sc->sc_ba5_st, sc->sc_ba5_sh, 0x60, 0x00ff00ff);
+               sc->sc_wdcdev.sc_atac.atac_nchannels = PDC20575_NCHANNELS;
+
+               sc->sc_wdcdev.reset = pdc205xx_do_reset;
+               sc->sc_wdcdev.sc_atac.atac_probe = pdc205xx_drv_probe;
+
+               break;
        }
 
        wdc_allocate_regs(&sc->sc_wdcdev);