diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-07 05:07:28 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-07 05:07:28 +0000 |
| commit | 3cd9cb1f4039c16901d06b552c6f999ff874271e (patch) | |
| tree | 7c8f0b29f8c71e4d266c9e62705b94b657904bbd | |
| parent | 077c1e2a35cb5ed0db45c780c7b78f2353fd29f7 (diff) | |
no, definately *wi.* does not work here
| -rw-r--r-- | sys/dev/ic/if_wireg.h | 25 | ||||
| -rw-r--r-- | sys/dev/ic/if_wivar.h | 7 |
2 files changed, 30 insertions, 2 deletions
diff --git a/sys/dev/ic/if_wireg.h b/sys/dev/ic/if_wireg.h index 811b0be7946..1f414993b4c 100644 --- a/sys/dev/ic/if_wireg.h +++ b/sys/dev/ic/if_wireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wireg.h,v 1.2 2001/06/06 18:53:50 millert Exp $ */ +/* $OpenBSD: if_wireg.h,v 1.3 2001/06/07 05:07:27 mickey Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -70,6 +70,10 @@ #define WI_DEFAULT_CHAN 3 +#define WI_DEFAULT_ROAMING 1 + +#define WI_DEFAULT_AUTHTYPE 1 + /* * register space access macros */ @@ -321,6 +325,25 @@ struct wi_ltv_memsz { }; /* + * NIC Identification (0xFD0B) + */ +#define WI_RID_CARDID 0xFD0B +#define WI_RID_IDENT 0xFD20 +struct wi_ltv_ver { + u_int16_t wi_len; + u_int16_t wi_type; + u_int16_t wi_ver[4]; +#define WI_NIC_EVB2 0x8000 +#define WI_NIC_HWB3763 0x8001 +#define WI_NIC_HWB3163 0x8002 +#define WI_NIC_HWB3163B 0x8003 +#define WI_NIC_EVB3 0x8004 +#define WI_NIC_HWB1153 0x8007 +#define WI_NIC_P2_SST 0x8008 /* Prism2 with SST flush */ +#define WI_NIC_PRISM2_5 0x800C +}; + +/* * List of intended regulatory domains (0xFD11). */ #define WI_RID_DOMAINS 0xFD11 diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h index fbd36ef22c1..24fa2317de1 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.1 2001/05/15 02:40:36 millert Exp $ */ +/* $OpenBSD: if_wivar.h,v 1.2 2001/06/07 05:07:27 mickey Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -56,9 +56,13 @@ struct wi_softc { u_int16_t wi_channel; u_int16_t wi_pm_enabled; u_int16_t wi_max_sleep; + u_int16_t wi_authtype; + u_int16_t wi_roaming; + char wi_node_name[32]; char wi_net_name[32]; char wi_ibss_name[32]; + u_int8_t wi_txbuf[1596]; int wi_has_wep; int wi_use_wep; @@ -68,6 +72,7 @@ struct wi_softc { void *sc_ih; struct timeout sc_timo; int sc_prism2; + int sc_prism2_ver; }; #define WI_PRT_FMT "%s" |