diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:51 -0500 |
commit | f68057e6fab6943ea2c5867d8b72e4b08bef5f6e (patch) | |
tree | fbac4cd9aa9a4b9c04d3fd35209b524d5b07bd65 /drivers/staging/ath6kl/include | |
parent | cb1e370987c3651707e30e404e41ebdc83571fba (diff) |
staging: ath6kl: Convert A_INT32 to s32
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/include')
-rw-r--r-- | drivers/staging/ath6kl/include/common/testcmd.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/common/wmi.h | 12 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/common_drv.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/wmi_api.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h index 49861e2058f..3799b687498 100644 --- a/drivers/staging/ath6kl/include/common/testcmd.h +++ b/drivers/staging/ath6kl/include/common/testcmd.h | |||
@@ -86,7 +86,7 @@ typedef PREPACK struct { | |||
86 | u32 mode; | 86 | u32 mode; |
87 | u32 freq; | 87 | u32 freq; |
88 | u32 dataRate; | 88 | u32 dataRate; |
89 | A_INT32 txPwr; | 89 | s32 txPwr; |
90 | u32 antenna; | 90 | u32 antenna; |
91 | u32 enANI; | 91 | u32 enANI; |
92 | u32 scramblerOff; | 92 | u32 scramblerOff; |
@@ -135,7 +135,7 @@ typedef PREPACK struct { | |||
135 | } POSTPACK para; | 135 | } POSTPACK para; |
136 | struct PREPACK TCMD_CONT_RX_REPORT { | 136 | struct PREPACK TCMD_CONT_RX_REPORT { |
137 | u32 totalPkt; | 137 | u32 totalPkt; |
138 | A_INT32 rssiInDBm; | 138 | s32 rssiInDBm; |
139 | u32 crcErrPkt; | 139 | u32 crcErrPkt; |
140 | u32 secErrPkt; | 140 | u32 secErrPkt; |
141 | u16 rateCnt[TCMD_MAX_RATES]; | 141 | u16 rateCnt[TCMD_MAX_RATES]; |
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index 12ca0254e8e..a03b4371519 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h | |||
@@ -2155,7 +2155,7 @@ typedef PREPACK struct { | |||
2155 | * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new) | 2155 | * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new) |
2156 | */ | 2156 | */ |
2157 | typedef PREPACK struct { | 2157 | typedef PREPACK struct { |
2158 | A_INT32 status; | 2158 | s32 status; |
2159 | } POSTPACK WMI_SCAN_COMPLETE_EVENT; | 2159 | } POSTPACK WMI_SCAN_COMPLETE_EVENT; |
2160 | 2160 | ||
2161 | #define MAX_OPT_DATA_LEN 1400 | 2161 | #define MAX_OPT_DATA_LEN 1400 |
@@ -2233,7 +2233,7 @@ typedef PREPACK struct { | |||
2233 | u32 tx_retry_cnt; | 2233 | u32 tx_retry_cnt; |
2234 | u32 tx_mult_retry_cnt; | 2234 | u32 tx_mult_retry_cnt; |
2235 | u32 tx_rts_fail_cnt; | 2235 | u32 tx_rts_fail_cnt; |
2236 | A_INT32 tx_unicast_rate; | 2236 | s32 tx_unicast_rate; |
2237 | }POSTPACK tx_stats_t; | 2237 | }POSTPACK tx_stats_t; |
2238 | 2238 | ||
2239 | typedef PREPACK struct { | 2239 | typedef PREPACK struct { |
@@ -2252,7 +2252,7 @@ typedef PREPACK struct { | |||
2252 | u32 rx_key_cache_miss; | 2252 | u32 rx_key_cache_miss; |
2253 | u32 rx_decrypt_err; | 2253 | u32 rx_decrypt_err; |
2254 | u32 rx_duplicate_frames; | 2254 | u32 rx_duplicate_frames; |
2255 | A_INT32 rx_unicast_rate; | 2255 | s32 rx_unicast_rate; |
2256 | }POSTPACK rx_stats_t; | 2256 | }POSTPACK rx_stats_t; |
2257 | 2257 | ||
2258 | typedef PREPACK struct { | 2258 | typedef PREPACK struct { |
@@ -2306,7 +2306,7 @@ typedef PREPACK struct { | |||
2306 | 2306 | ||
2307 | typedef PREPACK struct { | 2307 | typedef PREPACK struct { |
2308 | u32 lqVal; | 2308 | u32 lqVal; |
2309 | A_INT32 noise_floor_calibation; | 2309 | s32 noise_floor_calibation; |
2310 | pm_stats_t pmStats; | 2310 | pm_stats_t pmStats; |
2311 | wlan_net_stats_t txrxStats; | 2311 | wlan_net_stats_t txrxStats; |
2312 | wlan_wow_stats_t wowStats; | 2312 | wlan_wow_stats_t wowStats; |
@@ -2388,7 +2388,7 @@ typedef enum{ | |||
2388 | } WMI_LQ_THRESHOLD_VAL; | 2388 | } WMI_LQ_THRESHOLD_VAL; |
2389 | 2389 | ||
2390 | typedef PREPACK struct { | 2390 | typedef PREPACK struct { |
2391 | A_INT32 lq; | 2391 | s32 lq; |
2392 | u8 range; /* WMI_LQ_THRESHOLD_VAL */ | 2392 | u8 range; /* WMI_LQ_THRESHOLD_VAL */ |
2393 | }POSTPACK WMI_LQ_THRESHOLD_EVENT; | 2393 | }POSTPACK WMI_LQ_THRESHOLD_EVENT; |
2394 | /* | 2394 | /* |
@@ -2397,7 +2397,7 @@ typedef PREPACK struct { | |||
2397 | #define MAX_ROAM_TBL_CAND 5 | 2397 | #define MAX_ROAM_TBL_CAND 5 |
2398 | 2398 | ||
2399 | typedef PREPACK struct { | 2399 | typedef PREPACK struct { |
2400 | A_INT32 roam_util; | 2400 | s32 roam_util; |
2401 | u8 bssid[ATH_MAC_LEN]; | 2401 | u8 bssid[ATH_MAC_LEN]; |
2402 | s8 rssi; | 2402 | s8 rssi; |
2403 | s8 rssidt; | 2403 | s8 rssidt; |
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h index f5152eb86c5..141b7efc571 100644 --- a/drivers/staging/ath6kl/include/common_drv.h +++ b/drivers/staging/ath6kl/include/common_drv.h | |||
@@ -37,7 +37,7 @@ typedef struct _COMMON_CREDIT_STATE_INFO { | |||
37 | } COMMON_CREDIT_STATE_INFO; | 37 | } COMMON_CREDIT_STATE_INFO; |
38 | 38 | ||
39 | typedef struct { | 39 | typedef struct { |
40 | A_INT32 (*setupTransport)(void *ar); | 40 | s32 (*setupTransport)(void *ar); |
41 | void (*cleanupTransport)(void *ar); | 41 | void (*cleanupTransport)(void *ar); |
42 | } HCI_TRANSPORT_CALLBACKS; | 42 | } HCI_TRANSPORT_CALLBACKS; |
43 | 43 | ||
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h index b34c1f9c667..e51440ad7b7 100644 --- a/drivers/staging/ath6kl/include/wmi_api.h +++ b/drivers/staging/ath6kl/include/wmi_api.h | |||
@@ -153,9 +153,9 @@ 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, u16 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, s32 dataRate, s32 mgmtRate, s32 ctlRate); |
157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); | 157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); |
158 | s8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, s8 *rate_idx); | 158 | s8 wmi_validate_bitrate(struct wmi_t *wmip, s32 rate, s8 *rate_idx); |
159 | int wmi_get_regDomain_cmd(struct wmi_t *wmip); | 159 | 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, |
@@ -295,7 +295,7 @@ int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, | |||
295 | 295 | ||
296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); | 296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); |
297 | 297 | ||
298 | A_INT32 wmi_get_rate(s8 rateindex); | 298 | s32 wmi_get_rate(s8 rateindex); |
299 | 299 | ||
300 | int wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd); | 300 | int wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd); |
301 | 301 | ||