qcacld-3.0: Move PMO from CMN to CLD
Move PMO from CMN to CLD.
Change-Id: I31380da668ac3305731b8c9906d343a829777591
CRs-fixed: 2071528
diff --git a/Kbuild b/Kbuild
index 335ba60..fc4f0a7 100644
--- a/Kbuild
+++ b/Kbuild
@@ -883,11 +883,11 @@
$(UMAC_MGMT_TXRX_DIR)/dispatcher/src/wlan_mgmt_txrx_tgt_api.o
########## POWER MANAGEMENT OFFLOADS (PMO) ##########
-PMO_DIR := $(WLAN_COMMON_ROOT)/pmo
-PMO_INC := -I$(WLAN_COMMON_INC)/pmo/core/inc \
- -I$(WLAN_COMMON_INC)/pmo/dispatcher/inc \
- -I$(WLAN_COMMON_INC)/pmo/core/src \
- -I$(WLAN_COMMON_INC)/pmo/dispatcher/src
+PMO_DIR := core/components/pmo
+PMO_INC := -I$(WLAN_ROOT)/$(PMO_DIR)/core/inc \
+ -I$(WLAN_ROOT)/$(PMO_DIR)/core/src \
+ -I$(WLAN_ROOT)/$(PMO_DIR)/dispatcher/inc \
+ -I$(WLAN_ROOT)/$(PMO_DIR)/dispatcher/src \
PMO_OBJS := $(PMO_DIR)/core/src/wlan_pmo_main.o \
$(PMO_DIR)/core/src/wlan_pmo_arp.o \
@@ -913,6 +913,24 @@
$(PMO_DIR)/dispatcher/src/wlan_pmo_tgt_hw_filter.o \
$(PMO_DIR)/dispatcher/src/wlan_pmo_tgt_pkt_filter.o
+########## CLD TARGET_IF #######
+CLD_TARGET_IF_DIR := core/components/target_if
+
+CLD_TARGET_IF_INC := -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/pmo/inc \
+ -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/pmo/src \
+
+CLD_TARGET_IF_OBJ := $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_arp.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_gtk.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_hw_filter.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_lphb.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_main.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_mc_addr_filtering.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_ns.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_pkt_filter.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_static_config.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_suspend_resume.o \
+ $(CLD_TARGET_IF_DIR)/pmo/src/target_if_pmo_wow.o \
+
############## UMAC P2P ###########
P2P_DIR := umac/p2p
P2P_CORE_DIR := $(P2P_DIR)/core
@@ -973,25 +991,12 @@
TARGET_IF_INC := -I$(WLAN_COMMON_INC)/target_if/core/inc \
-I$(WLAN_COMMON_INC)/target_if/core/src \
-I$(WLAN_COMMON_INC)/target_if/init_deinit/inc \
- -I$(WLAN_COMMON_INC)/target_if/pmo/inc \
- -I$(WLAN_COMMON_INC)/target_if/pmo/src \
-I$(WLAN_COMMON_INC)/target_if/p2p/inc \
-I$(WLAN_COMMON_INC)/target_if/regulatory/inc \
-I$(WLAN_COMMON_INC)/target_if/tdls/inc
TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \
$(TARGET_IF_DIR)/init_deinit/src/service_ready_event_handler.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_main.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_arp.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_ns.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_gtk.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_wow.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_hw_filter.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_mc_addr_filtering.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_static_config.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_lphb.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_suspend_resume.o \
- $(TARGET_IF_DIR)/pmo/src/target_if_pmo_pkt_filter.o \
$(TARGET_IF_DIR)/p2p/src/target_if_p2p.o \
$(TARGET_IF_DIR)/regulatory/src/target_if_reg.o \
$(TARGET_IF_DIR)/tdls/src/target_if_tdls.o
@@ -1415,6 +1420,7 @@
$(CDS_INC) \
$(DFS_INC) \
$(TARGET_IF_INC) \
+ $(CLD_TARGET_IF_INC) \
$(OS_IF_INC) \
$(GLOBAL_LMAC_IF_INC)
@@ -1507,6 +1513,7 @@
$(HTT_OBJS) \
$(OS_IF_OBJ) \
$(TARGET_IF_OBJ) \
+ $(CLD_TARGET_IF_OBJ) \
$(GLOBAL_LMAC_IF_OBJ)
ifeq ($(CONFIG_LITHIUM), y)