qcacmn: Replace ucfg prefix with lmac

Replace functions with ucfg as prefix in init_deinit_ucfg file with lmac as
prefix

Change-Id: I90d77dd5ddae4854ea68eeb67dc1b4fc356c2fe3
CRs-Fixed: 2182449

target_if/core/src/target_if_main.c

@@ -62,7 +62,7 @@
 #ifdef WLAN_SUPPORT_GREEN_AP
 #include <target_if_green_ap.h>
 #endif
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 #include <service_ready_util.h>
 
 #ifdef DIRECT_BUF_RX_ENABLE
@@ -354,13 +354,13 @@ static void target_if_target_tx_ops_register(
 		target_is_tgt_type_qca9888;
 
 	target_tx_ops->tgt_get_tgt_type =
-		ucfg_get_tgt_type;
+		lmac_get_tgt_type;
 
 	target_tx_ops->tgt_get_tgt_version =
-		ucfg_get_tgt_version;
+		lmac_get_tgt_version;
 
 	target_tx_ops->tgt_get_tgt_revision =
-		ucfg_get_tgt_revision;
+		lmac_get_tgt_revision;
 }
 
 static QDF_STATUS

target_if/dfs/src/target_if_dfs.c

@@ -35,7 +35,7 @@
 #include <wmi_unified_dfs_api.h>
 #include "wlan_dfs_tgt_api.h"
 #include "target_type.h"
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 #include <wlan_reg_ucfg_api.h>
 #include <target_if_dfs_full_offload.h>
 #include <target_if_dfs_partial_offload.h>

target_if/dfs/src/target_if_dfs_full_offload.c

@@ -25,7 +25,7 @@
 #include <target_if.h>
 #include <target_if_dfs.h>
 #include <wmi_unified_dfs_api.h>
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 #include <wlan_module_ids.h>
 #include <target_if_dfs_full_offload.h>
 

target_if/direct_buf_rx/src/target_if_direct_buf_rx_main.c

