[src/trunk]: src add support for Ericsson PRISM2 card (kern/15130)

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

details:   https://anonhg.NetBSD.org/src/rev/12d58631ad17
branches:  trunk
changeset: 520801:12d58631ad17
user:      joda <joda%NetBSD.org@localhost>
date:      Thu Jan 17 09:56:43 2002 +0000

description:
add support for Ericsson PRISM2 card (kern/15130)

diffstat:

 share/man/man4/wi.4              |   8 ++++++--
 sys/dev/pcmcia/if_wi_pcmcia.c    |   9 +++++++--
 sys/dev/pcmcia/pcmciadevs        |   6 +++++-
 sys/dev/pcmcia/pcmciadevs.h      |  10 ++++++++--
 sys/dev/pcmcia/pcmciadevs_data.h |  19 +++++++++++++++++--
 5 files changed, 43 insertions(+), 9 deletions(-)

diffs (167 lines):

diff -r 5e63abd2df07 -r 12d58631ad17 share/man/man4/wi.4
--- a/share/man/man4/wi.4       Thu Jan 17 05:21:47 2002 +0000
+++ b/share/man/man4/wi.4       Thu Jan 17 09:56:43 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: wi.4,v 1.21 2001/11/18 06:38:23 mrg Exp $
+.\"     $NetBSD: wi.4,v 1.22 2002/01/17 09:56:45 joda Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"    Bill Paul <wpaul%ctr.columbia.edu@localhost>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"    $Id: wi.4,v 1.21 2001/11/18 06:38:23 mrg Exp $
+.\"    $Id: wi.4,v 1.22 2002/01/17 09:56:45 joda Exp $
 .\"
 .Dd January 11, 2001
 .Dt WI 4
@@ -126,6 +126,10 @@
 Intersil PRISM Mini-PCI
 .It
 Linksys Group, Inc. Instant Wireless Network PC Card (Prism2)
+.It
+Symbol Spectrum24 Wireless LAN
+.It
+Ericsson Wireless LAN
 .El
 .Pp
 The original PRISM-I chipset is supported by the
diff -r 5e63abd2df07 -r 12d58631ad17 sys/dev/pcmcia/if_wi_pcmcia.c
--- a/sys/dev/pcmcia/if_wi_pcmcia.c     Thu Jan 17 05:21:47 2002 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c     Thu Jan 17 09:56:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.15 2001/12/04 18:46:30 christos Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.16 2002/01/17 09:56:44 joda 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.15 2001/12/04 18:46:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.16 2002/01/17 09:56:44 joda Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -223,6 +223,11 @@
          PCMCIA_CIS_SIMPLETECH_SPECTRUM24_ALT,
          PCMCIA_STR_SIMPLETECH_SPECTRUM24_ALT },
 
