[src/trunk]: src/sys/dev/pcmcia Match 1460 names with Adaptec.

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

details:   https://anonhg.NetBSD.org/src/rev/72f3ccac5ae3
branches:  trunk
changeset: 476139:72f3ccac5ae3
user:      soren <soren%NetBSD.org@localhost>
date:      Tue Sep 07 19:30:10 1999 +0000

description:
Match 1460 names with Adaptec.

diffstat:

 sys/dev/pcmcia/aic_pcmcia.c      |  10 +++++-----
 sys/dev/pcmcia/pcmciadevs        |   6 +++---
 sys/dev/pcmcia/pcmciadevs.h      |  14 +++++++-------
 sys/dev/pcmcia/pcmciadevs_data.h |  14 +++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)

diffs (106 lines):

diff -r a795fd275e31 -r 72f3ccac5ae3 sys/dev/pcmcia/aic_pcmcia.c
--- a/sys/dev/pcmcia/aic_pcmcia.c       Tue Sep 07 19:29:52 1999 +0000
+++ b/sys/dev/pcmcia/aic_pcmcia.c       Tue Sep 07 19:30:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic_pcmcia.c,v 1.10 1999/06/19 18:50:28 mjl Exp $      */
+/*     $NetBSD: aic_pcmcia.c,v 1.11 1999/09/07 19:30:10 soren Exp $    */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -73,10 +73,10 @@
        int             app_expfunc;            /* expected function number */
        const char      *app_name;              /* device name */
 } aic_pcmcia_products[] = {
-       { PCMCIA_VENDOR_ADAPTEC,        PCMCIA_PRODUCT_ADAPTEC_APA1460_1,
-         0,                            PCMCIA_STR_ADAPTEC_APA1460_1 },
-       { PCMCIA_VENDOR_ADAPTEC,        PCMCIA_PRODUCT_ADAPTEC_APA1460_2,
-         0,                            PCMCIA_STR_ADAPTEC_APA1460_2 },
+       { PCMCIA_VENDOR_ADAPTEC,        PCMCIA_PRODUCT_ADAPTEC_APA1460,
+         0,                            PCMCIA_STR_ADAPTEC_APA1460 },
+       { PCMCIA_VENDOR_ADAPTEC,        PCMCIA_PRODUCT_ADAPTEC_APA1460A,
+         0,                            PCMCIA_STR_ADAPTEC_APA1460A },
        { PCMCIA_VENDOR_NEWMEDIA,       PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER,
          0,                            PCMCIA_STR_NEWMEDIA_BUSTOASTER },
 
diff -r a795fd275e31 -r 72f3ccac5ae3 sys/dev/pcmcia/pcmciadevs
--- a/sys/dev/pcmcia/pcmciadevs Tue Sep 07 19:29:52 1999 +0000
+++ b/sys/dev/pcmcia/pcmciadevs Tue Sep 07 19:30:10 1999 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.43 1999/08/24 17:47:45 tron Exp $
+$NetBSD: pcmciadevs,v 1.44 1999/09/07 19:30:10 soren Exp $
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,8 +69,8 @@
  * List of known products.  Grouped by vendor.
  */
 /* Adaptec Products */
-product ADAPTEC APA1460_1      0x0001 Adaptec APA-1460/A SCSI Host Adapter
-product ADAPTEC APA1460_2      0x0002 Adaptec APA-1460/B SCSI Host Adapter
+product ADAPTEC APA1460                0x0001 Adaptec APA-1460 SlimSCSI
+product ADAPTEC APA1460A       0x0002 Adaptec APA-1460A SlimSCSI
 
 /* 3COM Products */
 product 3COM 3C562             0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet
diff -r a795fd275e31 -r 72f3ccac5ae3 sys/dev/pcmcia/pcmciadevs.h
--- a/sys/dev/pcmcia/pcmciadevs.h       Tue Sep 07 19:29:52 1999 +0000
+++ b/sys/dev/pcmcia/pcmciadevs.h       Tue Sep 07 19:30:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmciadevs.h,v 1.46 1999/08/24 17:48:31 tron Exp $     */
+/*     $NetBSD: pcmciadevs.h,v 1.47 1999/09/07 19:30:11 soren Exp $    */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -76,12 +76,12 @@
  * List of known products.  Grouped by vendor.
  */
 /* Adaptec Products */
-#define        PCMCIA_CIS_ADAPTEC_APA1460_1    { NULL, NULL, NULL, NULL }
-#define        PCMCIA_PRODUCT_ADAPTEC_APA1460_1        0x0001
-#define        PCMCIA_STR_ADAPTEC_APA1460_1    "Adaptec APA-1460/A SCSI Host Adapter"
-#define        PCMCIA_CIS_ADAPTEC_APA1460_2    { NULL, NULL, NULL, NULL }
-#define        PCMCIA_PRODUCT_ADAPTEC_APA1460_2        0x0002
-#define        PCMCIA_STR_ADAPTEC_APA1460_2    "Adaptec APA-1460/B SCSI Host Adapter"
+#define        PCMCIA_CIS_ADAPTEC_APA1460      { NULL, NULL, NULL, NULL }
+#define        PCMCIA_PRODUCT_ADAPTEC_APA1460  0x0001
+#define        PCMCIA_STR_ADAPTEC_APA1460      "Adaptec APA-1460 SlimSCSI"
+#define        PCMCIA_CIS_ADAPTEC_APA1460A     { NULL, NULL, NULL, NULL }
+#define        PCMCIA_PRODUCT_ADAPTEC_APA1460A 0x0002
+#define        PCMCIA_STR_ADAPTEC_APA1460A     "Adaptec APA-1460A SlimSCSI"
 
 /* 3COM Products */
 #define        PCMCIA_CIS_3COM_3C562   { NULL, NULL, NULL, NULL }
diff -r a795fd275e31 -r 72f3ccac5ae3 sys/dev/pcmcia/pcmciadevs_data.h
--- a/sys/dev/pcmcia/pcmciadevs_data.h  Tue Sep 07 19:29:52 1999 +0000
+++ b/sys/dev/pcmcia/pcmciadevs_data.h  Tue Sep 07 19:30:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmciadevs_data.h,v 1.46 1999/08/24 17:48:31 tron Exp $        */
+/*     $NetBSD: pcmciadevs_data.h,v 1.47 1999/09/07 19:30:11 soren Exp $       */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -45,18 +45,18 @@
 
 struct pcmcia_knowndev pcmcia_knowndevs[] = {
        {
-           PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_1,
-           PCMCIA_CIS_ADAPTEC_APA1460_1,
+           PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460,
+           PCMCIA_CIS_ADAPTEC_APA1460,
            0,
            "Adaptec Corporation",
-           "Adaptec APA-1460/A SCSI Host Adapter"      },
+           "Adaptec APA-1460 SlimSCSI" },
        },
        {
-           PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_2,
-           PCMCIA_CIS_ADAPTEC_APA1460_2,
+           PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460A,
+           PCMCIA_CIS_ADAPTEC_APA1460A,
            0,
            "Adaptec Corporation",
-           "Adaptec APA-1460/B SCSI Host Adapter"      },
+           "Adaptec APA-1460A SlimSCSI"        },
        },
        {
            PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C562,