diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-06 20:31:57 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-06 20:31:57 +0000 |
| commit | 1ffd2dd0212e07660e093e5bb0ea41c1d79ba481 (patch) | |
| tree | 67ff5176a31fb981583028fdc695a3a4a6dff8e0 /sys/dev/ic/if_wivar.h | |
| parent | 67857a500302b2ff61b461cb9b125bdb6415d074 (diff) | |
Add support for Symbol cards and printing of the primary station
firmware version. Adapted from NetBSD and the Linux orinoco driver.
The Symbol firmware requires that we do a COR soft reset before
initializing the card in wi_reset(). Also, setting WI_RID_ROAMING_MODE
caused the Symbol card to go into a strange (non-working) mode with
firmware 2.x.x.
There are some other Symbol additions/oddities that will need to be
addressed in the future.
Diffstat (limited to 'sys/dev/ic/if_wivar.h')
| -rw-r--r-- | sys/dev/ic/if_wivar.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h index 309bbf750ab..73a54871165 100644 --- a/sys/dev/ic/if_wivar.h +++ b/sys/dev/ic/if_wivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wivar.h,v 1.6 2002/03/28 18:21:06 mickey Exp $ */ +/* $OpenBSD: if_wivar.h,v 1.7 2002/04/06 20:31:56 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -44,6 +44,9 @@ struct wi_softc { struct ifmedia sc_media; bus_space_handle_t wi_bhandle; bus_space_tag_t wi_btag; + bus_space_handle_t wi_lhandle; + bus_space_tag_t wi_ltag; + bus_size_t wi_cor_offset; int wi_tx_data_id; int wi_tx_mgmt_id; int wi_gone; @@ -77,14 +80,19 @@ struct wi_softc { void *sc_ih; struct timeout sc_timo; int sc_enabled; - int sc_prism2; - int sc_prism2_ver; + int sc_firmware_type; + int sc_sta_firmware_ver; int sc_pci; struct wihap_info wi_hostap_info; u_int32_t wi_icv; int wi_icv_flag; }; +/* Firmware types */ +#define WI_LUCENT 0 +#define WI_INTERSIL 1 +#define WI_SYMBOL 2 + #define WI_PRT_FMT "%s" #define WI_PRT_ARG(sc) (sc)->sc_dev.dv_xname |