[src/trunk]: src/sys/dev/pcmcia Support this device, which is evidently a reb...

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

details:   https://anonhg.NetBSD.org/src/rev/126510592d61
branches:  trunk
changeset: 535986:126510592d61
user:      mason <mason%NetBSD.org@localhost>
date:      Wed Sep 04 00:04:03 2002 +0000

description:
Support this device, which is evidently a rebadged GEMTEK WLAN which we
already support under another name:

wi0 at pcmcia0 function 0: NETGEAR MA401RA Wireless PC, Card, ISL37300PEval-RevA
wi0: 802.11 address <whatever>
wi0: using RF:PRISM2.5 MAC:ISL3873B(PCMCIA)
wi0: Intersil Firmware: Primary (1.0.7), Station (1.3.6)

diffstat:

 sys/dev/pcmcia/if_wi_pcmcia.c    |   9 +++++++--
 sys/dev/pcmcia/pcmciadevs        |   4 +++-
 sys/dev/pcmcia/pcmciadevs.h      |   6 +++++-
 sys/dev/pcmcia/pcmciadevs_data.h |  17 ++++++++++++++++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diffs (120 lines):

diff -r 0febe82e246c -r 126510592d61 sys/dev/pcmcia/if_wi_pcmcia.c
--- a/sys/dev/pcmcia/if_wi_pcmcia.c     Wed Sep 04 00:03:58 2002 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c     Wed Sep 04 00:04:03 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.24 2002/06/17 07:47:33 martin Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.25 2002/09/04 00:04:03 mason Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.24 2002/06/17 07:47:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.25 2002/09/04 00:04:03 mason Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -227,6 +227,11 @@
          PCMCIA_CIS_EMTAC_WLAN,
          PCMCIA_STR_EMTAC_WLAN },
 
+       { PCMCIA_VENDOR_NETGEAR_2,
+         PCMCIA_PRODUCT_NETGEAR_2_MA401,
+         PCMCIA_CIS_NETGEAR_2_MA401,
+         PCMCIA_STR_NETGEAR_2_MA401 },
+
        { PCMCIA_VENDOR_INTERSIL,
          PCMCIA_PRODUCT_GEMTEK_WLAN,
          PCMCIA_CIS_GEMTEK_WLAN,
diff -r 0febe82e246c -r 126510592d61 sys/dev/pcmcia/pcmciadevs
--- a/sys/dev/pcmcia/pcmciadevs Wed Sep 04 00:03:58 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs Wed Sep 04 00:04:03 2002 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.175 2002/07/23 23:11:04 rjs Exp $
+$NetBSD: pcmciadevs,v 1.176 2002/09/04 00:04:03 mason Exp $
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
 /*-
@@ -42,6 +42,7 @@
  */
 
 vendor FUJITSU                 0x0004  Fujitsu Corporation
+vendor NETGEAR_2               0x000b  Netgear
 vendor PANASONIC               0x0032  Matsushita Electric Industrial Co.
 vendor SANDISK                 0x0045  Sandisk Corporation
 vendor NEWMEDIA                        0x0057  New Media Corporation
@@ -279,6 +280,7 @@
 product NETGEAR FA410TX                0x0230 Netgear FA410TX
 product NETGEAR FA410TXC       0x4530 Netgear FA410TXC
 product NETGEAR FA411          0x0411 Netgear FA411
+product NETGEAR_2 MA401                0x7300 Netgear MA401
 
 /* National Instruments */
 product NI PCMCIA_GPIB         0x4882 National Instruments PCMCIA-GPIB
diff -r 0febe82e246c -r 126510592d61 sys/dev/pcmcia/pcmciadevs.h
--- a/sys/dev/pcmcia/pcmciadevs.h       Wed Sep 04 00:03:58 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs.h       Wed Sep 04 00:04:03 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmciadevs.h,v 1.175 2002/07/23 23:12:48 rjs Exp $     */
+/*     $NetBSD: pcmciadevs.h,v 1.176 2002/09/04 00:04:03 mason Exp $   */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -49,6 +49,7 @@
  */
 
 #define        PCMCIA_VENDOR_FUJITSU   0x0004  /* Fujitsu Corporation */
+#define        PCMCIA_VENDOR_NETGEAR_2 0x000b  /* Netgear */
 #define        PCMCIA_VENDOR_PANASONIC 0x0032  /* Matsushita Electric Industrial Co. */
 #define        PCMCIA_VENDOR_SANDISK   0x0045  /* Sandisk Corporation */
 #define        PCMCIA_VENDOR_NEWMEDIA  0x0057  /* New Media Corporation */
@@ -476,6 +477,9 @@
 #define        PCMCIA_CIS_NETGEAR_FA411        { NULL, NULL, NULL, NULL }
 #define        PCMCIA_PRODUCT_NETGEAR_FA411    0x0411
 #define        PCMCIA_STR_NETGEAR_FA411        "Netgear FA411"
+#define        PCMCIA_CIS_NETGEAR_2_MA401      { NULL, NULL, NULL, NULL }
+#define        PCMCIA_PRODUCT_NETGEAR_2_MA401  0x7300
+#define        PCMCIA_STR_NETGEAR_2_MA401      "Netgear MA401"
 
 /* National Instruments */
 #define        PCMCIA_CIS_NI_PCMCIA_GPIB       { NULL, NULL, NULL, NULL }
diff -r 0febe82e246c -r 126510592d61 sys/dev/pcmcia/pcmciadevs_data.h
--- a/sys/dev/pcmcia/pcmciadevs_data.h  Wed Sep 04 00:03:58 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs_data.h  Wed Sep 04 00:04:03 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmciadevs_data.h,v 1.175 2002/07/23 23:12:49 rjs Exp $        */
+/*     $NetBSD: pcmciadevs_data.h,v 1.176 2002/09/04 00:04:03 mason Exp $      */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -729,6 +729,13 @@
            "Netgear FA411",    }
        ,
        {
+           PCMCIA_VENDOR_NETGEAR_2, PCMCIA_PRODUCT_NETGEAR_2_MA401,
+           PCMCIA_CIS_NETGEAR_2_MA401,
+           0,
+           "Netgear",
+           "Netgear MA401",    }
+       ,
+       {
            PCMCIA_VENDOR_NI, PCMCIA_PRODUCT_NI_PCMCIA_GPIB,
            PCMCIA_CIS_NI_PCMCIA_GPIB,
            0,
@@ -1486,6 +1493,14 @@
            NULL,
        },
        {
+           PCMCIA_VENDOR_NETGEAR_2,
+           PCMCIA_KNOWNDEV_NOPROD,
+           PCMCIA_CIS_INVALID,
+           0,
+           "Netgear",
+           NULL,
+       },
+       {
            PCMCIA_VENDOR_PANASONIC,
            PCMCIA_KNOWNDEV_NOPROD,
            PCMCIA_CIS_INVALID,