diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_init.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_init.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_init.c b/drivers/net/wireless/wl12xx/wl1251_init.c index 0929461a6d3..df6c60f0fd6 100644 --- a/drivers/net/wireless/wl12xx/wl1251_init.c +++ b/drivers/net/wireless/wl12xx/wl1251_init.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * This file is part of wl12xx | 2 | * This file is part of wl1251 |
3 | * | 3 | * |
4 | * Copyright (C) 2009 Nokia Corporation | 4 | * Copyright (C) 2009 Nokia Corporation |
5 | * | 5 | * |
@@ -29,59 +29,59 @@ | |||
29 | #include "wl1251_acx.h" | 29 | #include "wl1251_acx.h" |
30 | #include "wl1251_cmd.h" | 30 | #include "wl1251_cmd.h" |
31 | 31 | ||
32 | int wl12xx_hw_init_hwenc_config(struct wl12xx *wl) | 32 | int wl1251_hw_init_hwenc_config(struct wl1251 *wl) |
33 | { | 33 | { |
34 | int ret; | 34 | int ret; |
35 | 35 | ||
36 | ret = wl12xx_acx_feature_cfg(wl); | 36 | ret = wl1251_acx_feature_cfg(wl); |
37 | if (ret < 0) { | 37 | if (ret < 0) { |
38 | wl12xx_warning("couldn't set feature config"); | 38 | wl1251_warning("couldn't set feature config"); |
39 | return ret; | 39 | return ret; |
40 | } | 40 | } |
41 | 41 | ||
42 | ret = wl12xx_acx_default_key(wl, wl->default_key); | 42 | ret = wl1251_acx_default_key(wl, wl->default_key); |
43 | if (ret < 0) { | 43 | if (ret < 0) { |
44 | wl12xx_warning("couldn't set default key"); | 44 | wl1251_warning("couldn't set default key"); |
45 | return ret; | 45 | return ret; |
46 | } | 46 | } |
47 | 47 | ||
48 | return 0; | 48 | return 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | int wl12xx_hw_init_templates_config(struct wl12xx *wl) | 51 | int wl1251_hw_init_templates_config(struct wl1251 *wl) |
52 | { | 52 | { |
53 | int ret; | 53 | int ret; |
54 | u8 partial_vbm[PARTIAL_VBM_MAX]; | 54 | u8 partial_vbm[PARTIAL_VBM_MAX]; |
55 | 55 | ||
56 | /* send empty templates for fw memory reservation */ | 56 | /* send empty templates for fw memory reservation */ |
57 | ret = wl12xx_cmd_template_set(wl, CMD_PROBE_REQ, NULL, | 57 | ret = wl1251_cmd_template_set(wl, CMD_PROBE_REQ, NULL, |
58 | sizeof(struct wl12xx_probe_req_template)); | 58 | sizeof(struct wl12xx_probe_req_template)); |
59 | if (ret < 0) | 59 | if (ret < 0) |
60 | return ret; | 60 | return ret; |
61 | 61 | ||
62 | ret = wl12xx_cmd_template_set(wl, CMD_NULL_DATA, NULL, | 62 | ret = wl1251_cmd_template_set(wl, CMD_NULL_DATA, NULL, |
63 | sizeof(struct wl12xx_null_data_template)); | 63 | sizeof(struct wl12xx_null_data_template)); |
64 | if (ret < 0) | 64 | if (ret < 0) |
65 | return ret; | 65 | return ret; |
66 | 66 | ||
67 | ret = wl12xx_cmd_template_set(wl, CMD_PS_POLL, NULL, | 67 | ret = wl1251_cmd_template_set(wl, CMD_PS_POLL, NULL, |
68 | sizeof(struct wl12xx_ps_poll_template)); | 68 | sizeof(struct wl12xx_ps_poll_template)); |
69 | if (ret < 0) | 69 | if (ret < 0) |
70 | return ret; | 70 | return ret; |
71 | 71 | ||
72 | ret = wl12xx_cmd_template_set(wl, CMD_QOS_NULL_DATA, NULL, | 72 | ret = wl1251_cmd_template_set(wl, CMD_QOS_NULL_DATA, NULL, |
73 | sizeof | 73 | sizeof |
74 | (struct wl12xx_qos_null_data_template)); | 74 | (struct wl12xx_qos_null_data_template)); |
75 | if (ret < 0) | 75 | if (ret < 0) |
76 | return ret; | 76 | return ret; |
77 | 77 | ||
78 | ret = wl12xx_cmd_template_set(wl, CMD_PROBE_RESP, NULL, | 78 | ret = wl1251_cmd_template_set(wl, CMD_PROBE_RESP, NULL, |
79 | sizeof | 79 | sizeof |
80 | (struct wl12xx_probe_resp_template)); | 80 | (struct wl12xx_probe_resp_template)); |
81 | if (ret < 0) | 81 | if (ret < 0) |
82 | return ret; | 82 | return ret; |
83 | 83 | ||
84 | ret = wl12xx_cmd_template_set(wl, CMD_BEACON, NULL, | 84 | ret = wl1251_cmd_template_set(wl, CMD_BEACON, NULL, |
85 | sizeof | 85 | sizeof |
86 | (struct wl12xx_beacon_template)); | 86 | (struct wl12xx_beacon_template)); |
87 | if (ret < 0) | 87 | if (ret < 0) |
@@ -89,112 +89,112 @@ int wl12xx_hw_init_templates_config(struct wl12xx *wl) | |||
89 | 89 | ||
90 | /* tim templates, first reserve space then allocate an empty one */ | 90 | /* tim templates, first reserve space then allocate an empty one */ |
91 | memset(partial_vbm, 0, PARTIAL_VBM_MAX); | 91 | memset(partial_vbm, 0, PARTIAL_VBM_MAX); |
92 | ret = wl12xx_cmd_vbm(wl, TIM_ELE_ID, partial_vbm, PARTIAL_VBM_MAX, 0); | 92 | ret = wl1251_cmd_vbm(wl, TIM_ELE_ID, partial_vbm, PARTIAL_VBM_MAX, 0); |
93 | if (ret < 0) | 93 | if (ret < 0) |
94 | return ret; | 94 | return ret; |
95 | 95 | ||
96 | ret = wl12xx_cmd_vbm(wl, TIM_ELE_ID, partial_vbm, 1, 0); | 96 | ret = wl1251_cmd_vbm(wl, TIM_ELE_ID, partial_vbm, 1, 0); |
97 | if (ret < 0) | 97 | if (ret < 0) |
98 | return ret; | 98 | return ret; |
99 | 99 | ||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | int wl12xx_hw_init_rx_config(struct wl12xx *wl, u32 config, u32 filter) | 103 | int wl1251_hw_init_rx_config(struct wl1251 *wl, u32 config, u32 filter) |
104 | { | 104 | { |
105 | int ret; | 105 | int ret; |
106 | 106 | ||
107 | ret = wl12xx_acx_rx_msdu_life_time(wl, RX_MSDU_LIFETIME_DEF); | 107 | ret = wl1251_acx_rx_msdu_life_time(wl, RX_MSDU_LIFETIME_DEF); |
108 | if (ret < 0) | 108 | if (ret < 0) |
109 | return ret; | 109 | return ret; |
110 | 110 | ||
111 | ret = wl12xx_acx_rx_config(wl, config, filter); | 111 | ret = wl1251_acx_rx_config(wl, config, filter); |
112 | if (ret < 0) | 112 | if (ret < 0) |
113 | return ret; | 113 | return ret; |
114 | 114 | ||
115 | return 0; | 115 | return 0; |
116 | } | 116 | } |
117 | 117 | ||
118 | int wl12xx_hw_init_phy_config(struct wl12xx *wl) | 118 | int wl1251_hw_init_phy_config(struct wl1251 *wl) |
119 | { | 119 | { |
120 | int ret; | 120 | int ret; |
121 | 121 | ||
122 | ret = wl12xx_acx_pd_threshold(wl); | 122 | ret = wl1251_acx_pd_threshold(wl); |
123 | if (ret < 0) | 123 | if (ret < 0) |
124 | return ret; | 124 | return ret; |
125 | 125 | ||
126 | ret = wl12xx_acx_slot(wl, DEFAULT_SLOT_TIME); | 126 | ret = wl1251_acx_slot(wl, DEFAULT_SLOT_TIME); |
127 | if (ret < 0) | 127 | if (ret < 0) |
128 | return ret; | 128 | return ret; |
129 | 129 | ||
130 | ret = wl12xx_acx_group_address_tbl(wl); | 130 | ret = wl1251_acx_group_address_tbl(wl); |
131 | if (ret < 0) | 131 | if (ret < 0) |
132 | return ret; | 132 | return ret; |
133 | 133 | ||
134 | ret = wl12xx_acx_service_period_timeout(wl); | 134 | ret = wl1251_acx_service_period_timeout(wl); |
135 | if (ret < 0) | 135 | if (ret < 0) |
136 | return ret; | 136 | return ret; |
137 | 137 | ||
138 | ret = wl12xx_acx_rts_threshold(wl, RTS_THRESHOLD_DEF); | 138 | ret = wl1251_acx_rts_threshold(wl, RTS_THRESHOLD_DEF); |
139 | if (ret < 0) | 139 | if (ret < 0) |
140 | return ret; | 140 | return ret; |
141 | 141 | ||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | int wl12xx_hw_init_beacon_filter(struct wl12xx *wl) | 145 | int wl1251_hw_init_beacon_filter(struct wl1251 *wl) |
146 | { | 146 | { |
147 | int ret; | 147 | int ret; |
148 | 148 | ||
149 | ret = wl12xx_acx_beacon_filter_opt(wl); | 149 | ret = wl1251_acx_beacon_filter_opt(wl); |
150 | if (ret < 0) | 150 | if (ret < 0) |
151 | return ret; | 151 | return ret; |
152 | 152 | ||
153 | ret = wl12xx_acx_beacon_filter_table(wl); | 153 | ret = wl1251_acx_beacon_filter_table(wl); |
154 | if (ret < 0) | 154 | if (ret < 0) |
155 | return ret; | 155 | return ret; |
156 | 156 | ||
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | 159 | ||
160 | int wl12xx_hw_init_pta(struct wl12xx *wl) | 160 | int wl1251_hw_init_pta(struct wl1251 *wl) |
161 | { | 161 | { |
162 | int ret; | 162 | int ret; |
163 | 163 | ||
164 | ret = wl12xx_acx_sg_enable(wl); | 164 | ret = wl1251_acx_sg_enable(wl); |
165 | if (ret < 0) | 165 | if (ret < 0) |
166 | return ret; | 166 | return ret; |
167 | 167 | ||
168 | ret = wl12xx_acx_sg_cfg(wl); | 168 | ret = wl1251_acx_sg_cfg(wl); |
169 | if (ret < 0) | 169 | if (ret < 0) |
170 | return ret; | 170 | return ret; |
171 | 171 | ||
172 | return 0; | 172 | return 0; |
173 | } | 173 | } |
174 | 174 | ||
175 | int wl12xx_hw_init_energy_detection(struct wl12xx *wl) | 175 | int wl1251_hw_init_energy_detection(struct wl1251 *wl) |
176 | { | 176 | { |
177 | int ret; | 177 | int ret; |
178 | 178 | ||
179 | ret = wl12xx_acx_cca_threshold(wl); | 179 | ret = wl1251_acx_cca_threshold(wl); |
180 | if (ret < 0) | 180 | if (ret < 0) |
181 | return ret; | 181 | return ret; |
182 | 182 | ||
183 | return 0; | 183 | return 0; |
184 | } | 184 | } |
185 | 185 | ||
186 | int wl12xx_hw_init_beacon_broadcast(struct wl12xx *wl) | 186 | int wl1251_hw_init_beacon_broadcast(struct wl1251 *wl) |
187 | { | 187 | { |
188 | int ret; | 188 | int ret; |
189 | 189 | ||
190 | ret = wl12xx_acx_bcn_dtim_options(wl); | 190 | ret = wl1251_acx_bcn_dtim_options(wl); |
191 | if (ret < 0) | 191 | if (ret < 0) |
192 | return ret; | 192 | return ret; |
193 | 193 | ||
194 | return 0; | 194 | return 0; |
195 | } | 195 | } |
196 | 196 | ||
197 | int wl12xx_hw_init_power_auth(struct wl12xx *wl) | 197 | int wl1251_hw_init_power_auth(struct wl1251 *wl) |
198 | { | 198 | { |
199 | return wl12xx_acx_sleep_auth(wl, WL12XX_PSM_CAM); | 199 | return wl1251_acx_sleep_auth(wl, WL1251_PSM_CAM); |
200 | } | 200 | } |