diff options
Diffstat (limited to 'drivers/staging/ath6kl/include/common/wmi.h')
| -rw-r--r-- | drivers/staging/ath6kl/include/common/wmi.h | 1402 |
1 files changed, 708 insertions, 694 deletions
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index c75d310c37a7..c645af373442 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h @@ -70,24 +70,24 @@ extern "C" { #endif PREPACK struct host_app_area_s { - A_UINT32 wmi_protocol_ver; + u32 wmi_protocol_ver; } POSTPACK; /* * Data Path */ typedef PREPACK struct { - A_UINT8 dstMac[ATH_MAC_LEN]; - A_UINT8 srcMac[ATH_MAC_LEN]; - A_UINT16 typeOrLen; + u8 dstMac[ATH_MAC_LEN]; + u8 srcMac[ATH_MAC_LEN]; + u16 typeOrLen; } POSTPACK ATH_MAC_HDR; typedef PREPACK struct { - A_UINT8 dsap; - A_UINT8 ssap; - A_UINT8 cntl; - A_UINT8 orgCode[3]; - A_UINT16 etherType; + u8 dsap; + u8 ssap; + u8 cntl; + u8 orgCode[3]; + u16 etherType; } POSTPACK ATH_LLC_SNAP_HDR; typedef enum { @@ -160,8 +160,8 @@ 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; - A_UINT8 info; /* usage of 'info' field(8-bit): + s8 rssi; + u8 info; /* usage of 'info' field(8-bit): * b1:b0 - WMI_MSG_TYPE * b4:b3:b2 - UP(tid) * b5 - Used in AP mode. More-data in tx dir, PS in rx. @@ -170,12 +170,12 @@ typedef PREPACK struct { * ACL data(2) */ - A_UINT16 info2; /* usage of 'info2' field(16-bit): + u16 info2; /* usage of 'info2' field(16-bit): * b11:b0 - seq_no * b12 - A-MSDU? * b15:b13 - META_DATA_VERSION 0 - 7 */ - A_UINT16 reserved; + u16 reserved; } POSTPACK WMI_DATA_HDR; /* @@ -195,17 +195,17 @@ typedef PREPACK struct { #endif typedef PREPACK struct { - A_UINT8 pktID; /* The packet ID to identify the tx request */ - A_UINT8 ratePolicyID; /* The rate policy to be used for the tx of this frame */ + u8 pktID; /* The packet ID to identify the tx request */ + u8 ratePolicyID; /* The rate policy to be used for the tx of this frame */ } POSTPACK WMI_TX_META_V1; #define WMI_CSUM_DIR_TX (0x1) #define TX_CSUM_CALC_FILL (0x1) typedef PREPACK struct { - A_UINT8 csumStart; /*Offset from start of the WMI header for csum calculation to begin */ - A_UINT8 csumDest; /*Offset from start of WMI header where final csum goes*/ - A_UINT8 csumFlags; /*number of bytes over which csum is calculated*/ + u8 csumStart; /*Offset from start of the WMI header for csum calculation to begin */ + u8 csumDest; /*Offset from start of WMI header where final csum goes*/ + u8 csumFlags; /*number of bytes over which csum is calculated*/ } POSTPACK WMI_TX_META_V2; @@ -242,17 +242,17 @@ typedef PREPACK struct { #endif typedef PREPACK struct { - A_UINT8 status; /* one of WMI_RX_STATUS_... */ - A_UINT8 rix; /* rate index mapped to rate at which this packet was received. */ - A_UINT8 rssi; /* rssi of packet */ - A_UINT8 channel;/* rf channel during packet reception */ - A_UINT16 flags; /* a combination of WMI_RX_FLAGS_... */ + u8 status; /* one of WMI_RX_STATUS_... */ + u8 rix; /* rate index mapped to rate at which this packet was received. */ + u8 rssi; /* rssi of packet */ + u8 channel;/* rf channel during packet reception */ + u16 flags; /* a combination of WMI_RX_FLAGS_... */ } POSTPACK WMI_RX_META_V1; #define RX_CSUM_VALID_FLAG (0x1) typedef PREPACK struct { - A_UINT16 csum; - A_UINT8 csumFlags;/* bit 0 set -partial csum valid + u16 csum; + u8 csumFlags;/* bit 0 set -partial csum valid bit 1 set -test mode */ } POSTPACK WMI_RX_META_V2; @@ -264,15 +264,15 @@ typedef PREPACK struct { * Control Path */ typedef PREPACK struct { - A_UINT16 commandId; + u16 commandId; /* * info1 - 16 bits * b03:b00 - id * b15:b04 - unused */ - A_UINT16 info1; + u16 info1; - A_UINT16 reserved; /* For alignment */ + u16 reserved; /* For alignment */ } POSTPACK WMI_CMD_HDR; /* used for commands and events */ /* @@ -422,17 +422,24 @@ typedef enum { WMI_AP_SET_11BG_RATESET_CMDID, WMI_SET_PMK_CMDID, WMI_MCAST_FILTER_CMDID, - /* COEX CMDID AR6003*/ - WMI_SET_BTCOEX_FE_ANT_CMDID, - WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMDID, - WMI_SET_BTCOEX_SCO_CONFIG_CMDID, - WMI_SET_BTCOEX_A2DP_CONFIG_CMDID, - WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMDID, - WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMDID, - WMI_SET_BTCOEX_DEBUG_CMDID, - WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMDID, - WMI_GET_BTCOEX_STATS_CMDID, - WMI_GET_BTCOEX_CONFIG_CMDID, + /* COEX CMDID AR6003*/ + WMI_SET_BTCOEX_FE_ANT_CMDID, + WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMDID, + WMI_SET_BTCOEX_SCO_CONFIG_CMDID, + WMI_SET_BTCOEX_A2DP_CONFIG_CMDID, + WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMDID, + WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMDID, + WMI_SET_BTCOEX_DEBUG_CMDID, + WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMDID, + WMI_GET_BTCOEX_STATS_CMDID, + WMI_GET_BTCOEX_CONFIG_CMDID, + WMI_GET_PMK_CMDID, + WMI_SET_PASSPHRASE_CMDID, + WMI_ENABLE_WAC_CMDID, + WMI_WAC_SCAN_REPLY_CMDID, + WMI_WAC_CTRL_REQ_CMDID, + WMI_SET_DIV_PARAMS_CMDID, + WMI_SET_EXCESS_TX_RETRY_THRES_CMDID, } WMI_COMMAND_ID; /* @@ -522,34 +529,41 @@ typedef enum { #define DEFAULT_CONNECT_CTRL_FLAGS (CONNECT_CSA_FOLLOW_BSS) typedef PREPACK struct { - A_UINT8 networkType; - A_UINT8 dot11AuthMode; - A_UINT8 authMode; - A_UINT8 pairwiseCryptoType; - A_UINT8 pairwiseCryptoLen; - A_UINT8 groupCryptoType; - A_UINT8 groupCryptoLen; - A_UINT8 ssidLength; - A_UCHAR ssid[WMI_MAX_SSID_LEN]; - A_UINT16 channel; - A_UINT8 bssid[ATH_MAC_LEN]; - A_UINT32 ctrl_flags; + u8 networkType; + u8 dot11AuthMode; + u8 authMode; + u8 pairwiseCryptoType; + u8 pairwiseCryptoLen; + u8 groupCryptoType; + u8 groupCryptoLen; + u8 ssidLength; + u8 ssid[WMI_MAX_SSID_LEN]; + u16 channel; + u8 bssid[ATH_MAC_LEN]; + u32 ctrl_flags; } POSTPACK WMI_CONNECT_CMD; /* * WMI_RECONNECT_CMDID */ typedef PREPACK struct { - A_UINT16 channel; /* hint */ - A_UINT8 bssid[ATH_MAC_LEN]; /* mandatory if set */ + u16 channel; /* hint */ + u8 bssid[ATH_MAC_LEN]; /* mandatory if set */ } POSTPACK WMI_RECONNECT_CMD; #define WMI_PMK_LEN 32 typedef PREPACK struct { - A_UINT8 pmk[WMI_PMK_LEN]; + u8 pmk[WMI_PMK_LEN]; } POSTPACK WMI_SET_PMK_CMD; /* + * WMI_SET_EXCESS_TX_RETRY_THRES_CMDID + */ +typedef PREPACK struct { + A_UINT32 threshold; +} POSTPACK WMI_SET_EXCESS_TX_RETRY_THRES_CMD; + +/* * WMI_ADD_CIPHER_KEY_CMDID */ typedef enum { @@ -572,21 +586,21 @@ typedef enum { #define KEY_OP_VALID_MASK 0x03 typedef PREPACK struct { - A_UINT8 keyIndex; - A_UINT8 keyType; - A_UINT8 keyUsage; /* KEY_USAGE */ - A_UINT8 keyLength; - A_UINT8 keyRSC[8]; /* key replay sequence counter */ - A_UINT8 key[WMI_MAX_KEY_LEN]; - A_UINT8 key_op_ctrl; /* Additional Key Control information */ - A_UINT8 key_macaddr[ATH_MAC_LEN]; + u8 keyIndex; + u8 keyType; + u8 keyUsage; /* KEY_USAGE */ + u8 keyLength; + u8 keyRSC[8]; /* key replay sequence counter */ + u8 key[WMI_MAX_KEY_LEN]; + u8 key_op_ctrl; /* Additional Key Control information */ + u8 key_macaddr[ATH_MAC_LEN]; } POSTPACK WMI_ADD_CIPHER_KEY_CMD; /* * WMI_DELETE_CIPHER_KEY_CMDID */ typedef PREPACK struct { - A_UINT8 keyIndex; + u8 keyIndex; } POSTPACK WMI_DELETE_CIPHER_KEY_CMD; #define WMI_KRK_LEN 16 @@ -594,7 +608,7 @@ typedef PREPACK struct { * WMI_ADD_KRK_CMDID */ typedef PREPACK struct { - A_UINT8 krk[WMI_KRK_LEN]; + u8 krk[WMI_KRK_LEN]; } POSTPACK WMI_ADD_KRK_CMD; /* @@ -606,7 +620,7 @@ typedef enum { } WMI_TKIP_CM_CONTROL; typedef PREPACK struct { - A_UINT8 cm_en; /* WMI_TKIP_CM_CONTROL */ + u8 cm_en; /* WMI_TKIP_CM_CONTROL */ } POSTPACK WMI_SET_TKIP_COUNTERMEASURES_CMD; /* @@ -621,9 +635,9 @@ typedef enum { } PMKID_ENABLE_FLG; typedef PREPACK struct { - A_UINT8 bssid[ATH_MAC_LEN]; - A_UINT8 enable; /* PMKID_ENABLE_FLG */ - A_UINT8 pmkid[WMI_PMKID_LEN]; + u8 bssid[ATH_MAC_LEN]; + u8 enable; /* PMKID_ENABLE_FLG */ + u8 pmkid[WMI_PMKID_LEN]; } POSTPACK WMI_SET_PMKID_CMD; /* @@ -635,13 +649,13 @@ typedef enum { } WMI_SCAN_TYPE; typedef PREPACK struct { - A_BOOL forceFgScan; - A_BOOL isLegacy; /* For Legacy Cisco AP compatibility */ - A_UINT32 homeDwellTime; /* Maximum duration in the home channel(milliseconds) */ - A_UINT32 forceScanInterval; /* Time interval between scans (milliseconds)*/ - A_UINT8 scanType; /* WMI_SCAN_TYPE */ - A_UINT8 numChannels; /* how many channels follow */ - A_UINT16 channelList[1]; /* channels in Mhz */ + u32 forceFgScan; + u32 isLegacy; /* For Legacy Cisco AP compatibility */ + u32 homeDwellTime; /* Maximum duration in the home channel(milliseconds) */ + u32 forceScanInterval; /* Time interval between scans (milliseconds)*/ + u8 scanType; /* WMI_SCAN_TYPE */ + u8 numChannels; /* how many channels follow */ + u16 channelList[1]; /* channels in Mhz */ } POSTPACK WMI_START_SCAN_CMD; /* @@ -676,16 +690,16 @@ typedef enum { typedef PREPACK struct { - A_UINT16 fg_start_period; /* seconds */ - A_UINT16 fg_end_period; /* seconds */ - A_UINT16 bg_period; /* seconds */ - A_UINT16 maxact_chdwell_time; /* msec */ - A_UINT16 pas_chdwell_time; /* msec */ - A_UINT8 shortScanRatio; /* how many shorts scan for one long */ - A_UINT8 scanCtrlFlags; - A_UINT16 minact_chdwell_time; /* msec */ - A_UINT16 maxact_scan_per_ssid; /* max active scans per ssid */ - A_UINT32 max_dfsch_act_time; /* msecs */ + u16 fg_start_period; /* seconds */ + u16 fg_end_period; /* seconds */ + u16 bg_period; /* seconds */ + u16 maxact_chdwell_time; /* msec */ + u16 pas_chdwell_time; /* msec */ + u8 shortScanRatio; /* how many shorts scan for one long */ + u8 scanCtrlFlags; + u16 minact_chdwell_time; /* msec */ + u16 maxact_scan_per_ssid; /* max active scans per ssid */ + u32 max_dfsch_act_time; /* msecs */ } POSTPACK WMI_SCAN_PARAMS_CMD; /* @@ -703,10 +717,10 @@ typedef enum { } WMI_BSS_FILTER; typedef PREPACK struct { - A_UINT8 bssFilter; /* see WMI_BSS_FILTER */ - A_UINT8 reserved1; /* For alignment */ - A_UINT16 reserved2; /* For alignment */ - A_UINT32 ieMask; + u8 bssFilter; /* see WMI_BSS_FILTER */ + u8 reserved1; /* For alignment */ + u16 reserved2; /* For alignment */ + u32 ieMask; } POSTPACK WMI_BSS_FILTER_CMD; /* @@ -721,10 +735,10 @@ typedef enum { } WMI_SSID_FLAG; typedef PREPACK struct { - A_UINT8 entryIndex; /* 0 to MAX_PROBED_SSID_INDEX */ - A_UINT8 flag; /* WMI_SSID_FLG */ - A_UINT8 ssidLength; - A_UINT8 ssid[32]; + u8 entryIndex; /* 0 to MAX_PROBED_SSID_INDEX */ + u8 flag; /* WMI_SSID_FLG */ + u8 ssidLength; + u8 ssid[32]; } POSTPACK WMI_PROBED_SSID_CMD; /* @@ -737,15 +751,15 @@ typedef PREPACK struct { #define MAX_LISTEN_BEACONS 50 typedef PREPACK struct { - A_UINT16 listenInterval; - A_UINT16 numBeacons; + u16 listenInterval; + u16 numBeacons; } POSTPACK WMI_LISTEN_INT_CMD; /* * WMI_SET_BEACON_INT_CMDID */ typedef PREPACK struct { - A_UINT16 beaconInterval; + u16 beaconInterval; } POSTPACK WMI_BEACON_INT_CMD; /* @@ -759,8 +773,8 @@ typedef PREPACK struct { #define MAX_BMISS_BEACONS 50 typedef PREPACK struct { - A_UINT16 bmissTime; - A_UINT16 numBeacons; + u16 bmissTime; + u16 numBeacons; } POSTPACK WMI_BMISS_TIME_CMD; /* @@ -772,25 +786,25 @@ typedef enum { } WMI_POWER_MODE; typedef PREPACK struct { - A_UINT8 powerMode; /* WMI_POWER_MODE */ + u8 powerMode; /* WMI_POWER_MODE */ } 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 { - A_UINT32 opcode; - A_UINT32 length; - A_CHAR buffer[1]; /* WMI_SET_PARAMS */ + u32 opcode; + u32 length; + char buffer[1]; /* WMI_SET_PARAMS */ } POSTPACK WMI_SET_PARAMS_CMD; typedef PREPACK struct { - A_UINT8 multicast_mac[ATH_MAC_LEN]; /* WMI_SET_MCAST_FILTER */ + u8 multicast_mac[ATH_MAC_LEN]; /* WMI_SET_MCAST_FILTER */ } POSTPACK WMI_SET_MCAST_FILTER_CMD; typedef PREPACK struct { - A_UINT8 enable; /* WMI_MCAST_FILTER */ + u8 enable; /* WMI_MCAST_FILTER */ } POSTPACK WMI_MCAST_FILTER_CMD; /* @@ -819,12 +833,12 @@ typedef enum { } POWER_SAVE_FAIL_EVENT_POLICY; typedef PREPACK struct { - A_UINT16 idle_period; /* msec */ - A_UINT16 pspoll_number; - A_UINT16 dtim_policy; - A_UINT16 tx_wakeup_policy; - A_UINT16 num_tx_to_wakeup; - A_UINT16 ps_fail_event_policy; + u16 idle_period; /* msec */ + u16 pspoll_number; + u16 dtim_policy; + u16 tx_wakeup_policy; + u16 num_tx_to_wakeup; + u16 ps_fail_event_policy; } POSTPACK WMI_POWER_PARAMS_CMD; /* Adhoc power save types */ @@ -836,10 +850,10 @@ typedef enum { } WMI_ADHOC_PS_TYPE; typedef PREPACK struct { - A_UINT8 power_saving; - A_UINT8 ttl; /* number of beacon periods */ - A_UINT16 atim_windows; /* msec */ - A_UINT16 timeout_value; /* msec */ + u8 power_saving; + u8 ttl; /* number of beacon periods */ + u16 atim_windows; /* msec */ + u16 timeout_value; /* msec */ } POSTPACK WMI_IBSS_PM_CAPS_CMD; /* AP power save types */ @@ -849,10 +863,10 @@ typedef enum { } WMI_AP_PS_TYPE; typedef PREPACK struct { - A_UINT32 idle_time; /* in msec */ - A_UINT32 ps_period; /* in usec */ - A_UINT8 sleep_period; /* in ps periods */ - A_UINT8 psType; + u32 idle_time; /* in msec */ + u32 ps_period; /* in usec */ + u8 sleep_period; /* in ps periods */ + u8 psType; } POSTPACK WMI_AP_PS_CMD; /* @@ -866,17 +880,17 @@ typedef enum { } APSD_TIM_POLICY; typedef PREPACK struct { - A_UINT16 psPollTimeout; /* msec */ - A_UINT16 triggerTimeout; /* msec */ - A_UINT32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */ - A_UINT32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */ + u16 psPollTimeout; /* msec */ + u16 triggerTimeout; /* msec */ + u32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */ + u32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */ } POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD; /* * WMI_SET_VOICE_PKT_SIZE_CMDID */ typedef PREPACK struct { - A_UINT16 voicePktSize; + u16 voicePktSize; } POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD; /* @@ -890,14 +904,14 @@ typedef enum { } APSD_SP_LEN_TYPE; typedef PREPACK struct { - A_UINT8 maxSPLen; + u8 maxSPLen; } POSTPACK WMI_SET_MAX_SP_LEN_CMD; /* * WMI_SET_DISC_TIMEOUT_CMDID */ typedef PREPACK struct { - A_UINT8 disconnectTimeout; /* seconds */ + u8 disconnectTimeout; /* seconds */ } POSTPACK WMI_DISC_TIMEOUT_CMD; typedef enum { @@ -921,47 +935,47 @@ typedef enum { * WMI_SYNCHRONIZE_CMDID */ typedef PREPACK struct { - A_UINT8 dataSyncMap; + u8 dataSyncMap; } POSTPACK WMI_SYNC_CMD; /* * WMI_CREATE_PSTREAM_CMDID */ typedef PREPACK struct { - A_UINT32 minServiceInt; /* in milli-sec */ - A_UINT32 maxServiceInt; /* in milli-sec */ - A_UINT32 inactivityInt; /* in milli-sec */ - A_UINT32 suspensionInt; /* in milli-sec */ - A_UINT32 serviceStartTime; - A_UINT32 minDataRate; /* in bps */ - A_UINT32 meanDataRate; /* in bps */ - A_UINT32 peakDataRate; /* in bps */ - A_UINT32 maxBurstSize; - A_UINT32 delayBound; - A_UINT32 minPhyRate; /* in bps */ - A_UINT32 sba; - A_UINT32 mediumTime; - A_UINT16 nominalMSDU; /* in octects */ - A_UINT16 maxMSDU; /* in octects */ - A_UINT8 trafficClass; - A_UINT8 trafficDirection; /* DIR_TYPE */ - A_UINT8 rxQueueNum; - A_UINT8 trafficType; /* TRAFFIC_TYPE */ - A_UINT8 voicePSCapability; /* VOICEPS_CAP_TYPE */ - A_UINT8 tsid; - A_UINT8 userPriority; /* 802.1D user priority */ - A_UINT8 nominalPHY; /* nominal phy rate */ + u32 minServiceInt; /* in milli-sec */ + u32 maxServiceInt; /* in milli-sec */ + u32 inactivityInt; /* in milli-sec */ + u32 suspensionInt; /* in milli-sec */ + u32 serviceStartTime; + u32 minDataRate; /* in bps */ + u32 meanDataRate; /* in bps */ + u32 peakDataRate; /* in bps */ + u32 maxBurstSize; + u32 delayBound; + u32 minPhyRate; /* in bps */ + u32 sba; + u32 mediumTime; + u16 nominalMSDU; /* in octects */ + u16 maxMSDU; /* in octects */ + u8 trafficClass; + u8 trafficDirection; /* DIR_TYPE */ + u8 rxQueueNum; + u8 trafficType; /* TRAFFIC_TYPE */ + u8 voicePSCapability; /* VOICEPS_CAP_TYPE */ + u8 tsid; + u8 userPriority; /* 802.1D user priority */ + u8 nominalPHY; /* nominal phy rate */ } POSTPACK WMI_CREATE_PSTREAM_CMD; /* * WMI_DELETE_PSTREAM_CMDID */ typedef PREPACK struct { - A_UINT8 txQueueNumber; - A_UINT8 rxQueueNumber; - A_UINT8 trafficDirection; - A_UINT8 trafficClass; - A_UINT8 tsid; + u8 txQueueNumber; + u8 rxQueueNumber; + u8 trafficDirection; + u8 trafficClass; + u8 tsid; } POSTPACK WMI_DELETE_PSTREAM_CMD; /* @@ -978,11 +992,11 @@ typedef enum { #define WMI_MAX_CHANNELS 32 typedef PREPACK struct { - A_UINT8 reserved1; - A_UINT8 scanParam; /* set if enable scan */ - A_UINT8 phyMode; /* see WMI_PHY_MODE */ - A_UINT8 numChannels; /* how many channels follow */ - A_UINT16 channelList[1]; /* channels in Mhz */ + u8 reserved1; + u8 scanParam; /* set if enable scan */ + u8 phyMode; /* see WMI_PHY_MODE */ + u8 numChannels; /* how many channels follow */ + u16 channelList[1]; /* channels in Mhz */ } POSTPACK WMI_CHANNEL_PARAMS_CMD; @@ -995,21 +1009,21 @@ typedef PREPACK struct { */ typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{ - A_UINT32 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 */ - A_UINT8 weight; /* "alpha" */ - A_UINT8 reserved[3]; + u32 pollTime; /* Polling time as a factor of LI */ + 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; /* @@ -1018,33 +1032,33 @@ typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{ */ typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{ - A_UINT32 pollTime; /* Polling time as a factor of LI */ - A_UINT8 weight; /* "alpha" */ - A_UINT8 thresholdAbove1_Val; /* lowest of uppper*/ - A_UINT8 thresholdAbove2_Val; - A_UINT8 thresholdAbove3_Val; - A_UINT8 thresholdAbove4_Val; /* highest of upper */ - A_UINT8 thresholdBelow1_Val; /* lowest of bellow */ - A_UINT8 thresholdBelow2_Val; - A_UINT8 thresholdBelow3_Val; - A_UINT8 thresholdBelow4_Val; /* highest of bellow */ - A_UINT8 reserved[3]; + u32 pollTime; /* Polling time as a factor of LI */ + u8 weight; /* "alpha" */ + u8 thresholdAbove1_Val; /* lowest of uppper*/ + u8 thresholdAbove2_Val; + u8 thresholdAbove3_Val; + u8 thresholdAbove4_Val; /* highest of upper */ + u8 thresholdBelow1_Val; /* lowest of bellow */ + u8 thresholdBelow2_Val; + u8 thresholdBelow3_Val; + u8 thresholdBelow4_Val; /* highest of bellow */ + u8 reserved[3]; } POSTPACK WMI_SNR_THRESHOLD_PARAMS_CMD; /* * WMI_LQ_THRESHOLD_PARAMS_CMDID */ typedef PREPACK struct WMI_LQ_THRESHOLD_PARAMS { - A_UINT8 enable; - A_UINT8 thresholdAbove1_Val; - A_UINT8 thresholdAbove2_Val; - A_UINT8 thresholdAbove3_Val; - A_UINT8 thresholdAbove4_Val; - A_UINT8 thresholdBelow1_Val; - A_UINT8 thresholdBelow2_Val; - A_UINT8 thresholdBelow3_Val; - A_UINT8 thresholdBelow4_Val; - A_UINT8 reserved[3]; + u8 enable; + u8 thresholdAbove1_Val; + u8 thresholdAbove2_Val; + u8 thresholdAbove3_Val; + u8 thresholdAbove4_Val; + u8 thresholdBelow1_Val; + u8 thresholdBelow2_Val; + u8 thresholdBelow3_Val; + u8 thresholdBelow4_Val; + u8 reserved[3]; } POSTPACK WMI_LQ_THRESHOLD_PARAMS_CMD; typedef enum { @@ -1058,12 +1072,12 @@ typedef enum { } WMI_PREAMBLE_POLICY; typedef PREPACK struct { - A_UINT8 status; - A_UINT8 preamblePolicy; + u8 status; + u8 preamblePolicy; }POSTPACK WMI_SET_LPREAMBLE_CMD; typedef PREPACK struct { - A_UINT16 threshold; + u16 threshold; }POSTPACK WMI_SET_RTS_CMD; /* @@ -1073,14 +1087,14 @@ typedef PREPACK struct { * via event, unless the bitmask is set again. */ typedef PREPACK struct { - A_UINT32 bitmask; + u32 bitmask; } POSTPACK WMI_TARGET_ERROR_REPORT_BITMASK; /* * WMI_SET_TX_PWR_CMDID */ typedef PREPACK struct { - A_UINT8 dbM; /* in dbM units */ + u8 dbM; /* in dbM units */ } POSTPACK WMI_SET_TX_PWR_CMD, WMI_TX_PWR_REPLY; /* @@ -1095,9 +1109,9 @@ typedef PREPACK struct { #define WMI_MAX_ASSOC_INFO_LEN 240 typedef PREPACK struct { - A_UINT8 ieType; - A_UINT8 bufferSize; - A_UINT8 assocInfo[1]; /* up to WMI_MAX_ASSOC_INFO_LEN */ + u8 ieType; + u8 bufferSize; + u8 assocInfo[1]; /* up to WMI_MAX_ASSOC_INFO_LEN */ } POSTPACK WMI_SET_ASSOC_INFO_CMD; @@ -1111,15 +1125,15 @@ typedef PREPACK struct { #define WMI_MAX_BAD_AP_INDEX 1 typedef PREPACK struct { - A_UINT8 badApIndex; /* 0 to WMI_MAX_BAD_AP_INDEX */ - A_UINT8 bssid[ATH_MAC_LEN]; + u8 badApIndex; /* 0 to WMI_MAX_BAD_AP_INDEX */ + u8 bssid[ATH_MAC_LEN]; } POSTPACK WMI_ADD_BAD_AP_CMD; /* * WMI_DELETE_BAD_AP_CMDID */ typedef PREPACK struct { - A_UINT8 badApIndex; /* 0 to WMI_MAX_BAD_AP_INDEX */ + u8 badApIndex; /* 0 to WMI_MAX_BAD_AP_INDEX */ } POSTPACK WMI_DELETE_BAD_AP_CMD; /* @@ -1132,11 +1146,11 @@ typedef PREPACK struct { #define WMI_DEFAULT_AIFSN_ACPARAM 2 #define WMI_MAX_AIFSN_ACPARAM 15 typedef PREPACK struct { - A_UINT16 txop; /* in units of 32 usec */ - A_UINT8 eCWmin; - A_UINT8 eCWmax; - A_UINT8 aifsn; - A_UINT8 ac; + u16 txop; /* in units of 32 usec */ + u8 eCWmin; + u8 eCWmax; + u8 aifsn; + u8 ac; } POSTPACK WMI_SET_ACCESS_PARAMS_CMD; @@ -1155,10 +1169,10 @@ typedef enum { } WMI_FRAMETYPE; typedef PREPACK struct { - A_UINT8 frameType; /* WMI_FRAMETYPE */ - A_UINT8 trafficClass; /* applies only to DATA_FRAMETYPE */ - A_UINT8 maxRetries; - A_UINT8 enableNotify; + u8 frameType; /* WMI_FRAMETYPE */ + u8 trafficClass; /* applies only to DATA_FRAMETYPE */ + u8 maxRetries; + u8 enableNotify; } POSTPACK WMI_SET_RETRY_LIMITS_CMD; /* @@ -1198,31 +1212,31 @@ typedef enum { */ typedef PREPACK struct { - A_UINT8 bssid[ATH_MAC_LEN]; - A_INT8 bias; + u8 bssid[ATH_MAC_LEN]; + s8 bias; } POSTPACK WMI_BSS_BIAS; typedef PREPACK struct { - A_UINT8 numBss; + u8 numBss; WMI_BSS_BIAS bssBias[1]; } POSTPACK WMI_BSS_BIAS_INFO; typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS { - A_UINT16 lowrssi_scan_period; - A_INT16 lowrssi_scan_threshold; - A_INT16 lowrssi_roam_threshold; - A_UINT8 roam_rssi_floor; - A_UINT8 reserved[1]; /* For alignment */ + u16 lowrssi_scan_period; + s16 lowrssi_scan_threshold; + s16 lowrssi_roam_threshold; + u8 roam_rssi_floor; + u8 reserved[1]; /* For alignment */ } POSTPACK WMI_LOWRSSI_SCAN_PARAMS; typedef PREPACK struct { PREPACK union { - A_UINT8 bssid[ATH_MAC_LEN]; /* WMI_FORCE_ROAM */ - A_UINT8 roamMode; /* WMI_SET_ROAM_MODE */ + u8 bssid[ATH_MAC_LEN]; /* WMI_FORCE_ROAM */ + u8 roamMode; /* WMI_SET_ROAM_MODE */ WMI_BSS_BIAS_INFO bssBiasInfo; /* WMI_SET_HOST_BIAS */ WMI_LOWRSSI_SCAN_PARAMS lrScanParams; } POSTPACK info; - A_UINT8 roamCtrlType ; + u8 roamCtrlType ; } POSTPACK WMI_SET_ROAM_CTRL_CMD; /* @@ -1234,26 +1248,26 @@ typedef enum { } BT_WLAN_CONN_PRECEDENCE; typedef PREPACK struct { - A_UINT8 precedence; + u8 precedence; } POSTPACK WMI_SET_BT_WLAN_CONN_PRECEDENCE; /* * WMI_ENABLE_RM_CMDID */ typedef PREPACK struct { - A_BOOL enable_radio_measurements; + u32 enable_radio_measurements; } POSTPACK WMI_ENABLE_RM_CMD; /* * WMI_SET_MAX_OFFHOME_DURATION_CMDID */ typedef PREPACK struct { - A_UINT8 max_offhome_duration; + u8 max_offhome_duration; } POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD; typedef PREPACK struct { - A_UINT32 frequency; - A_UINT8 threshold; + u32 frequency; + u8 threshold; } POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD; /*---------------------- BTCOEX RELATED -------------------------------------*/ /*----------------------COMMON to AR6002 and AR6003 -------------------------*/ @@ -1286,8 +1300,8 @@ typedef enum { } BT_STREAM_STATUS; typedef PREPACK struct { - A_UINT8 streamType; - A_UINT8 status; + u8 streamType; + u8 status; } POSTPACK WMI_SET_BT_STATUS_CMD; typedef enum { @@ -1329,13 +1343,13 @@ typedef enum { #define BT_SCO_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16) typedef PREPACK struct { - A_UINT32 numScoCyclesForceTrigger; /* Number SCO cycles after which + u32 numScoCyclesForceTrigger; /* Number SCO cycles after which force a pspoll. default = 10 */ - A_UINT32 dataResponseTimeout; /* Timeout Waiting for Downlink pkt + u32 dataResponseTimeout; /* Timeout Waiting for Downlink pkt in response for ps-poll, default = 10 msecs */ - A_UINT32 stompScoRules; - A_UINT32 scoOptFlags; /* SCO Options Flags : + u32 stompScoRules; + u32 scoOptFlags; /* SCO Options Flags : bits: meaning: 0 Allow Close Range Optimization 1 Force awake during close range @@ -1346,23 +1360,23 @@ typedef PREPACK struct { 16..23 Low Data Rate Max Cnt */ - A_UINT8 stompDutyCyleVal; /* Sco cycles to limit ps-poll queuing + u8 stompDutyCyleVal; /* Sco cycles to limit ps-poll queuing if stomped */ - A_UINT8 stompDutyCyleMaxVal; /*firm ware increases stomp duty cycle + u8 stompDutyCyleMaxVal; /*firm ware increases stomp duty cycle gradually uptill this value on need basis*/ - A_UINT8 psPollLatencyFraction; /* Fraction of idle + u8 psPollLatencyFraction; /* Fraction of idle period, within which additional ps-polls can be queued */ - A_UINT8 noSCOSlots; /* Number of SCO Tx/Rx slots. + u8 noSCOSlots; /* Number of SCO Tx/Rx slots. HVx, EV3, 2EV3 = 2 */ - A_UINT8 noIdleSlots; /* Number of Bluetooth idle slots between + u8 noIdleSlots; /* Number of Bluetooth idle slots between consecutive SCO Tx/Rx slots HVx, EV3 = 4 2EV3 = 10 */ - A_UINT8 scoOptOffRssi;/*RSSI value below which we go to ps poll*/ - A_UINT8 scoOptOnRssi; /*RSSI value above which we reenter opt mode*/ - A_UINT8 scoOptRtsCount; + u8 scoOptOffRssi;/*RSSI value below which we go to ps poll*/ + u8 scoOptOnRssi; /*RSSI value above which we reenter opt mode*/ + u8 scoOptRtsCount; } POSTPACK BT_PARAMS_SCO; #define BT_A2DP_ALLOW_CLOSE_RANGE_OPT (1 << 0) @@ -1377,13 +1391,13 @@ typedef PREPACK struct { #define BT_A2DP_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16) typedef PREPACK struct { - A_UINT32 a2dpWlanUsageLimit; /* MAX time firmware uses the medium for + u32 a2dpWlanUsageLimit; /* MAX time firmware uses the medium for wlan, after it identifies the idle time default (30 msecs) */ - A_UINT32 a2dpBurstCntMin; /* Minimum number of bluetooth data frames + u32 a2dpBurstCntMin; /* Minimum number of bluetooth data frames to replenish Wlan Usage limit (default 3) */ - A_UINT32 a2dpDataRespTimeout; - A_UINT32 a2dpOptFlags; /* A2DP Option flags: + u32 a2dpDataRespTimeout; + u32 a2dpOptFlags; /* A2DP Option flags: bits: meaning: 0 Allow Close Range Optimization 1 Force awake during close range @@ -1393,23 +1407,23 @@ typedef PREPACK struct { 8..15 Low Data Rate Min Cnt 16..23 Low Data Rate Max Cnt */ - A_UINT8 isCoLocatedBtRoleMaster; - A_UINT8 a2dpOptOffRssi;/*RSSI value below which we go to ps poll*/ - A_UINT8 a2dpOptOnRssi; /*RSSI value above which we reenter opt mode*/ - A_UINT8 a2dpOptRtsCount; + u8 isCoLocatedBtRoleMaster; + u8 a2dpOptOffRssi;/*RSSI value below which we go to ps poll*/ + u8 a2dpOptOnRssi; /*RSSI value above which we reenter opt mode*/ + u8 a2dpOptRtsCount; }POSTPACK BT_PARAMS_A2DP; /* During BT ftp/ BT OPP or any another data based acl profile on bluetooth (non a2dp).*/ typedef PREPACK struct { - A_UINT32 aclWlanMediumUsageTime; /* Wlan usage time during Acl (non-a2dp) + u32 aclWlanMediumUsageTime; /* Wlan usage time during Acl (non-a2dp) coexistence (default 30 msecs) */ - A_UINT32 aclBtMediumUsageTime; /* Bt usage time during acl coexistence + u32 aclBtMediumUsageTime; /* Bt usage time during acl coexistence (default 30 msecs)*/ - A_UINT32 aclDataRespTimeout; - A_UINT32 aclDetectTimeout; /* ACL coexistence enabled if we get + u32 aclDataRespTimeout; + u32 aclDetectTimeout; /* ACL coexistence enabled if we get 10 Pkts in X msec(default 100 msecs) */ - A_UINT32 aclmaxPktCnt; /* No of ACL pkts to receive before + u32 aclmaxPktCnt; /* No of ACL pkts to receive before enabling ACL coex */ }POSTPACK BT_PARAMS_ACLCOEX; @@ -1419,16 +1433,16 @@ typedef PREPACK struct { BT_PARAMS_SCO scoParams; BT_PARAMS_A2DP a2dpParams; BT_PARAMS_ACLCOEX aclCoexParams; - A_UINT8 antType; /* 0 -Disabled (default) + u8 antType; /* 0 -Disabled (default) 1 - BT_ANT_TYPE_DUAL 2 - BT_ANT_TYPE_SPLITTER 3 - BT_ANT_TYPE_SWITCH */ - A_UINT8 coLocatedBtDev; /* 0 - BT_COLOCATED_DEV_BTS4020 (default) + u8 coLocatedBtDev; /* 0 - BT_COLOCATED_DEV_BTS4020 (default) 1 - BT_COLCATED_DEV_CSR 2 - BT_COLOCATED_DEV_VALKYRIe */ } POSTPACK info; - A_UINT8 paramType ; + u8 paramType ; } POSTPACK WMI_SET_BT_PARAMS_CMD; /************************ END AR6002 BTCOEX *******************************/ @@ -1448,7 +1462,7 @@ typedef enum { }WMI_BTCOEX_FE_ANT_TYPE; typedef PREPACK struct { - A_UINT8 btcoexFeAntType; /* 1 - WMI_BTCOEX_FE_ANT_SINGLE for single antenna front end + u8 btcoexFeAntType; /* 1 - WMI_BTCOEX_FE_ANT_SINGLE for single antenna front end 2 - WMI_BTCOEX_FE_ANT_DUAL for dual antenna front end (for isolations less 35dB, for higher isolation there is not need to pass this command). @@ -1461,7 +1475,7 @@ typedef PREPACK struct { * bluetooth chip type.Based on bluetooth device, different coexistence protocol would be used. */ typedef PREPACK struct { - A_UINT8 btcoexCoLocatedBTdev; /*1 - Qcom BT (3 -wire PTA) + u8 btcoexCoLocatedBTdev; /*1 - Qcom BT (3 -wire PTA) 2 - CSR BT (3 wire PTA) 3 - Atheros 3001 BT (3 wire PTA) 4 - STE bluetooth (4-wire ePTA) @@ -1478,20 +1492,20 @@ typedef PREPACK struct { * During this the station will be power-save mode. */ typedef PREPA |