[src/trunk]: src/sys/dev/ic add more IDs of PRISM family

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

details:   https://anonhg.NetBSD.org/src/rev/b4d19e9575c4
branches:  trunk
changeset: 524860:b4d19e9575c4
user:      ichiro <ichiro%NetBSD.org@localhost>
date:      Mon Apr 01 02:46:47 2002 +0000

description:
add more IDs of PRISM family

diffstat:

 sys/dev/ic/wi.c    |  23 ++++++++++++++++++-----
 sys/dev/ic/wireg.h |   6 +++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diffs (101 lines):

diff -r 56c997472613 -r b4d19e9575c4 sys/dev/ic/wi.c
--- a/sys/dev/ic/wi.c   Mon Apr 01 01:52:44 2002 +0000
+++ b/sys/dev/ic/wi.c   Mon Apr 01 02:46:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wi.c,v 1.60 2002/03/31 10:44:44 jdolecek Exp $ */
+/*     $NetBSD: wi.c,v 1.61 2002/04/01 02:46:47 ichiro Exp $   */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.60 2002/03/31 10:44:44 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.61 2002/04/01 02:46:47 ichiro Exp $");
 
 #define WI_HERMES_AUTOINC_WAR  /* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR    /* Work around stats counter bug. */
@@ -1250,7 +1250,8 @@
                sc->wi_ap_density = le16toh(wreq->wi_val[0]);
                break;
        case WI_RID_CREATE_IBSS:
-               sc->wi_create_ibss = le16toh(wreq->wi_val[0]);
+               if (sc->sc_firmware_type == WI_LUCENT)
+                       sc->wi_create_ibss = le16toh(wreq->wi_val[0]);
                break;
        case WI_RID_OWN_CHNL:
                sc->wi_channel = le16toh(wreq->wi_val[0]);
@@ -1335,7 +1336,8 @@
                wreq->wi_val[0] = htole16(sc->wi_ap_density);
                break;
        case WI_RID_CREATE_IBSS:
-               wreq->wi_val[0] = htole16(sc->wi_create_ibss);
+               if (sc->sc_firmware_type == WI_LUCENT)
+                       wreq->wi_val[0] = htole16(sc->wi_create_ibss);
                break;
        case WI_RID_OWN_CHNL:
                wreq->wi_val[0] = htole16(sc->wi_channel);
@@ -1633,7 +1635,8 @@
        WI_SETVAL(WI_RID_MAX_DATALEN, sc->wi_max_data_len);
 
        /* Enable/disable IBSS creation. */
-       WI_SETVAL(WI_RID_CREATE_IBSS, sc->wi_create_ibss);
+       if (sc->sc_firmware_type == WI_LUCENT)
+               WI_SETVAL(WI_RID_CREATE_IBSS, sc->wi_create_ibss);
 
        /* Set the port type. */
        WI_SETVAL(WI_RID_PORTTYPE, sc->wi_ptype);
@@ -1983,6 +1986,7 @@
                sc->sc_firmware_type = WI_INTERSIL;
                break;
        case WI_NIC_EVB3:
+       case WI_NIC_3842:
                printf("RF:PRISM2 MAC:HFA3842");
                sc->sc_firmware_type = WI_INTERSIL;
                break;
@@ -1991,6 +1995,7 @@
                sc->sc_firmware_type = WI_INTERSIL;
                break;
        case WI_NIC_P2_SST:
+       case WI_NIC_EVB2_SST:
                printf("RF:PRISM2 MAC:HFA3841 CARD:HWB3163-SST-flash");
                sc->sc_firmware_type = WI_INTERSIL;
                break;
@@ -2002,6 +2007,14 @@
                printf("RF:PRISM2.5 MAC:ISL3874A(PCI)");
                sc->sc_firmware_type = WI_INTERSIL;
                break;
+       case WI_NIC_P3_SST:
+               printf("RF:PRISM3");
+               sc->sc_firmware_type = WI_INTERSIL;
+               break;
+       case WI_NIC_P3_PCI:
+               printf("RF:PRISM3");
+               sc->sc_firmware_type = WI_INTERSIL;
+               break;
        case WI_NIC_LUCENT:
                printf("Lucent Technologies, WaveLAN/IEEE");
                sc->sc_firmware_type = WI_LUCENT;
diff -r 56c997472613 -r b4d19e9575c4 sys/dev/ic/wireg.h
--- a/sys/dev/ic/wireg.h        Mon Apr 01 01:52:44 2002 +0000
+++ b/sys/dev/ic/wireg.h        Mon Apr 01 02:46:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wireg.h,v 1.25 2002/03/31 06:09:37 ichiro Exp $        */
+/*     $NetBSD: wireg.h,v 1.26 2002/04/01 02:46:48 ichiro Exp $        */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -430,8 +430,12 @@
 #define WI_NIC_EVB3    0x8004
 #define WI_NIC_HWB1153 0x8007
 #define WI_NIC_P2_SST  0x8008  /* Prism2 with SST flush */
+#define        WI_NIC_EVB2_SST 0x8009
+#define        WI_NIC_3842     0x800A  /* 3842 Evaluation Board */
 #define WI_NIC_PRISM2_5        0x800C
 #define WI_NIC_3874A   0x8013  /* Prism2.5 Mini-PCI */
+#define        WI_NIC_P3_SST   0x801B  /* Prism3 PCMCIA */
+#define        WI_NIC_P3_PCI   0x8022  /* Prism3 Mini-PCI */
 };
 
 /*