Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the Lucent (and clone) entries a bit.

Browse Source 
Add the Hermes II (doesn't work yet, but it's harmless).
This commit is contained in:
mycroft 2004-08-07 17:18:09 +00:00
parent 900254667d
commit 7e01821c61
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/pcmcia/if_wi_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wi_pcmcia.c,v 1.46 2004/08/07 05:27:39 mycroft Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.47 2004/08/07 17:18:09 mycroft 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.46 2004/08/07 05:27:39 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.47 2004/08/07 17:18:09 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -113,20 +113,23 @@ static const struct wi_pcmcia_product {
u_int32_t pp_product; /* product ID */
const char *pp_cisinfo[4]; /* CIS information */
} wi_pcmcia_products[] = {
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_SMC_2632W },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_NANOSPEED_PRISM2 },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_NEC_CMZ_RT_WP },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_NTT_ME_WLAN },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE,
PCMCIA_CIS_LUCENT_WAVELAN_IEEE },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_HERMES,
PCMCIA_CIS_INVALID },
{ PCMCIA_VENDOR_LUCENT, PCMCIA_PRODUCT_LUCENT_HERMES2,
PCMCIA_CIS_INVALID },
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CRWE737A,
PCMCIA_CIS_3COM_3CRWE737A },
@ -369,6 +372,7 @@ wi_pcmcia_attach(parent, self, aux)
const struct wi_pcmcia_product *pp;
struct pcmcia_attach_args *pa = aux;
struct pcmcia_config_entry *cfe;
int haveaddr;
aprint_normal("\n");
@ -427,7 +431,8 @@ wi_pcmcia_attach(parent, self, aux)
printf("%s:", self->dv_xname);
if (wi_attach(sc) != 0) {
haveaddr = pa->pf->pf_funce_lan_nidlen == IEEE80211_ADDR_LEN;
if (wi_attach(sc, haveaddr ? pa->pf->pf_funce_lan_nid : 0) != 0) {
aprint_error("%s: failed to attach controller\n", self->dv_xname);
goto attach_failed;
}

8
sys/dev/pcmcia/pcmciadevs
View File

@ -1,4 +1,4 @@
$NetBSD: pcmciadevs,v 1.203 2004/08/06 19:07:13 mycroft Exp $
$NetBSD: pcmciadevs,v 1.204 2004/08/07 17:18:09 mycroft Exp $
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
/*-
@ -263,8 +263,10 @@ product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card
product LINKSYS2 IWN3 0x1613 Instant Wireless Network PC Card, Versin 3
product LINKSYS2 WCF11 0x3301 Instant Wireless Network CF Card
/* Lucent WaveLAN/IEEE */
product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE
/* Lucent */
product LUCENT HERMES 0x0002 Hermes
product LUCENT HERMES2 0x0003 Hermes II
product LUCENT HERMES25 0x0004 Hermes II.5
/* MACNICA */
product MACNICA ME1_JEIDA 0x3300 MACNICA ME1 for JEIDA