summaryrefslogtreecommitdiff
path: root/drivers/staging/ath6kl/os
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-02-02 14:05:54 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-02 14:34:50 -0800
commitcb1e370987c3651707e30e404e41ebdc83571fba (patch)
treee54f7c8715a48dddf118af9fb5ef04694b2a8478 /drivers/staging/ath6kl/os
parentf2ab1275cb1cfd033868cf0b7c67d1143199630e (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')
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c24
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_pm.c2
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h6
-rw-r--r--drivers/staging/ath6kl/os/linux/include/athdrv_linux.h10
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 d527cee25d1c..651f9f4b665a 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 {
u16 bg_enable;
u16 enable;
};
- A_INT16 bg_param_a;
- A_INT16 bg_param_b;
- A_INT16 a_param_a;
- A_INT16 a_param_b;
+ s16 bg_param_a;
+ s16 bg_param_b;
+ s16 a_param_a;
+ s16 a_param_b;
u32 reserved;
} USER_RSSI_CPENSATION;
static USER_RSSI_CPENSATION rssi_compensation_param;
-static A_INT16 rssi_compensation_table[96];
+static s16 rssi_compensation_table[96];
int reconnect_flag = 0;
static ar6k_pal_config_t ar6k_pal_config_g;
@@ -2430,7 +2430,7 @@ int ar6000_init(struct net_device *dev)
AR_SOFTC_T *ar;
int status;
A_INT32 timeleft;
- A_INT16 i;
+ s16 i;
int ret = 0;
#if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE)
WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd;
@@ -5030,7 +5030,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len)
}
void
-ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi)
+ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi)
{
USER_RSSI_THOLD userRssiThold;
@@ -5791,7 +5791,7 @@ read_rssi_compensation_param(AR_SOFTC_T *ar)
//#define RSSICOMPENSATION_PRINT
#ifdef RSSICOMPENSATION_PRINT
- A_INT16 i;
+ s16 i;
cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType);
for (i=0; i<16; i++) {
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)
return rssi;
}
-A_INT16
-rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi)
+s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi)
{
if (ar->arBssChannel > 5000)
{
@@ -5885,10 +5884,9 @@ rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi)
return rssi;
}
-A_INT16
-rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above)
+s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above)
{
- A_INT16 i;
+ s16 i;
if (ar->arBssChannel > 5000)
{
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index 691e535403a1..0995bbbb4e38 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)
{
int status = A_OK;
AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
- A_INT16 pmmode = ar->arSuspendConfig;
+ s16 pmmode = ar->arSuspendConfig;
wow_not_connected:
switch (pmmode) {
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 bd62141b89eb..328982fb3a94 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);
void ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len);
void ar6000_rssiThreshold_event(struct ar6_softc *ar,
WMI_RSSI_THRESHOLD_VAL newThreshold,
- A_INT16 rssi);
+ s16 rssi);
void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal);
void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication,
u8 statusCode, u8 *tspecSuggestion);
@@ -78,8 +78,8 @@ void ar6000_gpio_data_rx(u32 reg_id, u32 value);
void ar6000_gpio_ack_rx(void);
A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt);
-A_INT16 rssi_compensation_calc(struct ar6_softc *ar, A_INT16 rssi);
-A_INT16 rssi_compensation_reverse_calc(struct ar6_softc *ar, A_INT16 rssi, bool Above);
+s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi);
+s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above);
void ar6000_dbglog_init_done(struct ar6_softc *ar);
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
index a345ecd319ba..a3e65081f98d 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 {
u32 wow_num_pkts_dropped;
u16 wow_num_events_discarded;
- A_INT16 noise_floor_calibation;
- A_INT16 cs_rssi;
- A_INT16 cs_aveBeacon_rssi;
+ s16 noise_floor_calibation;
+ s16 cs_rssi;
+ s16 cs_aveBeacon_rssi;
u8 cs_aveBeacon_snr;
u8 cs_lastRoam_msec;
u8 cs_snr;
@@ -1139,8 +1139,8 @@ typedef struct ar6000_dbglog_module_config_s {
} DBGLOG_MODULE_CONFIG;
typedef struct user_rssi_thold_t {
- A_INT16 tag;
- A_INT16 rssi;
+ s16 tag;
+ s16 rssi;
} USER_RSSI_THOLD;
typedef struct user_rssi_params_t {