staging: ath6kl: Convert A_INT16 to s16 (cb1e3709) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/ath6kl/include/common/wmi.h

+18 −18

Original line number	Diff line number	Diff line
		@@ -996,18 +996,18 @@ typedef PREPACK struct {

		typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
		u32 pollTime; /* Polling time as a factor of LI */
		A_INT16 thresholdAbove1_Val; /* lowest of upper */
		A_INT16 thresholdAbove2_Val;
		A_INT16 thresholdAbove3_Val;
		A_INT16 thresholdAbove4_Val;
		A_INT16 thresholdAbove5_Val;
		A_INT16 thresholdAbove6_Val; /* highest of upper */
		A_INT16 thresholdBelow1_Val; /* lowest of bellow */
		A_INT16 thresholdBelow2_Val;
		A_INT16 thresholdBelow3_Val;
		A_INT16 thresholdBelow4_Val;
		A_INT16 thresholdBelow5_Val;
		A_INT16 thresholdBelow6_Val; /* highest of bellow */
		s16 thresholdAbove1_Val; /* lowest of upper */
		s16 thresholdAbove2_Val;
		s16 thresholdAbove3_Val;
		s16 thresholdAbove4_Val;
		s16 thresholdAbove5_Val;
		s16 thresholdAbove6_Val; /* highest of upper */
		s16 thresholdBelow1_Val; /* lowest of bellow */
		s16 thresholdBelow2_Val;
		s16 thresholdBelow3_Val;
		s16 thresholdBelow4_Val;
		s16 thresholdBelow5_Val;
		s16 thresholdBelow6_Val; /* highest of bellow */
		u8 weight; /* "alpha" */
		u8 reserved[3];
		} POSTPACK WMI_RSSI_THRESHOLD_PARAMS_CMD;
		@@ -1209,8 +1209,8 @@ typedef PREPACK struct {

		typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS {
		u16 lowrssi_scan_period;
		A_INT16 lowrssi_scan_threshold;
		A_INT16 lowrssi_roam_threshold;
		s16 lowrssi_scan_threshold;
		s16 lowrssi_roam_threshold;
		u8 roam_rssi_floor;
		u8 reserved[1]; /* For alignment */
		} POSTPACK WMI_LOWRSSI_SCAN_PARAMS;
		@@ -2062,7 +2062,7 @@ typedef PREPACK struct {
		u16 channel;
		u8 frameType; /* see WMI_BI_FTYPE */
		u8 snr;
		A_INT16 rssi;
		s16 rssi;
		u8 bssid[ATH_MAC_LEN];
		u32 ieMask;
		} POSTPACK WMI_BSS_INFO_HDR;
		@@ -2277,9 +2277,9 @@ typedef PREPACK struct {
		u32 cs_lowRssi_cnt;
		u16 cs_connect_cnt;
		u16 cs_disconnect_cnt;
		A_INT16 cs_aveBeacon_rssi;
		s16 cs_aveBeacon_rssi;
		u16 cs_roam_count;
		A_INT16 cs_rssi;
		s16 cs_rssi;
		u8 cs_snr;
		u8 cs_aveBeacon_snr;
		u8 cs_lastRoam_msec;
		@@ -2335,7 +2335,7 @@ typedef enum{
		}WMI_RSSI_THRESHOLD_VAL;

		typedef PREPACK struct {
		A_INT16 rssi;
		s16 rssi;
		u8 range;
		}POSTPACK WMI_RSSI_THRESHOLD_EVENT;

drivers/staging/ath6kl/include/wlan_api.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ struct ieee80211_common_ie {
		typedef struct bss {
		u8 ni_macaddr[6];
		u8 ni_snr;
		A_INT16 ni_rssi;
		s16 ni_rssi;
		struct bss *ni_list_next;
		struct bss *ni_list_prev;
		struct bss *ni_hash_next;

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+11 −13

Original line number	Diff line number	Diff line
		@@ -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)
		{

drivers/staging/ath6kl/os/linux/ar6000_pm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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:

drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);