Deleted Added
sdiff udiff text old ( 50477 ) new ( 53702 )
full compact
if_wireg.h (50477) if_wireg.h (53702)
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/dev/wi/if_wireg.h 50477 1999-08-28 01:08:13Z peter $
32 * $FreeBSD: head/sys/dev/wi/if_wireg.h 53702 1999-11-25 20:45:49Z wpaul $
33 */
34
35struct wi_counters {
36 u_int32_t wi_tx_unicast_frames;
37 u_int32_t wi_tx_multicast_frames;
38 u_int32_t wi_tx_fragments;
39 u_int32_t wi_tx_unicast_octets;
40 u_int32_t wi_tx_multicast_octets;

--- 13 unchanged lines hidden (view full) ---

54 u_int32_t wi_rx_WEP_cant_decrypt;
55 u_int32_t wi_rx_msg_in_msg_frags;
56 u_int32_t wi_rx_msg_in_bad_msg_frags;
57};
58
59struct wi_softc {
60 struct arpcom arpcom;
61 struct ifmedia ifmedia;
33 */
34
35struct wi_counters {
36 u_int32_t wi_tx_unicast_frames;
37 u_int32_t wi_tx_multicast_frames;
38 u_int32_t wi_tx_fragments;
39 u_int32_t wi_tx_unicast_octets;
40 u_int32_t wi_tx_multicast_octets;

--- 13 unchanged lines hidden (view full) ---

54 u_int32_t wi_rx_WEP_cant_decrypt;
55 u_int32_t wi_rx_msg_in_msg_frags;
56 u_int32_t wi_rx_msg_in_bad_msg_frags;
57};
58
59struct wi_softc {
60 struct arpcom arpcom;
61 struct ifmedia ifmedia;
62 device_t dev;
62 int wi_unit;
63 int wi_unit;
64 struct resource * iobase;
65 struct resource * irq;
63 bus_space_handle_t wi_bhandle;
64 bus_space_tag_t wi_btag;
66 bus_space_handle_t wi_bhandle;
67 bus_space_tag_t wi_btag;
68 void * wi_intrhand;
69 int wi_io_addr;
65 int wi_tx_data_id;
66 int wi_tx_mgmt_id;
67 int wi_gone;
68 int wi_if_flags;
69 u_int16_t wi_ptype;
70 u_int16_t wi_portnum;
71 u_int16_t wi_max_data_len;
72 u_int16_t wi_rts_thresh;
73 u_int16_t wi_ap_density;
74 u_int16_t wi_tx_rate;
75 u_int16_t wi_create_ibss;
76 u_int16_t wi_channel;
77 u_int16_t wi_pm_enabled;
78 u_int16_t wi_max_sleep;
79 char wi_node_name[32];
80 char wi_net_name[32];
81 char wi_ibss_name[32];
82 u_int8_t wi_txbuf[1536];
83 struct wi_counters wi_stats;
70 int wi_tx_data_id;
71 int wi_tx_mgmt_id;
72 int wi_gone;
73 int wi_if_flags;
74 u_int16_t wi_ptype;
75 u_int16_t wi_portnum;
76 u_int16_t wi_max_data_len;
77 u_int16_t wi_rts_thresh;
78 u_int16_t wi_ap_density;
79 u_int16_t wi_tx_rate;
80 u_int16_t wi_create_ibss;
81 u_int16_t wi_channel;
82 u_int16_t wi_pm_enabled;
83 u_int16_t wi_max_sleep;
84 char wi_node_name[32];
85 char wi_net_name[32];
86 char wi_ibss_name[32];
87 u_int8_t wi_txbuf[1536];
88 struct wi_counters wi_stats;
89#ifdef WICACHE
90 int wi_sigitems;
91 struct wi_sigcache wi_sigcache[MAXWICACHE];
92 int wi_nextitem;
93#endif
84 struct callout_handle wi_stat_ch;
85};
86
87#define WI_TIMEOUT 65536
88
89#define WI_PORT0 0
90#define WI_PORT1 1
91#define WI_PORT2 2
92#define WI_PORT3 3
93#define WI_PORT4 4
94#define WI_PORT5 5
95
96/* Default port: 0 (only 0 exists on stations) */
97#define WI_DEFAULT_PORT (WI_PORT0 << 8)
98
99/* Default TX rate: 2Mbps, auto fallback */
100#define WI_DEFAULT_TX_RATE 3
101
94 struct callout_handle wi_stat_ch;
95};
96
97#define WI_TIMEOUT 65536
98
99#define WI_PORT0 0
100#define WI_PORT1 1
101#define WI_PORT2 2
102#define WI_PORT3 3
103#define WI_PORT4 4
104#define WI_PORT5 5
105
106/* Default port: 0 (only 0 exists on stations) */
107#define WI_DEFAULT_PORT (WI_PORT0 << 8)
108
109/* Default TX rate: 2Mbps, auto fallback */
110#define WI_DEFAULT_TX_RATE 3
111
102/* Default network name: ANY */
103#define WI_DEFAULT_NETNAME "ANY"
112/* Default network name: empty string implies any */
113#define WI_DEFAULT_NETNAME ""
104
105#define WI_DEFAULT_AP_DENSITY 1
106
107#define WI_DEFAULT_RTS_THRESH 2347
108
109#define WI_DEFAULT_DATALEN 2304
110
111#define WI_DEFAULT_CREATE_IBSS 0

--- 490 unchanged lines hidden --- 		114
115#define WI_DEFAULT_AP_DENSITY 1
116
117#define WI_DEFAULT_RTS_THRESH 2347
118
119#define WI_DEFAULT_DATALEN 2304
120
121#define WI_DEFAULT_CREATE_IBSS 0

--- 490 unchanged lines hidden ---