commit 1edffd327b9b48ca065e193afc45068ec90e4c08
author Houston Hoffman <hhoffman@codeaurora.org> Wed Jan 27 16:30:34 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 24 11:58:31 2016 -0700
tree 7e7524eb0fbb00ac8ae124ab83771a38f75954c8
parent 7e58dd3820a848453c3cd2e5ecb3bac1d48b43dd

qcacld-3.0: Support simultaneous mutlibus in kbuild

Make the kbuild support multiple bus types at the same time.

Change-Id: I3ac6ea75b9495681ce0b3fc65ed4999f19cf5a6d
CRs-Fixed: 986480

Kbuild

diff --git a/Kbuild b/Kbuild
index 04763f1..b9e44f2 100755
--- a/Kbuild
+++ b/Kbuild
@@ -710,20 +710,25 @@
 HIF_CE_DIR := $(HIF_DIR)/src/ce
 HIF_CNSS_STUB_DIR := $(HIF_DIR)/src/icnss_stub
 
-ifeq ($(CONFIG_HIF_PCI), 1)
+
+HIF_DISPATCHER_DIR := $(HIF_DIR)/src/dispatcher
+
 HIF_PCIE_DIR := $(HIF_DIR)/src/pcie
-else
 HIF_SNOC_DIR := $(HIF_DIR)/src/snoc
-endif
 
 HIF_INC := -I$(WLAN_COMMON_INC)/$(HIF_DIR)/inc \
 	   -I$(WLAN_COMMON_INC)/$(HIF_DIR)/src \
 	   -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR) \
 	   -I$(WLAN_COMMON_INC)/$(HIF_CNSS_STUB_DIR)
 
+
 ifeq ($(CONFIG_HIF_PCI), 1)
+HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_PCIE_DIR)
-else
+endif
+
+ifeq ($(CONFIG_HIF_SNOC), 1)
+HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SNOC_DIR)
 endif
 
@@ -736,23 +741,28 @@
 		$(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/mp_dev.o \
 		$(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/regtable.o
 
-ifeq ($(CONFIG_CNSS), y)
-HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CNSS_STUB_DIR)/icnss_stub.o \
-		$(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o
+ifneq ($(CONFIG_ICNSS), y)
+HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CNSS_STUB_DIR)/icnss_stub.o
 endif
 
 ifeq ($(CONFIG_WLAN_NAPI), y)
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_napi.o
 endif
 
-ifeq ($(CONFIG_HIF_PCI), 1)
 HIF_PCIE_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_PCIE_DIR)/if_pci.o
-
-HIF_OBJS += $(HIF_PCIE_OBJS)
-else
+HIF_PCIE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o
 HIF_SNOC_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_SNOC_DIR)/if_snoc.o
 
+HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus.o
+
+ifeq ($(CONFIG_HIF_PCI), 1)
+HIF_OBJS += $(HIF_PCIE_OBJS)
+HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_pci.o
+endif
+
+ifeq ($(CONFIG_HIF_SNOC), 1)
 HIF_OBJS += $(HIF_SNOC_OBJS)
+HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_snoc.o
 endif
 
 ############ WMA ############
@@ -1090,6 +1100,10 @@
 CDEFINES += -DHIF_PCI
 endif
 
+ifeq ($(CONFIG_HIF_SNOC), 1)
+CDEFINES += -DHIF_SNOC
+endif
+
 #Enable USB specific APIS
 ifeq ($(CONFIG_HIF_USB), 1)
 CDEFINES += -DHIF_USB