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

Make the inclusion of the spectrum24t firmware a config option, default 

to enabled.
This commit is contained in:
dsl 2006-11-25 17:52:57 +00:00
parent 9f1ff68ee1
commit f26a3ca423
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pcmcia/files.pcmcia
View File

@ -1,4 +1,4 @@
# $NetBSD: files.pcmcia,v 1.52 2006/10/24 20:54:10 drochner Exp $
# $NetBSD: files.pcmcia,v 1.53 2006/11/25 17:52:57 dsl Exp $
#
# Config.new file and device description for machine-independent PCMCIA code.
# Included by ports that need it.
@ -96,6 +96,8 @@ file dev/pcmcia/if_awi_pcmcia.c awi_pcmcia
# Lucent & Intersil WaveLan IEEE (802.11)
attach wi at pcmcia with wi_pcmcia
file dev/pcmcia/if_wi_pcmcia.c wi_pcmcia
# The spectrun24t firmware for symbol LA4100 cards is 70k, allow its exclusion
defparam opt_if_wi_pcmcia.h WI_PCMCIA_SPECTRUM24T_FW=1
# Xircom Ethernet and Ethernet+Modem cards
device xirc { }

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

@ -1,4 +1,4 @@
/* $NetBSD: if_wi_pcmcia.c,v 1.72 2006/11/16 01:33:20 christos Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.73 2006/11/25 17:52:57 dsl Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.72 2006/11/16 01:33:20 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.73 2006/11/25 17:52:57 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,7 +71,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.72 2006/11/16 01:33:20 christos E
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciadevs.h>
#include <opt_if_wi_pcmcia.h>
#if WI_PCMCIA_SPECTRUM24T_FW
#include <dev/microcode/wi/spectrum24t_cf.h>
#endif
static int wi_pcmcia_match(struct device *, struct cfdata *, void *);
static int wi_pcmcia_validate_config(struct pcmcia_config_entry *);
@ -82,10 +86,12 @@ static void wi_pcmcia_disable(struct wi_softc *);
static void wi_pcmcia_powerhook(int, void *);
static void wi_pcmcia_shutdown(void *);
#if WI_PCMCIA_SPECTRUM24T_FW
/* support to download firmware for symbol CF card */
static int wi_pcmcia_load_firm(struct wi_softc *, const void *, int, const void *, int);
static int wi_pcmcia_write_firm(struct wi_softc *, const void *, int, const void *, int);
static int wi_pcmcia_set_hcr(struct wi_softc *, int);
#endif
struct wi_pcmcia_softc {
struct wi_softc sc_wi;
@ -284,6 +290,7 @@ wi_pcmcia_enable(sc)
}
if (psc->sc_symbol_cf) {
#if WI_PCMCIA_SPECTRUM24T_FW
if (wi_pcmcia_load_firm(sc,
spectrum24t_primsym, sizeof(spectrum24t_primsym),
spectrum24t_secsym, sizeof(spectrum24t_secsym))) {
@ -292,6 +299,11 @@ wi_pcmcia_enable(sc)
wi_pcmcia_disable(sc);
return (EIO);
}
#else
printf("%s: firmware load not configured\n",
sc->sc_dev.dv_xname);
return EIO;
#endif
}
DELAY(1000);
@ -443,6 +455,7 @@ wi_pcmcia_shutdown(arg)
#define GETLE32(p) ((p)[0] | ((p)[1]<<8) | ((p)[2]<<16) | ((p)[3]<<24))
#define GETLE16(p) ((p)[0] | ((p)[1]<<8))
#if WI_PCMCIA_SPECTRUM24T_FW
static int
wi_pcmcia_load_firm(sc, primsym, primlen, secsym, seclen)
struct wi_softc *sc;
@ -574,3 +587,4 @@ wi_pcmcia_set_hcr(sc, mode)
tsleep(sc, PWAIT, "wiinit", 1);
return 0;
}
#endif