From cf632579b1e33283b136991565b054136d137446 Mon Sep 17 00:00:00 2001 From: Sourav Mohapatra Date: Mon, 2 Apr 2018 11:01:35 +0530 Subject: [PATCH] qcacld-3.0: Use new API for fetching wmi_handle Use get_wmi_unified_hdl_from_psoc instead of GET_WMI_HDL_FROM_PSOC due to incompatible return types. Solve renaming dependencies with common side changes. Change-Id: Ie84641327d64876877c7d26b63d632c79770a88c CRs-Fixed: 2203055 --- Kbuild | 2 +- .../target_if/disa/src/target_if_disa.c | 11 +-- components/target_if/ipa/src/target_if_ipa.c | 4 +- components/target_if/ocb/src/target_if_ocb.c | 73 ++++++++++--------- .../target_if/pmo/src/target_if_pmo_arp.c | 4 +- .../target_if/pmo/src/target_if_pmo_gtk.c | 8 +- .../pmo/src/target_if_pmo_hw_filter.c | 4 +- .../target_if/pmo/src/target_if_pmo_lphb.c | 12 +-- .../pmo/src/target_if_pmo_mc_addr_filtering.c | 10 +-- .../target_if/pmo/src/target_if_pmo_ns.c | 4 +- .../pmo/src/target_if_pmo_pkt_filter.c | 8 +- .../pmo/src/target_if_pmo_static_config.c | 8 +- .../pmo/src/target_if_pmo_suspend_resume.c | 40 +++++----- .../target_if/pmo/src/target_if_pmo_wow.c | 12 +-- core/wma/src/wma_dev_if.c | 10 +-- core/wma/src/wma_main.c | 10 +-- 16 files changed, 115 insertions(+), 105 deletions(-) diff --git a/Kbuild b/Kbuild index df7524d8d9c4..73d6e4bce86c 100644 --- a/Kbuild +++ b/Kbuild @@ -1339,7 +1339,7 @@ TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \ $(TARGET_IF_DIR)/regulatory/src/target_if_reg.o \ $(TARGET_IF_DIR)/tdls/src/target_if_tdls.o \ $(TARGET_IF_DIR)/init_deinit/src/init_cmd_api.o \ - $(TARGET_IF_DIR)/init_deinit/src/init_deinit_ucfg.o \ + $(TARGET_IF_DIR)/init_deinit/src/init_deinit_lmac.o \ $(TARGET_IF_DIR)/init_deinit/src/init_event_handler.o \ $(TARGET_IF_DIR)/init_deinit/src/service_ready_util.o \ diff --git a/components/target_if/disa/src/target_if_disa.c b/components/target_if/disa/src/target_if_disa.c index 96a037f59c4a..c1ac4a24d9b8 100644 --- a/components/target_if/disa/src/target_if_disa.c +++ b/components/target_if/disa/src/target_if_disa.c @@ -44,7 +44,7 @@ target_if_encrypt_decrypt_event_handler(ol_scn_t scn_handle, uint8_t *data, } if (wmi_extract_encrypt_decrypt_resp_params( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), data, &resp) != QDF_STATUS_SUCCESS) { target_if_err("Extraction of encrypt decrypt resp params failed"); return -EINVAL; @@ -60,7 +60,7 @@ target_if_disa_register_ev_handlers(struct wlan_objmgr_psoc *psoc) { QDF_STATUS status; - status = wmi_unified_register_event(GET_WMI_HDL_FROM_PSOC(psoc), + status = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc), wmi_vdev_encrypt_decrypt_data_rsp_event_id, target_if_encrypt_decrypt_event_handler); if (status) { @@ -76,7 +76,8 @@ target_if_disa_unregister_ev_handlers(struct wlan_objmgr_psoc *psoc) { QDF_STATUS status; - status = wmi_unified_unregister_event(GET_WMI_HDL_FROM_PSOC(psoc), + status = wmi_unified_unregister_event( + get_wmi_unified_hdl_from_psoc(psoc), wmi_vdev_encrypt_decrypt_data_rsp_event_id); if (status) { target_if_err("Failed to unregister Scan match event cb"); @@ -90,8 +91,8 @@ QDF_STATUS target_if_disa_encrypt_decrypt_req(struct wlan_objmgr_psoc *psoc, struct disa_encrypt_decrypt_req_params *req) { - return wmi_unified_encrypt_decrypt_send_cmd(GET_WMI_HDL_FROM_PSOC(psoc), - req); + return wmi_unified_encrypt_decrypt_send_cmd( + get_wmi_unified_hdl_from_psoc(psoc), req); } diff --git a/components/target_if/ipa/src/target_if_ipa.c b/components/target_if/ipa/src/target_if_ipa.c index 1b5eb69cf091..bde980809f0f 100644 --- a/components/target_if/ipa/src/target_if_ipa.c +++ b/components/target_if/ipa/src/target_if_ipa.c @@ -40,8 +40,8 @@ static QDF_STATUS target_if_ipa_uc_offload_control_req(struct wlan_objmgr_psoc *psoc, struct ipa_uc_offload_control_params *req) { - return wmi_unified_ipa_offload_control_cmd(GET_WMI_HDL_FROM_PSOC(psoc), - req); + return wmi_unified_ipa_offload_control_cmd( + get_wmi_unified_hdl_from_psoc(psoc), req); } void target_if_ipa_register_tx_ops(ipa_uc_offload_control_req *ipa_tx_op) diff --git a/components/target_if/ocb/src/target_if_ocb.c b/components/target_if/ocb/src/target_if_ocb.c index 6d66294b8402..e727a9b781fe 100644 --- a/components/target_if/ocb/src/target_if_ocb.c +++ b/components/target_if/ocb/src/target_if_ocb.c @@ -62,7 +62,7 @@ static QDF_STATUS target_if_ocb_set_config(struct wlan_objmgr_psoc *psoc, { QDF_STATUS status; - status = wmi_unified_ocb_set_config(GET_WMI_HDL_FROM_PSOC(psoc), + status = wmi_unified_ocb_set_config(get_wmi_unified_hdl_from_psoc(psoc), config); if (status) target_if_err("Failed to set OCB config %d", status); @@ -82,8 +82,8 @@ static QDF_STATUS target_if_ocb_set_utc_time(struct wlan_objmgr_psoc *psoc, { QDF_STATUS status; - status = wmi_unified_ocb_set_utc_time_cmd(GET_WMI_HDL_FROM_PSOC(psoc), - utc); + status = wmi_unified_ocb_set_utc_time_cmd( + get_wmi_unified_hdl_from_psoc(psoc), utc); if (status) target_if_err("Failed to set OCB UTC time %d", status); @@ -105,7 +105,7 @@ target_if_ocb_start_timing_advert(struct wlan_objmgr_psoc *psoc, QDF_STATUS status; status = wmi_unified_ocb_start_timing_advert( - GET_WMI_HDL_FROM_PSOC(psoc), ta); + get_wmi_unified_hdl_from_psoc(psoc), ta); if (status) target_if_err("Failed to start OCB timing advert %d", status); @@ -127,8 +127,8 @@ target_if_ocb_stop_timing_advert(struct wlan_objmgr_psoc *psoc, QDF_STATUS status; status = - wmi_unified_ocb_stop_timing_advert(GET_WMI_HDL_FROM_PSOC(psoc), - ta); + wmi_unified_ocb_stop_timing_advert( + get_wmi_unified_hdl_from_psoc(psoc), ta); if (status) target_if_err("Failed to stop OCB timing advert %d", status); @@ -148,8 +148,8 @@ target_if_ocb_get_tsf_timer(struct wlan_objmgr_psoc *psoc, { QDF_STATUS status; - status = wmi_unified_ocb_get_tsf_timer(GET_WMI_HDL_FROM_PSOC(psoc), - request); + status = wmi_unified_ocb_get_tsf_timer( + get_wmi_unified_hdl_from_psoc(psoc), request); if (status) target_if_err("Failed to send get tsf timer cmd: %d", status); @@ -169,8 +169,8 @@ target_if_dcc_get_stats(struct wlan_objmgr_psoc *psoc, { QDF_STATUS status; - status = wmi_unified_dcc_get_stats_cmd(GET_WMI_HDL_FROM_PSOC(psoc), - get_stats_param); + status = wmi_unified_dcc_get_stats_cmd( + get_wmi_unified_hdl_from_psoc(psoc), get_stats_param); if (status) target_if_err("Failed to send get DCC stats cmd: %d", status); @@ -190,8 +190,8 @@ target_if_dcc_clear_stats(struct wlan_objmgr_psoc *psoc, { QDF_STATUS status; - status = wmi_unified_dcc_clear_stats(GET_WMI_HDL_FROM_PSOC(psoc), - clear_stats_param); + status = wmi_unified_dcc_clear_stats( + get_wmi_unified_hdl_from_psoc(psoc), clear_stats_param); if (status) target_if_err("Failed to send clear DCC stats cmd: %d", status); @@ -212,7 +212,7 @@ target_if_dcc_update_ndl(struct wlan_objmgr_psoc *psoc, QDF_STATUS status; /* Send the WMI command */ - status = wmi_unified_dcc_update_ndl(GET_WMI_HDL_FROM_PSOC(psoc), + status = wmi_unified_dcc_update_ndl(get_wmi_unified_hdl_from_psoc(psoc), update_ndl_param); if (status) target_if_err("Failed to send NDL update cmd: %d", status); @@ -262,7 +262,7 @@ target_if_ocb_set_config_resp(ol_scn_t scn, uint8_t *event_buf, ocb_rx_ops = target_if_ocb_get_rx_ops(pdev); if (ocb_rx_ops->ocb_set_config_status) { status = wmi_extract_ocb_set_channel_config_resp( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), event_buf, &resp); if (QDF_IS_STATUS_ERROR(status)) { target_if_err("Failed to extract config status"); @@ -328,8 +328,9 @@ static int target_if_ocb_get_tsf_timer_resp(ol_scn_t scn, ocb_rx_ops = target_if_ocb_get_rx_ops(pdev); if (ocb_rx_ops->ocb_tsf_timer) { - status = wmi_extract_ocb_tsf_timer(GET_WMI_HDL_FROM_PSOC(psoc), - event_buf, &response); + status = wmi_extract_ocb_tsf_timer( + get_wmi_unified_hdl_from_psoc(psoc), + event_buf, &response); if (QDF_IS_STATUS_ERROR(status)) { target_if_err("Failed to extract tsf timer"); rc = -EINVAL; @@ -402,7 +403,7 @@ static int target_if_dcc_update_ndl_resp(ol_scn_t scn, ocb_rx_ops = target_if_ocb_get_rx_ops(pdev); if (ocb_rx_ops->ocb_dcc_ndl_update) { status = wmi_extract_dcc_update_ndl_resp( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), event_buf, resp); if (QDF_IS_STATUS_ERROR(status)) { target_if_err("Failed to extract ndl status"); @@ -470,8 +471,9 @@ static int target_if_dcc_get_stats_resp(ol_scn_t scn, ocb_rx_ops = target_if_ocb_get_rx_ops(pdev); if (ocb_rx_ops->ocb_dcc_stats_indicate) { - status = wmi_extract_dcc_stats(GET_WMI_HDL_FROM_PSOC(psoc), - event_buf, &response); + status = wmi_extract_dcc_stats( + get_wmi_unified_hdl_from_psoc(psoc), + event_buf, &response); if (!response || QDF_IS_STATUS_ERROR(status)) { target_if_err("Cannot get DCC stats"); rc = -ENOMEM; @@ -540,8 +542,9 @@ static int target_if_dcc_stats_resp(ol_scn_t scn, uint8_t *event_buf, ocb_rx_ops = target_if_ocb_get_rx_ops(pdev); if (ocb_rx_ops->ocb_dcc_stats_indicate) { - status = wmi_extract_dcc_stats(GET_WMI_HDL_FROM_PSOC(psoc), - event_buf, &response); + status = wmi_extract_dcc_stats( + get_wmi_unified_hdl_from_psoc(psoc), + event_buf, &response); if (!response || QDF_IS_STATUS_ERROR(status)) { target_if_err("Cannot get DCC stats"); rc = -ENOMEM; @@ -575,7 +578,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, int rc; /* Initialize the members in WMA used by wma_ocb */ - rc = wmi_unified_register_event(GET_WMI_HDL_FROM_PSOC(psoc), + rc = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_set_config_resp_event_id, target_if_ocb_set_config_resp); if (rc) { @@ -584,7 +587,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, } rc = wmi_unified_register_event( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_get_tsf_timer_resp_event_id, target_if_ocb_get_tsf_timer_resp); if (rc) { @@ -593,7 +596,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, } rc = wmi_unified_register_event( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_get_stats_resp_event_id, target_if_dcc_get_stats_resp); if (rc) { @@ -602,7 +605,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, } rc = wmi_unified_register_event( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_update_ndl_resp_event_id, target_if_dcc_update_ndl_resp); if (rc) { @@ -610,7 +613,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, goto unreg_get_stats; } - rc = wmi_unified_register_event(GET_WMI_HDL_FROM_PSOC(psoc), + rc = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_stats_event_id, target_if_dcc_stats_resp); if (rc) { @@ -622,18 +625,18 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc, unreg_ndl: wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_update_ndl_resp_event_id); unreg_get_stats: wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_get_stats_resp_event_id); unreg_tsf_timer: wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_get_tsf_timer_resp_event_id); unreg_set_config: - wmi_unified_unregister_event(GET_WMI_HDL_FROM_PSOC(psoc), + wmi_unified_unregister_event(get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_set_config_resp_event_id); return QDF_STATUS_E_FAILURE; @@ -646,30 +649,30 @@ target_if_ocb_unregister_event_handler(struct wlan_objmgr_psoc *psoc, int rc; rc = wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_stats_event_id); if (rc) target_if_err("Failed to unregister DCC stats event cb"); rc = wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_update_ndl_resp_event_id); if (rc) target_if_err("Failed to unregister NDL update event cb"); rc = wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_dcc_get_stats_resp_event_id); if (rc) target_if_err("Failed to unregister DCC get stats resp cb"); rc = wmi_unified_unregister_event_handler( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_get_tsf_timer_resp_event_id); if (rc) target_if_err("Failed to unregister OCB TSF resp event cb"); - rc = wmi_unified_unregister_event(GET_WMI_HDL_FROM_PSOC(psoc), + rc = wmi_unified_unregister_event(get_wmi_unified_hdl_from_psoc(psoc), wmi_ocb_set_config_resp_event_id); if (rc) target_if_err("Failed to unregister OCB config resp event cb"); diff --git a/components/target_if/pmo/src/target_if_pmo_arp.c b/components/target_if/pmo/src/target_if_pmo_arp.c index b28b08a55f01..e072d4bdfb9d 100644 --- a/components/target_if/pmo/src/target_if_pmo_arp.c +++ b/components/target_if/pmo/src/target_if_pmo_arp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -48,7 +48,7 @@ QDF_STATUS target_if_pmo_send_arp_offload_req( } status = wmi_unified_enable_arp_ns_offload_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), arp_offload_req, ns_offload_req, vdev_id); diff --git a/components/target_if/pmo/src/target_if_pmo_gtk.c b/components/target_if/pmo/src/target_if_pmo_gtk.c index 5f67b9fa03a5..291d69667b88 100644 --- a/components/target_if/pmo/src/target_if_pmo_gtk.c +++ b/components/target_if/pmo/src/target_if_pmo_gtk.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -52,7 +52,7 @@ QDF_STATUS target_if_pmo_send_gtk_offload_req(struct wlan_objmgr_vdev *vdev, gtk_offload_opcode = GTK_OFFLOAD_DISABLE_OPCODE; status = wmi_unified_send_gtk_offload_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, gtk_req, gtk_req->flags, @@ -87,7 +87,7 @@ QDF_STATUS target_if_pmo_send_gtk_response_req(struct wlan_objmgr_vdev *vdev) /* send the wmi command */ status = wmi_unified_process_gtk_offload_getinfo_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, offload_req_opcode); return status; @@ -115,7 +115,7 @@ int target_if_pmo_gtk_offload_status_event(void *scn_handle, goto out; } - if (wmi_extract_gtk_rsp_event(GET_WMI_HDL_FROM_PSOC(psoc), + if (wmi_extract_gtk_rsp_event(get_wmi_unified_hdl_from_psoc(psoc), event, gtk_rsp_param, len) != QDF_STATUS_SUCCESS) { target_if_err("Extraction of gtk rsp event failed"); qdf_mem_free(gtk_rsp_param); diff --git a/components/target_if/pmo/src/target_if_pmo_hw_filter.c b/components/target_if/pmo/src/target_if_pmo_hw_filter.c index 8070a6459a7e..8c9e92a1221e 100644 --- a/components/target_if/pmo/src/target_if_pmo_hw_filter.c +++ b/components/target_if/pmo/src/target_if_pmo_hw_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -38,7 +38,7 @@ QDF_STATUS target_if_pmo_conf_hw_filter(struct wlan_objmgr_psoc *psoc, } status = wmi_unified_conf_hw_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), req); if (QDF_IS_STATUS_ERROR(status)) diff --git a/components/target_if/pmo/src/target_if_pmo_lphb.c b/components/target_if/pmo/src/target_if_pmo_lphb.c index 8c630b803ab0..44c1243ebb57 100644 --- a/components/target_if/pmo/src/target_if_pmo_lphb.c +++ b/components/target_if/pmo/src/target_if_pmo_lphb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -56,7 +56,7 @@ QDF_STATUS target_if_pmo_send_lphb_enable(struct wlan_objmgr_psoc *psoc, hb_enable_fp.session = ts_lphb_enable->session; status = wmi_unified_lphb_config_hbenable_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), &hb_enable_fp); if (status != EOK) { qdf_status = QDF_STATUS_E_FAILURE; @@ -104,7 +104,7 @@ QDF_STATUS target_if_pmo_send_lphb_tcp_params(struct wlan_objmgr_psoc *psoc, &hb_tcp_params_fp.gateway_mac); status = wmi_unified_lphb_config_tcp_params_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), &hb_tcp_params_fp); if (status != EOK) { qdf_status = QDF_STATUS_E_FAILURE; @@ -146,7 +146,7 @@ QDF_STATUS target_if_pmo_send_lphb_tcp_pkt_filter(struct wlan_objmgr_psoc *psoc, WMI_WLAN_HB_MAX_FILTER_SIZE); status = wmi_unified_lphb_config_tcp_pkt_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), &hb_tcp_filter_fp); if (status != EOK) { qdf_status = QDF_STATUS_E_FAILURE; @@ -192,7 +192,7 @@ QDF_STATUS target_if_pmo_send_lphb_udp_params(struct wlan_objmgr_psoc *psoc, &hb_udp_params_fp.gateway_mac); status = wmi_unified_lphb_config_udp_params_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), &hb_udp_params_fp); if (status != EOK) { qdf_status = QDF_STATUS_E_FAILURE; @@ -241,7 +241,7 @@ QDF_STATUS target_if_pmo_send_lphb_udp_pkt_filter(struct wlan_objmgr_psoc *psoc, WMI_WLAN_HB_MAX_FILTER_SIZE); status = wmi_unified_lphb_config_udp_pkt_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), &hb_udp_filter_fp); if (status != EOK) { qdf_status = QDF_STATUS_E_FAILURE; diff --git a/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c b/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c index 3cccd5844fc9..a087c226a528 100644 --- a/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c +++ b/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c @@ -48,7 +48,7 @@ QDF_STATUS target_if_pmo_set_mc_filter_req( } status = wmi_unified_add_clear_mcbc_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, multicast_addr, false); if (status) @@ -78,7 +78,7 @@ QDF_STATUS target_if_pmo_clear_mc_filter_req( } status = wmi_unified_add_clear_mcbc_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, multicast_addr, true); if (status) @@ -91,7 +91,7 @@ QDF_STATUS target_if_pmo_clear_mc_filter_req( bool target_if_pmo_get_multiple_mc_filter_support( struct wlan_objmgr_psoc *psoc) { - wmi_unified_t wmi_handle = GET_WMI_HDL_FROM_PSOC(psoc); + wmi_unified_t wmi_handle = get_wmi_unified_hdl_from_psoc(psoc); return wmi_service_enabled(wmi_handle, wmi_service_multiple_mcast_filter_set); @@ -126,7 +126,7 @@ QDF_STATUS target_if_pmo_set_multiple_mc_filter_req( filter_params.action = 1; status = wmi_unified_multiple_add_clear_mcbc_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, &filter_params); if (status) @@ -164,7 +164,7 @@ QDF_STATUS target_if_pmo_clear_multiple_mc_filter_req( filter_params.action = 0; status = wmi_unified_multiple_add_clear_mcbc_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, &filter_params); if (status) diff --git a/components/target_if/pmo/src/target_if_pmo_ns.c b/components/target_if/pmo/src/target_if_pmo_ns.c index 6b2946b88fc8..b4111c49b9a7 100644 --- a/components/target_if/pmo/src/target_if_pmo_ns.c +++ b/components/target_if/pmo/src/target_if_pmo_ns.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -48,7 +48,7 @@ QDF_STATUS target_if_pmo_send_ns_offload_req( } status = wmi_unified_enable_arp_ns_offload_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), arp_offload_req, ns_offload_req, vdev_id); diff --git a/components/target_if/pmo/src/target_if_pmo_pkt_filter.c b/components/target_if/pmo/src/target_if_pmo_pkt_filter.c index 7907c7a0a0f9..930c620d9d3e 100644 --- a/components/target_if/pmo/src/target_if_pmo_pkt_filter.c +++ b/components/target_if/pmo/src/target_if_pmo_pkt_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -48,7 +48,7 @@ QDF_STATUS target_if_pmo_send_pkt_filter_req(struct wlan_objmgr_vdev *vdev, /* send the command along with data */ status = wmi_unified_config_packet_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, rcv_filter_param, rcv_filter_param->filter_id, true); if (status) { @@ -58,7 +58,7 @@ QDF_STATUS target_if_pmo_send_pkt_filter_req(struct wlan_objmgr_vdev *vdev, /* Enable packet filter */ status = wmi_unified_enable_disable_packet_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, true); if (status) target_if_err("Failed to send packet filter wmi cmd to fw"); @@ -87,7 +87,7 @@ QDF_STATUS target_if_pmo_clear_pkt_filter_req(struct wlan_objmgr_vdev *vdev, /* send the command along with data */ status = wmi_unified_config_packet_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, NULL, rcv_clear_param->filter_id, false); if (status) diff --git a/components/target_if/pmo/src/target_if_pmo_static_config.c b/components/target_if/pmo/src/target_if_pmo_static_config.c index 8207e361dd14..498ccfe2eb3b 100644 --- a/components/target_if/pmo/src/target_if_pmo_static_config.c +++ b/components/target_if/pmo/src/target_if_pmo_static_config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -47,7 +47,7 @@ QDF_STATUS target_if_pmo_send_ra_filter_req(struct wlan_objmgr_vdev *vdev, } status = wmi_unified_wow_sta_ra_filter_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, default_pattern, rate_limit_interval); if (status) target_if_err("Failed to send RA rate limit to fw"); @@ -76,7 +76,7 @@ QDF_STATUS target_if_pmo_send_action_frame_patterns( } status = wmi_unified_action_frame_patterns_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), ip_cmd); + get_wmi_unified_hdl_from_psoc(psoc), ip_cmd); if (status != QDF_STATUS_SUCCESS) target_if_err("Failed to config wow action frame map, ret %d", status); @@ -104,7 +104,7 @@ QDF_STATUS target_if_pmo_send_enhance_mc_offload_req( } status = wmi_unified_enable_enhance_multicast_offload_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, enable); + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, enable); if (status) target_if_err("Failed to config wow wakeup event"); diff --git a/components/target_if/pmo/src/target_if_pmo_suspend_resume.c b/components/target_if/pmo/src/target_if_pmo_suspend_resume.c index fa14cecc07cc..7608b979718d 100644 --- a/components/target_if/pmo/src/target_if_pmo_suspend_resume.c +++ b/components/target_if/pmo/src/target_if_pmo_suspend_resume.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -66,8 +66,8 @@ QDF_STATUS target_if_pmo_send_vdev_update_param_req( param.param_value = param_value; target_if_info("set vdev param vdev_id: %d value: %d for param_id: %d", vdev_id, param_value, param_id); - return wmi_unified_vdev_set_param_send(GET_WMI_HDL_FROM_PSOC(psoc), - ¶m); + return wmi_unified_vdev_set_param_send( + get_wmi_unified_hdl_from_psoc(psoc), ¶m); } QDF_STATUS target_if_pmo_send_vdev_ps_param_req( @@ -107,8 +107,8 @@ QDF_STATUS target_if_pmo_send_vdev_ps_param_req( target_if_info("set vdev param vdev_id: %d value: %d for param_id: %d", vdev_id, param_value, param_id); - status = wmi_unified_sta_ps_cmd_send(GET_WMI_HDL_FROM_PSOC(psoc), - &sta_ps_param); + status = wmi_unified_sta_ps_cmd_send( + get_wmi_unified_hdl_from_psoc(psoc), &sta_ps_param); if (QDF_IS_STATUS_ERROR(status)) return status; @@ -119,23 +119,24 @@ QDF_STATUS target_if_pmo_send_vdev_ps_param_req( void target_if_pmo_psoc_update_bus_suspend(struct wlan_objmgr_psoc *psoc, uint8_t value) { - wmi_set_is_wow_bus_suspended(GET_WMI_HDL_FROM_PSOC(psoc), value); + wmi_set_is_wow_bus_suspended( + get_wmi_unified_hdl_from_psoc(psoc), value); } int target_if_pmo_psoc_get_host_credits(struct wlan_objmgr_psoc *psoc) { - return wmi_get_host_credits(GET_WMI_HDL_FROM_PSOC(psoc)); + return wmi_get_host_credits(get_wmi_unified_hdl_from_psoc(psoc)); } int target_if_pmo_psoc_get_pending_cmnds(struct wlan_objmgr_psoc *psoc) { - return wmi_get_pending_cmds(GET_WMI_HDL_FROM_PSOC(psoc)); + return wmi_get_pending_cmds(get_wmi_unified_hdl_from_psoc(psoc)); } void target_if_pmo_update_target_suspend_flag(struct wlan_objmgr_psoc *psoc, uint8_t value) { - wmi_set_target_suspend(GET_WMI_HDL_FROM_PSOC(psoc), value); + wmi_set_target_suspend(get_wmi_unified_hdl_from_psoc(psoc), value); } QDF_STATUS target_if_pmo_psoc_send_wow_enable_req( @@ -143,7 +144,7 @@ QDF_STATUS target_if_pmo_psoc_send_wow_enable_req( struct pmo_wow_cmd_params *param) { wma_check_and_set_wake_timer(SIR_INSTALL_KEY_TIMEOUT_MS); - return wmi_unified_wow_enable_send(GET_WMI_HDL_FROM_PSOC(psoc), + return wmi_unified_wow_enable_send(get_wmi_unified_hdl_from_psoc(psoc), (struct wow_cmd_params *)param, TGT_WILDCARD_PDEV_ID); } @@ -152,7 +153,7 @@ QDF_STATUS target_if_pmo_psoc_send_suspend_req( struct wlan_objmgr_psoc *psoc, struct pmo_suspend_params *param) { - return wmi_unified_suspend_send(GET_WMI_HDL_FROM_PSOC(psoc), + return wmi_unified_suspend_send(get_wmi_unified_hdl_from_psoc(psoc), (struct suspend_params *) param, TGT_WILDCARD_PDEV_ID); } @@ -160,27 +161,28 @@ QDF_STATUS target_if_pmo_psoc_send_suspend_req( void target_if_pmo_set_runtime_pm_in_progress(struct wlan_objmgr_psoc *psoc, bool value) { - return wmi_set_runtime_pm_inprogress(GET_WMI_HDL_FROM_PSOC(psoc), - value); + return wmi_set_runtime_pm_inprogress( + get_wmi_unified_hdl_from_psoc(psoc), value); } bool target_if_pmo_get_runtime_pm_in_progress( struct wlan_objmgr_psoc *psoc) { - return wmi_get_runtime_pm_inprogress(GET_WMI_HDL_FROM_PSOC(psoc)); + return wmi_get_runtime_pm_inprogress( + get_wmi_unified_hdl_from_psoc(psoc)); } QDF_STATUS target_if_pmo_psoc_send_host_wakeup_ind( struct wlan_objmgr_psoc *psoc) { return wmi_unified_host_wakeup_ind_to_fw_cmd( - GET_WMI_HDL_FROM_PSOC(psoc)); + get_wmi_unified_hdl_from_psoc(psoc)); } QDF_STATUS target_if_pmo_psoc_send_target_resume_req( struct wlan_objmgr_psoc *psoc) { - return wmi_unified_resume_send(GET_WMI_HDL_FROM_PSOC(psoc), + return wmi_unified_resume_send(get_wmi_unified_hdl_from_psoc(psoc), TGT_WILDCARD_PDEV_ID); } @@ -188,14 +190,16 @@ QDF_STATUS target_if_pmo_psoc_send_target_resume_req( QDF_STATUS target_if_pmo_psoc_send_d0wow_enable_req( struct wlan_objmgr_psoc *psoc) { - return wmi_unified_d0wow_enable_send(GET_WMI_HDL_FROM_PSOC(psoc), + return wmi_unified_d0wow_enable_send( + get_wmi_unified_hdl_from_psoc(psoc), TGT_WILDCARD_PDEV_ID); } QDF_STATUS target_if_pmo_psoc_send_d0wow_disable_req( struct wlan_objmgr_psoc *psoc) { - return wmi_unified_d0wow_disable_send(GET_WMI_HDL_FROM_PSOC(psoc), + return wmi_unified_d0wow_disable_send( + get_wmi_unified_hdl_from_psoc(psoc), TGT_WILDCARD_PDEV_ID); } #else diff --git a/components/target_if/pmo/src/target_if_pmo_wow.c b/components/target_if/pmo/src/target_if_pmo_wow.c index 2fa1a0c5334b..507078657d31 100644 --- a/components/target_if/pmo/src/target_if_pmo_wow.c +++ b/components/target_if/pmo/src/target_if_pmo_wow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -47,7 +47,8 @@ QDF_STATUS target_if_pmo_enable_wow_wakeup_event(struct wlan_objmgr_vdev *vdev, } status = wmi_unified_add_wow_wakeup_event_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, bitmap, true); + get_wmi_unified_hdl_from_psoc(psoc), + vdev_id, bitmap, true); if (status) target_if_err("Failed to config wow wakeup event"); @@ -74,7 +75,8 @@ QDF_STATUS target_if_pmo_disable_wow_wakeup_event(struct wlan_objmgr_vdev *vdev, } status = wmi_unified_add_wow_wakeup_event_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), vdev_id, bitmap, false); + get_wmi_unified_hdl_from_psoc(psoc), + vdev_id, bitmap, false); if (status) target_if_err("Failed to config wow wakeup event"); @@ -104,7 +106,7 @@ QDF_STATUS target_if_pmo_send_wow_patterns_to_fw(struct wlan_objmgr_vdev *vdev, } status = wmi_unified_wow_patterns_to_fw_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), + get_wmi_unified_hdl_from_psoc(psoc), vdev_id, ptrn_id, ptrn, ptrn_len, ptrn_offset, mask, mask_len, user, 0); @@ -132,7 +134,7 @@ QDF_STATUS target_if_pmo_del_wow_patterns_to_fw(struct wlan_objmgr_vdev *vdev, } status = wmi_unified_wow_delete_pattern_cmd( - GET_WMI_HDL_FROM_PSOC(psoc), ptrn_id, + get_wmi_unified_hdl_from_psoc(psoc), ptrn_id, vdev_id); return status; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index a252aaa6423a..82e9fdd33e01 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -72,7 +72,7 @@ #include "wma_he.h" #include "wlan_roam_debug.h" #include "wlan_ocb_ucfg_api.h" -#include "init_deinit_ucfg.h" +#include "init_deinit_lmac.h" #include /** @@ -1079,7 +1079,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, WMA_LOGD("%s: Enter", __func__); - wlan_res_cfg = ucfg_get_tgt_res_cfg(psoc); + wlan_res_cfg = lmac_get_tgt_res_cfg(psoc); if (!wlan_res_cfg) { WMA_LOGE("%s: Wlan resource config is NULL", __func__); return -EINVAL; @@ -1544,7 +1544,7 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, struct cdp_pdev *pdev, return QDF_STATUS_E_INVAL; } - wlan_res_cfg = ucfg_get_tgt_res_cfg(psoc); + wlan_res_cfg = lmac_get_tgt_res_cfg(psoc); if (!wlan_res_cfg) { WMA_LOGE("%s: psoc target res cfg is null", __func__); return QDF_STATUS_E_INVAL; @@ -5255,7 +5255,7 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta) uint8_t oper_mode = BSS_OPERATIONAL_MODE_STA; void *htc_handle; - htc_handle = ucfg_get_htc_hdl(wma->psoc); + htc_handle = lmac_get_htc_hdl(wma->psoc); if (!htc_handle) { WMA_LOGE(":%sHTC handle is NULL:%d", __func__, __LINE__); return; @@ -5314,7 +5314,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) bool rsp_requested = del_sta->respReqd; void *htc_handle; - htc_handle = ucfg_get_htc_hdl(wma->psoc); + htc_handle = lmac_get_htc_hdl(wma->psoc); if (!htc_handle) { WMA_LOGE(":%sHTC handle is NULL:%d", __func__, __LINE__); return; diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index c02d370c72a2..ef1612bd83a5 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -85,7 +85,7 @@ #include #include #include "init_event_handler.h" -#include "init_deinit_ucfg.h" +#include "init_deinit_lmac.h" #include "target_if_green_ap.h" #include "service_ready_param.h" #include "wlan_cp_stats_mc_ucfg_api.h" @@ -3624,7 +3624,7 @@ QDF_STATUS wma_pre_start(void) goto end; } - htc_handle = ucfg_get_htc_hdl(wma_handle->psoc); + htc_handle = lmac_get_htc_hdl(wma_handle->psoc); if (!htc_handle) { WMA_LOGE("%s: invalid htc handle", __func__); qdf_status = QDF_STATUS_E_INVAL; @@ -4129,7 +4129,7 @@ QDF_STATUS wma_start(void) goto end; } - wmi_handle = ucfg_get_wmi_hdl(wma_handle->psoc); + wmi_handle = get_wmi_unified_hdl_from_psoc(wma_handle->psoc); if (!wmi_handle) { WMA_LOGE("%s: Invalid wmi handle", __func__); qdf_status = QDF_STATUS_E_INVAL; @@ -5425,7 +5425,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle) } service_ext_param = target_psoc_get_service_ext_param(tgt_hdl); - wmi_handle = target_psoc_get_wmi_hdl(tgt_hdl); + wmi_handle = get_wmi_unified_hdl_from_psoc(wma_handle->psoc); if (!wmi_handle) { WMA_LOGE("%s: wmi handle is NULL", __func__); return; @@ -5641,7 +5641,7 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, return -EINVAL; } - wmi_handle = target_psoc_get_wmi_hdl(tgt_hdl); + wmi_handle = get_wmi_unified_hdl_from_psoc(wma_handle->psoc); if (!wmi_handle) { WMA_LOGE("%s: wmi handle is NULL", __func__); return -EINVAL;