diff options
Diffstat (limited to 'drivers/staging/ath6kl/include')
19 files changed, 243 insertions, 244 deletions
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h index 4cc7b6beffde..dbba3f85616f 100644 --- a/drivers/staging/ath6kl/include/a_debug.h +++ b/drivers/staging/ath6kl/include/a_debug.h @@ -57,7 +57,7 @@ extern "C" { /* macro to make a module-specific masks */ #define ATH_DEBUG_MAKE_MODULE_MASK(index) (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index))) -void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription); +void DebugDumpBytes(A_UCHAR *buffer, u16 length, char *pDescription); /* Debug support on a per-module basis * diff --git a/drivers/staging/ath6kl/include/aggr_recv_api.h b/drivers/staging/ath6kl/include/aggr_recv_api.h index 8f76f3744b5e..67a058492c4d 100644 --- a/drivers/staging/ath6kl/include/aggr_recv_api.h +++ b/drivers/staging/ath6kl/include/aggr_recv_api.h @@ -30,7 +30,7 @@ extern "C" { typedef void (* RX_CALLBACK)(void * dev, void *osbuf); -typedef void (* ALLOC_NETBUFS)(A_NETBUF_QUEUE_T *q, A_UINT16 num); +typedef void (* ALLOC_NETBUFS)(A_NETBUF_QUEUE_T *q, u16 num); /* * aggr_init: @@ -64,7 +64,7 @@ aggr_register_rx_dispatcher(void *cntxt, void * dev, RX_CALLBACK fn); * up to the indicated sequence number. */ void -aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no); +aggr_process_bar(void *cntxt, u8 tid, u16 seq_no); /* @@ -82,7 +82,7 @@ aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no); * in hold_q to OS. */ void -aggr_recv_addba_req_evt(void * cntxt, u8 tid, A_UINT16 seq_no, u8 win_sz); +aggr_recv_addba_req_evt(void * cntxt, u8 tid, u16 seq_no, u8 win_sz); /* @@ -108,7 +108,7 @@ aggr_recv_delba_req_evt(void * cntxt, u8 tid); * callback may be called to deliver frames in order. */ void -aggr_process_recv_frm(void *cntxt, u8 tid, A_UINT16 seq_no, bool is_amsdu, void **osbuf); +aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osbuf); /* diff --git a/drivers/staging/ath6kl/include/ar3kconfig.h b/drivers/staging/ath6kl/include/ar3kconfig.h index 5556660b270f..b7c503975c11 100644 --- a/drivers/staging/ath6kl/include/ar3kconfig.h +++ b/drivers/staging/ath6kl/include/ar3kconfig.h @@ -45,12 +45,12 @@ typedef struct { HIF_DEVICE *pHIFDevice; /* HIF layer device */ A_UINT32 AR3KBaudRate; /* AR3K operational baud rate */ - A_UINT16 AR6KScale; /* AR6K UART scale value */ - A_UINT16 AR6KStep; /* AR6K UART step value */ + u16 AR6KScale; /* AR6K UART scale value */ + u16 AR6KStep; /* AR6K UART step value */ struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ A_UINT32 PwrMgmtEnabled; /* TLPM enabled? */ - A_UINT16 IdleTimeout; /* TLPM idle timeout */ - A_UINT16 WakeupTimeout; /* TLPM wakeup timeout */ + u16 IdleTimeout; /* TLPM idle timeout */ + u16 WakeupTimeout; /* TLPM wakeup timeout */ u8 bdaddr[6]; /* Bluetooth device address */ } AR3K_CONFIG_INFO; diff --git a/drivers/staging/ath6kl/include/common/a_hci.h b/drivers/staging/ath6kl/include/common/a_hci.h index 1d7d5fa35421..317ea57ba87f 100644 --- a/drivers/staging/ath6kl/include/common/a_hci.h +++ b/drivers/staging/ath6kl/include/common/a_hci.h @@ -242,7 +242,7 @@ typedef enum { /* Command pkt */ typedef struct hci_cmd_pkt_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 params[255]; } POSTPACK HCI_CMD_PKT; @@ -250,8 +250,8 @@ typedef struct hci_cmd_pkt_t { #define ACL_DATA_HDR_SIZE 4 /* hdl_and flags + data_len */ /* Data pkt */ typedef struct hci_acl_data_pkt_t { - A_UINT16 hdl_and_flags; - A_UINT16 data_len; + u16 hdl_and_flags; + u16 data_len; u8 data[Max80211_PAL_PDU_Size]; } POSTPACK HCI_ACL_DATA_PKT; @@ -265,7 +265,7 @@ typedef struct hci_event_pkt_t { /*============== HCI Command definitions ======================= */ typedef struct hci_cmd_phy_link_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; u8 link_key_len; @@ -274,62 +274,62 @@ typedef struct hci_cmd_phy_link_t { } POSTPACK HCI_CMD_PHY_LINK; typedef struct hci_cmd_write_rem_amp_assoc_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; - A_UINT16 len_so_far; - A_UINT16 amp_assoc_remaining_len; + u16 len_so_far; + u16 amp_assoc_remaining_len; u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ]; } POSTPACK HCI_CMD_WRITE_REM_AMP_ASSOC; typedef struct hci_cmd_opcode_hdl_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 hdl; + u16 hdl; } POSTPACK HCI_CMD_READ_LINK_QUAL, HCI_CMD_FLUSH, HCI_CMD_READ_LINK_SUPERVISION_TIMEOUT; typedef struct hci_cmd_read_local_amp_assoc_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; - A_UINT16 len_so_far; - A_UINT16 max_rem_amp_assoc_len; + u16 len_so_far; + u16 max_rem_amp_assoc_len; } POSTPACK HCI_CMD_READ_LOCAL_AMP_ASSOC; typedef struct hci_cmd_set_event_mask_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; A_UINT64 mask; }POSTPACK HCI_CMD_SET_EVT_MASK, HCI_CMD_SET_EVT_MASK_PG_2; typedef struct hci_cmd_enhanced_flush_t{ - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 hdl; + u16 hdl; u8 type; } POSTPACK HCI_CMD_ENHANCED_FLUSH; typedef struct hci_cmd_write_timeout_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 timeout; + u16 timeout; } POSTPACK HCI_CMD_WRITE_TIMEOUT; typedef struct hci_cmd_write_link_supervision_timeout_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 hdl; - A_UINT16 timeout; + u16 hdl; + u16 timeout; } POSTPACK HCI_CMD_WRITE_LINK_SUPERVISION_TIMEOUT; typedef struct hci_cmd_write_flow_control_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 mode; } POSTPACK HCI_CMD_WRITE_FLOW_CONTROL; @@ -341,7 +341,7 @@ typedef struct location_data_cfg_t { } POSTPACK LOCATION_DATA_CFG; typedef struct hci_cmd_write_location_data_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; LOCATION_DATA_CFG cfg; } POSTPACK HCI_CMD_WRITE_LOCATION_DATA; @@ -350,7 +350,7 @@ typedef struct hci_cmd_write_location_data_t { typedef struct flow_spec_t { u8 id; u8 service_type; - A_UINT16 max_sdu; + u16 max_sdu; A_UINT32 sdu_inter_arrival_time; A_UINT32 access_latency; A_UINT32 flush_timeout; @@ -358,7 +358,7 @@ typedef struct flow_spec_t { typedef struct hci_cmd_create_logical_link_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; FLOW_SPEC tx_flow_spec; @@ -366,34 +366,34 @@ typedef struct hci_cmd_create_logical_link_t { } POSTPACK HCI_CMD_CREATE_LOGICAL_LINK; typedef struct hci_cmd_flow_spec_modify_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 hdl; + u16 hdl; FLOW_SPEC tx_flow_spec; FLOW_SPEC rx_flow_spec; } POSTPACK HCI_CMD_FLOW_SPEC_MODIFY; typedef struct hci_cmd_logical_link_cancel_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; u8 tx_flow_spec_id; } POSTPACK HCI_CMD_LOGICAL_LINK_CANCEL; typedef struct hci_cmd_disconnect_logical_link_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; - A_UINT16 logical_link_hdl; + u16 logical_link_hdl; } POSTPACK HCI_CMD_DISCONNECT_LOGICAL_LINK; typedef struct hci_cmd_disconnect_phy_link_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; } POSTPACK HCI_CMD_DISCONNECT_PHY_LINK; typedef struct hci_cmd_srm_t { - A_UINT16 opcode; + u16 opcode; u8 param_length; u8 phy_link_hdl; u8 mode; @@ -409,7 +409,7 @@ typedef struct hci_event_cmd_complete_t { u8 event_code; u8 param_len; u8 num_hci_cmd_pkts; - A_UINT16 opcode; + u16 opcode; u8 params[255]; } POSTPACK HCI_EVENT_CMD_COMPLETE; @@ -420,7 +420,7 @@ typedef struct hci_event_cmd_status_t { u8 param_len; u8 status; u8 num_hci_cmd_pkts; - A_UINT16 opcode; + u16 opcode; } POSTPACK HCI_EVENT_CMD_STATUS; /* Hardware Error event */ @@ -435,7 +435,7 @@ typedef struct hci_event_hw_err_t { typedef struct hci_event_handle_t { u8 event_code; u8 param_len; - A_UINT16 handle; + u16 handle; } POSTPACK HCI_EVENT_FLUSH_OCCRD, HCI_EVENT_QOS_VIOLATION; @@ -457,7 +457,7 @@ typedef struct hci_data_buf_overflow_t { typedef struct hci_enhanced_flush_complt_t{ u8 event_code; u8 param_len; - A_UINT16 hdl; + u16 hdl; } POSTPACK HCI_EVENT_ENHANCED_FLUSH_COMPLT; /* Channel select event */ @@ -480,7 +480,7 @@ typedef struct hci_event_logical_link_complete_event_t { u8 event_code; u8 param_len; u8 status; - A_UINT16 logical_link_hdl; + u16 logical_link_hdl; u8 phy_hdl; u8 tx_flow_id; } POSTPACK HCI_EVENT_LOGICAL_LINK_COMPLETE_EVENT; @@ -490,7 +490,7 @@ typedef struct hci_event_disconnect_logical_link_event_t { u8 event_code; u8 param_len; u8 status; - A_UINT16 logical_link_hdl; + u16 logical_link_hdl; u8 reason; } POSTPACK HCI_EVENT_DISCONNECT_LOGICAL_LINK_EVENT; @@ -523,7 +523,7 @@ typedef struct hci_event_status_handle_t { u8 event_code; u8 param_len; u8 status; - A_UINT16 handle; + u16 handle; } POSTPACK HCI_EVENT_FLOW_SPEC_MODIFY, HCI_EVENT_FLUSH; @@ -532,7 +532,7 @@ typedef struct hci_event_status_handle_t { typedef struct hci_event_num_of_compl_data_blks_t { u8 event_code; u8 param_len; - A_UINT16 num_data_blks; + u16 num_data_blks; u8 num_handles; u8 params[255]; } POSTPACK HCI_EVENT_NUM_COMPL_DATA_BLKS; @@ -564,8 +564,8 @@ typedef struct local_amp_info_resp_t { A_UINT32 min_latency; A_UINT32 max_pdu_size; u8 amp_type; - A_UINT16 pal_capabilities; - A_UINT16 amp_assoc_len; + u16 pal_capabilities; + u16 amp_assoc_len; A_UINT32 max_flush_timeout; /* in ms */ A_UINT32 be_flush_timeout; /* in ms */ } POSTPACK LOCAL_AMP_INFO; @@ -573,7 +573,7 @@ typedef struct local_amp_info_resp_t { typedef struct amp_assoc_cmd_resp_t{ u8 status; u8 phy_hdl; - A_UINT16 amp_assoc_len; + u16 amp_assoc_len; u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ]; }POSTPACK AMP_ASSOC_CMD_RESP; @@ -619,18 +619,18 @@ enum PAL_HCI_CMD_STATUS { */ typedef struct timeout_read_t { u8 status; - A_UINT16 timeout; + u16 timeout; }POSTPACK TIMEOUT_INFO; typedef struct link_supervision_timeout_read_t { u8 status; - A_UINT16 hdl; - A_UINT16 timeout; + u16 hdl; + u16 timeout; }POSTPACK LINK_SUPERVISION_TIMEOUT_INFO; typedef struct status_hdl_t { u8 status; - A_UINT16 hdl; + u16 hdl; }POSTPACK INFO_STATUS_HDL; typedef struct write_remote_amp_assoc_t{ @@ -650,15 +650,15 @@ typedef struct read_flow_ctrl_mode_t { typedef struct read_data_blk_size_t { u8 status; - A_UINT16 max_acl_data_pkt_len; - A_UINT16 data_block_len; - A_UINT16 total_num_data_blks; + u16 max_acl_data_pkt_len; + u16 data_block_len; + u16 total_num_data_blks; }POSTPACK READ_DATA_BLK_SIZE_INFO; /* Read Link quality info */ typedef struct link_qual_t { u8 status; - A_UINT16 hdl; + u16 hdl; u8 link_qual; } POSTPACK READ_LINK_QUAL_INFO, READ_RSSI_INFO; @@ -672,10 +672,10 @@ typedef struct ll_cancel_resp_t { typedef struct read_local_ver_info_t { u8 status; u8 hci_version; - A_UINT16 hci_revision; + u16 hci_revision; u8 pal_version; - A_UINT16 manf_name; - A_UINT16 pal_sub_ver; + u16 manf_name; + u16 pal_sub_ver; } POSTPACK READ_LOCAL_VER_INFO; diff --git a/drivers/staging/ath6kl/include/common/dset_internal.h b/drivers/staging/ath6kl/include/common/dset_internal.h index 2460f0ecf12b..74914f9cb3c4 100644 --- a/drivers/staging/ath6kl/include/common/dset_internal.h +++ b/drivers/staging/ath6kl/include/common/dset_internal.h @@ -42,8 +42,8 @@ typedef PREPACK struct dset_descriptor_s { struct dset_descriptor_s *next; /* List link. NULL only at the last descriptor */ - A_UINT16 id; /* Dset ID */ - A_UINT16 size; /* Dset size. */ + u16 id; /* Dset ID */ + u16 size; /* Dset size. */ void *DataPtr; /* Pointer to raw data for standard DataSet or pointer to original dset_descriptor for patched diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h index 061884dfb337..45f82dd79236 100644 --- a/drivers/staging/ath6kl/include/common/epping_test.h +++ b/drivers/staging/ath6kl/include/common/epping_test.h @@ -56,13 +56,13 @@ typedef PREPACK struct { u8 TimeStamp[8]; /* timestamp of packet (host or target) */ A_UINT32 HostContext_h; /* 4 byte host context, target echos this back */ A_UINT32 SeqNo; /* sequence number (set by host or target) */ - A_UINT16 Cmd_h; /* ping command (filled by host) */ - A_UINT16 CmdFlags_h; /* optional flags */ + u16 Cmd_h; /* ping command (filled by host) */ + u16 CmdFlags_h; /* optional flags */ u8 CmdBuffer_h[8]; /* buffer for command (host -> target) */ u8 CmdBuffer_t[8]; /* buffer for command (target -> host) */ - A_UINT16 DataLength; /* length of data */ - A_UINT16 DataCRC; /* 16 bit CRC of data */ - A_UINT16 HeaderCRC; /* header CRC (fields : StreamNo_h to end, minus HeaderCRC) */ + u16 DataLength; /* length of data */ + u16 DataCRC; /* 16 bit CRC of data */ + u16 HeaderCRC; /* header CRC (fields : StreamNo_h to end, minus HeaderCRC) */ } POSTPACK EPPING_HEADER; #define EPPING_PING_MAGIC_0 0xAA @@ -97,9 +97,9 @@ typedef PREPACK struct { /* test command parameters may be no more than 8 bytes */ typedef PREPACK struct { - A_UINT16 BurstCnt; /* number of packets to burst together (for HTC 2.1 testing) */ - A_UINT16 PacketLength; /* length of packet to generate including header */ - A_UINT16 Flags; /* flags */ + u16 BurstCnt; /* number of packets to burst together (for HTC 2.1 testing) */ + u16 PacketLength; /* length of packet to generate including header */ + u16 Flags; /* flags */ #define EPPING_CONT_RX_DATA_CRC (1 << 0) /* Add CRC to all data */ #define EPPING_CONT_RX_RANDOM_DATA (1 << 1) /* randomize the data pattern */ @@ -107,7 +107,7 @@ typedef PREPACK struct { } POSTPACK EPPING_CONT_RX_PARAMS; #define EPPING_HDR_CRC_OFFSET A_OFFSETOF(EPPING_HEADER,StreamNo_h) -#define EPPING_HDR_BYTES_CRC (sizeof(EPPING_HEADER) - EPPING_HDR_CRC_OFFSET - (sizeof(A_UINT16))) +#define EPPING_HDR_BYTES_CRC (sizeof(EPPING_HEADER) - EPPING_HDR_CRC_OFFSET - (sizeof(u16))) #define HCI_TRANSPORT_STREAM_NUM 16 /* this number is higher than the define WMM AC classes so we can use this to distinguish packets */ diff --git a/drivers/staging/ath6kl/include/common/gmboxif.h b/drivers/staging/ath6kl/include/common/gmboxif.h index 374007569d6d..dd9afbd78ff9 100644 --- a/drivers/staging/ath6kl/include/common/gmboxif.h +++ b/drivers/staging/ath6kl/include/common/gmboxif.h @@ -41,17 +41,17 @@ /* definitions for BT HCI packets */ typedef PREPACK struct { - A_UINT16 Flags_ConnHandle; - A_UINT16 Length; + u16 Flags_ConnHandle; + u16 Length; } POSTPACK BT_HCI_ACL_HEADER; typedef PREPACK struct { - A_UINT16 Flags_ConnHandle; + u16 Flags_ConnHandle; u8 Length; } POSTPACK BT_HCI_SCO_HEADER; typedef PREPACK struct { - A_UINT16 OpCode; + u16 OpCode; u8 ParamLength; } POSTPACK BT_HCI_COMMAND_HEADER; diff --git a/drivers/staging/ath6kl/include/common/htc.h b/drivers/staging/ath6kl/include/common/htc.h index 13a24da3af8e..6c85bebd994d 100644 --- a/drivers/staging/ath6kl/include/common/htc.h +++ b/drivers/staging/ath6kl/include/common/htc.h @@ -31,7 +31,7 @@ #define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field)) #define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \ - (((A_UINT16)(((u8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((u8 *)(p))[(lowbyte)])) + (((u16)(((u8 *)(p))[(highbyte)])) << 8 | (u16)(((u8 *)(p))[(lowbyte)])) /* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a * structure using only the type and field name. @@ -71,7 +71,7 @@ typedef PREPACK struct _HTC_FRAME_HDR{ * to take advantage of 4-byte lookaheads in some hardware implementations */ u8 EndpointID; u8 Flags; - A_UINT16 PayloadLen; /* length of data (including trailer) that follows the header */ + u16 PayloadLen; /* length of data (including trailer) that follows the header */ /***** end of 4-byte lookahead ****/ @@ -110,15 +110,15 @@ typedef PREPACK struct _HTC_FRAME_HDR{ /* base message ID header */ typedef PREPACK struct { - A_UINT16 MessageID; + u16 MessageID; } POSTPACK HTC_UNKNOWN_MSG; /* HTC ready message * direction : target-to-host */ typedef PREPACK struct { - A_UINT16 MessageID; /* ID */ - A_UINT16 CreditCount; /* number of credits the target can offer */ - A_UINT16 CreditSize; /* size of each credit */ + u16 MessageID; /* ID */ + u16 CreditCount; /* number of credits the target can offer */ + u16 CreditSize; /* size of each credit */ u8 MaxEndpoints; /* maximum number of endpoints the target has resources for */ u8 _Pad1; } POSTPACK HTC_READY_MSG; @@ -139,9 +139,9 @@ typedef PREPACK struct { /* connect service * direction : host-to-target */ typedef PREPACK struct { - A_UINT16 MessageID; - A_UINT16 ServiceID; /* service ID of the service to connect to */ - A_UINT16 ConnectionFlags; /* connection flags */ + u16 MessageID; + u16 ServiceID; /* service ID of the service to connect to */ + u16 ConnectionFlags; /* connection flags */ #define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2) /* reduce credit dribbling when the host needs credits */ @@ -161,11 +161,11 @@ typedef PREPACK struct { /* connect response * direction : target-to-host */ typedef PREPACK struct { - A_UINT16 MessageID; - A_UINT16 ServiceID; /* service ID that the connection request was made */ + u16 MessageID; + u16 ServiceID; /* service ID that the connection request was made */ u8 Status; /* service connection status */ u8 EndpointID; /* assigned endpoint ID */ - A_UINT16 MaxMsgSize; /* maximum expected message size on this endpoint */ + u16 MaxMsgSize; /* maximum expected message size on this endpoint */ u8 ServiceMetaLength; /* length of meta data that follows */ u8 _Pad1; @@ -174,13 +174,13 @@ typedef PREPACK struct { } POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG; typedef PREPACK struct { - A_UINT16 MessageID; + u16 MessageID; /* currently, no other fields */ } POSTPACK HTC_SETUP_COMPLETE_MSG; /* extended setup completion message */ typedef PREPACK struct { - A_UINT16 MessageID; + u16 MessageID; A_UINT32 SetupFlags; u8 MaxMsgsPerBundledRecv; u8 Rsvd[3]; diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h index 8cf1af834bd0..d6f2301f5713 100644 --- a/drivers/staging/ath6kl/include/common/ini_dset.h +++ b/drivers/staging/ath6kl/include/common/ini_dset.h @@ -74,8 +74,8 @@ typedef enum { } WHAL_INI_DATA_ID; typedef PREPACK struct { - A_UINT16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common - A_UINT16 offset; + u16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common + u16 offset; A_UINT32 newValue; } POSTPACK INI_DSET_REG_OVERRIDE; diff --git a/drivers/staging/ath6kl/include/common/pkt_log.h b/drivers/staging/ath6kl/include/common/pkt_log.h index 331cc04edada..a3719adf54ca 100644 --- a/drivers/staging/ath6kl/include/common/pkt_log.h +++ b/drivers/staging/ath6kl/include/common/pkt_log.h @@ -31,11 +31,11 @@ extern "C" { /* Pkt log info */ typedef PREPACK struct pkt_log_t { struct info_t { - A_UINT16 st; - A_UINT16 end; - A_UINT16 cur; + u16 st; + u16 end; + u16 cur; }info[4096]; - A_UINT16 last_idx; + u16 last_idx; }POSTPACK PACKET_LOG; diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h index a50e9eb24581..36e266fe02dd 100644 --- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h +++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h @@ -128,7 +128,7 @@ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structure char entrySize; /* Entry size per table row */ char searchType; /* Index based access or key based */ char reserved[3]; /* for alignment */ - A_UINT16 tableSize; /* Size of this table */ + u16 tableSize; /* Size of this table */ char *dataPtr; /* Ptr to the actual Table */ } POSTPACK dbMasterTable; /* Master table - table of tables */ @@ -169,9 +169,9 @@ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structure */ typedef PREPACK struct reg_dmn_pair_mapping { - A_UINT16 regDmnEnum; /* 16 bit reg domain pair */ - A_UINT16 regDmn5GHz; /* 5GHz reg domain */ - A_UINT16 regDmn2GHz; /* 2GHz reg domain */ + u16 regDmnEnum; /* 16 bit reg domain pair */ + u16 regDmn5GHz; /* 5GHz reg domain */ + u16 regDmn2GHz; /* 2GHz reg domain */ u8 flags5GHz; /* Requirements flags (AdHoc disallow etc) */ u8 flags2GHz; /* Requirements flags (AdHoc disallow etc) */ A_UINT32 pscanMask; /* Passive Scan flags which can override unitary domain passive scan @@ -188,8 +188,8 @@ typedef PREPACK struct reg_dmn_pair_mapping { #define MCS_HT40_G_NO (0 << 3) typedef PREPACK struct { - A_UINT16 countryCode; - A_UINT16 regDmnEnum; + u16 countryCode; + u16 regDmnEnum; char isoName[3]; char allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */ } POSTPACK COUNTRY_CODE_TO_ENUM_RD; @@ -209,8 +209,8 @@ typedef PREPACK struct { #define FREQ_QUARTER_RATE 0x20000 typedef PREPACK struct RegDmnFreqBand { - A_UINT16 lowChannel; /* Low channel center in MHz */ - A_UINT16 highChannel; /* High Channel center in MHz */ + u16 lowChannel; /* Low channel center in MHz */ + u16 highChannel; /* High Channel center in MHz */ u8 power; /* Max power (dBm) for channel range */ u8 channelSep; /* Channel separation within the band */ u8 useDfs; /* Use DFS in the RegDomain if corresponding bit is set */ @@ -223,12 +223,12 @@ typedef PREPACK struct RegDmnFreqBand { typedef PREPACK struct regDomain { - A_UINT16 regDmnEnum; /* value from EnumRd table */ + u16 regDmnEnum; /* value from EnumRd table */ u8 rdCTL; u8 maxAntGain; u8 dfsMask; /* DFS bitmask for 5Ghz tables */ u8 flags; /* Requirement flags (AdHoc disallow etc) */ - A_UINT16 reserved; /* for alignment */ + u16 reserved; /* for alignment */ A_UINT32 pscan; /* Bitmask for passive scan */ A_UINT32 chan11a[BMLEN]; /* 64 bit bitmask for channel/band selection */ A_UINT32 chan11bg[BMLEN];/* 64 bit bitmask for channel/band selection */ diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h index d6616f0fab7d..4138c1d13d15 100644 --- a/drivers/staging/ath6kl/include/common/testcmd.h +++ b/drivers/staging/ath6kl/include/common/testcmd.h @@ -91,8 +91,8 @@ typedef PREPACK struct { A_UINT32 enANI; A_UINT32 scramblerOff; A_UINT32 aifsn; - A_UINT16 pktSz; - A_UINT16 txPattern; + u16 pktSz; + u16 txPattern; A_UINT32 shortGuard; A_UINT32 numPackets; A_UINT32 wlanMode; @@ -138,8 +138,8 @@ typedef PREPACK struct { A_INT32 rssiInDBm; A_UINT32 crcErrPkt; A_UINT32 secErrPkt; - A_UINT16 rateCnt[TCMD_MAX_RATES]; - A_UINT16 rateCntShortGuard[TCMD_MAX_RATES]; + u16 rateCnt[TCMD_MAX_RATES]; + u16 rateCntShortGuard[TCMD_MAX_RATES]; } POSTPACK report; struct PREPACK TCMD_CONT_RX_MAC { A_UCHAR addr[ATH_MAC_LEN]; diff --git a/drivers/staging/ath6kl/include/common/wlan_dset.h b/drivers/staging/ath6kl/include/common/wlan_dset.h index e092020a2632..e775b25de3a8 100644 --- a/drivers/staging/ath6kl/include/common/wlan_dset.h +++ b/drivers/staging/ath6kl/include/common/wlan_dset.h @@ -27,7 +27,7 @@ typedef PREPACK struct wow_config_dset { u8 valid_dset; u8 gpio_enable; - A_UINT16 gpio_pin; + u16 gpio_pin; } POSTPACK WOW_CONFIG_DSET; #endif diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index d39e7282ec23..d4f8d404b6ee 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h @@ -79,7 +79,7 @@ PREPACK struct host_app_area_s { typedef PREPACK struct { u8 dstMac[ATH_MAC_LEN]; u8 srcMac[ATH_MAC_LEN]; - A_UINT16 typeOrLen; + u16 typeOrLen; } POSTPACK ATH_MAC_HDR; typedef PREPACK struct { @@ -87,7 +87,7 @@ typedef PREPACK struct { u8 ssap; u8 cntl; u8 orgCode[3]; - A_UINT16 etherType; + u16 etherType; } POSTPACK ATH_LLC_SNAP_HDR; typedef enum { @@ -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; /* @@ -246,12 +246,12 @@ typedef PREPACK struct { 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 */ - A_UINT16 flags; /* a combination of WMI_RX_FLAGS_... */ + 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; + 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 */ /* @@ -531,7 +531,7 @@ typedef PREPACK struct { u8 groupCryptoLen; u8 ssidLength; A_UCHAR ssid[WMI_MAX_SSID_LEN]; - A_UINT16 channel; + u16 channel; u8 bssid[ATH_MAC_LEN]; A_UINT32 ctrl_flags; } POSTPACK WMI_CONNECT_CMD; @@ -540,7 +540,7 @@ typedef PREPACK struct { * WMI_RECONNECT_CMDID */ typedef PREPACK struct { - A_UINT16 channel; /* hint */ + u16 channel; /* hint */ u8 bssid[ATH_MAC_LEN]; /* mandatory if set */ } POSTPACK WMI_RECONNECT_CMD; @@ -641,7 +641,7 @@ typedef PREPACK struct { A_UINT32 forceScanInterval; /* Time interval between scans (milliseconds)*/ u8 scanType; /* WMI_SCAN_TYPE */ u8 numChannels; /* how many channels follow */ - A_UINT16 channelList[1]; /* channels in Mhz */ + u16 channelList[1]; /* channels in Mhz */ } POSTPACK WMI_START_SCAN_CMD; /* @@ -676,15 +676,15 @@ 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 */ + 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; - A_UINT16 minact_chdwell_time; /* msec */ - A_UINT16 maxact_scan_per_ssid; /* max active scans per ssid */ + u16 minact_chdwell_time; /* msec */ + u16 maxact_scan_per_ssid; /* max active scans per ssid */ A_UINT32 max_dfsch_act_time; /* msecs */ } POSTPACK WMI_SCAN_PARAMS_CMD; @@ -705,7 +705,7 @@ typedef enum { typedef PREPACK struct { u8 bssFilter; /* see WMI_BSS_FILTER */ u8 reserved1; /* For alignment */ - A_UINT16 reserved2; /* For alignment */ + u16 reserved2; /* For alignment */ A_UINT32 ieMask; } POSTPACK WMI_BSS_FILTER_CMD; @@ -737,15 +737,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 +759,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; /* @@ -819,12 +819,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 */ @@ -838,8 +838,8 @@ typedef enum { typedef PREPACK struct { u8 power_saving; u8 ttl; /* number of beacon periods */ - A_UINT16 atim_windows; /* msec */ - A_UINT16 timeout_value; /* msec */ + u16 atim_windows; /* msec */ + u16 timeout_value; /* msec */ } POSTPACK WMI_IBSS_PM_CAPS_CMD; /* AP power save types */ @@ -866,8 +866,8 @@ typedef enum { } APSD_TIM_POLICY; typedef PREPACK struct { - A_UINT16 psPollTimeout; /* msec */ - A_UINT16 triggerTimeout; /* msec */ + u16 psPollTimeout; /* msec */ + u16 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 */ } POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD; @@ -876,7 +876,7 @@ typedef PREPACK struct { * WMI_SET_VOICE_PKT_SIZE_CMDID */ typedef PREPACK struct { - A_UINT16 voicePktSize; + u16 voicePktSize; } POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD; /* @@ -941,8 +941,8 @@ typedef PREPACK struct { A_UINT32 minPhyRate; /* in bps */ A_UINT32 sba; A_UINT32 mediumTime; - A_UINT16 nominalMSDU; /* in octects */ - A_UINT16 maxMSDU; /* in octects */ + u16 nominalMSDU; /* in octects */ + u16 maxMSDU; /* in octects */ u8 trafficClass; u8 trafficDirection; /* DIR_TYPE */ u8 rxQueueNum; @@ -982,7 +982,7 @@ typedef PREPACK struct { u8 scanParam; /* set if enable scan */ u8 phyMode; /* see WMI_PHY_MODE */ u8 numChannels; /* how many channels follow */ - A_UINT16 channelList[1]; /* channels in Mhz */ + u16 channelList[1]; /* channels in Mhz */ } POSTPACK WMI_CHANNEL_PARAMS_CMD; @@ -1063,7 +1063,7 @@ typedef PREPACK struct { }POSTPACK WMI_SET_LPREAMBLE_CMD; typedef PREPACK struct { - A_UINT16 threshold; + u16 threshold; }POSTPACK WMI_SET_RTS_CMD; /* @@ -1132,7 +1132,7 @@ 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 */ + u16 txop; /* in units of 32 usec */ u8 eCWmin; u8 eCWmax; u8 aifsn; @@ -1208,7 +1208,7 @@ typedef PREPACK struct { } POSTPACK WMI_BSS_BIAS_INFO; typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS { - A_UINT16 lowrssi_scan_period; + u16 lowrssi_scan_period; A_INT16 lowrssi_scan_threshold; A_INT16 lowrssi_roam_threshold; u8 roam_rssi_floor; @@ -1866,7 +1866,7 @@ typedef PREPACK struct { typedef PREPACK struct { - A_UINT16 cmd_buf_sz; /* HCI cmd buffer size */ + u16 cmd_buf_sz; /* HCI cmd buffer size */ u8 buf[1]; /* Absolute HCI cmd */ } POSTPACK WMI_HCI_CMD; @@ -1880,7 +1880,7 @@ typedef PREPACK struct { typedef PREPACK struct { u8 reserved1; u8 numChannels; /* number of channels in reply */ - A_UINT16 channelList[1]; /* channel in Mhz */ + u16 channelList[1]; /* channel in Mhz */ } POSTPACK WMI_CHANNEL_LIST_REPLY; typedef enum { @@ -2002,10 +2002,10 @@ typedef PREPACK struct { * Connect Event */ typedef PREPACK struct { - A_UINT16 channel; + u16 channel; u8 bssid[ATH_MAC_LEN]; - A_UINT16 listenInterval; - A_UINT16 beaconInterval; + u16 listenInterval; + u16 beaconInterval; A_UINT32 networkType; u8 beaconIeLen; u8 assocReqLen; @@ -2033,7 +2033,7 @@ typedef enum { } WMI_DISCONNECT_REASON; typedef PREPACK struct { - A_UINT16 protocolReasonStatus; /* reason code, see 802.11 spec. */ + u16 protocolReasonStatus; /* reason code, see 802.11 spec. */ u8 bssid[ATH_MAC_LEN]; /* set if known */ u8 disconnectReason ; /* see WMI_DISCONNECT_REASON */ u8 assocRespLen; @@ -2059,7 +2059,7 @@ enum { }; typedef PREPACK struct { - A_UINT16 channel; + u16 channel; u8 frameType; /* see WMI_BI_FTYPE */ u8 snr; A_INT16 rssi; @@ -2076,11 +2076,11 @@ typedef PREPACK struct { * - Remove rssi and compute it on the host. rssi = snr - 95 */ typedef PREPACK struct { - A_UINT16 channel; + u16 channel; u8 frameType; /* see WMI_BI_FTYPE */ u8 snr; u8 bssid[ATH_MAC_LEN]; - A_UINT16 ieMask; + u16 ieMask; } POSTPACK WMI_BSS_INFO_HDR2; /* @@ -2093,7 +2093,7 @@ typedef enum { } WMI_ERROR_CODE; typedef PREPACK struct { - A_UINT16 commandId; + u16 commandId; u8 errorCode; } POSTPACK WMI_CMD_ERROR_EVENT; @@ -2190,7 +2190,7 @@ typedef enum { } WMI_OPT_FTYPE; typedef PREPACK struct { - A_UINT16 optIEDataLen; + u16 optIEDataLen; u8 frmType; u8 dstAddr[ATH_MAC_LEN]; u8 bssid[ATH_MAC_LEN]; @@ -2205,7 +2205,7 @@ typedef PREPACK struct { * The 802.11 header is not included. */ typedef PREPACK struct { - A_UINT16 channel; + u16 channel; u8 frameType; /* see WMI_OPT_FTYPE */ A_INT8 snr; u8 srcAddr[ATH_MAC_LEN]; @@ -2266,19 +2266,19 @@ typedef PREPACK struct { typedef PREPACK struct { A_UINT32 power_save_failure_cnt; - A_UINT16 stop_tx_failure_cnt; - A_UINT16 atim_tx_failure_cnt; - A_UINT16 atim_rx_failure_cnt; - A_UINT16 bcn_rx_failure_cnt; + u16 stop_tx_failure_cnt; + u16 atim_tx_failure_cnt; + u16 atim_rx_failure_cnt; + u16 bcn_rx_failure_cnt; }POSTPACK pm_stats_t; typedef PREPACK struct { A_UINT32 cs_bmiss_cnt; A_UINT32 cs_lowRssi_cnt; - A_UINT16 cs_connect_cnt; - A_UINT16 cs_disconnect_cnt; + u16 cs_connect_cnt; + u16 cs_disconnect_cnt; A_INT16 cs_aveBeacon_rssi; - A_UINT16 cs_roam_count; + u16 cs_roam_count; A_INT16 cs_rssi; u8 cs_snr; u8 cs_aveBeacon_snr; @@ -2299,7 +2299,7 @@ typedef PREPACK struct { typedef PREPACK struct { A_UINT32 wow_num_pkts_dropped; - A_UINT16 wow_num_events_discarded; + u16 wow_num_events_discarded; u8 wow_num_host_pkt_wakeups; u8 wow_num_host_event_wakeups; } POSTPACK wlan_wow_stats_t; @@ -2409,8 +2409,8 @@ typedef PREPACK struct { typedef PREPACK struct { - A_UINT16 roamMode; - A_UINT16 numEntries; + u16 roamMode; + u16 numEntries; WMI_BSS_ROAM_INFO bssRoamInfo[1]; } POSTPACK WMI_TARGET_ROAM_TBL; @@ -2418,7 +2418,7 @@ typedef PREPACK struct { * WMI_HCI_EVENT_EVENTID */ typedef PREPACK struct { - A_UINT16 evt_buf_sz; /* HCI event buffer size */ + u16 evt_buf_sz; /* HCI event buffer size */ u8 buf[1]; /* HCI event */ } POSTPACK WMI_HCI_EVENT; @@ -2451,7 +2451,7 @@ typedef enum { typedef PREPACK struct { u8 bssid[ATH_MAC_LEN]; - A_UINT16 channel; + u16 channel; } POSTPACK WMI_AP_INFO_V1; typedef PREPACK union { @@ -2728,7 +2728,7 @@ typedef enum { typedef PREPACK struct { u32 enable_wow; WMI_WOW_FILTER filter; - A_UINT16 hostReqDelay; + u16 hostReqDelay; } POSTPACK WMI_SET_WOW_MODE_CMD; typedef PREPACK struct { @@ -2754,8 +2754,8 @@ typedef PREPACK struct { } POSTPACK WMI_ADD_WOW_PATTERN_CMD; typedef PREPACK struct { - A_UINT16 filter_list_id; - A_UINT16 filter_id; + u16 filter_list_id; + u16 filter_id; } POSTPACK WMI_DEL_WOW_PATTERN_CMD; typedef PREPACK struct { @@ -2797,7 +2797,7 @@ typedef PREPACK struct { } POSTPACK WMI_PMKID_LIST_REPLY; typedef PREPACK struct { - A_UINT16 oldChannel; + u16 oldChannel; A_UINT32 newChannel; } POSTPACK WMI_CHANNEL_CHANGE_EVENT; @@ -2810,7 +2810,7 @@ typedef PREPACK struct { typedef PREPACK struct { u8 tid; u8 win_sz; - A_UINT16 st_seq_no; + u16 st_seq_no; u8 status; /* f/w response for ADDBA Req; OK(0) or failure(!=0) */ } POSTPACK WMI_ADDBA_REQ_EVENT; @@ -2818,7 +2818,7 @@ typedef PREPACK struct { typedef PREPACK struct { u8 tid; u8 status; /* OK(0), failure (!=0) */ - A_UINT16 amsdu_sz; /* Three values: Not supported(0), 3839, 8k */ + u16 amsdu_sz; /* Three values: Not supported(0), 3839, 8k */ } POSTPACK WMI_ADDBA_RESP_EVENT; /* WMI_DELBA_EVENTID @@ -2828,7 +2828,7 @@ typedef PREPACK struct { typedef PREPACK struct { u8 tid; u8 is_peer_initiator; - A_UINT16 reason_code; + u16 reason_code; } POSTPACK WMI_DELBA_EVENT; @@ -2847,8 +2847,8 @@ typedef PREPACK struct { * on each tid, in each direction */ typedef PREPACK struct { - A_UINT16 tx_allow_aggr; /* 16-bit mask to allow uplink ADDBA negotiation - bit position indicates tid*/ - A_UINT16 rx_allow_aggr; /* 16-bit mask to allow donwlink ADDBA negotiation - bit position indicates tid*/ + u16 tx_allow_aggr; /* 16-bit mask to allow uplink ADDBA negotiation - bit position indicates tid*/ + u16 rx_allow_aggr; /* 16-bit mask to allow donwlink ADDBA negotiation - bit position indicates tid*/ } POSTPACK WMI_ALLOW_AGGR_CMD; /* WMI_ADDBA_REQ_CMDID @@ -2973,7 +2973,7 @@ typedef PREPACK struct { } POSTPACK WMI_AP_ACL_MAC_CMD; typedef PREPACK struct { - A_UINT16 index; + u16 index; u8 acl_mac[AP_ACL_SIZE][ATH_MAC_LEN]; u8 wildcard[AP_ACL_SIZE]; u8 policy; @@ -2991,7 +2991,7 @@ typedef PREPACK struct { */ typedef PREPACK struct { u8 mac[ATH_MAC_LEN]; - A_UINT16 reason; /* 802.11 reason code */ + u16 reason; /* 802.11 reason code */ u8 cmd; /* operation to perform */ #define WMI_AP_MLME_ASSOC 1 /* associate station */ #define WMI_AP_DISASSOC 2 /* disassociate station */ @@ -3011,7 +3011,7 @@ typedef PREPACK struct { typedef PREPACK struct { u32 flag; - A_UINT16 aid; + u16 aid; } POSTPACK WMI_AP_SET_PVB_CMD; #define WMI_DISABLE_REGULATORY_CODE "FF" @@ -3074,7 +3074,7 @@ typedef PREPACK struct { /* AP mode events */ /* WMI_PS_POLL_EVENT */ typedef PREPACK struct { - A_UINT16 aid; + u16 aid; } POSTPACK WMI_PSPOLL_EVENT; typedef PREPACK struct { diff --git a/drivers/staging/ath6kl/include/common/wmi_thin.h b/drivers/staging/ath6kl/include/common/wmi_thin.h index 5444a0b9197b..dee5e8aae425 100644 --- a/drivers/staging/ath6kl/include/common/wmi_thin.h +++ b/drivers/staging/ath6kl/include/common/wmi_thin.h @@ -103,7 +103,7 @@ typedef enum{ typedef PREPACK struct { u8 version; /* the versioned type of messages to use or 0 to disable */ u8 countThreshold; /* msg count threshold triggering a tx complete message */ - A_UINT16 timeThreshold; /* timeout interval in MSEC triggering a tx complete message */ + u16 timeThreshold; /* timeout interval in MSEC triggering a tx complete message */ } POSTPACK WMI_THIN_CONFIG_TXCOMPLETE; /* WMI_THIN_CONFIG_DECRYPT_ERR -- Used to configure behavior for received frames @@ -139,7 +139,7 @@ typedef PREPACK struct { #define WMI_THIN_CFG_MAC_RULES 0x00000004 #define WMI_THIN_CFG_FILTER_RULES 0x00000008 A_UINT32 cfgField; /* combination of WMI_THIN_CFG_... describes contents of config command */ - A_UINT16 length; /* length in bytes of appended sub-commands */ + u16 length; /* length in bytes of appended sub-commands */ u8 reserved[2]; /* align padding */ } POSTPACK WMI_THIN_CONFIG_CMD; @@ -192,13 +192,13 @@ typedef PREPACK struct { } POSTPACK WMI_THIN_MIB_SLOT_TIME; typedef PREPACK struct { - A_UINT16 length; //units == bytes + u16 length; //units == bytes } POSTPACK WMI_THIN_MIB_RTS_THRESHOLD; typedef PREPACK struct { u8 type; // type of frame u8 rate; // tx rate to be used (one of WMI_BIT_RATE) - A_UINT16 length; // num bytes following this structure as the template data + u16 length; // num bytes following this structure as the template data } POSTPACK WMI_THIN_MIB_TEMPLATE_FRAME; typedef PREPACK struct { @@ -221,11 +221,11 @@ typedef PREPACK struct { u8 treatment; u8 oui[3]; u8 type; - A_UINT16 version; + u16 version; } POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_OUI; typedef PREPACK struct { - A_UINT16 numElements; + u16 numElements; u8 entrySize; // sizeof(WMI_THIN_MIB_BEACON_FILTER_TABLE) on host cpu may be 2 may be 4 u8 reserved; } POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_HEADER; @@ -290,7 +290,7 @@ typedef PREPACK struct { } POSTPACK WMI_THIN_MIB_PREAMBLE; typedef PREPACK struct { - A_UINT16 length; /* the length in bytes of the appended MIB data */ + u16 length; /* the length in bytes of the appended MIB data */ u8 mibID; /* the ID of the MIB element being set */ u8 reserved; /* align padding */ } POSTPACK WMI_THIN_SET_MIB_CMD; @@ -303,8 +303,8 @@ typedef PREPACK struct { typedef PREPACK struct { A_UINT32 basicRateMask; /* bit mask of basic rates */ A_UINT32 beaconIntval; /* TUs */ - A_UINT16 atimWindow; /* TUs */ - A_UINT16 channel; /* frequency in Mhz */ + u16 atimWindow; /* TUs */ + u16 channel; /* frequency in Mhz */ u8 networkType; /* INFRA_NETWORK | ADHOC_NETWORK */ u8 ssidLength; /* 0 - 32 */ u8 probe; /* != 0 : issue probe req at start */ @@ -314,8 +314,8 @@ typedef PREPACK struct { } POSTPACK WMI_THIN_JOIN_CMD; typedef PREPACK struct { - A_UINT16 dtim; /* dtim interval in num beacons */ - A_UINT16 aid; /* 80211 AID from Assoc resp */ + u16 dtim; /* dtim interval in num beacons */ + u16 aid; /* 80211 AID from Assoc resp */ } POSTPACK WMI_THIN_POST_ASSOC_CMD; typedef enum { diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h index 9059f249856f..27d8fa281c9c 100644 --- a/drivers/staging/ath6kl/include/htc_api.h +++ b/drivers/staging/ath6kl/include/htc_api.h @@ -41,7 +41,7 @@ extern "C" { typedef void *HTC_HANDLE; -typedef A_UINT16 HTC_SERVICE_ID; +typedef u16 HTC_SERVICE_ID; typedef struct _HTC_INIT_INFO { void *pContext; /* context for target failure notification */ @@ -141,7 +141,7 @@ typedef struct _HTC_EP_CALLBACKS { /* service connection information */ typedef struct _HTC_SERVICE_CONNECT_REQ { HTC_SERVICE_ID ServiceID; /* service ID to connect to */ - A_UINT16 ConnectionFlags; /* connection flags, see htc protocol definition */ + u16 ConnectionFlags; /* connection flags, see htc protocol definition */ u8 *pMetaData; /* ptr to optional service-specific meta-data */ u8 MetaDataLength; /* optional meta data length */ HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */ diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h index 55914efd4be8..bbf33d1564de 100644 --- a/drivers/staging/ath6kl/include/htc_packet.h +++ b/drivers/staging/ath6kl/include/htc_packet.h @@ -46,7 +46,7 @@ struct _HTC_PACKET; typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *); -typedef A_UINT16 HTC_TX_TAG; +typedef u16 HTC_TX_TAG; typedef struct _HTC_TX_PACKET_INFO { HTC_TX_TAG Tag; /* tag used to selective flush packets */ diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h index bbc9b1f1982f..8fe804d6a215 100644 --- a/drivers/staging/ath6kl/include/wlan_api.h +++ b/drivers/staging/ath6kl/include/wlan_api.h @@ -35,7 +35,7 @@ struct ieee80211_node_table; struct ieee80211_frame; struct ieee80211_common_ie { - A_UINT16 ie_chan; + u16 ie_chan; u8 *ie_tstamp; u8 *ie_ssid; u8 *ie_rates; @@ -45,8 +45,8 @@ struct ieee80211_common_ie { u8 *ie_rsn; u8 *ie_wmm; u8 *ie_ath; - A_UINT16 ie_capInfo; - A_UINT16 ie_beaconInt; + u16 ie_capInfo; + u16 ie_beaconInt; u8 *ie_tim; u8 *ie_chswitch; u8 ie_erp; @@ -68,7 +68,7 @@ typedef struct bss { struct bss *ni_hash_prev; struct ieee80211_common_ie ni_cie; u8 *ni_buf; - A_UINT16 ni_framelen; + u16 ni_framelen; struct ieee80211_node_table *ni_table; A_UINT32 ni_refcnt; int ni_scangen; @@ -99,8 +99,8 @@ void wlan_node_table_cleanup(struct ieee80211_node_table *nt); int wlan_parse_beacon(u8 *buf, int framelen, struct ieee80211_common_ie *cie); -A_UINT16 wlan_ieee2freq(int chan); -A_UINT32 wlan_freq2ieee(A_UINT16 freq); +u16 wlan_ieee2freq(int chan); +A_UINT32 wlan_freq2ieee(u16 freq); void wlan_set_nodeage(struct ieee80211_node_table *nt, A_UINT32 nodeAge); diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h index 3f622100e9b0..a0310b66106c 100644 --- a/drivers/staging/ath6kl/include/wmi_api.h +++ b/drivers/staging/ath6kl/include/wmi_api.h @@ -69,7 +69,7 @@ void wmi_qos_state_init(struct wmi_t *wmip); void wmi_shutdown(struct wmi_t *wmip); HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip); void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid); -A_UINT16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 ); +u16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 ); int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf); int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, u8 msgType, bool bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,u8 metaVersion, void *pTxMetaS); int wmi_dot3_2_dix(void *osbuf); @@ -113,46 +113,46 @@ int wmi_connect_cmd(struct wmi_t *wmip, int ssidLength, A_UCHAR *ssid, u8 *bssid, - A_UINT16 channel, + u16 channel, A_UINT32 ctrl_flags); int wmi_reconnect_cmd(struct wmi_t *wmip, u8 *bssid, - A_UINT16 channel); + u16 channel); int wmi_disconnect_cmd(struct wmi_t *wmip); int wmi_getrev_cmd(struct wmi_t *wmip); int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, u32 forceFgScan, u32 isLegacy, A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, - A_INT8 numChan, A_UINT16 *channelList); -int wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, - A_UINT16 fg_end_sec, A_UINT16 bg_sec, - A_UINT16 minact_chdw_msec, - A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec, + A_INT8 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, + u16 maxact_chdw_msec, u16 pas_chdw_msec, u8 shScanRatio, u8 scanCtrlFlags, A_UINT32 max_dfsch_act_time, - A_UINT16 maxact_scan_per_ssid); + u16 maxact_scan_per_ssid); int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask); int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, u8 ssidLength, A_UCHAR *ssid); -int wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons); -int wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons); +int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons); +int wmi_bmisstime_cmd(struct wmi_t *wmip, u16 bmisstime, u16 bmissbeacons); int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType, u8 ieLen, u8 *ieInfo); int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode); int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, - A_UINT16 atim_windows, A_UINT16 timeout_value); + u16 atim_windows, u16 timeout_value); int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time, A_UINT32 ps_period, u8 sleep_period); -int wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, - A_UINT16 psPollNum, A_UINT16 dtimPolicy, - A_UINT16 wakup_tx_policy, A_UINT16 num_tx_to_wakeup, - A_UINT16 ps_fail_event_policy); +int wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod, + u16 psPollNum, u16 dtimPolicy, + u16 wakup_tx_policy, u16 num_tx_to_wakeup, + u16 ps_fail_event_policy); int wmi_disctimeout_cmd(struct wmi_t *wmip, u8 timeout); int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber); int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); 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, A_UINT16 rateMask); +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); @@ -160,7 +160,7 @@ 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, - A_UINT16 *channelList); + u16 *channelList); int wmi_set_snr_threshold_params(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); @@ -169,7 +169,7 @@ int wmi_set_rssi_threshold_params(struct wmi_t *wmip, int wmi_clr_rssi_snr(struct wmi_t *wmip); int wmi_set_lq_threshold_params(struct wmi_t *wmip, WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd); -int wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold); +int wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold); int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy); int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); @@ -177,8 +177,8 @@ int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source); -int wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, - A_UINT16 tsr, bool rep, A_UINT16 size, +int wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask, + u16 tsr, bool rep, u16 size, A_UINT32 valid); int wmi_get_stats_cmd(struct wmi_t *wmip); @@ -204,7 +204,7 @@ int wmi_deleteBadAp_cmd(struct wmi_t *wmip, u8 apIndex); int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en); int wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, bool set); -int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, A_UINT16 txop, +int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, u16 txop, u8 eCWmin, u8 eCWmax, u8 aifsn); int wmi_set_retry_limits_cmd(struct wmi_t *wmip, u8 frameType, @@ -226,11 +226,11 @@ int wmi_opt_tx_frame_cmd(struct wmi_t *wmip, u8 frmType, u8 *dstMacAddr, u8 *bssid, - A_UINT16 optIEDataLen, + u16 optIEDataLen, u8 *optIEData); -int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl); -int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize); +int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, u16 intvl); +int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, u16 voicePktSize); int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, u8 maxSpLen); u8 convert_userPriority_to_trafficClass(u8 userPriority); u8 wmi_get_power_mode_cmd(struct wmi_t *wmip); @@ -293,7 +293,7 @@ int wmi_set_keepalive_cmd(struct wmi_t *wmip, u8 keepaliveInterval); int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, u8 ieLen,u8 *ieInfo); -int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, A_UINT16 dataLen); +int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); A_INT32 wmi_get_rate(A_INT8 rateindex); @@ -371,10 +371,10 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *a); u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl); int -wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, A_UINT16 reason); +wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, u16 reason); int -wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, bool flag); +wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag); int wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); @@ -395,7 +395,7 @@ int wmi_set_ht_op_cmd(struct wmi_t *wmip, u8 sta_chan_width); int -wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz); +wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz); int wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); @@ -407,7 +407,7 @@ int wmi_delete_aggr_cmd(struct wmi_t *wmip, u8 tid, bool uplink); int -wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask); +wmi_allow_aggr_cmd(struct wmi_t *wmip, u16 tx_tidmask, u16 rx_tidmask); int wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, bool rxDot11Hdr, bool defragOnHost); @@ -421,11 +421,10 @@ wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE pre int wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk); -A_UINT16 -wmi_ieee2freq (int chan); +u16 wmi_ieee2freq (int chan); A_UINT32 -wmi_freq2ieee (A_UINT16 freq); +wmi_freq2ieee (u16 freq); bss_t * wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, |