From 16b886a0c8e953a40746698b9ca0f3f6728048b3 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Wed, 16 Mar 2016 16:27:50 +0530 Subject: [PATCH] qcacmn: Replace mac_id with pdev_id in common wmi layer Replace mac_id with pdev_id, add vdev_id to peer commands/events and change reserved0 to pdev_id in PDEV commands. Change-Id: I2f659159fa2f0d023650eae68b6d3115aac379b0 CRs-Fixed: 983619 --- wmi/inc/wmi_unified_priv.h | 4 ++-- wmi/src/wmi_unified.c | 33 +++++++++++++++++++++++++++++++++ wmi/src/wmi_unified_tlv.c | 6 +++--- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index b6069fc200..0e6a6603dd 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -576,7 +576,7 @@ QDF_STATUS (*send_get_buf_extscan_hotlist_cmd)(wmi_unified_t wmi_handle, * @buf: Buffer containing the wmi INIT command * @buf_len: Length of the buffer */ -struct wmi_init_cmd { +struct wmi_cmd_init { wmi_buf_t buf; uint32_t buf_len; }; @@ -598,7 +598,7 @@ struct wmi_unified { int wmi_stop_in_progress; struct _wmi_abi_version fw_abi_version; struct _wmi_abi_version final_abi_vers; - struct wmi_init_cmd saved_wmi_init_cmd; + struct wmi_cmd_init saved_wmi_init_cmd; uint32_t num_of_diag_events_logs; uint32_t *events_logs_list; struct host_offload_req_param arp_info; diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index 1f29fcc1a3..f437092fe7 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -763,6 +763,39 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_BPF_GET_VDEV_STATS_CMDID); CASE_RETURN_STRING(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); CASE_RETURN_STRING(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID); + CASE_RETURN_STRING(WMI_NDI_GET_CAP_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_INITIATOR_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_RESPONDER_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_END_REQ_CMDID); + CASE_RETURN_STRING(WMI_PEER_UPDATE_WDS_ENTRY_CMDID); + CASE_RETURN_STRING(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID); + CASE_RETURN_STRING(WMI_PDEV_FIPS_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_ENABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_CTL_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CMDID); + CASE_RETURN_STRING(WMI_MIB_STATS_ENABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_VDEV_RATEMASK_CMDID); + CASE_RETURN_STRING(WMI_VDEV_ATF_REQUEST_CMDID); + CASE_RETURN_STRING(WMI_VDEV_SET_DSCP_TID_MAP_CMDID); + CASE_RETURN_STRING(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID); + CASE_RETURN_STRING(WMI_VDEV_SET_QUIET_MODE_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); + CASE_RETURN_STRING(WMI_PEER_ATF_REQUEST_CMDID); + CASE_RETURN_STRING(WMI_FWTEST_CMDID); + CASE_RETURN_STRING(WMI_QBOOST_CFG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_NFCAL_POWER_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_PCL_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_HW_MODE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_MAC_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_MODE_CMDID); + CASE_RETURN_STRING(WMI_ROAM_SET_MBO_PARAM_CMDID); } diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index f457de3871..3955d2e876 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -411,7 +411,7 @@ QDF_STATUS send_green_ap_ps_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_pdev_green_ap_ps_enable_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_pdev_green_ap_ps_enable_cmd_fixed_param)); - cmd->reserved0 = 0; + cmd->pdev_id = 0; cmd->enable = value; if (wmi_unified_cmd_send(wmi_handle, buf, len, @@ -542,7 +542,7 @@ send_pdev_param_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_pdev_set_param_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_pdev_set_param_cmd_fixed_param)); - cmd->reserved0 = 0; + cmd->pdev_id = 0; cmd->param_id = param->param_id; cmd->param_value = param->param_value; WMI_LOGD("Setting pdev param = %x, value = %u", param->param_id, @@ -6001,7 +6001,7 @@ QDF_STATUS send_pktlog_wmi_send_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_pdev_pktlog_disable_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_pdev_pktlog_disable_cmd_fixed_param)); - disable_cmd->reserved0 = 0; + disable_cmd->pdev_id = 0; if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_DISABLE_CMDID)) { WMI_LOGE("failed to send pktlog disable cmdid");