diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:50 -0500 |
commit | 4853ac05cff7745979830c52fe6fb46a7be6fa94 (patch) | |
tree | 3ac45cd8a9aaaee0c0de0cb50db78ba62844bbed /drivers/staging/ath6kl/include/wmi_api.h | |
parent | ab3655dae4948a82a3be52681af0b778ead2c0ff (diff) |
staging: ath6kl: Convert A_UINT16 to u16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/include/wmi_api.h')
-rw-r--r-- | drivers/staging/ath6kl/include/wmi_api.h | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h index 3f622100e9b..a0310b66106 100644 --- a/drivers/staging/ath6kl/include/wmi_api.h +++ b/drivers/staging/ath6kl/include/wmi_api.h | |||
@@ -69,7 +69,7 @@ void wmi_qos_state_init(struct wmi_t *wmip); | |||
69 | void wmi_shutdown(struct wmi_t *wmip); | 69 | void wmi_shutdown(struct wmi_t *wmip); |
70 | HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip); | 70 | HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip); |
71 | void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid); | 71 | void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid); |
72 | A_UINT16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 ); | 72 | u16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 ); |
73 | int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf); | 73 | int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf); |
74 | int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, u8 msgType, bool bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,u8 metaVersion, void *pTxMetaS); | 74 | int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, u8 msgType, bool bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,u8 metaVersion, void *pTxMetaS); |
75 | int wmi_dot3_2_dix(void *osbuf); | 75 | int wmi_dot3_2_dix(void *osbuf); |
@@ -113,46 +113,46 @@ int wmi_connect_cmd(struct wmi_t *wmip, | |||
113 | int ssidLength, | 113 | int ssidLength, |
114 | A_UCHAR *ssid, | 114 | A_UCHAR *ssid, |
115 | u8 *bssid, | 115 | u8 *bssid, |
116 | A_UINT16 channel, | 116 | u16 channel, |
117 | A_UINT32 ctrl_flags); | 117 | A_UINT32 ctrl_flags); |
118 | 118 | ||
119 | int wmi_reconnect_cmd(struct wmi_t *wmip, | 119 | int wmi_reconnect_cmd(struct wmi_t *wmip, |
120 | u8 *bssid, | 120 | u8 *bssid, |
121 | A_UINT16 channel); | 121 | u16 channel); |
122 | int wmi_disconnect_cmd(struct wmi_t *wmip); | 122 | int wmi_disconnect_cmd(struct wmi_t *wmip); |
123 | int wmi_getrev_cmd(struct wmi_t *wmip); | 123 | int wmi_getrev_cmd(struct wmi_t *wmip); |
124 | int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, | 124 | int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, |
125 | u32 forceFgScan, u32 isLegacy, | 125 | u32 forceFgScan, u32 isLegacy, |
126 | A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, | 126 | A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, |
127 | A_INT8 numChan, A_UINT16 *channelList); | 127 | A_INT8 numChan, u16 *channelList); |
128 | int wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, | 128 | int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec, |
129 | A_UINT16 fg_end_sec, A_UINT16 bg_sec, | 129 | u16 fg_end_sec, u16 bg_sec, |
130 | A_UINT16 minact_chdw_msec, | 130 | u16 minact_chdw_msec, |
131 | A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec, | 131 | u16 maxact_chdw_msec, u16 pas_chdw_msec, |
132 | u8 shScanRatio, u8 scanCtrlFlags, | 132 | u8 shScanRatio, u8 scanCtrlFlags, |
133 | A_UINT32 max_dfsch_act_time, | 133 | A_UINT32 max_dfsch_act_time, |
134 | A_UINT16 maxact_scan_per_ssid); | 134 | u16 maxact_scan_per_ssid); |
135 | int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask); | 135 | int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask); |
136 | int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, | 136 | int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, |
137 | u8 ssidLength, A_UCHAR *ssid); | 137 | u8 ssidLength, A_UCHAR *ssid); |
138 | int wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons); | 138 | int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons); |
139 | int wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons); | 139 | int wmi_bmisstime_cmd(struct wmi_t *wmip, u16 bmisstime, u16 bmissbeacons); |
140 | int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType, | 140 | int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType, |
141 | u8 ieLen, u8 *ieInfo); | 141 | u8 ieLen, u8 *ieInfo); |
142 | int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode); | 142 | int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode); |
143 | int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, | 143 | int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, |
144 | A_UINT16 atim_windows, A_UINT16 timeout_value); | 144 | u16 atim_windows, u16 timeout_value); |
145 | int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time, | 145 | int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time, |
146 | A_UINT32 ps_period, u8 sleep_period); | 146 | A_UINT32 ps_period, u8 sleep_period); |
147 | int wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, | 147 | int wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod, |
148 | A_UINT16 psPollNum, A_UINT16 dtimPolicy, | 148 | u16 psPollNum, u16 dtimPolicy, |
149 | A_UINT16 wakup_tx_policy, A_UINT16 num_tx_to_wakeup, | 149 | u16 wakup_tx_policy, u16 num_tx_to_wakeup, |
150 | A_UINT16 ps_fail_event_policy); | 150 | u16 ps_fail_event_policy); |
151 | int wmi_disctimeout_cmd(struct wmi_t *wmip, u8 timeout); | 151 | int wmi_disctimeout_cmd(struct wmi_t *wmip, u8 timeout); |
152 | int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber); | 152 | int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber); |
153 | int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); | 153 | int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); |
154 | int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID); | 154 | int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID); |
155 | int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, A_UINT16 rateMask); | 155 | int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask); |
156 | int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate); | 156 | int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate); |
157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); | 157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); |
158 | A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx); | 158 | A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx); |
@@ -160,7 +160,7 @@ int wmi_get_regDomain_cmd(struct wmi_t *wmip); | |||
160 | int wmi_get_channelList_cmd(struct wmi_t *wmip); | 160 | int wmi_get_channelList_cmd(struct wmi_t *wmip); |
161 | int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, | 161 | int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, |
162 | WMI_PHY_MODE mode, A_INT8 numChan, | 162 | WMI_PHY_MODE mode, A_INT8 numChan, |
163 | A_UINT16 *channelList); | 163 | u16 *channelList); |
164 | 164 | ||
165 | int wmi_set_snr_threshold_params(struct wmi_t *wmip, | 165 | int wmi_set_snr_threshold_params(struct wmi_t *wmip, |
166 | WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); | 166 | WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); |
@@ -169,7 +169,7 @@ int wmi_set_rssi_threshold_params(struct wmi_t *wmip, | |||
169 | int wmi_clr_rssi_snr(struct wmi_t *wmip); | 169 | int wmi_clr_rssi_snr(struct wmi_t *wmip); |
170 | int wmi_set_lq_threshold_params(struct wmi_t *wmip, | 170 | int wmi_set_lq_threshold_params(struct wmi_t *wmip, |
171 | WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd); | 171 | WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd); |
172 | int wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold); | 172 | int wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold); |
173 | int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy); | 173 | int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy); |
174 | 174 | ||
175 | int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); | 175 | int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); |
@@ -177,8 +177,8 @@ int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); | |||
177 | int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, | 177 | int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, |
178 | A_UINT32 source); | 178 | A_UINT32 source); |
179 | 179 | ||
180 | int wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, | 180 | int wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask, |
181 | A_UINT16 tsr, bool rep, A_UINT16 size, | 181 | u16 tsr, bool rep, u16 size, |
182 | A_UINT32 valid); | 182 | A_UINT32 valid); |
183 | 183 | ||
184 | int wmi_get_stats_cmd(struct wmi_t *wmip); | 184 | int wmi_get_stats_cmd(struct wmi_t *wmip); |
@@ -204,7 +204,7 @@ int wmi_deleteBadAp_cmd(struct wmi_t *wmip, u8 apIndex); | |||
204 | int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en); | 204 | int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en); |
205 | int wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, | 205 | int wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, |
206 | bool set); | 206 | bool set); |
207 | int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, A_UINT16 txop, | 207 | int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, u16 txop, |
208 | u8 eCWmin, u8 eCWmax, | 208 | u8 eCWmin, u8 eCWmax, |
209 | u8 aifsn); | 209 | u8 aifsn); |
210 | int wmi_set_retry_limits_cmd(struct wmi_t *wmip, u8 frameType, | 210 | int wmi_set_retry_limits_cmd(struct wmi_t *wmip, u8 frameType, |
@@ -226,11 +226,11 @@ int wmi_opt_tx_frame_cmd(struct wmi_t *wmip, | |||
226 | u8 frmType, | 226 | u8 frmType, |
227 | u8 *dstMacAddr, | 227 | u8 *dstMacAddr, |
228 | u8 *bssid, | 228 | u8 *bssid, |
229 | A_UINT16 optIEDataLen, | 229 | u16 optIEDataLen, |
230 | u8 *optIEData); | 230 | u8 *optIEData); |
231 | 231 | ||
232 | int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl); | 232 | int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, u16 intvl); |
233 | int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize); | 233 | int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, u16 voicePktSize); |
234 | int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, u8 maxSpLen); | 234 | int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, u8 maxSpLen); |
235 | u8 convert_userPriority_to_trafficClass(u8 userPriority); | 235 | u8 convert_userPriority_to_trafficClass(u8 userPriority); |
236 | u8 wmi_get_power_mode_cmd(struct wmi_t *wmip); | 236 | u8 wmi_get_power_mode_cmd(struct wmi_t *wmip); |
@@ -293,7 +293,7 @@ int wmi_set_keepalive_cmd(struct wmi_t *wmip, u8 keepaliveInterval); | |||
293 | int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, | 293 | int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, |
294 | u8 ieLen,u8 *ieInfo); | 294 | u8 ieLen,u8 *ieInfo); |
295 | 295 | ||
296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, A_UINT16 dataLen); | 296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); |
297 | 297 | ||
298 | A_INT32 wmi_get_rate(A_INT8 rateindex); | 298 | A_INT32 wmi_get_rate(A_INT8 rateindex); |
299 | 299 | ||
@@ -371,10 +371,10 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *a); | |||
371 | u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl); | 371 | u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl); |
372 | 372 | ||
373 | int | 373 | int |
374 | wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, A_UINT16 reason); | 374 | wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, u16 reason); |
375 | 375 | ||
376 | int | 376 | int |
377 | wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, bool flag); | 377 | wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag); |
378 | 378 | ||
379 | int | 379 | int |
380 | wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); | 380 | wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); |
@@ -395,7 +395,7 @@ int | |||
395 | wmi_set_ht_op_cmd(struct wmi_t *wmip, u8 sta_chan_width); | 395 | wmi_set_ht_op_cmd(struct wmi_t *wmip, u8 sta_chan_width); |
396 | 396 | ||
397 | int | 397 | int |
398 | wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz); | 398 | wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz); |
399 | 399 | ||
400 | int | 400 | int |
401 | wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); | 401 | wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); |
@@ -407,7 +407,7 @@ int | |||
407 | wmi_delete_aggr_cmd(struct wmi_t *wmip, u8 tid, bool uplink); | 407 | wmi_delete_aggr_cmd(struct wmi_t *wmip, u8 tid, bool uplink); |
408 | 408 | ||
409 | int | 409 | int |
410 | wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask); | 410 | wmi_allow_aggr_cmd(struct wmi_t *wmip, u16 tx_tidmask, u16 rx_tidmask); |
411 | 411 | ||
412 | int | 412 | int |
413 | wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, bool rxDot11Hdr, bool defragOnHost); | 413 | wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, bool rxDot11Hdr, bool defragOnHost); |
@@ -421,11 +421,10 @@ wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE pre | |||
421 | int | 421 | int |
422 | wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk); | 422 | wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk); |
423 | 423 | ||
424 | A_UINT16 | 424 | u16 wmi_ieee2freq (int chan); |
425 | wmi_ieee2freq (int chan); | ||
426 | 425 | ||
427 | A_UINT32 | 426 | A_UINT32 |
428 | wmi_freq2ieee (A_UINT16 freq); | 427 | wmi_freq2ieee (u16 freq); |
429 | 428 | ||
430 | bss_t * | 429 | bss_t * |
431 | wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, | 430 | wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, |