Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.165 (requested by bouyer...



details:   https://anonhg.NetBSD.org/src/rev/1399f70919ac
branches:  netbsd-1-6
changeset: 529215:1399f70919ac
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 01 13:23:06 2002 +0000

description:
Pull up revision 1.165 (requested by bouyer in ticket #724):
Add support for Promise Ultra133TX2 and Ultra133TX2v2, from FreeBSD and
stephen%degler.net@localhost in kern/17509.

diffstat:

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

diffs (62 lines):

diff -r 897776b529b5 -r 1399f70919ac sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Fri Nov 01 13:18:46 2002 +0000
+++ b/sys/dev/pci/pciide.c      Fri Nov 01 13:23:06 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.153.2.5 2002/08/02 05:55:43 lukem Exp $   */
+/*     $NetBSD: pciide.c,v 1.153.2.6 2002/11/01 13:23:06 tron Exp $    */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.5 2002/08/02 05:55:43 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.6 2002/11/01 13:23:06 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -458,6 +458,16 @@
          "Promise Ultra133/ATA Bus Master IDE Accelerator",
          pdc202xx_chip_map,
        },
+       { PCI_PRODUCT_PROMISE_ULTRA133TX2,
+         IDE_PCI_CLASS_OVERRIDE,
+         "Promise Ultra133TX2/ATA Bus Master IDE Accelerator",
+         pdc202xx_chip_map,
+       },
+       { PCI_PRODUCT_PROMISE_ULTRA133TX2v2,
+         IDE_PCI_CLASS_OVERRIDE,
+         "Promise Ultra133TX2v2/ATA Bus Master IDE Accelerator",
+         pdc202xx_chip_map,
+       },
        { 0,
          0,
          NULL,
@@ -3488,17 +3498,23 @@
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100X ||    \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2 ||  \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2v2 || \
-       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133)
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133 ||     \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2 ||  \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2v2)
 #define PDC_IS_265(sc)                                                 \
        ((sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100 ||    \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100X ||    \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2 ||  \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2v2 || \
-       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133)
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133 ||     \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2 ||  \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2v2)
 #define PDC_IS_268(sc)                                                 \
        ((sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2 || \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100TX2v2 || \
-       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133)
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133 ||     \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2 ||  \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2v2)
 
 void
 pdc202xx_chip_map(sc, pa)



Home | Main Index | Thread Index | Old Index