staging: ath6kl: Convert A_INT8 to s8 (f2ab1275) · Commits · e / devices / android_kernel_teracube_emerald

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

+16 −16

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ typedef enum {
		#define WMI_DATA_HDR_SET_META(h, _v) ((h)->info2 = ((h)->info2 & ~(WMI_DATA_HDR_META_MASK << WMI_DATA_HDR_META_SHIFT)) \| ((_v) << WMI_DATA_HDR_META_SHIFT))

		typedef PREPACK struct {
		A_INT8 rssi;
		s8 rssi;
		u8 info; /* usage of 'info' field(8-bit):
		* b1:b0 - WMI_MSG_TYPE
		* b4:b3:b2 - UP(tid)
		@@ -776,7 +776,7 @@ typedef PREPACK struct {
		} POSTPACK WMI_POWER_MODE_CMD;

		typedef PREPACK struct {
		A_INT8 status; /* WMI_SET_PARAMS_REPLY */
		s8 status; /* WMI_SET_PARAMS_REPLY */
		} POSTPACK WMI_SET_PARAMS_REPLY;

		typedef PREPACK struct {
		@@ -1199,7 +1199,7 @@ typedef enum {

		typedef PREPACK struct {
		u8 bssid[ATH_MAC_LEN];
		A_INT8 bias;
		s8 bias;
		} POSTPACK WMI_BSS_BIAS;

		typedef PREPACK struct {
		@@ -2139,7 +2139,7 @@ typedef PREPACK struct {
		} POSTPACK WMI_NEIGHBOR_INFO;

		typedef PREPACK struct {
		A_INT8 numberOfAps;
		s8 numberOfAps;
		WMI_NEIGHBOR_INFO neighbor[1];
		} POSTPACK WMI_NEIGHBOR_REPORT_EVENT;

		@@ -2207,7 +2207,7 @@ typedef PREPACK struct {
		typedef PREPACK struct {
		u16 channel;
		u8 frameType; /* see WMI_OPT_FTYPE */
		A_INT8 snr;
		s8 snr;
		u8 srcAddr[ATH_MAC_LEN];
		u8 bssid[ATH_MAC_LEN];
		} POSTPACK WMI_OPT_RX_INFO_HDR;
		@@ -2399,11 +2399,11 @@ typedef PREPACK struct {
		typedef PREPACK struct {
		A_INT32 roam_util;
		u8 bssid[ATH_MAC_LEN];
		A_INT8 rssi;
		A_INT8 rssidt;
		A_INT8 last_rssi;
		A_INT8 util;
		A_INT8 bias;
		s8 rssi;
		s8 rssidt;
		s8 last_rssi;
		s8 util;
		s8 bias;
		u8 reserved; /* For alignment */
		} POSTPACK WMI_BSS_ROAM_INFO;

		@@ -2506,14 +2506,14 @@ typedef enum {
		} WMI_BIT_RATE;

		typedef PREPACK struct {
		A_INT8 rateIndex; /* see WMI_BIT_RATE */
		A_INT8 mgmtRateIndex;
		A_INT8 ctlRateIndex;
		s8 rateIndex; /* see WMI_BIT_RATE */
		s8 mgmtRateIndex;
		s8 ctlRateIndex;
		} POSTPACK WMI_BIT_RATE_CMD;


		typedef PREPACK struct {
		A_INT8 rateIndex; /* see WMI_BIT_RATE */
		s8 rateIndex; /* see WMI_BIT_RATE */
		} POSTPACK WMI_BIT_RATE_REPLY;


		@@ -2599,9 +2599,9 @@ typedef PREPACK struct {
		u32 assoc_time;
		u32 allow_txrx_time;
		u8 disassoc_bssid[ATH_MAC_LEN];
		A_INT8 disassoc_bss_rssi;
		s8 disassoc_bss_rssi;
		u8 assoc_bssid[ATH_MAC_LEN];
		A_INT8 assoc_bss_rssi;
		s8 assoc_bss_rssi;
		} POSTPACK WMI_TARGET_ROAM_TIME;

		typedef PREPACK struct {

drivers/staging/ath6kl/include/wmi_api.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ int wmi_getrev_cmd(struct wmi_t *wmip);
		int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
		u32 forceFgScan, u32 isLegacy,
		u32 homeDwellTime, u32 forceScanInterval,
		A_INT8 numChan, u16 *channelList);
		s8 numChan, u16 *channelList);
		int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec,
		u16 fg_end_sec, u16 bg_sec,
		u16 minact_chdw_msec,
		@@ -155,11 +155,11 @@ int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID);
		int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask);
		int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate);
		int wmi_get_bitrate_cmd(struct wmi_t *wmip);
		A_INT8 wmi_validate_bitrate(struct wmi_t wmip, A_INT32 rate, A_INT8 rate_idx);
		s8 wmi_validate_bitrate(struct wmi_t wmip, A_INT32 rate, s8 rate_idx);
		int wmi_get_regDomain_cmd(struct wmi_t *wmip);
		int wmi_get_channelList_cmd(struct wmi_t *wmip);
		int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
		WMI_PHY_MODE mode, A_INT8 numChan,
		WMI_PHY_MODE mode, s8 numChan,
		u16 *channelList);

		int wmi_set_snr_threshold_params(struct wmi_t *wmip,
		@@ -295,7 +295,7 @@ int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType,

		int wmi_set_halparam_cmd(struct wmi_t wmip, u8 cmd, u16 dataLen);

		A_INT32 wmi_get_rate(A_INT8 rateindex);
		A_INT32 wmi_get_rate(s8 rateindex);

		int wmi_set_ip_cmd(struct wmi_t wmip, WMI_SET_IP_CMD cmd);

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -451,7 +451,7 @@ ar6000_dbglog_init_done(AR_SOFTC_T *ar)
		ar->dbglog_init_done = true;
		}

		u32 dbglog_get_debug_fragment(A_INT8 *datap, u32 len, u32 limit)
		u32 dbglog_get_debug_fragment(s8 *datap, u32 len, u32 limit)
		{
		A_INT32 *buffer;
		u32 count;
		@@ -477,7 +477,7 @@ u32 dbglog_get_debug_fragment(A_INT8 *datap, u32 len, u32 limit)
		}

		void
		dbglog_parse_debug_logs(A_INT8 *datap, u32 len)
		dbglog_parse_debug_logs(s8 *datap, u32 len)
		{
		A_INT32 *buffer;
		u32 count;
		@@ -571,7 +571,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
		{
		break;
		}
		ar6000_dbglog_event(ar, dropped, (A_INT8*)&ar->log_buffer[ar->log_cnt], length);
		ar6000_dbglog_event(ar, dropped, (s8 *)&ar->log_buffer[ar->log_cnt], length);
		ar->log_cnt += length;
		} else {
		AR_DEBUG_PRINTF(ATH_DEBUG_DBG_LOG,("Length: %d (Total size: %d)\n",
		@@ -597,7 +597,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)

		void
		ar6000_dbglog_event(AR_SOFTC_T *ar, u32 dropped,
		A_INT8 *buffer, u32 length)
		s8 *buffer, u32 length)
		{
		#ifdef REPORT_DEBUG_LOGS_TO_APP
		#define MAX_WIRELESS_EVENT_SIZE 252
		@@ -622,7 +622,7 @@ ar6000_dbglog_event(AR_SOFTC_T *ar, u32 dropped,
		dropped, length));

		/* Interpret the debug logs */
		dbglog_parse_debug_logs((A_INT8*)buffer, length);
		dbglog_parse_debug_logs((s8 *)buffer, length);
		#endif /* REPORT_DEBUG_LOGS_TO_APP */
		}

		@@ -2795,7 +2795,7 @@ ar6000_txPwr_rx(void *devt, u8 txPwr)


		void
		ar6000_channelList_rx(void devt, A_INT8 numChan, u16 chanList)
		ar6000_channelList_rx(void devt, s8 numChan, u16 chanList)
		{
		AR_SOFTC_T ar = (AR_SOFTC_T )devt;

		@@ -4755,7 +4755,7 @@ void
		ar6000_hci_event_rcv_evt(struct ar6_softc ar, WMI_HCI_EVENT cmd)
		{
		void *osbuf = NULL;
		A_INT8 i;
		s8 i;
		u8 size, *buf;
		int ret = A_OK;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -493,18 +493,18 @@ typedef struct ar6_softc {
		u16 arListenIntervalT;
		struct ar6000_version arVersion;
		u32 arTargetType;
		A_INT8 arRssi;
		s8 arRssi;
		u8 arTxPwr;
		bool arTxPwrSet;
		A_INT32 arBitRate;
		struct net_device_stats arNetStats;
		struct iw_statistics arIwStats;
		A_INT8 arNumChannels;
		s8 arNumChannels;
		u16 arChannelList[32];
		u32 arRegCode;
		bool statsUpdatePending;
		TARGET_STATS arTargetStats;
		A_INT8 arMaxRetries;
		s8 arMaxRetries;
		u8 arPhyCapability;
		#ifdef CONFIG_HOST_TCMD_SUPPORT
		u8 tcmdRxReport;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ void ar6000_disconnect_event(struct ar6_softc *ar, u8 reason,
		void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid,
		bool ismcast);
		void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps);
		void ar6000_channelList_rx(void devt, A_INT8 numChan, u16 chanList);
		void ar6000_channelList_rx(void devt, s8 numChan, u16 chanList);
		void ar6000_regDomain_event(struct ar6_softc *ar, u32 regCode);
		void ar6000_txPwr_rx(void *devt, u8 txPwr);
		void ar6000_keepalive_rx(void *devt, u8 configured);
		@@ -109,7 +109,7 @@ int ar6000_get_driver_cfg(struct net_device *dev,
		void ar6000_bssInfo_event_rx(struct ar6_softc ar, u8 data, int len);

		void ar6000_dbglog_event(struct ar6_softc *ar, u32 dropped,
		A_INT8 *buffer, u32 length);
		s8 *buffer, u32 length);

		int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);