diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:50 -0500 |
commit | cb1e370987c3651707e30e404e41ebdc83571fba (patch) | |
tree | e54f7c8715a48dddf118af9fb5ef04694b2a8478 /drivers/staging/ath6kl/os/linux | |
parent | f2ab1275cb1cfd033868cf0b7c67d1143199630e (diff) |
staging: ath6kl: Convert A_INT16 to s16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/os/linux')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 24 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_pm.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | 10 |
4 files changed, 20 insertions, 22 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index d527cee25d1..651f9f4b665 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -260,16 +260,16 @@ typedef struct user_rssi_compensation_t { | |||
260 | u16 bg_enable; | 260 | u16 bg_enable; |
261 | u16 enable; | 261 | u16 enable; |
262 | }; | 262 | }; |
263 | A_INT16 bg_param_a; | 263 | s16 bg_param_a; |
264 | A_INT16 bg_param_b; | 264 | s16 bg_param_b; |
265 | A_INT16 a_param_a; | 265 | s16 a_param_a; |
266 | A_INT16 a_param_b; | 266 | s16 a_param_b; |
267 | u32 reserved; | 267 | u32 reserved; |
268 | } USER_RSSI_CPENSATION; | 268 | } USER_RSSI_CPENSATION; |
269 | 269 | ||
270 | static USER_RSSI_CPENSATION rssi_compensation_param; | 270 | static USER_RSSI_CPENSATION rssi_compensation_param; |
271 | 271 | ||
272 | static A_INT16 rssi_compensation_table[96]; | 272 | static s16 rssi_compensation_table[96]; |
273 | 273 | ||
274 | int reconnect_flag = 0; | 274 | int reconnect_flag = 0; |
275 | static ar6k_pal_config_t ar6k_pal_config_g; | 275 | static ar6k_pal_config_t ar6k_pal_config_g; |
@@ -2430,7 +2430,7 @@ int ar6000_init(struct net_device *dev) | |||
2430 | AR_SOFTC_T *ar; | 2430 | AR_SOFTC_T *ar; |
2431 | int status; | 2431 | int status; |
2432 | A_INT32 timeleft; | 2432 | A_INT32 timeleft; |
2433 | A_INT16 i; | 2433 | s16 i; |
2434 | int ret = 0; | 2434 | int ret = 0; |
2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) | 2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) |
2436 | WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd; | 2436 | WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd; |
@@ -5030,7 +5030,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len) | |||
5030 | } | 5030 | } |
5031 | 5031 | ||
5032 | void | 5032 | void |
5033 | ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi) | 5033 | ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi) |
5034 | { | 5034 | { |
5035 | USER_RSSI_THOLD userRssiThold; | 5035 | USER_RSSI_THOLD userRssiThold; |
5036 | 5036 | ||
@@ -5791,7 +5791,7 @@ read_rssi_compensation_param(AR_SOFTC_T *ar) | |||
5791 | //#define RSSICOMPENSATION_PRINT | 5791 | //#define RSSICOMPENSATION_PRINT |
5792 | 5792 | ||
5793 | #ifdef RSSICOMPENSATION_PRINT | 5793 | #ifdef RSSICOMPENSATION_PRINT |
5794 | A_INT16 i; | 5794 | s16 i; |
5795 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); | 5795 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); |
5796 | for (i=0; i<16; i++) { | 5796 | for (i=0; i<16; i++) { |
5797 | A_PRINTF("cust_data_%d = %x \n", i, *(u8 *)cust_data_ptr); | 5797 | A_PRINTF("cust_data_%d = %x \n", i, *(u8 *)cust_data_ptr); |
@@ -5856,8 +5856,7 @@ rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt) | |||
5856 | return rssi; | 5856 | return rssi; |
5857 | } | 5857 | } |
5858 | 5858 | ||
5859 | A_INT16 | 5859 | s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi) |
5860 | rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi) | ||
5861 | { | 5860 | { |
5862 | if (ar->arBssChannel > 5000) | 5861 | if (ar->arBssChannel > 5000) |
5863 | { | 5862 | { |
@@ -5885,10 +5884,9 @@ rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi) | |||
5885 | return rssi; | 5884 | return rssi; |
5886 | } | 5885 | } |
5887 | 5886 | ||
5888 | A_INT16 | 5887 | s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above) |
5889 | rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above) | ||
5890 | { | 5888 | { |
5891 | A_INT16 i; | 5889 | s16 i; |
5892 | 5890 | ||
5893 | if (ar->arBssChannel > 5000) | 5891 | if (ar->arBssChannel > 5000) |
5894 | { | 5892 | { |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index 691e535403a..0995bbbb4e3 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c | |||
@@ -215,7 +215,7 @@ int ar6000_suspend_ev(void *context) | |||
215 | { | 215 | { |
216 | int status = A_OK; | 216 | int status = A_OK; |
217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; | 217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; |
218 | A_INT16 pmmode = ar->arSuspendConfig; | 218 | s16 pmmode = ar->arSuspendConfig; |
219 | wow_not_connected: | 219 | wow_not_connected: |
220 | switch (pmmode) { | 220 | switch (pmmode) { |
221 | case WLAN_SUSPEND_WOW: | 221 | case WLAN_SUSPEND_WOW: |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h index bd62141b89e..328982fb3a9 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | |||
@@ -54,7 +54,7 @@ void ar6000_scanComplete_event(struct ar6_softc *ar, int status); | |||
54 | void ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len); | 54 | void ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len); |
55 | void ar6000_rssiThreshold_event(struct ar6_softc *ar, | 55 | void ar6000_rssiThreshold_event(struct ar6_softc *ar, |
56 | WMI_RSSI_THRESHOLD_VAL newThreshold, | 56 | WMI_RSSI_THRESHOLD_VAL newThreshold, |
57 | A_INT16 rssi); | 57 | s16 rssi); |
58 | void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); | 58 | void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); |
59 | void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, | 59 | void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, |
60 | u8 statusCode, u8 *tspecSuggestion); | 60 | u8 statusCode, u8 *tspecSuggestion); |
@@ -78,8 +78,8 @@ void ar6000_gpio_data_rx(u32 reg_id, u32 value); | |||
78 | void ar6000_gpio_ack_rx(void); | 78 | void ar6000_gpio_ack_rx(void); |
79 | 79 | ||
80 | A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt); | 80 | A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt); |
81 | A_INT16 rssi_compensation_calc(struct ar6_softc *ar, A_INT16 rssi); | 81 | s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi); |
82 | A_INT16 rssi_compensation_reverse_calc(struct ar6_softc *ar, A_INT16 rssi, bool Above); | 82 | s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above); |
83 | 83 | ||
84 | void ar6000_dbglog_init_done(struct ar6_softc *ar); | 84 | void ar6000_dbglog_init_done(struct ar6_softc *ar); |
85 | 85 | ||
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h index a345ecd319b..a3e65081f98 100644 --- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | |||
@@ -1069,9 +1069,9 @@ typedef struct targetStats_t { | |||
1069 | u32 wow_num_pkts_dropped; | 1069 | u32 wow_num_pkts_dropped; |
1070 | u16 wow_num_events_discarded; | 1070 | u16 wow_num_events_discarded; |
1071 | 1071 | ||
1072 | A_INT16 noise_floor_calibation; | 1072 | s16 noise_floor_calibation; |
1073 | A_INT16 cs_rssi; | 1073 | s16 cs_rssi; |
1074 | A_INT16 cs_aveBeacon_rssi; | 1074 | s16 cs_aveBeacon_rssi; |
1075 | u8 cs_aveBeacon_snr; | 1075 | u8 cs_aveBeacon_snr; |
1076 | u8 cs_lastRoam_msec; | 1076 | u8 cs_lastRoam_msec; |
1077 | u8 cs_snr; | 1077 | u8 cs_snr; |
@@ -1139,8 +1139,8 @@ typedef struct ar6000_dbglog_module_config_s { | |||
1139 | } DBGLOG_MODULE_CONFIG; | 1139 | } DBGLOG_MODULE_CONFIG; |
1140 | 1140 | ||
1141 | typedef struct user_rssi_thold_t { | 1141 | typedef struct user_rssi_thold_t { |
1142 | A_INT16 tag; | 1142 | s16 tag; |
1143 | A_INT16 rssi; | 1143 | s16 rssi; |
1144 | } USER_RSSI_THOLD; | 1144 | } USER_RSSI_THOLD; |
1145 | 1145 | ||
1146 | typedef struct user_rssi_params_t { | 1146 | typedef struct user_rssi_params_t { |