+       { PCMCIA_VENDOR_ERICSSON,
+         PCMCIA_PRODUCT_ERICSSON_WIRELESSLAN,
+         PCMCIA_CIS_ERICSSON_WIRELESSLAN,
+         PCMCIA_STR_ERICSSON_WIRELESSLAN },
+
        { 0,
          0,
          { NULL, NULL, NULL, NULL },
diff -r 5e63abd2df07 -r 12d58631ad17 sys/dev/pcmcia/pcmciadevs
--- a/sys/dev/pcmcia/pcmciadevs Thu Jan 17 05:21:47 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs Thu Jan 17 09:56:43 2002 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.157 2002/01/13 10:38:47 aymeric Exp $
+$NetBSD: pcmciadevs,v 1.158 2002/01/17 09:56:43 joda Exp $
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
 /*-
@@ -69,6 +69,7 @@
 vendor SYMBOL2                 0x014d  Symbol
 vendor LUCENT                  0x0156  Lucent Technologies
 vendor AIRONET                 0x015f  Aironet Wireless Communications
+vendor ERICSSON                        0x016b  Ericsson
 vendor PSION                   0x016c  Psion
 vendor COMPAQ2                 0x0183  Compaq
 vendor KINGSTON                        0x0186  Kingston
@@ -184,6 +185,9 @@
 /* EMTAC */
 product EMTAC WLAN             0x0002  EMTAC A2424i 11Mbps WLAN Card
 
+/* Ericsson */
+product ERICSSON WIRELESSLAN   0x0001  DSSS Wireless LAN PC Card
+
 /* Farallon */
 product FARALLON SKYLINE       0x0a01 SkyLINE Wireless
 
diff -r 5e63abd2df07 -r 12d58631ad17 sys/dev/pcmcia/pcmciadevs.h
--- a/sys/dev/pcmcia/pcmciadevs.h       Thu Jan 17 05:21:47 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs.h       Thu Jan 17 09:56:43 2002 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: pcmciadevs.h,v 1.157 2002/01/13 10:39:33 aymeric Exp $ */
+/*     $NetBSD: pcmciadevs.h,v 1.158 2002/01/17 09:56:44 joda Exp $    */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     NetBSD: pcmciadevs,v 1.156 2001/12/29 15:00:45 pooka Exp 
+ *     NetBSD: pcmciadevs,v 1.157 2002/01/13 10:38:47 aymeric Exp 
  */
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
@@ -76,6 +76,7 @@
 #define        PCMCIA_VENDOR_SYMBOL2   0x014d  /* Symbol */
 #define        PCMCIA_VENDOR_LUCENT    0x0156  /* Lucent Technologies */
 #define        PCMCIA_VENDOR_AIRONET   0x015f  /* Aironet Wireless Communications */
+#define        PCMCIA_VENDOR_ERICSSON  0x016b  /* Ericsson */
 #define        PCMCIA_VENDOR_PSION     0x016c  /* Psion */
 #define        PCMCIA_VENDOR_COMPAQ2   0x0183  /* Compaq */
 #define        PCMCIA_VENDOR_KINGSTON  0x0186  /* Kingston */
@@ -269,6 +270,11 @@
 #define        PCMCIA_PRODUCT_EMTAC_WLAN       0x0002
 #define        PCMCIA_STR_EMTAC_WLAN   "EMTAC A2424i 11Mbps WLAN Card"
 
+/* Ericsson */
+#define        PCMCIA_CIS_ERICSSON_WIRELESSLAN { NULL, NULL, NULL, NULL }
+#define        PCMCIA_PRODUCT_ERICSSON_WIRELESSLAN     0x0001
+#define        PCMCIA_STR_ERICSSON_WIRELESSLAN "DSSS Wireless LAN PC Card"
+
 /* Farallon */
 #define        PCMCIA_CIS_FARALLON_SKYLINE     { NULL, NULL, NULL, NULL }
 #define        PCMCIA_PRODUCT_FARALLON_SKYLINE 0x0a01
diff -r 5e63abd2df07 -r 12d58631ad17 sys/dev/pcmcia/pcmciadevs_data.h
--- a/sys/dev/pcmcia/pcmciadevs_data.h  Thu Jan 17 05:21:47 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs_data.h  Thu Jan 17 09:56:43 2002 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: pcmciadevs_data.h,v 1.158 2002/01/13 10:39:33 aymeric Exp $    */
+/*     $NetBSD: pcmciadevs_data.h,v 1.159 2002/01/17 09:56:44 joda Exp $       */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     NetBSD: pcmciadevs,v 1.156 2001/12/29 15:00:45 pooka Exp 
+ *     NetBSD: pcmciadevs,v 1.157 2002/01/13 10:38:47 aymeric Exp 
  */
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
@@ -337,6 +337,13 @@
            "EMTAC A2424i 11Mbps WLAN Card",    }
        ,
        {
+           PCMCIA_VENDOR_ERICSSON, PCMCIA_PRODUCT_ERICSSON_WIRELESSLAN,
+           PCMCIA_CIS_ERICSSON_WIRELESSLAN,
+           0,
+           "Ericsson",
+           "DSSS Wireless LAN PC Card",        }
+       ,
+       {
            PCMCIA_VENDOR_FARALLON, PCMCIA_PRODUCT_FARALLON_SKYLINE,
            PCMCIA_CIS_FARALLON_SKYLINE,
            0,
@@ -1590,6 +1597,14 @@
            NULL,
        },
        {
+           PCMCIA_VENDOR_ERICSSON,
+           PCMCIA_KNOWNDEV_NOPROD,
+           PCMCIA_CIS_INVALID,
+           0,
+           "Ericsson",
+           NULL,
+       },
+       {
            PCMCIA_VENDOR_PSION,
            PCMCIA_KNOWNDEV_NOPROD,
            PCMCIA_CIS_INVALID,