From 2b109825ac3470bf1a50948e4a53bd4ec8668c2f Mon Sep 17 00:00:00 2001 From: Vivek Date: Thu, 22 Mar 2018 23:27:21 +0530 Subject: [PATCH] qcacmn: Replace A_UINT with appropriate types There are instances of use of older A_UINT/A_INT. Replace all such instances with the qdf u_int*_t/int*_t. Change-Id: I7ce29b03f29a0d1a0cf87cfd3c846f4694da4c2a CR's-Fixed: 2210869 --- dp/inc/cdp_txrx_stats_struct.h | 114 ++++----- hif/src/usb/if_usb.c | 8 +- htc/htc_internal.h | 8 +- utils/epping/inc/epping_internal.h | 4 +- utils/epping/src/epping_helper.c | 6 +- utils/epping/src/epping_tx.c | 6 +- utils/fwlog/dbglog_host.c | 370 ++++++++++++++--------------- utils/fwlog/dbglog_host.h | 20 +- utils/pktlog/pktlog_internal.c | 6 +- wmi/inc/wmi_unified_api.h | 2 +- wmi/inc/wmi_unified_param.h | 24 +- wmi/inc/wmi_unified_priv.h | 14 +- wmi/src/wmi_tlv_helper.c | 138 +++++------ wmi/src/wmi_unified.c | 10 +- wmi/src/wmi_unified_api.c | 2 +- wmi/src/wmi_unified_non_tlv.c | 38 +-- wmi/src/wmi_unified_tlv.c | 98 ++++---- 17 files changed, 434 insertions(+), 434 deletions(-) diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h index ee2c4b153250..f404385f9abc 100644 --- a/dp/inc/cdp_txrx_stats_struct.h +++ b/dp/inc/cdp_txrx_stats_struct.h @@ -909,70 +909,70 @@ struct ol_txrx_stats { }; struct ol_ath_dbg_rx_rssi { - A_UINT8 rx_rssi_pri20; - A_UINT8 rx_rssi_sec20; - A_UINT8 rx_rssi_sec40; - A_UINT8 rx_rssi_sec80; + uint8_t rx_rssi_pri20; + uint8_t rx_rssi_sec20; + uint8_t rx_rssi_sec40; + uint8_t rx_rssi_sec80; }; struct ol_ath_radiostats { - A_UINT64 tx_beacon; - A_UINT32 be_nobuf; - A_UINT32 tx_buf_count; - A_UINT32 tx_packets; - A_UINT32 rx_packets; - A_INT32 tx_mgmt; - A_UINT32 tx_num_data; - A_UINT32 rx_num_data; - A_INT32 rx_mgmt; - A_UINT32 rx_num_mgmt; - A_UINT32 rx_num_ctl; - A_UINT32 tx_rssi; - A_UINT32 tx_mcs[10]; - A_UINT32 rx_mcs[10]; - A_UINT32 rx_rssi_comb; + uint64_t tx_beacon; + uint32_t be_nobuf; + uint32_t tx_buf_count; + uint32_t tx_packets; + uint32_t rx_packets; + int32_t tx_mgmt; + uint32_t tx_num_data; + uint32_t rx_num_data; + int32_t rx_mgmt; + uint32_t rx_num_mgmt; + uint32_t rx_num_ctl; + uint32_t tx_rssi; + uint32_t tx_mcs[10]; + uint32_t rx_mcs[10]; + uint32_t rx_rssi_comb; struct ol_ath_dbg_rx_rssi rx_rssi_chain0; struct ol_ath_dbg_rx_rssi rx_rssi_chain1; struct ol_ath_dbg_rx_rssi rx_rssi_chain2; struct ol_ath_dbg_rx_rssi rx_rssi_chain3; - A_UINT64 rx_bytes; - A_UINT64 tx_bytes; - A_UINT32 tx_compaggr; - A_UINT32 rx_aggr; - A_UINT32 tx_bawadv; - A_UINT32 tx_compunaggr; - A_UINT32 rx_overrun; - A_UINT32 rx_badcrypt; - A_UINT32 rx_badmic; - A_UINT32 rx_crcerr; - A_UINT32 rx_phyerr; - A_UINT32 ackRcvBad; - A_UINT32 rtsBad; - A_UINT32 rtsGood; - A_UINT32 fcsBad; - A_UINT32 noBeacons; - A_UINT32 mib_int_count; - A_UINT32 rx_looplimit_start; - A_UINT32 rx_looplimit_end; - A_UINT8 ap_stats_tx_cal_enable; - A_UINT32 tgt_asserts; - A_INT16 chan_nf; - A_UINT32 rx_last_msdu_unset_cnt; - A_INT16 chan_nf_sec80; - A_UINT64 wmi_tx_mgmt; - A_UINT64 wmi_tx_mgmt_completions; - A_UINT32 wmi_tx_mgmt_completion_err; - A_UINT32 peer_delete_req; - A_UINT32 peer_delete_resp; - A_UINT32 rx_mgmt_rssi_drop; - A_UINT32 tx_retries; - A_UINT32 rx_data_bytes; - A_UINT32 tx_frame_count; - A_UINT32 rx_frame_count; - A_UINT32 rx_clear_count; - A_UINT32 cycle_count; - A_UINT32 phy_err_count; - A_UINT32 chan_tx_pwr; + uint64_t rx_bytes; + uint64_t tx_bytes; + uint32_t tx_compaggr; + uint32_t rx_aggr; + uint32_t tx_bawadv; + uint32_t tx_compunaggr; + uint32_t rx_overrun; + uint32_t rx_badcrypt; + uint32_t rx_badmic; + uint32_t rx_crcerr; + uint32_t rx_phyerr; + uint32_t ackRcvBad; + uint32_t rtsBad; + uint32_t rtsGood; + uint32_t fcsBad; + uint32_t noBeacons; + uint32_t mib_int_count; + uint32_t rx_looplimit_start; + uint32_t rx_looplimit_end; + uint8_t ap_stats_tx_cal_enable; + uint32_t tgt_asserts; + int16_t chan_nf; + uint32_t rx_last_msdu_unset_cnt; + int16_t chan_nf_sec80; + uint64_t wmi_tx_mgmt; + uint64_t wmi_tx_mgmt_completions; + uint32_t wmi_tx_mgmt_completion_err; + uint32_t peer_delete_req; + uint32_t peer_delete_resp; + uint32_t rx_mgmt_rssi_drop; + uint32_t tx_retries; + uint32_t rx_data_bytes; + uint32_t tx_frame_count; + uint32_t rx_frame_count; + uint32_t rx_clear_count; + uint32_t cycle_count; + uint32_t phy_err_count; + uint32_t chan_tx_pwr; }; /* diff --git a/hif/src/usb/if_usb.c b/hif/src/usb/if_usb.c index 1d6f03f3aec7..5d6fd26bc324 100644 --- a/hif/src/usb/if_usb.c +++ b/hif/src/usb/if_usb.c @@ -584,7 +584,7 @@ void hif_fw_assert_ramdump_pattern(struct hif_usb_softc *sc) data = sc->fw_data; len = sc->fw_data_len; - pattern = *((A_UINT32 *) data); + pattern = *((uint32_t *) data); qdf_assert(sc->ramdump_index < FW_RAM_SEG_CNT); i = sc->ramdump_index; @@ -613,7 +613,7 @@ void hif_fw_assert_ramdump_pattern(struct hif_usb_softc *sc) ram_ptr = (sc->ramdump[i])->mem + (sc->ramdump[i])->length; (sc->ramdump[i])->length += (len - 8); if (sc->ramdump[i]->length <= fw_ram_reg_size[i]) { - qdf_mem_copy(ram_ptr, (A_UINT8 *) reg, len - 8); + qdf_mem_copy(ram_ptr, (uint8_t *) reg, len - 8); } else { HIF_ERROR("memory copy overlap\n"); QDF_BUG(0); @@ -664,7 +664,7 @@ void hif_usb_ramdump_handler(struct hif_opaque_softc *scn) data = sc->fw_data; len = sc->fw_data_len; - pattern = *((A_UINT32 *) data); + pattern = *((uint32_t *) data); if (pattern == FW_ASSERT_PATTERN) { HIF_ERROR("Firmware crash detected...\n"); @@ -676,7 +676,7 @@ void hif_usb_ramdump_handler(struct hif_opaque_softc *scn) reg = (uint32_t *) (data + 4); print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET, 16, 4, reg, - min_t(A_UINT32, len - 4, FW_REG_DUMP_CNT * 4), + min_t(uint32_t, len - 4, FW_REG_DUMP_CNT * 4), false); sc->fw_ram_dumping = 0; diff --git a/htc/htc_internal.h b/htc/htc_internal.h index ffcb7bb79ad0..c03473d536ae 100644 --- a/htc/htc_internal.h +++ b/htc/htc_internal.h @@ -226,12 +226,12 @@ typedef struct _HTC_TARGET { qdf_work_t queue_kicker; #ifdef HIF_SDIO - A_UINT16 AltDataCreditSize; + uint16_t AltDataCreditSize; #endif - A_UINT32 avail_tx_credits; + uint32_t avail_tx_credits; #if defined(DEBUG_HL_LOGGING) && defined(CONFIG_HL_SUPPORT) - A_UINT32 rx_bundle_stats[HTC_MAX_MSG_PER_BUNDLE_RX]; - A_UINT32 tx_bundle_stats[HTC_MAX_MSG_PER_BUNDLE_TX]; + uint32_t rx_bundle_stats[HTC_MAX_MSG_PER_BUNDLE_RX]; + uint32_t tx_bundle_stats[HTC_MAX_MSG_PER_BUNDLE_TX]; #endif uint32_t con_mode; diff --git a/utils/epping/inc/epping_internal.h b/utils/epping/inc/epping_internal.h index 0460b2f50391..0a6f8eac7d0a 100644 --- a/utils/epping/inc/epping_internal.h +++ b/utils/epping/inc/epping_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -163,7 +163,7 @@ void epping_log_packet(epping_adapter_t *adapter, EPPING_HEADER *eppingHdr, int ret, const char *str); void epping_log_stats(epping_adapter_t *adapter, const char *str); void epping_set_kperf_flag(epping_adapter_t *adapter, - HTC_ENDPOINT_ID eid, A_UINT8 kperf_flag); + HTC_ENDPOINT_ID eid, uint8_t kperf_flag); /* epping_tx signatures */ void epping_tx_timer_expire(epping_adapter_t *adapter); diff --git a/utils/epping/src/epping_helper.c b/utils/epping/src/epping_helper.c index 01b1fc4f7166..b484f5d80eef 100644 --- a/utils/epping/src/epping_helper.c +++ b/utils/epping/src/epping_helper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) { - A_UINT32 i, j; + uint32_t i, j; pEpping_ctx->cookie_list = NULL; pEpping_ctx->cookie_count = 0; @@ -203,7 +203,7 @@ void epping_log_stats(epping_adapter_t *adapter, const char *str) } void epping_set_kperf_flag(epping_adapter_t *adapter, - HTC_ENDPOINT_ID eid, A_UINT8 kperf_flag) + HTC_ENDPOINT_ID eid, uint8_t kperf_flag) { adapter->pEpping_ctx->kperf_num_rx_recv[eid] = 0; adapter->pEpping_ctx->kperf_num_tx_acks[eid] = 0; diff --git a/utils/epping/src/epping_tx.c b/utils/epping/src/epping_tx.c index 9119c1cde00f..759f0783213f 100644 --- a/utils/epping/src/epping_tx.c +++ b/utils/epping/src/epping_tx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -104,7 +104,7 @@ static int epping_tx_send_int(qdf_nbuf_t skb, epping_adapter_t *adapter) EPPING_HEADER *eppingHdr = (EPPING_HEADER *) qdf_nbuf_data(skb); HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; struct epping_cookie *cookie = NULL; - A_UINT8 ac = 0; + uint8_t ac = 0; QDF_STATUS ret = QDF_STATUS_SUCCESS; int skb_len; EPPING_HEADER tmpHdr = *eppingHdr; @@ -219,7 +219,7 @@ int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *adapter) { qdf_nbuf_t nodrop_skb; EPPING_HEADER *eppingHdr; - A_UINT8 ac = 0; + uint8_t ac = 0; eppingHdr = (EPPING_HEADER *) qdf_nbuf_data(skb); diff --git a/utils/fwlog/dbglog_host.c b/utils/fwlog/dbglog_host.c index bf4006b859d1..8ea604baf3fd 100644 --- a/utils/fwlog/dbglog_host.c +++ b/utils/fwlog/dbglog_host.c @@ -85,9 +85,9 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(fwlog, module_dbg_print mod_print[WLAN_MODULE_ID_MAX]; -A_UINT32 dbglog_process_type = DBGLOG_PROCESS_NET_RAW; +uint32_t dbglog_process_type = DBGLOG_PROCESS_NET_RAW; -static const char *dbglog_get_module_str(A_UINT32 module_id) +static const char *dbglog_get_module_str(uint32_t module_id) { switch (module_id) { case WLAN_MODULE_INF: @@ -1267,10 +1267,10 @@ char *DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = { }, }; -int dbglog_module_log_enable(wmi_unified_t wmi_handle, A_UINT32 mod_id, +int dbglog_module_log_enable(wmi_unified_t wmi_handle, uint32_t mod_id, bool isenable) { - A_UINT32 val = 0; + uint32_t val = 0; if (mod_id > WLAN_MODULE_ID_MAX) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, @@ -1293,7 +1293,7 @@ int dbglog_module_log_enable(wmi_unified_t wmi_handle, A_UINT32 mod_id, return 0; } -int dbglog_vap_log_enable(wmi_unified_t wmi_handle, A_UINT16 vap_id, +int dbglog_vap_log_enable(wmi_unified_t wmi_handle, uint16_t vap_id, bool isenable) { if (vap_id > DBGLOG_MAX_VDEVID) { @@ -1313,7 +1313,7 @@ int dbglog_vap_log_enable(wmi_unified_t wmi_handle, A_UINT16 vap_id, int dbglog_set_log_lvl(wmi_unified_t wmi_handle, DBGLOG_LOG_LVL log_lvl) { - A_UINT32 val = 0; + uint32_t val = 0; if (log_lvl > DBGLOG_LVL_MAX) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, @@ -1330,7 +1330,7 @@ int dbglog_set_log_lvl(wmi_unified_t wmi_handle, DBGLOG_LOG_LVL log_lvl) return 0; } -int dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, A_UINT32 mod_log_lvl) +int dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, uint32_t mod_log_lvl) { /* set the global module level to log_lvl */ wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, @@ -1341,7 +1341,7 @@ int dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, A_UINT32 mod_log_lvl) void dbglog_set_vap_enable_bitmap(wmi_unified_t wmi_handle, - A_UINT32 vap_enable_bitmap) + uint32_t vap_enable_bitmap) { wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP, @@ -1349,8 +1349,8 @@ dbglog_set_vap_enable_bitmap(wmi_unified_t wmi_handle, } void -dbglog_set_mod_enable_bitmap(wmi_unified_t wmi_handle, A_UINT32 log_level, - A_UINT32 *mod_enable_bitmap, A_UINT32 bitmap_len) +dbglog_set_mod_enable_bitmap(wmi_unified_t wmi_handle, uint32_t log_level, + uint32_t *mod_enable_bitmap, uint32_t bitmap_len) { wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP, @@ -1376,7 +1376,7 @@ int dbglog_report_enable(wmi_unified_t wmi_handle, bool isenable) return 0; } -static char *dbglog_get_msg(A_UINT32 moduleid, A_UINT32 debugid) +static char *dbglog_get_msg(uint32_t moduleid, uint32_t debugid) { static char unknown_str[64]; @@ -1393,7 +1393,7 @@ static char *dbglog_get_msg(A_UINT32 moduleid, A_UINT32 debugid) } static -void dbglog_printf(A_UINT32 timestamp, A_UINT16 vap_id, const char *fmt, ...) +void dbglog_printf(uint32_t timestamp, uint16_t vap_id, const char *fmt, ...) { char buf[128]; va_list ap; @@ -1415,8 +1415,8 @@ void dbglog_printf(A_UINT32 timestamp, A_UINT16 vap_id, const char *fmt, ...) } static void -dbglog_printf_no_line_break(A_UINT32 timestamp, - A_UINT16 vap_id, const char *fmt, ...) +dbglog_printf_no_line_break(uint32_t timestamp, + uint16_t vap_id, const char *fmt, ...) { char buf[128]; va_list ap; @@ -1440,9 +1440,9 @@ dbglog_printf_no_line_break(A_UINT32 timestamp, #define USE_NUMERIC 0 static A_BOOL -dbglog_default_print_handler(A_UINT32 mod_id, A_UINT16 vap_id, A_UINT32 dbg_id, - A_UINT32 timestamp, A_UINT16 numargs, - A_UINT32 *args) +dbglog_default_print_handler(uint32_t mod_id, uint16_t vap_id, uint32_t dbg_id, + uint32_t timestamp, uint16_t numargs, + uint32_t *args) { int i; @@ -1473,13 +1473,13 @@ dbglog_default_print_handler(A_UINT32 mod_id, A_UINT16 vap_id, A_UINT32 dbg_id, } #define DBGLOG_PARSE_ARGS_STRING_LENGTH (DBGLOG_NUM_ARGS_MAX * 11 + 10) -static int dbglog_print_raw_data(A_UINT32 *buffer, A_UINT32 length) +static int dbglog_print_raw_data(uint32_t *buffer, uint32_t length) { - A_UINT32 timestamp; - A_UINT32 debugid; - A_UINT32 moduleid; - A_UINT16 numargs, curArgs; - A_UINT32 count = 0, totalWriteLen, writeLen; + uint32_t timestamp; + uint32_t debugid; + uint32_t moduleid; + uint16_t numargs, curArgs; + uint32_t count = 0, totalWriteLen, writeLen; char parseArgsString[DBGLOG_PARSE_ARGS_STRING_LENGTH]; char *dbgidString; @@ -1558,7 +1558,7 @@ skip_args_processing: #ifdef WLAN_OPEN_SOURCE static int dbglog_debugfs_raw_data(wmi_unified_t wmi_handle, const uint8_t *buf, - A_UINT32 length, A_UINT32 dropped) + uint32_t length, uint32_t dropped) { struct fwdebug *fwlog = (struct fwdebug *)&wmi_handle->dbglog; struct dbglog_slot *slot; @@ -1575,7 +1575,7 @@ dbglog_debugfs_raw_data(wmi_unified_t wmi_handle, const uint8_t *buf, return -ENOMEM; slot = (struct dbglog_slot *)skb_put(skb, slot_len); - slot->diag_type = (A_UINT32) DIAG_TYPE_FW_DEBUG_MSG; + slot->diag_type = (uint32_t) DIAG_TYPE_FW_DEBUG_MSG; slot->timestamp = cpu_to_le32(jiffies); slot->length = cpu_to_le32(length); slot->dropped = cpu_to_le32(dropped); @@ -1628,8 +1628,8 @@ static int nl_srv_bcast_fw_logs(struct sk_buff *skb) * * return: 0 if sent successfully, otherwise error code */ -static int send_fw_diag_nl_data(const uint8_t *buffer, A_UINT32 len, - A_UINT32 event_type) +static int send_fw_diag_nl_data(const uint8_t *buffer, uint32_t len, + uint32_t event_type) { struct sk_buff *skb_out; struct nlmsghdr *nlh; @@ -1725,7 +1725,7 @@ process_fw_diag_event_data(uint8_t *datap, uint32_t num_data) } static int -send_diag_netlink_data(const uint8_t *buffer, A_UINT32 len, A_UINT32 cmd) +send_diag_netlink_data(const uint8_t *buffer, uint32_t len, uint32_t cmd) { struct sk_buff *skb_out; struct nlmsghdr *nlh; @@ -1786,7 +1786,7 @@ send_diag_netlink_data(const uint8_t *buffer, A_UINT32 len, A_UINT32 cmd) static int dbglog_process_netlink_data(wmi_unified_t wmi_handle, const uint8_t *buffer, - A_UINT32 len, A_UINT32 dropped) + uint32_t len, uint32_t dropped) { struct sk_buff *skb_out; struct nlmsghdr *nlh; @@ -1827,7 +1827,7 @@ dbglog_process_netlink_data(wmi_unified_t wmi_handle, const uint8_t *buffer, wnl->radio = radio; /* data buffer offset from: nlmsg_hdr + sizeof(int) radio */ slot = (struct dbglog_slot *) (nlmsg_data(nlh) + sizeof(radio)); - slot->diag_type = (A_UINT32) DIAG_TYPE_FW_DEBUG_MSG; + slot->diag_type = (uint32_t) DIAG_TYPE_FW_DEBUG_MSG; slot->timestamp = cpu_to_le32(jiffies); slot->length = cpu_to_le32(len); slot->dropped = cpu_to_le32(dropped); @@ -1918,7 +1918,7 @@ static int diag_fw_handler(ol_scn_t scn, uint8_t *data, uint32_t datalen) } if (dbglog_process_type == DBGLOG_PROCESS_NET_RAW) { - return send_diag_netlink_data((A_UINT8 *) datap, + return send_diag_netlink_data((uint8_t *) datap, len, DIAG_TYPE_FW_MSG); } #ifdef WLAN_OPEN_SOURCE @@ -1969,15 +1969,15 @@ fw_diag_data_event_handler(ol_scn_t scn, uint8_t *data, uint32_t datalen) int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) { tp_wma_handle wma = (tp_wma_handle) scn; - A_UINT32 count; - A_UINT32 *buffer; - A_UINT32 timestamp; - A_UINT32 debugid; - A_UINT32 moduleid; - A_UINT16 vapid; - A_UINT16 numargs; + uint32_t count; + uint32_t *buffer; + uint32_t timestamp; + uint32_t debugid; + uint32_t moduleid; + uint16_t vapid; + uint16_t numargs; qdf_size_t length; - A_UINT32 dropped; + uint32_t dropped; WMI_DEBUG_MESG_EVENTID_param_tlvs *param_buf; uint8_t *datap; uint32_t len; @@ -2008,7 +2008,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) return A_ERROR; } - dropped = *((A_UINT32 *) datap); + dropped = *((uint32_t *) datap); if (dropped > 0) { AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("%d log buffers are dropped\n", dropped)); @@ -2017,7 +2017,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) len -= sizeof(dropped); count = 0; - buffer = (A_UINT32 *) datap; + buffer = (uint32_t *) datap; length = (len >> 2); if (dbglog_process_type == DBGLOG_PROCESS_PRINT_RAW) @@ -2026,13 +2026,13 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) if (dbglog_process_type == DBGLOG_PROCESS_NET_RAW) { return dbglog_process_netlink_data((wmi_unified_t) wma-> wmi_handle, - (A_UINT8 *) buffer, + (uint8_t *) buffer, len, dropped); } #ifdef WLAN_OPEN_SOURCE if (dbglog_process_type == DBGLOG_PROCESS_POOL_RAW) { return dbglog_debugfs_raw_data((wmi_unified_t) wma->wmi_handle, - (A_UINT8 *) buffer, len, + (uint8_t *) buffer, len, dropped); } #endif /* WLAN_OPEN_SOURCE */ @@ -2057,12 +2057,12 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) */ dbglog_default_print_handler(moduleid, vapid, debugid, timestamp, numargs, - (((A_UINT32 *) buffer) + + (((uint32_t *) buffer) + 2 + count)); } else { if (!(mod_print[moduleid](moduleid, vapid, debugid, timestamp, numargs, - (((A_UINT32 *) buffer) + + (((uint32_t *) buffer) + 2 + count)))) { /* * The message is not handled @@ -2071,7 +2071,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) dbglog_default_print_handler(moduleid, vapid, debugid, timestamp, numargs, - (((A_UINT32 *) + (((uint32_t *) buffer) + 2 + count)); @@ -2085,7 +2085,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) return A_OK; } -void dbglog_reg_modprint(A_UINT32 mod_id, module_dbg_print printfn) +void dbglog_reg_modprint(uint32_t mod_id, module_dbg_print printfn) { if (!mod_print[mod_id]) { mod_print[mod_id] = printfn; @@ -2097,16 +2097,16 @@ void dbglog_reg_modprint(A_UINT32 mod_id, module_dbg_print printfn) } static void -dbglog_sm_print(A_UINT32 timestamp, - A_UINT16 vap_id, - A_UINT16 numargs, - A_UINT32 *args, +dbglog_sm_print(uint32_t timestamp, + uint16_t vap_id, + uint16_t numargs, + uint32_t *args, const char *module_prefix, - const char *const states[], A_UINT32 num_states, - const char *const events[], A_UINT32 num_events) + const char *const states[], uint32_t num_states, + const char *const events[], uint32_t num_events) { - A_UINT8 type, arg1, arg2, arg3; - A_UINT32 extra, extra2, extra3; + uint8_t type, arg1, arg2, arg3; + uint32_t extra, extra2, extra3; if (numargs != 4) return; @@ -2172,11 +2172,11 @@ dbglog_sm_print(A_UINT32 timestamp, } static A_BOOL -dbglog_sta_powersave_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_sta_powersave_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { static const char *const states[] = { "IDLE", @@ -2323,8 +2323,8 @@ dbglog_sta_powersave_print_handler(A_UINT32 mod_id, "QPOWER_ENABLE", 0 }, }; - A_UINT32 param = args[0]; - A_UINT32 value = args[1]; + uint32_t param = args[0]; + uint32_t value = args[1]; if (param < QDF_ARRAY_SIZE(params)) { if (params[param].is_time_param) { @@ -2371,11 +2371,11 @@ enum wlan_ibss_ps_sub_module { #define WLAN_IBSS_PS_SUB_MODULE_OFFSET 0x1E static A_BOOL -dbglog_ibss_powersave_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_ibss_powersave_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { static const char *const nw_states[] = { "WAIT_FOR_TBTT", @@ -2735,11 +2735,11 @@ dbglog_ibss_powersave_print_handler(A_UINT32 mod_id, } static -A_BOOL dbglog_ratectrl_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +A_BOOL dbglog_ratectrl_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { switch (dbg_id) { case RATECTRL_DBGID_ASSOC: @@ -2798,11 +2798,11 @@ A_BOOL dbglog_ratectrl_print_handler(A_UINT32 mod_id, } static -A_BOOL dbglog_ani_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +A_BOOL dbglog_ani_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { switch (dbg_id) { case ANI_DBGID_ENABLE: @@ -2893,11 +2893,11 @@ A_BOOL dbglog_ani_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_ap_powersave_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_ap_powersave_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { switch (dbg_id) { case AP_PS_DBGID_UPDATE_TIM: @@ -3036,10 +3036,10 @@ dbglog_ap_powersave_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_wal_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, A_UINT16 numargs, A_UINT32 *args) +dbglog_wal_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, uint16_t numargs, uint32_t *args) { static const char *const states[] = { "ACTIVE", @@ -3191,10 +3191,10 @@ dbglog_wal_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_scan_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, A_UINT16 numargs, A_UINT32 *args) +dbglog_scan_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, uint16_t numargs, uint32_t *args) { static const char *const states[] = { "IDLE", @@ -3229,13 +3229,13 @@ dbglog_scan_print_handler(A_UINT32 mod_id, } static -A_BOOL dbglog_coex_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +A_BOOL dbglog_coex_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { - A_UINT8 i; + uint8_t i; char *dbg_id_str; static const char *const wlan_rx_xput_status[] = { @@ -3723,11 +3723,11 @@ A_BOOL dbglog_coex_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_beacon_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_beacon_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { static const char *const states[] = { "INIT", @@ -3805,11 +3805,11 @@ dbglog_beacon_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_data_txrx_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_data_txrx_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { switch (dbg_id) { case DATA_TXRX_DBGID_RX_DATA_SEQ_LEN_INFO: @@ -3826,11 +3826,11 @@ dbglog_data_txrx_print_handler(A_UINT32 mod_id, } static -A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +A_BOOL dbglog_smps_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { static const char *const states[] = { "S_INACTIVE", @@ -3945,10 +3945,10 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_p2p_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, A_UINT16 numargs, A_UINT32 *args) +dbglog_p2p_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, uint16_t numargs, uint32_t *args) { static const char *const states[] = { "ACTIVE", @@ -3984,11 +3984,11 @@ dbglog_p2p_print_handler(A_UINT32 mod_id, } static A_BOOL -dbglog_pcielp_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, - A_UINT16 numargs, A_UINT32 *args) +dbglog_pcielp_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, + uint16_t numargs, uint32_t *args) { static const char *const states[] = { "STOP", @@ -4276,7 +4276,7 @@ int cnss_diag_activate_service(void) static int cnss_diag_msg_callback(struct sk_buff *skb) { struct nlmsghdr *nlh; - A_UINT8 *msg; + uint8_t *msg; nlh = (struct nlmsghdr *)skb->data; if (!nlh) { @@ -4318,10 +4318,10 @@ int cnss_diag_activate_service(void) #endif static A_BOOL -dbglog_wow_print_handler(A_UINT32 mod_id, - A_UINT16 vap_id, - A_UINT32 dbg_id, - A_UINT32 timestamp, A_UINT16 numargs, A_UINT32 *args) +dbglog_wow_print_handler(uint32_t mod_id, + uint16_t vap_id, + uint32_t dbg_id, + uint32_t timestamp, uint16_t numargs, uint32_t *args) { switch (dbg_id) { @@ -4329,22 +4329,22 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "Enable NS offload, for sender %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - *(A_UINT8 *) &args[0], - *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), - *((A_UINT8 *) &args[0] + 3), - *(A_UINT8 *) &args[1], - *((A_UINT8 *) &args[1] + 1), - *((A_UINT8 *) &args[1] + 2), - *((A_UINT8 *) &args[1] + 3), - *(A_UINT8 *) &args[2], - *((A_UINT8 *) &args[2] + 1), - *((A_UINT8 *) &args[2] + 2), - *((A_UINT8 *) &args[2] + 3), - *(A_UINT8 *) &args[3], - *((A_UINT8 *) &args[3] + 1), - *((A_UINT8 *) &args[3] + 2), - *((A_UINT8 *) &args[3] + 3)); + *(uint8_t *) &args[0], + *((uint8_t *) &args[0] + 1), + *((uint8_t *) &args[0] + 2), + *((uint8_t *) &args[0] + 3), + *(uint8_t *) &args[1], + *((uint8_t *) &args[1] + 1), + *((uint8_t *) &args[1] + 2), + *((uint8_t *) &args[1] + 3), + *(uint8_t *) &args[2], + *((uint8_t *) &args[2] + 1), + *((uint8_t *) &args[2] + 2), + *((uint8_t *) &args[2] + 3), + *(uint8_t *) &args[3], + *((uint8_t *) &args[3] + 1), + *((uint8_t *) &args[3] + 2), + *((uint8_t *) &args[3] + 3)); } else { return false; } @@ -4353,10 +4353,10 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (1 == numargs) { dbglog_printf(timestamp, vap_id, "Enable ARP offload, for sender %d.%d.%d.%d", - *(A_UINT8 *) args, - *((A_UINT8 *) args + 1), - *((A_UINT8 *) args + 2), - *((A_UINT8 *) args + 3)); + *(uint8_t *) args, + *((uint8_t *) args + 1), + *((uint8_t *) args + 2), + *((uint8_t *) args + 3)); } else { return false; } @@ -4373,22 +4373,22 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS requested from %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - *(A_UINT8 *) &args[0], - *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), - *((A_UINT8 *) &args[0] + 3), - *(A_UINT8 *) &args[1], - *((A_UINT8 *) &args[1] + 1), - *((A_UINT8 *) &args[1] + 2), - *((A_UINT8 *) &args[1] + 3), - *(A_UINT8 *) &args[2], - *((A_UINT8 *) &args[2] + 1), - *((A_UINT8 *) &args[2] + 2), - *((A_UINT8 *) &args[2] + 3), - *(A_UINT8 *) &args[3], - *((A_UINT8 *) &args[3] + 1), - *((A_UINT8 *) &args[3] + 2), - *((A_UINT8 *) &args[3] + 3)); + *(uint8_t *) &args[0], + *((uint8_t *) &args[0] + 1), + *((uint8_t *) &args[0] + 2), + *((uint8_t *) &args[0] + 3), + *(uint8_t *) &args[1], + *((uint8_t *) &args[1] + 1), + *((uint8_t *) &args[1] + 2), + *((uint8_t *) &args[1] + 3), + *(uint8_t *) &args[2], + *((uint8_t *) &args[2] + 1), + *((uint8_t *) &args[2] + 2), + *((uint8_t *) &args[2] + 3), + *(uint8_t *) &args[3], + *((uint8_t *) &args[3] + 1), + *((uint8_t *) &args[3] + 2), + *((uint8_t *) &args[3] + 3)); } else { return false; } @@ -4397,22 +4397,22 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS replied to %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - *(A_UINT8 *) &args[0], - *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), - *((A_UINT8 *) &args[0] + 3), - *(A_UINT8 *) &args[1], - *((A_UINT8 *) &args[1] + 1), - *((A_UINT8 *) &args[1] + 2), - *((A_UINT8 *) &args[1] + 3), - *(A_UINT8 *) &args[2], - *((A_UINT8 *) &args[2] + 1), - *((A_UINT8 *) &args[2] + 2), - *((A_UINT8 *) &args[2] + 3), - *(A_UINT8 *) &args[3], - *((A_UINT8 *) &args[3] + 1), - *((A_UINT8 *) &args[3] + 2), - *((A_UINT8 *) &args[3] + 3)); + *(uint8_t *) &args[0], + *((uint8_t *) &args[0] + 1), + *((uint8_t *) &args[0] + 2), + *((uint8_t *) &args[0] + 3), + *(uint8_t *) &args[1], + *((uint8_t *) &args[1] + 1), + *((uint8_t *) &args[1] + 2), + *((uint8_t *) &args[1] + 3), + *(uint8_t *) &args[2], + *((uint8_t *) &args[2] + 1), + *((uint8_t *) &args[2] + 2), + *((uint8_t *) &args[2] + 3), + *(uint8_t *) &args[3], + *((uint8_t *) &args[3] + 1), + *((uint8_t *) &args[3] + 2), + *((uint8_t *) &args[3] + 3)); } else { return false; } @@ -4421,10 +4421,10 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (1 == numargs) { dbglog_printf(timestamp, vap_id, "ARP requested from %d.%d.%d.%d", - *(A_UINT8 *) args, - *((A_UINT8 *) args + 1), - *((A_UINT8 *) args + 2), - *((A_UINT8 *) args + 3)); + *(uint8_t *) args, + *((uint8_t *) args + 1), + *((uint8_t *) args + 2), + *((uint8_t *) args + 3)); } else { return false; } @@ -4434,10 +4434,10 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (1 == numargs) { dbglog_printf(timestamp, vap_id, "ARP replied to %d.%d.%d.%d", - *(A_UINT8 *) args, - *((A_UINT8 *) args + 1), - *((A_UINT8 *) args + 2), - *((A_UINT8 *) args + 3)); + *(uint8_t *) args, + *((uint8_t *) args + 1), + *((uint8_t *) args + 2), + *((uint8_t *) args + 3)); } else { return false; } diff --git a/utils/fwlog/dbglog_host.h b/utils/fwlog/dbglog_host.h index 78caa0ca2a75..3e62f29d0b5a 100644 --- a/utils/fwlog/dbglog_host.h +++ b/utils/fwlog/dbglog_host.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -100,7 +100,7 @@ dbglog_deinit(wmi_unified_t wmi_handle); * @brief size - Report size */ int -dbglog_set_report_size(wmi_unified_t wmi_handle, A_UINT16 size); +dbglog_set_report_size(wmi_unified_t wmi_handle, uint16_t size); /** Set the resolution for time stamp * @brief wmi_handle - handle to Wmi module @@ -108,7 +108,7 @@ dbglog_set_report_size(wmi_unified_t wmi_handle, A_UINT16 size); */ int dbglog_set_timestamp_resolution(wmi_unified_t wmi_handle, - A_UINT16 tsr); + uint16_t tsr); /** Enable reporting. If it is set to false then Traget wont deliver * any debug information @@ -142,21 +142,21 @@ dbglog_set_log_lvl(wmi_unified_t wmi_handle, DBGLOG_LOG_LVL log_lvl); * to be passed from user to the driver. */ int -dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, A_UINT32 mod_id_lvl); +dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, uint32_t mod_id_lvl); /** Enable/Disable the logging for VAP */ int -dbglog_vap_log_enable(wmi_unified_t wmi_handle, A_UINT16 vap_id, +dbglog_vap_log_enable(wmi_unified_t wmi_handle, uint16_t vap_id, A_BOOL isenable); /** Enable/Disable logging for Module */ int -dbglog_module_log_enable(wmi_unified_t wmi_handle, A_UINT32 mod_id, +dbglog_module_log_enable(wmi_unified_t wmi_handle, uint32_t mod_id, A_BOOL isenable); /** set vap enablie bitmap */ void dbglog_set_vap_enable_bitmap(wmi_unified_t wmi_handle, - A_UINT32 vap_enable_bitmap); + uint32_t vap_enable_bitmap); /** set log level for all the modules specified in the bitmap. * for all other modules with 0 in the bitmap (or) outside the bitmap, @@ -164,9 +164,9 @@ dbglog_set_vap_enable_bitmap(wmi_unified_t wmi_handle, */ void dbglog_set_mod_enable_bitmap(wmi_unified_t wmi_handle, - A_UINT32 log_level, - A_UINT32 *mod_enable_bitmap, - A_UINT32 bitmap_len); + uint32_t log_level, + uint32_t *mod_enable_bitmap, + uint32_t bitmap_len); int dbglog_parse_debug_logs(ol_scn_t scn, u_int8_t *datap, diff --git a/utils/pktlog/pktlog_internal.c b/utils/pktlog/pktlog_internal.c index 67ad50c5d60a..d4cf098587ed 100644 --- a/utils/pktlog/pktlog_internal.c +++ b/utils/pktlog/pktlog_internal.c @@ -523,9 +523,9 @@ A_STATUS process_tx_info(struct cdp_pdev *txrx_pdev, void *data) } if (pl_hdr.log_type == PKTLOG_TYPE_TX_VIRT_ADDR) { - A_UINT32 desc_id = (A_UINT32) *((A_UINT32 *)(fw_data->data + + uint32_t desc_id = (uint32_t) *((uint32_t *)(fw_data->data + sizeof(pl_hdr))); - A_UINT32 vdev_id = desc_id; + uint32_t vdev_id = desc_id; /* if the pkt log msg is for the bcn frame the vdev id * is piggybacked in desc_id and the MSB of the desc ID @@ -534,7 +534,7 @@ A_STATUS process_tx_info(struct cdp_pdev *txrx_pdev, void *data) #define BCN_DESC_ID 0xFF if ((desc_id >> 24) == BCN_DESC_ID) { void *data; - A_UINT32 buf_size; + uint32_t buf_size; vdev_id &= 0x00FFFFFF; /* TODO: MCL specific API */ diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index a76b25a2d2df..6e72fd0b064c 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -787,7 +787,7 @@ QDF_STATUS wmi_extract_encrypt_decrypt_resp_params(void *wmi_hdl, #endif QDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl, - A_UINT32 vdev_id, uint8_t *p2p_ie); + uint32_t vdev_id, uint8_t *p2p_ie); QDF_STATUS wmi_unified_set_gateway_params_cmd(void *wmi_hdl, diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index d40665f92219..cd6c539c1cc4 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -3467,17 +3467,17 @@ struct hlp_params { * @action_flag: add/delete the entry */ struct wmi_unified_pmk_cache { - A_UINT32 tlv_header; - A_UINT32 pmk_len; - A_UINT8 session_id; - A_UINT8 pmk[WMI_UNIFIED_MAX_PMK_LEN]; - A_UINT32 pmkid_len; - A_UINT8 pmkid[WMI_UNIFIED_MAX_PMKID_LEN]; + uint32_t tlv_header; + uint32_t pmk_len; + uint8_t session_id; + uint8_t pmk[WMI_UNIFIED_MAX_PMK_LEN]; + uint32_t pmkid_len; + uint8_t pmkid[WMI_UNIFIED_MAX_PMKID_LEN]; wmi_host_mac_addr bssid; struct mac_ssid ssid; - A_UINT32 cache_id; - A_UINT32 cat_flag; - A_UINT32 action_flag; + uint32_t cache_id; + uint32_t cat_flag; + uint32_t action_flag; }; @@ -4688,7 +4688,7 @@ typedef struct { /* VERSION_4 (4 wire coex) */ uint32_t coex_version; - /* No. of A_UINT32 elements in payload buffer. Will depend on the coex + /* No. of uint32_t elements in payload buffer. Will depend on the coex * version */ uint32_t length; @@ -7745,7 +7745,7 @@ typedef struct { uint32_t board_cal_version; /* board_mcn_detail: * Provide a calibration message string for the host to display. - * Note: on a big-endian host, the 4 bytes within each A_UINT32 portion + * Note: on a big-endian host, the 4 bytes within each uint32_t portion * of a WMI message will be automatically byteswapped by the copy engine * as the messages are transferred between host and target, to convert * between the target's little-endianness and the host's big-endianness. @@ -8097,7 +8097,7 @@ struct bcn_offload_control { struct wdsentry { u_int8_t peer_mac[IEEE80211_ADDR_LEN]; u_int8_t wds_mac[IEEE80211_ADDR_LEN]; - A_UINT32 flags; + uint32_t flags; }; #define WMI_HOST_DBR_RING_ADDR_LO_S 0 diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index 5a7d6bbe1b11..92a6d67b8cc7 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -420,7 +420,7 @@ QDF_STATUS (*send_set_enable_disable_mcc_adaptive_scheduler_cmd)( uint32_t pdev_id); QDF_STATUS (*send_p2p_go_set_beacon_ie_cmd)(wmi_unified_t wmi_handle, - A_UINT32 vdev_id, uint8_t *p2p_ie); + uint32_t vdev_id, uint8_t *p2p_ie); QDF_STATUS (*send_probe_rsp_tmpl_send_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id, @@ -537,7 +537,7 @@ QDF_STATUS (*send_process_ll_stats_get_cmd) QDF_STATUS (*send_congestion_cmd)(wmi_unified_t wmi_handle, - A_UINT8 vdev_id); + uint8_t vdev_id); QDF_STATUS (*send_snr_request_cmd)(wmi_unified_t wmi_handle); @@ -1547,15 +1547,15 @@ QDF_STATUS (*send_invoke_neighbor_report_cmd)(wmi_unified_t wmi_handle, void (*wmi_pdev_id_conversion_enable)(wmi_unified_t wmi_handle); void (*send_time_stamp_sync_cmd)(wmi_unified_t wmi_handle); -void (*wmi_free_allocated_event)(A_UINT32 cmd_event_id, +void (*wmi_free_allocated_event)(uint32_t cmd_event_id, void **wmi_cmd_struct_ptr); int (*wmi_check_and_pad_event)(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id, + uint32_t param_buf_len, + uint32_t wmi_cmd_event_id, void **wmi_cmd_struct_ptr); int (*wmi_check_command_params)(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id); + uint32_t param_buf_len, + uint32_t wmi_cmd_event_id); QDF_STATUS (*send_bss_color_change_enable_cmd)(wmi_unified_t wmi_handle, uint32_t vdev_id, bool enable); diff --git a/wmi/src/wmi_tlv_helper.c b/wmi/src/wmi_tlv_helper.c index 48031deb22b2..486552a2304f 100644 --- a/wmi/src/wmi_tlv_helper.c +++ b/wmi/src/wmi_tlv_helper.c @@ -54,17 +54,17 @@ WMITLV_SET_ATTRB0(id), \ WMITLV_TABLE(id,SET_TLV_ATTRIB, NULL, 0) -A_UINT32 cmd_attr_list[] = { +uint32_t cmd_attr_list[] = { WMITLV_ALL_CMD_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) }; -A_UINT32 evt_attr_list[] = { +uint32_t evt_attr_list[] = { WMITLV_ALL_EVT_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) }; #ifdef NO_DYNAMIC_MEM_ALLOC static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf; -A_UINT32 g_wmi_static_max_cmd_param_tlvs; +uint32_t g_wmi_static_max_cmd_param_tlvs; #endif @@ -88,7 +88,7 @@ A_UINT32 g_wmi_static_max_cmd_param_tlvs; */ void wmitlv_set_static_param_tlv_buf(void *param_tlv_buf, - A_UINT32 max_tlvs_accomodated) + uint32_t max_tlvs_accomodated) { #ifdef NO_DYNAMIC_MEM_ALLOC g_wmi_static_cmd_param_info_buf = param_tlv_buf; @@ -110,12 +110,12 @@ wmitlv_set_static_param_tlv_buf(void *param_tlv_buf, * Return: 0 if success. Return >=1 if failure. */ static -A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id, - A_UINT32 curr_tlv_order, +uint32_t wmitlv_get_attributes(uint32_t is_cmd_id, uint32_t cmd_event_id, + uint32_t curr_tlv_order, wmitlv_attributes_struc *tlv_attr_ptr) { - A_UINT32 i, base_index, num_tlvs, num_entries; - A_UINT32 *pAttrArrayList; + uint32_t i, base_index, num_tlvs, num_entries; + uint32_t *pAttrArrayList; if (is_cmd_id) { pAttrArrayList = &cmd_attr_list[0]; @@ -198,15 +198,15 @@ A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id, */ static int wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 is_cmd_id, - A_UINT32 wmi_cmd_event_id) + uint32_t param_buf_len, uint32_t is_cmd_id, + uint32_t wmi_cmd_event_id) { wmitlv_attributes_struc attr_struct_ptr; - A_UINT32 buf_idx = 0; - A_UINT32 tlv_index = 0; - A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; - A_UINT32 expected_num_tlvs, expected_tlv_len; - A_INT32 error = -1; + uint32_t buf_idx = 0; + uint32_t tlv_index = 0; + uint8_t *buf_ptr = (unsigned char *)param_struc_ptr; + uint32_t expected_num_tlvs, expected_tlv_len; + int32_t error = -1; /* Get the number of TLVs for this command/event */ if (wmitlv_get_attributes @@ -223,9 +223,9 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, expected_num_tlvs = attr_struct_ptr.cmd_num_tlv; while ((buf_idx + WMI_TLV_HDR_SIZE) <= param_buf_len) { - A_UINT32 curr_tlv_tag = + uint32_t curr_tlv_tag = WMITLV_GET_TLVTAG(WMITLV_GET_HDR(buf_ptr)); - A_UINT32 curr_tlv_len = + uint32_t curr_tlv_len = WMITLV_GET_TLVLEN(WMITLV_GET_HDR(buf_ptr)); if ((buf_idx + WMI_TLV_HDR_SIZE + curr_tlv_len) > param_buf_len) { @@ -287,7 +287,7 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, attr_struct_ptr.tag_id) { expected_tlv_len = roundup(expected_tlv_len, - sizeof(A_UINT32)); + sizeof(uint32_t)); } if (curr_tlv_len != expected_tlv_len) { @@ -328,10 +328,10 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, if (curr_tlv_tag == WMITLV_TAG_ARRAY_STRUC) { - A_UINT8 *tlv_buf_ptr = NULL; - A_UINT32 in_tlv_len; - A_UINT32 idx; - A_UINT32 num_of_elems; + uint8_t *tlv_buf_ptr = NULL; + uint32_t in_tlv_len; + uint32_t idx; + uint32_t num_of_elems; /* Verify length of inner TLVs */ @@ -404,11 +404,11 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, } /* Check TLV length is aligned to 4 bytes or not */ - if ((curr_tlv_len % sizeof(A_UINT32)) != 0) { + if ((curr_tlv_len % sizeof(uint32_t)) != 0) { wmi_tlv_print_error ("%s: ERROR: TLV length %d for Cmd=0x%x is not aligned to %zu bytes\n", __func__, curr_tlv_len, wmi_cmd_event_id, - sizeof(A_UINT32)); + sizeof(uint32_t)); goto Error_wmitlv_check_tlv_params; } @@ -443,9 +443,9 @@ Error_wmitlv_check_tlv_params: */ int wmitlv_check_event_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 wmi_cmd_event_id) + uint32_t param_buf_len, uint32_t wmi_cmd_event_id) { - A_UINT32 is_cmd_id = 0; + uint32_t is_cmd_id = 0; return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, @@ -467,10 +467,10 @@ wmitlv_check_event_tlv_params(void *os_handle, void *param_struc_ptr, */ int wmitlv_check_command_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id) + uint32_t param_buf_len, + uint32_t wmi_cmd_event_id) { - A_UINT32 is_cmd_id = 1; + uint32_t is_cmd_id = 1; return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, @@ -495,20 +495,20 @@ qdf_export_symbol(wmitlv_check_command_tlv_params); */ static int wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 is_cmd_id, - A_UINT32 wmi_cmd_event_id, void **wmi_cmd_struct_ptr) + uint32_t param_buf_len, uint32_t is_cmd_id, + uint32_t wmi_cmd_event_id, void **wmi_cmd_struct_ptr) { wmitlv_attributes_struc attr_struct_ptr; - A_UINT32 buf_idx = 0; - A_UINT32 tlv_index = 0; - A_UINT32 num_of_elems = 0; + uint32_t buf_idx = 0; + uint32_t tlv_index = 0; + uint32_t num_of_elems = 0; int tlv_size_diff = 0; - A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; + uint8_t *buf_ptr = (unsigned char *)param_struc_ptr; wmitlv_cmd_param_info *cmd_param_tlvs_ptr = NULL; - A_UINT32 remaining_expected_tlvs = 0xFFFFFFFF; - A_UINT32 len_wmi_cmd_struct_buf; - A_UINT32 free_buf_len; - A_INT32 error = -1; + uint32_t remaining_expected_tlvs = 0xFFFFFFFF; + uint32_t len_wmi_cmd_struct_buf; + uint32_t free_buf_len; + int32_t error = -1; /* Get the number of TLVs for this command/event */ if (wmitlv_get_attributes @@ -564,9 +564,9 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, while (((buf_idx + WMI_TLV_HDR_SIZE) <= param_buf_len) && (remaining_expected_tlvs)) { - A_UINT32 curr_tlv_tag = + uint32_t curr_tlv_tag = WMITLV_GET_TLVTAG(WMITLV_GET_HDR(buf_ptr)); - A_UINT32 curr_tlv_len = + uint32_t curr_tlv_len = WMITLV_GET_TLVLEN(WMITLV_GET_HDR(buf_ptr)); int num_padding_bytes = 0; @@ -633,7 +633,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, } else { /* This TLV has a variable number of elements */ if (WMITLV_TAG_ARRAY_STRUC == attr_struct_ptr.tag_id) { - A_UINT32 in_tlv_len = 0; + uint32_t in_tlv_len = 0; if (curr_tlv_len != 0) { in_tlv_len = @@ -683,9 +683,9 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, if ((WMITLV_TAG_ARRAY_STRUC == attr_struct_ptr.tag_id) && (tlv_size_diff != 0)) { void *new_tlv_buf = NULL; - A_UINT8 *tlv_buf_ptr = NULL; - A_UINT32 in_tlv_len; - A_UINT32 i; + uint8_t *tlv_buf_ptr = NULL; + uint32_t in_tlv_len; + uint32_t i; if (attr_struct_ptr.tag_varied_size == WMITLV_SIZE_FIX) { /* This is not allowed. The tag WMITLV_TAG_ARRAY_STRUC can @@ -727,7 +727,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, wmi_tlv_OS_MEMZERO(new_tlv_buf, (num_of_elems * attr_struct_ptr.tag_struct_size)); - tlv_buf_ptr = (A_UINT8 *) new_tlv_buf; + tlv_buf_ptr = (uint8_t *) new_tlv_buf; for (i = 0; i < num_of_elems; i++) { if (tlv_size_diff > 0) { /* Incoming structure size is greater than expected @@ -753,9 +753,9 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, } #else { - A_UINT8 *src_addr; - A_UINT8 *dst_addr; - A_UINT32 buf_mov_len; + uint8_t *src_addr; + uint8_t *dst_addr; + uint32_t buf_mov_len; if (tlv_size_diff < 0) { /* Incoming structure size is smaller than expected size @@ -939,9 +939,9 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, { /* Note: tlv_size_diff is a value less than zero */ /* Move the Subsequent TLVs by amount of bytes needs to be padded */ - A_UINT8 *src_addr; - A_UINT8 *dst_addr; - A_UINT32 src_len; + uint8_t *src_addr; + uint8_t *dst_addr; + uint32_t src_len; num_padding_bytes = (tlv_size_diff * -1); @@ -999,11 +999,11 @@ Error_wmitlv_check_and_pad_tlvs: */ int wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id, + uint32_t param_buf_len, + uint32_t wmi_cmd_event_id, void **wmi_cmd_struct_ptr) { - A_UINT32 is_cmd_id = 0; + uint32_t is_cmd_id = 0; return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, wmi_cmd_event_id, wmi_cmd_struct_ptr); @@ -1025,11 +1025,11 @@ qdf_export_symbol(wmitlv_check_and_pad_event_tlvs); */ int wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id, + uint32_t param_buf_len, + uint32_t wmi_cmd_event_id, void **wmi_cmd_struct_ptr) { - A_UINT32 is_cmd_id = 1; + uint32_t is_cmd_id = 1; return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, wmi_cmd_event_id, wmi_cmd_struct_ptr); @@ -1046,8 +1046,8 @@ wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, * * Return: none */ -static void wmitlv_free_allocated_tlvs(A_UINT32 is_cmd_id, - A_UINT32 cmd_event_id, +static void wmitlv_free_allocated_tlvs(uint32_t is_cmd_id, + uint32_t cmd_event_id, void **wmi_cmd_struct_ptr) { void *ptr = *wmi_cmd_struct_ptr; @@ -1109,7 +1109,7 @@ break; * * Return: none */ -void wmitlv_free_allocated_command_tlvs(A_UINT32 cmd_event_id, +void wmitlv_free_allocated_command_tlvs(uint32_t cmd_event_id, void **wmi_cmd_struct_ptr) { wmitlv_free_allocated_tlvs(1, cmd_event_id, wmi_cmd_struct_ptr); @@ -1125,7 +1125,7 @@ void wmitlv_free_allocated_command_tlvs(A_UINT32 cmd_event_id, * * Return: none */ -void wmitlv_free_allocated_event_tlvs(A_UINT32 cmd_event_id, +void wmitlv_free_allocated_event_tlvs(uint32_t cmd_event_id, void **wmi_cmd_struct_ptr) { wmitlv_free_allocated_tlvs(0, cmd_event_id, wmi_cmd_struct_ptr); @@ -1180,12 +1180,12 @@ wmi_versions_can_downgrade(int num_whitelist, wmi_abi_version *opp_vers, wmi_abi_version *out_vers) { - A_UINT8 can_try_to_downgrade; - A_UINT32 my_major_vers = WMI_VER_GET_MAJOR(my_vers->abi_version_0); - A_UINT32 my_minor_vers = WMI_VER_GET_MINOR(my_vers->abi_version_0); - A_UINT32 opp_major_vers = WMI_VER_GET_MAJOR(opp_vers->abi_version_0); - A_UINT32 opp_minor_vers = WMI_VER_GET_MINOR(opp_vers->abi_version_0); - A_UINT32 downgraded_minor_vers; + uint8_t can_try_to_downgrade; + uint32_t my_major_vers = WMI_VER_GET_MAJOR(my_vers->abi_version_0); + uint32_t my_minor_vers = WMI_VER_GET_MINOR(my_vers->abi_version_0); + uint32_t opp_major_vers = WMI_VER_GET_MAJOR(opp_vers->abi_version_0); + uint32_t opp_minor_vers = WMI_VER_GET_MINOR(opp_vers->abi_version_0); + uint32_t downgraded_minor_vers; if ((my_vers->abi_version_ns_0 != opp_vers->abi_version_ns_0) || (my_vers->abi_version_ns_1 != opp_vers->abi_version_ns_1) || @@ -1222,7 +1222,7 @@ wmi_versions_can_downgrade(int num_whitelist, /* Try to see we can downgrade the supported version */ downgraded_minor_vers = my_minor_vers; while (downgraded_minor_vers > opp_minor_vers) { - A_UINT8 downgraded = false; + uint8_t downgraded = false; int i; for (i = 0; i < num_whitelist; i++) { diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index 820c21dacd24..6493d74d5b38 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -54,11 +54,11 @@ WMI_CMD_HDR to be defined here. */ #define WO(_f) ((_f##_OFFSET) >> 2) #undef GET_FIELD -#define GET_FIELD(_addr, _f) MS(*((A_UINT32 *)(_addr) + WO(_f)), _f) +#define GET_FIELD(_addr, _f) MS(*((uint32_t *)(_addr) + WO(_f)), _f) #undef SET_FIELD #define SET_FIELD(_addr, _f, _val) \ - (*((A_UINT32 *)(_addr) + WO(_f)) = \ - (*((A_UINT32 *)(_addr) + WO(_f)) & ~_f##_MASK) | SM(_val, _f)) + (*((uint32_t *)(_addr) + WO(_f)) = \ + (*((uint32_t *)(_addr) + WO(_f)) & ~_f##_MASK) | SM(_val, _f)) #define WMI_GET_FIELD(_msg_buf, _msg_type, _f) \ GET_FIELD(_msg_buf, _msg_type ## _ ## _f) @@ -74,7 +74,7 @@ WMI_CMD_HDR to be defined here. */ * * Control Path * */ typedef PREPACK struct { - A_UINT32 commandId:24, + uint32_t commandId:24, reserved:2, /* used for WMI endpoint ID */ plt_priv:6; /* platform private */ } POSTPACK WMI_CMD_HDR; /* used for commands and events */ @@ -1359,7 +1359,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, if (wmi_get_runtime_pm_inprogress(wmi_handle)) { htc_tag = - (A_UINT16)wmi_handle->ops->wmi_set_htc_tx_tag( + (uint16_t)wmi_handle->ops->wmi_set_htc_tx_tag( wmi_handle, buf, cmd_id); } else if (qdf_atomic_read(&wmi_handle->is_target_suspended) && (!wmi_is_pm_resume_cmd(cmd_id))) { diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index 082d4d8d3b17..78f073d2ae52 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -1525,7 +1525,7 @@ QDF_STATUS wmi_unified_setup_install_key_cmd(void *wmi_hdl, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl, - A_UINT32 vdev_id, uint8_t *p2p_ie) + uint32_t vdev_id, uint8_t *p2p_ie) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index 093857e03f78..0bffe7c54fd9 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -1639,7 +1639,7 @@ static QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_buf_t wmi_buf; int bcn_len = qdf_nbuf_len(param->wbuf); int len = sizeof(wmi_bcn_send_from_host_cmd_t); - A_UINT32 dtim_flag = 0; + uint32_t dtim_flag = 0; /* get the DTIM count */ @@ -1828,7 +1828,7 @@ static QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle, /* Update peer rate information */ cmd->peer_rate_caps = param->peer_rate_caps; cmd->peer_legacy_rates.num_rates = param->peer_legacy_rates.num_rates; - /* NOTE: cmd->peer_legacy_rates.rates is of type A_UINT32 */ + /* NOTE: cmd->peer_legacy_rates.rates is of type uint32_t */ /* ni->ni_rates.rs_rates is of type u_int8_t */ /** * for cmd->peer_legacy_rates.rates: @@ -1841,7 +1841,7 @@ static QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle, param->peer_legacy_rates.num_rates); #ifdef BIG_ENDIAN_HOST for (i = 0; - i < param->peer_legacy_rates.num_rates/sizeof(A_UINT32) + 1; + i < param->peer_legacy_rates.num_rates/sizeof(uint32_t) + 1; i++) cmd->peer_legacy_rates.rates[i] = qdf_le32_to_cpu(cmd->peer_legacy_rates.rates[i]); @@ -1852,7 +1852,7 @@ static QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle, param->peer_ht_rates.num_rates); #ifdef BIG_ENDIAN_HOST - for (i = 0; i < param->peer_ht_rates.num_rates/sizeof(A_UINT32) + 1; + for (i = 0; i < param->peer_ht_rates.num_rates/sizeof(uint32_t) + 1; i++) cmd->peer_ht_rates.rates[i] = qdf_le32_to_cpu(cmd->peer_ht_rates.rates[i]); @@ -1914,15 +1914,15 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_bssid_list *bssid_list; wmi_ssid_list *ssid_list; wmi_ie_data *ie_data; - A_UINT32 *tmp_ptr; + uint32_t *tmp_ptr; int i, len = sizeof(wmi_start_scan_cmd); #ifdef TEST_CODE - len += sizeof(wmi_chan_list) + 3 * sizeof(A_UINT32); + len += sizeof(wmi_chan_list) + 3 * sizeof(uint32_t); #else if (param->chan_list.num_chan) { len += sizeof(wmi_chan_list) + (param->chan_list.num_chan - 1) - * sizeof(A_UINT32); + * sizeof(uint32_t); } #endif if (param->num_ssids) { @@ -1934,10 +1934,10 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, * sizeof(wmi_mac_addr); } if (param->extraie.len) { - i = param->extraie.len % sizeof(A_UINT32); + i = param->extraie.len % sizeof(uint32_t); if (i) - len += sizeof(A_UINT32) - i; - len += 2 * sizeof(A_UINT32) + param->extraie.len; + len += sizeof(uint32_t) - i; + len += 2 * sizeof(uint32_t) + param->extraie.len; } buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -2027,7 +2027,7 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, #else cmd->max_scan_time = param->max_scan_time; #endif - tmp_ptr = (A_UINT32 *) (cmd + 1); + tmp_ptr = (uint32_t *) (cmd + 1); #ifdef TEST_CODE #define DEFAULT_TIME 150 cmd->min_rest_time = DEFAULT_TIME; @@ -2065,7 +2065,7 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, param->ssid[i].length); } tmp_ptr += (2 + (sizeof(wmi_ssid) * - param->num_ssids)/sizeof(A_UINT32)); + param->num_ssids)/sizeof(uint32_t)); } if (param->num_bssid) { bssid_list = (wmi_bssid_list *) tmp_ptr; @@ -2077,7 +2077,7 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, &bssid_list->bssid_list[i]); } tmp_ptr += (2 + (sizeof(wmi_mac_addr) * - param->num_bssid)/sizeof(A_UINT32)); + param->num_bssid)/sizeof(uint32_t)); } if (param->extraie.len) { ie_data = (wmi_ie_data *) tmp_ptr; @@ -3598,7 +3598,7 @@ void wmi_host_swap_bytes(void *pv, size_t n) { int noWords; int i; - A_UINT32 *wordPtr; + uint32_t *wordPtr; noWords = n/sizeof(u_int32_t); wordPtr = (u_int32_t *)pv; @@ -3790,7 +3790,7 @@ send_set_ratepwr_table_cmd_non_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_FAILURE; len = sizeof(wmi_pdev_ratepwr_table_cmd); - len += roundup(param->ratepwr_len, sizeof(A_UINT32)) - sizeof(A_UINT32); + len += roundup(param->ratepwr_len, sizeof(uint32_t)) - sizeof(uint32_t); /* already 4 bytes in cmd structure */ qdf_print("wmi buf len = %d\n", len); buf = wmi_buf_alloc(wmi_handle, len); @@ -3925,7 +3925,7 @@ send_set_ctl_table_cmd_non_tlv(wmi_unified_t wmi_handle, } len = sizeof(wmi_pdev_set_ctl_table_cmd); - len += roundup(param->ctl_cmd_len, sizeof(A_UINT32)) - sizeof(A_UINT32); + len += roundup(param->ctl_cmd_len, sizeof(uint32_t)) - sizeof(uint32_t); qdf_print("wmi buf len = %d\n", len); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -3976,7 +3976,7 @@ send_set_mimogain_table_cmd_non_tlv(wmi_unified_t wmi_handle, } len = sizeof(wmi_pdev_set_mimogain_table_cmd); - len += roundup(param->tbl_len, sizeof(A_UINT32)) - sizeof(A_UINT32); + len += roundup(param->tbl_len, sizeof(uint32_t)) - sizeof(uint32_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { qdf_print("%s:wmi_buf_alloc failed\n", __func__); @@ -4021,7 +4021,7 @@ send_set_ratepwr_chainmsk_cmd_non_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_FAILURE; len = sizeof(wmi_pdev_ratepwr_chainmsk_tbl_cmd); - len += roundup(param->num_rate*sizeof(uint32_t), sizeof(A_UINT32)); + len += roundup(param->num_rate*sizeof(uint32_t), sizeof(uint32_t)); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { qdf_print("%s:wmi_buf_alloc failed\n", __func__); @@ -4195,7 +4195,7 @@ send_set_vap_dscp_tid_map_cmd_non_tlv(wmi_unified_t wmi_handle, cmd_vdev = (wmi_vdev_set_dscp_tid_map_cmd *)wmi_buf_data(buf); qdf_mem_copy(cmd_vdev->dscp_to_tid_map, param->dscp_to_tid_map, - sizeof(A_UINT32) * WMI_DSCP_MAP_MAX); + sizeof(uint32_t) * WMI_DSCP_MAP_MAX); cmd_vdev->vdev_id = param->vdev_id; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index b02116e27a39..bbb7a5692fa2 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -1617,13 +1617,13 @@ send_dbglog_cmd_tlv(wmi_unified_t wmi_handle, configmsg->value = dbglog_param->val; /* Filling in the data part of second tlv -- should * follow first tlv _ WMI_TLV_HDR_SIZE */ - module_id_bitmap_array = (A_UINT32 *) (buf_ptr + + module_id_bitmap_array = (uint32_t *) (buf_ptr + sizeof (wmi_debug_log_config_cmd_fixed_param) + WMI_TLV_HDR_SIZE); WMITLV_SET_HDR(buf_ptr + sizeof(wmi_debug_log_config_cmd_fixed_param), WMITLV_TAG_ARRAY_UINT32, - sizeof(A_UINT32) * MAX_MODULE_ID_BITMAP_WORDS); + sizeof(uint32_t) * MAX_MODULE_ID_BITMAP_WORDS); if (dbglog_param->module_id_bitmap) { for (i = 0; i < dbglog_param->bitmap_len; ++i) { module_id_bitmap_array[i] = @@ -3587,10 +3587,10 @@ static QDF_STATUS send_p2p_lo_start_cmd_tlv(wmi_unified_t wmi_handle, device_types_len_aligned = qdf_roundup(param->dev_types_len, - sizeof(A_UINT32)); + sizeof(uint32_t)); probe_resp_len_aligned = qdf_roundup(param->probe_resp_len, - sizeof(A_UINT32)); + sizeof(uint32_t)); len += 2 * WMI_TLV_HDR_SIZE + device_types_len_aligned + probe_resp_len_aligned; @@ -5289,7 +5289,7 @@ static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle, WMI_LOGD(FL("Send probe response template for vdev %d"), vdev_id); tmpl_len = probe_rsp_info->prb_rsp_template_len; - tmpl_len_aligned = roundup(tmpl_len, sizeof(A_UINT32)); + tmpl_len_aligned = roundup(tmpl_len, sizeof(uint32_t)); wmi_buf_len = sizeof(wmi_prb_tmpl_cmd_fixed_param) + sizeof(wmi_bcn_prb_info) + WMI_TLV_HDR_SIZE + @@ -5427,7 +5427,7 @@ static QDF_STATUS send_setup_install_key_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(wmi_vdev_install_key_cmd_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, roundup(key_params->key_len, sizeof(uint32_t))); - key_data = (A_UINT8 *) (buf_ptr + WMI_TLV_HDR_SIZE); + key_data = (uint8_t *) (buf_ptr + WMI_TLV_HDR_SIZE); qdf_mem_copy((void *)key_data, (const void *)key_params->key_data, key_params->key_len); if (key_params->key_rsc_counter) @@ -5635,7 +5635,7 @@ QDF_STATUS send_encrypt_decrypt_send_cmd_tlv(wmi_unified_t wmi_handle, WMI_LOGD(FL("Send encrypt decrypt cmd")); len = sizeof(*cmd) + - roundup(encrypt_decrypt_params->data_len, sizeof(A_UINT32)) + + roundup(encrypt_decrypt_params->data_len, sizeof(uint32_t)) + WMI_TLV_HDR_SIZE; wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { @@ -5672,7 +5672,7 @@ QDF_STATUS send_encrypt_decrypt_send_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(*cmd); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, roundup(encrypt_decrypt_params->data_len, - sizeof(A_UINT32))); + sizeof(uint32_t))); buf_ptr += WMI_TLV_HDR_SIZE; qdf_mem_copy(buf_ptr, encrypt_decrypt_params->data, encrypt_decrypt_params->data_len); @@ -5749,7 +5749,7 @@ QDF_STATUS extract_encrypt_decrypt_resp_event_tlv(wmi_unified_t wmi_handle, * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle, - A_UINT32 vdev_id, uint8_t *p2p_ie) + uint32_t vdev_id, uint8_t *p2p_ie) { QDF_STATUS ret; wmi_p2p_go_set_beacon_ie_fixed_param *cmd; @@ -5772,7 +5772,7 @@ static QDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_INVAL; } - ie_len_aligned = roundup(ie_len, sizeof(A_UINT32)); + ie_len_aligned = roundup(ie_len, sizeof(uint32_t)); wmi_buf_len = sizeof(wmi_p2p_go_set_beacon_ie_fixed_param) + ie_len_aligned + @@ -6915,7 +6915,7 @@ static QDF_STATUS send_roam_scan_filter_cmd_tlv(wmi_unified_t wmi_handle, len += 2 * WMI_TLV_HDR_SIZE; if (roam_req->num_bssid_preferred_list) { len += roam_req->num_bssid_preferred_list * sizeof(wmi_mac_addr); - len += roam_req->num_bssid_preferred_list * sizeof(A_UINT32); + len += roam_req->num_bssid_preferred_list * sizeof(uint32_t); } len += WMI_TLV_HDR_SIZE; if (roam_req->lca_disallow_config_present) { @@ -7037,7 +7037,7 @@ static QDF_STATUS send_roam_scan_filter_cmd_tlv(wmi_unified_t wmi_handle, rssi_rej->remaining_disallow_duration = roam_req->rssi_rejection_ap[i].remaining_duration; rssi_rej->requested_rssi = - (A_INT32)roam_req->rssi_rejection_ap[i].expected_rssi; + (int32_t)roam_req->rssi_rejection_ap[i].expected_rssi; buf_ptr += (sizeof(wmi_roam_rssi_rejection_oce_config_param)); } @@ -8752,7 +8752,7 @@ static QDF_STATUS send_process_ll_stats_get_cmd_tlv(wmi_unified_t wmi_handle, * Return: CDF status */ static QDF_STATUS send_congestion_cmd_tlv(wmi_unified_t wmi_handle, - A_UINT8 vdev_id) + uint8_t vdev_id) { wmi_buf_t buf; wmi_request_stats_cmd_fixed_param *cmd; @@ -9635,8 +9635,8 @@ static QDF_STATUS send_wow_timer_pattern_cmd_tlv(wmi_unified_t wmi_handle, WMI_TLV_HDR_SIZE + 0 * sizeof(WOW_IPV4_SYNC_PATTERN_T) + WMI_TLV_HDR_SIZE + 0 * sizeof(WOW_IPV6_SYNC_PATTERN_T) + WMI_TLV_HDR_SIZE + 0 * sizeof(WOW_MAGIC_PATTERN_CMD) + - WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32) + - WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32); + WMI_TLV_HDR_SIZE + 1 * sizeof(uint32_t) + + WMI_TLV_HDR_SIZE + 1 * sizeof(uint32_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -9673,15 +9673,15 @@ static QDF_STATUS send_wow_timer_pattern_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += WMI_TLV_HDR_SIZE; /* Fill TLV for pattern_info_timeout, and time value */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(A_UINT32)); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(uint32_t)); buf_ptr += WMI_TLV_HDR_SIZE; - *((A_UINT32 *) buf_ptr) = time; - buf_ptr += sizeof(A_UINT32); + *((uint32_t *) buf_ptr) = time; + buf_ptr += sizeof(uint32_t); /* Fill TLV for ra_ratelimit_interval. with dummy 0 value */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(A_UINT32)); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(uint32_t)); buf_ptr += WMI_TLV_HDR_SIZE; - *((A_UINT32 *) buf_ptr) = 0; + *((uint32_t *) buf_ptr) = 0; WMI_LOGD("%s: send wake timer pattern with time[%d] to fw vdev = %d", __func__, time, vdev_id); @@ -11258,7 +11258,7 @@ send_set_ctl_table_cmd_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_FAILURE; ctl_tlv_len = WMI_TLV_HDR_SIZE + - roundup(param->ctl_cmd_len, sizeof(A_UINT32)); + roundup(param->ctl_cmd_len, sizeof(uint32_t)); len = sizeof(*cmd) + ctl_tlv_len; buf = wmi_buf_alloc(wmi_handle, len); @@ -11750,7 +11750,7 @@ send_set_vap_dscp_tid_map_cmd_tlv(wmi_unified_t wmi_handle, cmd = (wmi_vdev_set_dscp_tid_map_cmd_fixed_param *)wmi_buf_data(buf); qdf_mem_copy(cmd->dscp_to_tid_map, param->dscp_to_tid_map, - sizeof(A_UINT32) * WMI_DSCP_MAP_MAX); + sizeof(uint32_t) * WMI_DSCP_MAP_MAX); cmd->vdev_id = param->vdev_id; cmd->enable_override = 0; @@ -12040,9 +12040,9 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_tlv( int32_t len = 0, args_tlv_len; int ret; int i = 0; - A_UINT32 *node_config_args; + uint32_t *node_config_args; - args_tlv_len = WMI_TLV_HDR_SIZE + param->args_count * sizeof(A_UINT32); + args_tlv_len = WMI_TLV_HDR_SIZE + param->args_count * sizeof(uint32_t); len = sizeof(*cmd) + args_tlv_len; if ((param->args_count == 0)) { @@ -12071,9 +12071,9 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_tlv( buf_ptr += sizeof( wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (cmd->args_count * sizeof(A_UINT32))); + (cmd->args_count * sizeof(uint32_t))); buf_ptr += WMI_TLV_HDR_SIZE; - node_config_args = (A_UINT32 *)buf_ptr; + node_config_args = (uint32_t *)buf_ptr; for (i = 0; i < param->args_count; i++) { node_config_args[i] = param->args_arr[i]; @@ -14298,7 +14298,7 @@ static QDF_STATUS send_wow_patterns_to_fw_cmd_tlv(wmi_unified_t wmi_handle, WMI_TLV_HDR_SIZE + 0 * sizeof(WOW_MAGIC_PATTERN_CMD) + WMI_TLV_HDR_SIZE + - 0 * sizeof(A_UINT32) + WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32); + 0 * sizeof(uint32_t) + WMI_TLV_HDR_SIZE + 1 * sizeof(uint32_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -14373,9 +14373,9 @@ static QDF_STATUS send_wow_patterns_to_fw_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += WMI_TLV_HDR_SIZE; /* Fill TLV for ratelimit_interval with dummy data as this fix elem */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 1 * sizeof(A_UINT32)); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 1 * sizeof(uint32_t)); buf_ptr += WMI_TLV_HDR_SIZE; - *(A_UINT32 *) buf_ptr = 0; + *(uint32_t *) buf_ptr = 0; ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_ADD_WAKE_PATTERN_CMDID); @@ -14595,7 +14595,7 @@ static QDF_STATUS send_enable_arp_ns_offload_cmd_tlv(wmi_unified_t wmi_handle, { int32_t res; WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param *cmd; - A_UINT8 *buf_ptr; + uint8_t *buf_ptr; wmi_buf_t buf; int32_t len; uint32_t count = 0, num_ns_ext_tuples = 0; @@ -14633,7 +14633,7 @@ static QDF_STATUS send_enable_arp_ns_offload_cmd_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_NOMEM; } - buf_ptr = (A_UINT8 *) wmi_buf_data(buf); + buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param *) buf_ptr; WMITLV_SET_HDR(&cmd->tlv_header, WMITLV_TAG_STRUC_WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param, @@ -14781,7 +14781,7 @@ static QDF_STATUS send_wow_sta_ra_filter_cmd_tlv(wmi_unified_t wmi_handle, WMI_TLV_HDR_SIZE + 0 * sizeof(WOW_MAGIC_PATTERN_CMD) + WMI_TLV_HDR_SIZE + - 0 * sizeof(A_UINT32) + WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32); + 0 * sizeof(uint32_t) + WMI_TLV_HDR_SIZE + 1 * sizeof(uint32_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -14822,10 +14822,10 @@ static QDF_STATUS send_wow_sta_ra_filter_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += WMI_TLV_HDR_SIZE; /* Fill TLV for ra_ratelimit_interval. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(A_UINT32)); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(uint32_t)); buf_ptr += WMI_TLV_HDR_SIZE; - *((A_UINT32 *) buf_ptr) = rate_limit_interval; + *((uint32_t *) buf_ptr) = rate_limit_interval; WMI_LOGD("%s: send RA rate limit [%d] to fw vdev = %d", __func__, rate_limit_interval, vdev_id); @@ -14925,7 +14925,7 @@ static QDF_STATUS send_multiple_add_clear_mcbc_filter_cmd_tlv( return QDF_STATUS_E_NOMEM; } - buf_ptr = (A_UINT8 *) wmi_buf_data(buf); + buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (WMI_SET_MULTIPLE_MCAST_FILTER_CMD_fixed_param *) wmi_buf_data(buf); qdf_mem_zero(cmd, sizeof(*cmd)); @@ -15124,7 +15124,7 @@ static QDF_STATUS send_action_frame_patterns_cmd_tlv(wmi_unified_t wmi_handle, uint32_t len = 0, *cmd_args; uint8_t *buf_ptr; - len = (PMO_SUPPORTED_ACTION_CATE * sizeof(A_UINT32)) + len = (PMO_SUPPORTED_ACTION_CATE * sizeof(uint32_t)) + WMI_TLV_HDR_SIZE + sizeof(*cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -15147,7 +15147,7 @@ static QDF_STATUS send_action_frame_patterns_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(WMI_WOW_SET_ACTION_WAKE_UP_CMD_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (PMO_SUPPORTED_ACTION_CATE * sizeof(A_UINT32))); + (PMO_SUPPORTED_ACTION_CATE * sizeof(uint32_t))); buf_ptr += WMI_TLV_HDR_SIZE; cmd_args = (uint32_t *) buf_ptr; for (i = 0; i < PMO_SUPPORTED_ACTION_CATE; i++) @@ -15782,10 +15782,10 @@ static QDF_STATUS send_unit_test_cmd_tlv(wmi_unified_t wmi_handle, uint8_t *buf_ptr; int i; uint16_t len, args_tlv_len; - A_UINT32 *unit_test_cmd_args; + uint32_t *unit_test_cmd_args; args_tlv_len = - WMI_TLV_HDR_SIZE + wmi_utest->num_args * sizeof(A_UINT32); + WMI_TLV_HDR_SIZE + wmi_utest->num_args * sizeof(uint32_t); len = sizeof(wmi_unit_test_cmd_fixed_param) + args_tlv_len; wmi_buf = wmi_buf_alloc(wmi_handle, len); @@ -15806,7 +15806,7 @@ static QDF_STATUS send_unit_test_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(wmi_unit_test_cmd_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, (wmi_utest->num_args * sizeof(uint32_t))); - unit_test_cmd_args = (A_UINT32 *) (buf_ptr + WMI_TLV_HDR_SIZE); + unit_test_cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); WMI_LOGI("%s: VDEV ID: %d\n", __func__, cmd->vdev_id); WMI_LOGI("%s: MODULE ID: %d\n", __func__, cmd->module_id); WMI_LOGI("%s: TOKEN: %d\n", __func__, cmd->diag_token); @@ -15842,12 +15842,12 @@ static QDF_STATUS send_roam_invoke_cmd_tlv(wmi_unified_t wmi_handle, wmi_buf_t wmi_buf; u_int8_t *buf_ptr; u_int16_t len, args_tlv_len; - A_UINT32 *channel_list; + uint32_t *channel_list; wmi_mac_addr *bssid_list; wmi_tlv_buf_len_param *buf_len_tlv; /* Host sends only one channel and one bssid */ - args_tlv_len = (4 * WMI_TLV_HDR_SIZE) + sizeof(A_UINT32) + + args_tlv_len = (4 * WMI_TLV_HDR_SIZE) + sizeof(uint32_t) + sizeof(wmi_mac_addr) + sizeof(wmi_tlv_buf_len_param) + roundup(roaminvoke->frame_len, sizeof(uint32_t)); len = sizeof(wmi_roam_invoke_cmd_fixed_param) + args_tlv_len; @@ -15885,9 +15885,9 @@ static QDF_STATUS send_roam_invoke_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(wmi_roam_invoke_cmd_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, (sizeof(u_int32_t))); - channel_list = (A_UINT32 *)(buf_ptr + WMI_TLV_HDR_SIZE); + channel_list = (uint32_t *)(buf_ptr + WMI_TLV_HDR_SIZE); *channel_list = ch_hz; - buf_ptr += sizeof(A_UINT32) + WMI_TLV_HDR_SIZE; + buf_ptr += sizeof(uint32_t) + WMI_TLV_HDR_SIZE; WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC, (sizeof(wmi_mac_addr))); bssid_list = (wmi_mac_addr *)(buf_ptr + WMI_TLV_HDR_SIZE); @@ -16251,7 +16251,7 @@ static QDF_STATUS send_roam_scan_offload_chan_list_cmd_tlv(wmi_unified_t wmi_han int i; uint8_t *buf_ptr; wmi_roam_chan_list_fixed_param *chan_list_fp; - A_UINT32 *roam_chan_list_array; + uint32_t *roam_chan_list_array; if (chan_count == 0) { WMI_LOGD("%s : invalid number of channels %d", __func__, @@ -16259,7 +16259,7 @@ static QDF_STATUS send_roam_scan_offload_chan_list_cmd_tlv(wmi_unified_t wmi_han return QDF_STATUS_E_EMPTY; } /* Channel list is a table of 2 TLV's */ - list_tlv_len = WMI_TLV_HDR_SIZE + chan_count * sizeof(A_UINT32); + list_tlv_len = WMI_TLV_HDR_SIZE + chan_count * sizeof(uint32_t); len = sizeof(wmi_roam_chan_list_fixed_param) + list_tlv_len; buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -16288,7 +16288,7 @@ static QDF_STATUS send_roam_scan_offload_chan_list_cmd_tlv(wmi_unified_t wmi_han buf_ptr += sizeof(wmi_roam_chan_list_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, (chan_list_fp->num_chan * sizeof(uint32_t))); - roam_chan_list_array = (A_UINT32 *) (buf_ptr + WMI_TLV_HDR_SIZE); + roam_chan_list_array = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); WMI_LOGD("%s: %d channels = ", __func__, chan_list_fp->num_chan); for (i = 0; ((i < chan_list_fp->num_chan) && (i < WMI_ROAM_MAX_CHANNELS)); i++) { @@ -16769,13 +16769,13 @@ static QDF_STATUS send_multiple_vdev_restart_req_cmd_tlv( WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - sizeof(A_UINT32) * param->num_vdevs); + sizeof(uint32_t) * param->num_vdevs); vdev_ids = (uint32_t *)(buf_ptr + WMI_TLV_HDR_SIZE); for (i = 0; i < param->num_vdevs; i++) { vdev_ids[i] = param->vdev_ids[i]; } - buf_ptr += (sizeof(A_UINT32) * param->num_vdevs) + WMI_TLV_HDR_SIZE; + buf_ptr += (sizeof(uint32_t) * param->num_vdevs) + WMI_TLV_HDR_SIZE; WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_STRUC_wmi_channel,