[src/netbsd-1-5]: src/sys/dev/pci Pull up revs 1.25-1.26:

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

details:   https://anonhg.NetBSD.org/src/rev/5597308eab6e
branches:  netbsd-1-5
changeset: 489383:5597308eab6e
user:      soren <soren%NetBSD.org@localhost>
date:      Tue Sep 05 01:00:25 2000 +0000

description:
Pull up revs 1.25-1.26:
> Add support for the AAA-131 RAID controller by treating it as a 7890.
> Taken from rev 1.32 of the FreeBSD ahc_pci.c.
> Fix 'RAID unsupported' printf.

diffstat:

 sys/dev/pci/ahc_pci.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r d6e55680a2f5 -r 5597308eab6e sys/dev/pci/ahc_pci.c
--- a/sys/dev/pci/ahc_pci.c     Mon Sep 04 22:59:09 2000 +0000
+++ b/sys/dev/pci/ahc_pci.c     Tue Sep 05 01:00:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahc_pci.c,v 1.24 2000/05/10 17:07:52 thorpej Exp $     */
+/*     $NetBSD: ahc_pci.c,v 1.24.4.1 2000/09/05 01:00:25 soren Exp $   */
 
 /*
  * Product specific probe and attach routines for:
@@ -132,6 +132,7 @@
 #define ID_AHA_3944AU          0x7895900478949004ull
 
 #define ID_AIC7890             0x001F9005000F9005ull
+#define ID_AAA_131U2           0x0013900500039005ull
 #define ID_AHA_2930U2          0x0011900501819005ull
 #define ID_AHA_2940U2B         0x00109005A1009005ull
 #define ID_AHA_2940U2_OEM      0x0010900521809005ull
@@ -156,7 +157,7 @@
 #define ID_AHA_3960D_CPQ       0x00C09005F6200E11ull
 
 #define ID_AIC7810             0x1078900400000000ull
-#define ID_AIC7815             0x1578900400000000ull
+#define ID_AIC7815             0x7815900400000000ull
 
 typedef int (ahc_device_setup_t)(struct pci_attach_args *, char *,
                                 ahc_chip *, ahc_feature *, ahc_flag *);
@@ -344,6 +345,12 @@
                "Adaptec 2950 Ultra2 SCSI adapter",
                ahc_aic7890_setup
        },
+       {
+               ID_AAA_131U2,
+               ID_ALL_MASK,
+               "Adaptec AAA-131 Ultra2 RAID adapter",
+               ahc_aic7890_setup
+       }, 
        /* aic7892 based controllers */
        {
                ID_AHA_29160,
@@ -1229,7 +1236,7 @@
 ahc_raid_setup(struct pci_attach_args *pa, char *channel,
               ahc_chip *chip, ahc_feature *features, ahc_flag *flags)
 {
-       printf("RAID functionality unsupported\n");
+       printf(": RAID functionality unsupported\n");
        return (ENXIO);
 }