@@ -23,7 +23,7 @@
 #include <target_if_direct_buf_rx_api.h>
 #include "hal_api.h"
 #include <service_ready_util.h>
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 
 static uint8_t get_num_dbr_modules_per_pdev(struct wlan_objmgr_pdev *pdev)
 {
@@ -574,7 +574,7 @@ static QDF_STATUS target_if_dbr_cfg_tgt(struct wlan_objmgr_pdev *pdev,
 
 	dbr_ring_cfg = mod_param->dbr_ring_cfg;
 	dbr_ring_cap = mod_param->dbr_ring_cap;
-	wmi_hdl = ucfg_get_pdev_wmi_handle(pdev);
+	wmi_hdl = lmac_get_pdev_wmi_handle(pdev);
 	if (!wmi_hdl) {
 		direct_buf_rx_err("WMI handle null. Can't send WMI CMD");
 		return QDF_STATUS_E_INVAL;

target_if/init_deinit/inc/init_deinit_ucfg.h → target_if/init_deinit/inc/init_deinit_lmac.h

@@ -17,26 +17,26 @@
  */
 
 /**
- * DOC: init_deinit_ucfg.h
+ * DOC: init_deinit_lmac.h
  *
  * Public APIs to get target_if info
  */
 
-#ifndef _INIT_DEINIT_UCFG_H_
-#define _INIT_DEINIT_UCFG_H_
+#ifndef _INIT_DEINIT_LMAC_H_
+#define _INIT_DEINIT_LMAC_H_
 
 /**
- * ucfg_get_service_param() - get service param
+ * lmac_get_service_param() - get service param
  * @psoc: pointer to psoc
  *
  * API to get service parameters
  *
  * Return: service parameter array pointer
  */
-uint32_t *ucfg_get_service_param(struct wlan_objmgr_psoc *psoc);
+uint32_t *lmac_get_service_param(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_is_service_param_bit_enabled() - check service param bit enabled
+ * lmac_is_service_param_bit_enabled() - check service param bit enabled
  * @service_param: Service bitmap array
  * @bit_idx: Service bit index to be checked
  *
@@ -45,11 +45,11 @@ uint32_t *ucfg_get_service_param(struct wlan_objmgr_psoc *psoc);
  * Return: true, if service is enabled
  *         false, if service is not enabled
  */
-bool ucfg_is_service_param_bit_enabled(uint32_t *service_param,
+bool lmac_is_service_param_bit_enabled(uint32_t *service_param,
 					uint16_t bit_idx);
 
 /**
- * ucfg_get_dfs_offload() - get dfs offload
+ * lmac_get_dfs_offload() - get dfs offload
  * @psoc: pointer to psoc
  * @is_tgt_offload: boolean flag for offload enabled/disabled
  *
@@ -57,42 +57,42 @@ bool ucfg_is_service_param_bit_enabled(uint32_t *service_param,
  *
  * Return: SUCCESS, if API is invoked without any failures
  */
-QDF_STATUS ucfg_get_dfs_offload(struct wlan_objmgr_psoc *psoc,
+QDF_STATUS lmac_get_dfs_offload(struct wlan_objmgr_psoc *psoc,
 			bool *is_tgt_offload);
 
 /**
- * ucfg_get_tgt_res_cfg() - get target resource config
+ * lmac_get_tgt_res_cfg() - get target resource config
  * @psoc: pointer to psoc
  *
  * API to get target resource config
  *
  * Return: target resource configuration
  */
-target_resource_config *ucfg_get_tgt_res_cfg(struct wlan_objmgr_psoc *psoc);
+target_resource_config *lmac_get_tgt_res_cfg(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_target_cap() - get target capability
+ * lmac_get_target_cap() - get target capability
  * @psoc: pointer to psoc
  *
  * API to get target capability
  *
  * Return: target capability Information
  */
-struct wlan_psoc_target_capability_info *ucfg_get_target_cap(
+struct wlan_psoc_target_capability_info *lmac_get_target_cap(
 				struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_pdev_idx() - get pdev id
+ * lmac_get_pdev_idx() - get pdev id
  * @pdev: pointer to pdev
  *
  * API to get pdev id
  *
  * Return: pdev id
  */
-int32_t ucfg_get_pdev_idx(struct wlan_objmgr_pdev *pdev);
+int32_t lmac_get_pdev_idx(struct wlan_objmgr_pdev *pdev);
 
 /**
- * ucfg_get_pdev_target_type() - check pdev target type
+ * lmac_get_pdev_target_type() - check pdev target type
  * @pdev: pointer to pdev
  * @target_type: target type ptr, it is assigned with pdev target_type
  *               target type stores the radio code
@@ -101,81 +101,81 @@ int32_t ucfg_get_pdev_idx(struct wlan_objmgr_pdev *pdev);
  *
  * Return: Success if found required target type else Failure
  */
-QDF_STATUS ucfg_get_pdev_target_type(struct wlan_objmgr_pdev *pdev,
+QDF_STATUS lmac_get_pdev_target_type(struct wlan_objmgr_pdev *pdev,
 				uint32_t *target_type);
 
 /**
- * ucfg_get_tgt_type() - get target type
+ * lmac_get_tgt_type() - get target type
  * @psoc: pointer to psoc
  *
  * API to get target type
  *
  * Return: target type (value to identify particular radio)
  */
-uint32_t ucfg_get_tgt_type(struct wlan_objmgr_psoc *psoc);
+uint32_t lmac_get_tgt_type(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_tgt_version() - get target version
+ * lmac_get_tgt_version() - get target version
  * @psoc: pointer to psoc
  *
  * API to get target version
  *
  * Return: target version
  */
-uint32_t ucfg_get_tgt_version(struct wlan_objmgr_psoc *psoc);
+uint32_t lmac_get_tgt_version(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_tgt_revision() - get target revision
+ * lmac_get_tgt_revision() - get target revision
  * @psoc: pointer to psoc
  *
  * API to get target revision
  *
  * Return: target revision
  */
-uint32_t ucfg_get_tgt_revision(struct wlan_objmgr_psoc *psoc);
+uint32_t lmac_get_tgt_revision(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_is_target_ar900b() - checks the target type
+ * lmac_is_target_ar900b() - checks the target type
  * @psoc: pointer to psoc
  *
  * API to check target type
  *
  * Return: True on presence of required target type else false
  */
-bool ucfg_is_target_ar900b(struct wlan_objmgr_psoc *psoc);
+bool lmac_is_target_ar900b(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_wmi_hdl() - get wmi handle
+ * lmac_get_wmi_hdl() - get wmi handle
  * @psoc: pointer to psoc
  *
  * API to get wmi handle
  *
  * Return: wmi handler
  */
-struct common_wmi_handle *ucfg_get_wmi_hdl(struct wlan_objmgr_psoc *psoc);
+struct common_wmi_handle *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_wmi_unified_hdl() - get wmi handle
+ * lmac_get_wmi_unified_hdl() - get wmi handle
  * @psoc: pointer to psoc
  *
  * API to get wmi handle
  *
  * Return: wmi handler
  */
-wmi_unified_t ucfg_get_wmi_unified_hdl(struct wlan_objmgr_psoc *psoc);
+wmi_unified_t lmac_get_wmi_unified_hdl(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_htc_hdl() - get htc handler
+ * lmac_get_htc_hdl() - get htc handler
  * @psoc: pointer to psoc
  *
  * API to get htc handle
  *
  * Return: htc handler
  */
-struct common_htc_handle *ucfg_get_htc_hdl(struct wlan_objmgr_psoc *psoc);
+struct common_htc_handle *lmac_get_htc_hdl(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_set_htc_hdl() - set htc handle
+ * lmac_set_htc_hdl() - set htc handle
  * @psoc: pointer to psoc
  * @htc_hdl: HTC handle
  *
@@ -183,79 +183,79 @@ struct common_htc_handle *ucfg_get_htc_hdl(struct wlan_objmgr_psoc *psoc);
  *
  * Return: void
  */
-void ucfg_set_htc_hdl(struct wlan_objmgr_psoc *psoc,
-			struct common_htc_handle *htc_hdl);
+void lmac_set_htc_hdl(struct wlan_objmgr_psoc *psoc,
+		struct common_htc_handle *htc_hdl);
 
 /**
- * ucfg_get_hif_hdl() - get hif handle
+ * lmac_get_hif_hdl() - get hif handle
  * @psoc: pointer to psoc
  *
  * API to get hif handle
  *
  * Return: hif handler
  */
-struct common_hif_handle *ucfg_get_hif_hdl(struct wlan_objmgr_psoc *psoc);
+struct common_hif_handle *lmac_get_hif_hdl(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_ol_hif_hdl() - get hif handle
+ * lmac_get_ol_hif_hdl() - get hif handle
  * @psoc: pointer to psoc
  *
  * API to get hif handle
  *
  * Return: hif handler
  */
-struct hif_opaque_softc *ucfg_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc);
+struct hif_opaque_softc *lmac_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_pdev_wmi_handle() - get pdev wmi handle
+ * lmac_get_pdev_wmi_handle() - get pdev wmi handle
  * @pdev: pointer to dev
  *
  * API to get wmi handle
  *
  * Return: wmi handle
  */
-struct common_wmi_handle *ucfg_get_pdev_wmi_handle(
+struct common_wmi_handle *lmac_get_pdev_wmi_handle(
 		struct wlan_objmgr_pdev *pdev);
 
 /**
- * ucfg_get_pdev_wmi_unified_handle() - get pdev wmi handle
+ * lmac_get_pdev_wmi_unified_handle() - get pdev wmi handle
  * @pdev: pointer to dev
  *
  * API to get wmi handle
  *
  * Return: wmi handle
  */
-wmi_unified_t ucfg_get_pdev_wmi_unified_handle(
+wmi_unified_t lmac_get_pdev_wmi_unified_handle(
 		struct wlan_objmgr_pdev *pdev);
 
 /**
- * ucfg_get_psoc_feature_ptr() - get feature pointer
+ * lmac_get_psoc_feature_ptr() - get feature pointer
  * @psoc: pointer to psoc
  *
  * API to get legacy pointer
  *
  * Return: feature pointer
  */
-void *ucfg_get_psoc_feature_ptr(struct wlan_objmgr_psoc *psoc);
+void *lmac_get_psoc_feature_ptr(struct wlan_objmgr_psoc *psoc);
 
 /**
- * ucfg_get_pdev_feature_ptr() - get feature pointer
+ * lmac_get_pdev_feature_ptr() - get feature pointer
  * @pdev: pointer to pdev
  *
  * API to get legacy pointer
  *
  * Return: pdev feature pointer
  */
-void *ucfg_get_pdev_feature_ptr(struct wlan_objmgr_pdev *pdev);
+void *lmac_get_pdev_feature_ptr(struct wlan_objmgr_pdev *pdev);
 
 /**
- * ucfg_get_num_radios() - get number of radios
+ * lmac_get_num_radios() - get number of radios
  * @psoc: pointer to psoc
  *
  * API to get number of radios
  *
  * Return: number of radios
  */
-uint32_t ucfg_get_num_radios(struct wlan_objmgr_psoc *psoc);
+uint32_t lmac_get_num_radios(struct wlan_objmgr_psoc *psoc);
 
-#endif /* _INIT_DEINIT_UCFG_H_ */
+#endif /* _INIT_DEINIT_LMAC_H_ */

target_if/init_deinit/src/init_deinit_ucfg.c → target_if/init_deinit/src/init_deinit_lmac.c

@@ -17,7 +17,7 @@
  */
 
 /**
- * DOC: init_deinit_ucfg.c
+ * DOC: init_deinit_lmac.c
  *
  * APIs to get/set target_if params
  */
@@ -26,10 +26,10 @@
 #include <wlan_objmgr_pdev_obj.h>
 #include <target_if.h>
 #include <target_type.h>
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 #include <qdf_module.h>
 
-uint32_t *ucfg_get_service_param(struct wlan_objmgr_psoc *psoc)
+uint32_t *lmac_get_service_param(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -47,7 +47,7 @@ uint32_t *ucfg_get_service_param(struct wlan_objmgr_psoc *psoc)
 	return target_psoc_get_service_bitmap(tgt_hdl);
 }
 
-struct wlan_psoc_target_capability_info *ucfg_get_target_cap(
+struct wlan_psoc_target_capability_info *lmac_get_target_cap(
 				struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
@@ -66,7 +66,7 @@ struct wlan_psoc_target_capability_info *ucfg_get_target_cap(
 	return target_psoc_get_target_caps(tgt_hdl);
 }
 
-bool ucfg_is_service_param_bit_enabled(uint32_t *service_param,
+bool lmac_is_service_param_bit_enabled(uint32_t *service_param,
 					uint16_t bit_idx)
 {
 	bool retval = false;
@@ -81,7 +81,7 @@ bool ucfg_is_service_param_bit_enabled(uint32_t *service_param,
 /* dfs offload service bit */
 #define DFS_SERVICE_PHYERR_OFFLOAD 113
 
-QDF_STATUS ucfg_get_dfs_offload(struct wlan_objmgr_psoc *psoc,
+QDF_STATUS lmac_get_dfs_offload(struct wlan_objmgr_psoc *psoc,
 			bool *is_tgt_offload)
 {
 	uint32_t *service_bitmap;
@@ -93,19 +93,19 @@ QDF_STATUS ucfg_get_dfs_offload(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	service_bitmap = ucfg_get_service_param(psoc);
+	service_bitmap = lmac_get_service_param(psoc);
 	if (!service_bitmap) {
 		target_if_err("pdev is null");
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	*is_tgt_offload = ucfg_is_service_param_bit_enabled(service_bitmap,
+	*is_tgt_offload = lmac_is_service_param_bit_enabled(service_bitmap,
 				DFS_SERVICE_PHYERR_OFFLOAD);
 
 	return QDF_STATUS_SUCCESS;
 }
 
-target_resource_config *ucfg_get_tgt_res_cfg(struct wlan_objmgr_psoc *psoc)
+target_resource_config *lmac_get_tgt_res_cfg(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -123,7 +123,7 @@ target_resource_config *ucfg_get_tgt_res_cfg(struct wlan_objmgr_psoc *psoc)
 	return target_psoc_get_wlan_res_cfg(tgt_hdl);
 }
 
-int32_t ucfg_get_pdev_idx(struct wlan_objmgr_pdev *pdev)
+int32_t lmac_get_pdev_idx(struct wlan_objmgr_pdev *pdev)
 {
 	struct target_pdev_info *tgt_hdl;
 
@@ -141,7 +141,7 @@ int32_t ucfg_get_pdev_idx(struct wlan_objmgr_pdev *pdev)
 	return target_pdev_get_pdev_idx(tgt_hdl);
 }
 
-uint32_t ucfg_get_tgt_type(struct wlan_objmgr_psoc *psoc)
+uint32_t lmac_get_tgt_type(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -158,9 +158,9 @@ uint32_t ucfg_get_tgt_type(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_target_type(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_tgt_type);
+qdf_export_symbol(lmac_get_tgt_type);
 
-QDF_STATUS ucfg_get_pdev_target_type(struct wlan_objmgr_pdev *pdev,
+QDF_STATUS lmac_get_pdev_target_type(struct wlan_objmgr_pdev *pdev,
 					uint32_t *target_type)
 {
 	struct wlan_objmgr_psoc *psoc;
@@ -171,12 +171,12 @@ QDF_STATUS ucfg_get_pdev_target_type(struct wlan_objmgr_pdev *pdev,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	*target_type = ucfg_get_tgt_type(psoc);
+	*target_type = lmac_get_tgt_type(psoc);
 	return QDF_STATUS_SUCCESS;
 }
-qdf_export_symbol(ucfg_get_pdev_target_type);
+qdf_export_symbol(lmac_get_pdev_target_type);
 
-uint32_t ucfg_get_tgt_version(struct wlan_objmgr_psoc *psoc)
+uint32_t lmac_get_tgt_version(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -194,7 +194,7 @@ uint32_t ucfg_get_tgt_version(struct wlan_objmgr_psoc *psoc)
 	return target_psoc_get_target_ver(tgt_hdl);
 }
 
-uint32_t ucfg_get_tgt_revision(struct wlan_objmgr_psoc *psoc)
+uint32_t lmac_get_tgt_revision(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -211,9 +211,9 @@ uint32_t ucfg_get_tgt_revision(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_target_rev(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_tgt_revision);
+qdf_export_symbol(lmac_get_tgt_revision);
 
-bool ucfg_is_target_ar900b(struct wlan_objmgr_psoc *psoc)
+bool lmac_is_target_ar900b(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 	uint32_t target_type;
@@ -241,9 +241,9 @@ bool ucfg_is_target_ar900b(struct wlan_objmgr_psoc *psoc)
 	}
 	return false;
 }
-qdf_export_symbol(ucfg_is_target_ar900b);
+qdf_export_symbol(lmac_is_target_ar900b);
 
-struct common_wmi_handle *ucfg_get_wmi_hdl(struct wlan_objmgr_psoc *psoc)
+struct common_wmi_handle *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -260,15 +260,15 @@ struct common_wmi_handle *ucfg_get_wmi_hdl(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_wmi_hdl(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_wmi_hdl);
+qdf_export_symbol(lmac_get_wmi_hdl);
 
-wmi_unified_t ucfg_get_wmi_unified_hdl(struct wlan_objmgr_psoc *psoc)
+wmi_unified_t lmac_get_wmi_unified_hdl(struct wlan_objmgr_psoc *psoc)
 {
-	return (wmi_unified_t)ucfg_get_wmi_hdl(psoc);
+	return (wmi_unified_t)lmac_get_wmi_hdl(psoc);
 }
-qdf_export_symbol(ucfg_get_wmi_unified_hdl);
+qdf_export_symbol(lmac_get_wmi_unified_hdl);
 
-struct common_htc_handle *ucfg_get_htc_hdl(struct wlan_objmgr_psoc *psoc)
+struct common_htc_handle *lmac_get_htc_hdl(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -285,10 +285,10 @@ struct common_htc_handle *ucfg_get_htc_hdl(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_htc_hdl(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_htc_hdl);
+qdf_export_symbol(lmac_get_htc_hdl);
 
-void ucfg_set_htc_hdl(struct wlan_objmgr_psoc *psoc,
-			struct common_htc_handle *htc_hdl)
+void lmac_set_htc_hdl(struct wlan_objmgr_psoc *psoc,
+		struct common_htc_handle *htc_hdl)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -305,7 +305,7 @@ void ucfg_set_htc_hdl(struct wlan_objmgr_psoc *psoc,
 	target_psoc_set_htc_hdl(tgt_hdl, htc_hdl);
 }
 
-struct common_hif_handle *ucfg_get_hif_hdl(struct wlan_objmgr_psoc *psoc)
+struct common_hif_handle *lmac_get_hif_hdl(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -322,15 +322,15 @@ struct common_hif_handle *ucfg_get_hif_hdl(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_hif_hdl(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_hif_hdl);
+qdf_export_symbol(lmac_get_hif_hdl);
 
-struct hif_opaque_softc *ucfg_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc)
+struct hif_opaque_softc *lmac_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc)
 {
-	return (struct hif_opaque_softc *)ucfg_get_hif_hdl(psoc);
+	return (struct hif_opaque_softc *)lmac_get_hif_hdl(psoc);
 }
-qdf_export_symbol(ucfg_get_ol_hif_hdl);
+qdf_export_symbol(lmac_get_ol_hif_hdl);
 
-struct common_wmi_handle *ucfg_get_pdev_wmi_handle(
+struct common_wmi_handle *lmac_get_pdev_wmi_handle(
 		struct wlan_objmgr_pdev *pdev)
 {
 	struct target_pdev_info *tgt_hdl;
@@ -348,15 +348,14 @@ struct common_wmi_handle *ucfg_get_pdev_wmi_handle(
 
 	return target_pdev_get_wmi_handle(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_pdev_wmi_handle);
 
 wmi_unified_t
-ucfg_get_pdev_wmi_unified_handle(struct wlan_objmgr_pdev *pdev)
+lmac_get_pdev_wmi_unified_handle(struct wlan_objmgr_pdev *pdev)
 {
-	return (wmi_unified_t)ucfg_get_pdev_wmi_handle(pdev);
+	return (wmi_unified_t)lmac_get_pdev_wmi_handle(pdev);
 }
 
-uint32_t ucfg_get_num_radios(struct wlan_objmgr_psoc *psoc)
+uint32_t lmac_get_num_radios(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -372,8 +371,9 @@ uint32_t ucfg_get_num_radios(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_num_radios(tgt_hdl);
 }
+qdf_export_symbol(lmac_get_num_radios);
 
-void *ucfg_get_psoc_feature_ptr(struct wlan_objmgr_psoc *psoc)
+void *lmac_get_psoc_feature_ptr(struct wlan_objmgr_psoc *psoc)
 {
 	struct target_psoc_info *tgt_hdl;
 
@@ -389,9 +389,9 @@ void *ucfg_get_psoc_feature_ptr(struct wlan_objmgr_psoc *psoc)
 
 	return target_psoc_get_feature_ptr(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_psoc_feature_ptr);
+qdf_export_symbol(lmac_get_psoc_feature_ptr);
 
-void *ucfg_get_pdev_feature_ptr(struct wlan_objmgr_pdev *pdev)
+void *lmac_get_pdev_feature_ptr(struct wlan_objmgr_pdev *pdev)
 {
 	struct target_pdev_info *tgt_hdl;
 
@@ -407,4 +407,4 @@ void *ucfg_get_pdev_feature_ptr(struct wlan_objmgr_pdev *pdev)
 
 	return target_pdev_get_feature_ptr(tgt_hdl);
 }
-qdf_export_symbol(ucfg_get_pdev_feature_ptr);
+qdf_export_symbol(lmac_get_pdev_feature_ptr);

target_if/p2p/src/target_if_p2p.c

@@ -24,7 +24,7 @@
 #include <wlan_p2p_public_struct.h>
 #include "target_if.h"
 #include "target_if_p2p.h"
-#include "init_deinit_ucfg.h"
+#include "init_deinit_lmac.h"
 
 static inline struct wlan_lmac_if_p2p_rx_ops *
 target_if_psoc_get_p2p_rx_ops(struct wlan_objmgr_psoc *psoc)
@@ -168,7 +168,7 @@ QDF_STATUS target_if_p2p_register_lo_event_handler(
 	struct wlan_objmgr_psoc *psoc, void *arg)
 {
 	int status;
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
 
@@ -191,7 +191,7 @@ QDF_STATUS target_if_p2p_register_noa_event_handler(
 	struct wlan_objmgr_psoc *psoc, void *arg)
 {
 	int status;
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
 
@@ -214,7 +214,7 @@ QDF_STATUS target_if_p2p_unregister_lo_event_handler(
 	struct wlan_objmgr_psoc *psoc, void *arg)
 {
 	int status;
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
 
@@ -236,7 +236,7 @@ QDF_STATUS target_if_p2p_unregister_noa_event_handler(
 	struct wlan_objmgr_psoc *psoc, void *arg)
 {
 	int status;
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
 
@@ -259,7 +259,7 @@ QDF_STATUS target_if_p2p_set_ps(struct wlan_objmgr_psoc *psoc,
 {
 	struct p2p_ps_params cmd;
 	QDF_STATUS status;
-	 wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	 wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	if (!wmi_handle) {
 		target_if_err("Invalid wmi handle");
@@ -300,7 +300,7 @@ QDF_STATUS target_if_p2p_set_ps(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS target_if_p2p_lo_start(struct wlan_objmgr_psoc *psoc,
 	struct p2p_lo_start *lo_start)
 {
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	if (!wmi_handle) {
 		target_if_err("Invalid wmi handle");
@@ -319,7 +319,7 @@ QDF_STATUS target_if_p2p_lo_start(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS target_if_p2p_lo_stop(struct wlan_objmgr_psoc *psoc,
 	uint32_t vdev_id)
 {
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	target_if_debug("psoc:%pK, vdev_id:%d", psoc, vdev_id);
 
@@ -336,7 +336,7 @@ QDF_STATUS target_if_p2p_set_noa(struct wlan_objmgr_psoc *psoc,
 	uint32_t vdev_id, bool disable_noa)
 {
 	struct vdev_set_params param;
-	wmi_unified_t wmi_handle = ucfg_get_wmi_unified_hdl(psoc);
+	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 
 	if (!wmi_handle) {
 		target_if_err("Invalid wmi handle");

target_if/spectral/target_if_spectral.c

@@ -25,7 +25,7 @@
 #include <target_if_spectral.h>
 #include <wlan_lmac_if_def.h>
 #include <wlan_osif_priv.h>
-#include <init_deinit_ucfg.h>
+#include <init_deinit_lmac.h>
 #include <reg_services_public_struct.h>
 #ifdef CONFIG_WIN
 #include <wlan_mlme_dispatcher.h>