wlan: add support for pronto
diff --git a/Kbuild b/Kbuild
index 776d22f..a2ded76 100644
--- a/Kbuild
+++ b/Kbuild
@@ -10,16 +10,13 @@
# These are provided in Android-based builds
# Need to explicitly define for Kernel-based builds
MODNAME := wlan
- WLAN_PRIMA := drivers/staging/prima
+ WLAN_ROOT := drivers/staging/prima
endif
ifeq ($(KERNEL_BUILD),0)
# These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds
- #Build the driver as a DLKM
- CONFIG_PRIMA_WLAN := m
-
#Flag to enable BlueTooth AMP feature
CONFIG_PRIMA_WLAN_BTAMP := n
@@ -64,8 +61,8 @@
BAP_INC_DIR := $(BAP_DIR)/inc
BAP_SRC_DIR := $(BAP_DIR)/src
-BAP_INC := -I$(WLAN_PRIMA)/$(BAP_INC_DIR) \
- -I$(WLAN_PRIMA)/$(BAP_SRC_DIR)
+BAP_INC := -I$(WLAN_ROOT)/$(BAP_INC_DIR) \
+ -I$(WLAN_ROOT)/$(BAP_SRC_DIR)
BAP_OBJS := $(BAP_SRC_DIR)/bapApiData.o \
$(BAP_SRC_DIR)/bapApiDebug.o \
@@ -93,8 +90,8 @@
DXE_INC_DIR := $(DXE_DIR)/inc
DXE_SRC_DIR := $(DXE_DIR)/src
-DXE_INC := -I$(WLAN_PRIMA)/$(DXE_INC_DIR) \
- -I$(WLAN_PRIMA)/$(DXE_SRC_DIR)
+DXE_INC := -I$(WLAN_ROOT)/$(DXE_INC_DIR) \
+ -I$(WLAN_ROOT)/$(DXE_SRC_DIR)
DXE_OBJS = $(DXE_SRC_DIR)/wlan_qct_dxe.o \
$(DXE_SRC_DIR)/wlan_qct_dxe_cfg_i.o
@@ -104,8 +101,8 @@
HDD_INC_DIR := $(HDD_DIR)/inc
HDD_SRC_DIR := $(HDD_DIR)/src
-HDD_INC := -I$(WLAN_PRIMA)/$(HDD_INC_DIR) \
- -I$(WLAN_PRIMA)/$(HDD_SRC_DIR)
+HDD_INC := -I$(WLAN_ROOT)/$(HDD_INC_DIR) \
+ -I$(WLAN_ROOT)/$(HDD_SRC_DIR)
HDD_OBJS := $(HDD_SRC_DIR)/bap_hdd_main.o \
$(HDD_SRC_DIR)/wlan_hdd_assoc.o \
@@ -139,11 +136,11 @@
MAC_INC_DIR := $(MAC_DIR)/inc
MAC_SRC_DIR := $(MAC_DIR)/src
-MAC_INC := -I$(WLAN_PRIMA)/$(MAC_INC_DIR) \
- -I$(WLAN_PRIMA)/$(MAC_SRC_DIR)/dph \
- -I$(WLAN_PRIMA)/$(MAC_SRC_DIR)/include \
- -I$(WLAN_PRIMA)/$(MAC_SRC_DIR)/pe/include \
- -I$(WLAN_PRIMA)/$(MAC_SRC_DIR)/pe/lim
+MAC_INC := -I$(WLAN_ROOT)/$(MAC_INC_DIR) \
+ -I$(WLAN_ROOT)/$(MAC_SRC_DIR)/dph \
+ -I$(WLAN_ROOT)/$(MAC_SRC_DIR)/include \
+ -I$(WLAN_ROOT)/$(MAC_SRC_DIR)/pe/include \
+ -I$(WLAN_ROOT)/$(MAC_SRC_DIR)/pe/lim
MAC_CFG_OBJS := $(MAC_SRC_DIR)/cfg/cfgApi.o \
$(MAC_SRC_DIR)/cfg/cfgDebug.o \
@@ -226,8 +223,8 @@
SAP_INC_DIR := $(SAP_DIR)/inc
SAP_SRC_DIR := $(SAP_DIR)/src
-SAP_INC := -I$(WLAN_PRIMA)/$(SAP_INC_DIR) \
- -I$(WLAN_PRIMA)/$(SAP_SRC_DIR)
+SAP_INC := -I$(WLAN_ROOT)/$(SAP_INC_DIR) \
+ -I$(WLAN_ROOT)/$(SAP_SRC_DIR)
SAP_OBJS := $(SAP_SRC_DIR)/sapApiLinkCntl.o \
$(SAP_SRC_DIR)/sapChSelect.o \
@@ -239,8 +236,8 @@
SME_INC_DIR := $(SME_DIR)/inc
SME_SRC_DIR := $(SME_DIR)/src
-SME_INC := -I$(WLAN_PRIMA)/$(SME_INC_DIR) \
- -I$(WLAN_PRIMA)/$(SME_SRC_DIR)/csr
+SME_INC := -I$(WLAN_ROOT)/$(SME_INC_DIR) \
+ -I$(WLAN_ROOT)/$(SME_SRC_DIR)/csr
SME_CCM_OBJS := $(SME_SRC_DIR)/ccm/ccmApi.o \
$(SME_SRC_DIR)/ccm/ccmLogDump.o
@@ -254,7 +251,7 @@
$(SME_SRC_DIR)/csr/csrUtil.o
ifeq ($(CONFIG_QCOM_CCX),y)
-SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csrCcx.o
+SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csrCcx.o
endif
ifeq ($(CONFIG_QCOM_TDLS),y)
@@ -293,8 +290,8 @@
SVC_INC_DIR := $(SVC_DIR)/inc
SVC_SRC_DIR := $(SVC_DIR)/src
-SVC_INC := -I$(WLAN_PRIMA)/$(SVC_INC_DIR) \
- -I$(WLAN_PRIMA)/$(SVC_DIR)/external
+SVC_INC := -I$(WLAN_ROOT)/$(SVC_INC_DIR) \
+ -I$(WLAN_ROOT)/$(SVC_DIR)/external
BTC_SRC_DIR := $(SVC_SRC_DIR)/btc
BTC_OBJS := $(BTC_SRC_DIR)/wlan_btc_svc.o
@@ -312,11 +309,11 @@
############ SYS ############
SYS_DIR := CORE/SYS
-SYS_INC := -I$(WLAN_PRIMA)/$(SYS_DIR)/common/inc \
- -I$(WLAN_PRIMA)/$(SYS_DIR)/legacy/src/pal/inc \
- -I$(WLAN_PRIMA)/$(SYS_DIR)/legacy/src/platform/inc \
- -I$(WLAN_PRIMA)/$(SYS_DIR)/legacy/src/system/inc \
- -I$(WLAN_PRIMA)/$(SYS_DIR)/legacy/src/utils/inc
+SYS_INC := -I$(WLAN_ROOT)/$(SYS_DIR)/common/inc \
+ -I$(WLAN_ROOT)/$(SYS_DIR)/legacy/src/pal/inc \
+ -I$(WLAN_ROOT)/$(SYS_DIR)/legacy/src/platform/inc \
+ -I$(WLAN_ROOT)/$(SYS_DIR)/legacy/src/system/inc \
+ -I$(WLAN_ROOT)/$(SYS_DIR)/legacy/src/utils/inc
SYS_COMMON_SRC_DIR := $(SYS_DIR)/common/src
SYS_LEGACY_SRC_DIR := $(SYS_DIR)/legacy/src
@@ -344,8 +341,8 @@
TL_INC_DIR := $(TL_DIR)/inc
TL_SRC_DIR := $(TL_DIR)/src
-TL_INC := -I$(WLAN_PRIMA)/$(TL_INC_DIR) \
- -I$(WLAN_PRIMA)/$(TL_SRC_DIR)
+TL_INC := -I$(WLAN_ROOT)/$(TL_INC_DIR) \
+ -I$(WLAN_ROOT)/$(TL_SRC_DIR)
TL_OBJS := $(TL_SRC_DIR)/wlan_qct_tl.o \
$(TL_SRC_DIR)/wlan_qct_tl_ba.o \
@@ -356,8 +353,8 @@
VOSS_INC_DIR := $(VOSS_DIR)/inc
VOSS_SRC_DIR := $(VOSS_DIR)/src
-VOSS_INC := -I$(WLAN_PRIMA)/$(VOSS_INC_DIR) \
- -I$(WLAN_PRIMA)/$(VOSS_SRC_DIR)
+VOSS_INC := -I$(WLAN_ROOT)/$(VOSS_INC_DIR) \
+ -I$(WLAN_ROOT)/$(VOSS_SRC_DIR)
VOSS_OBJS := $(VOSS_SRC_DIR)/vos_api.o \
$(VOSS_SRC_DIR)/vos_event.o \
@@ -385,9 +382,9 @@
WDA_INC_DIR := $(WDA_DIR)/inc
WDA_SRC_DIR := $(WDA_DIR)/src
-WDA_INC := -I$(WLAN_PRIMA)/$(WDA_INC_DIR) \
- -I$(WLAN_PRIMA)/$(WDA_INC_DIR)/legacy \
- -I$(WLAN_PRIMA)/$(WDA_SRC_DIR)
+WDA_INC := -I$(WLAN_ROOT)/$(WDA_INC_DIR) \
+ -I$(WLAN_ROOT)/$(WDA_INC_DIR)/legacy \
+ -I$(WLAN_ROOT)/$(WDA_SRC_DIR)
WDA_OBJS := $(WDA_SRC_DIR)/wlan_qct_wda.o \
$(WDA_SRC_DIR)/wlan_qct_wda_debug.o \
@@ -398,32 +395,32 @@
############ WDI ############
WDI_DIR := CORE/WDI
-WDI_CP_INC := -I$(WLAN_PRIMA)/$(WDI_DIR)/CP/inc/
+WDI_CP_INC := -I$(WLAN_ROOT)/$(WDI_DIR)/CP/inc/
WDI_CP_SRC_DIR := $(WDI_DIR)/CP/src
WDI_CP_OBJS := $(WDI_CP_SRC_DIR)/wlan_qct_wdi.o \
$(WDI_CP_SRC_DIR)/wlan_qct_wdi_dp.o \
$(WDI_CP_SRC_DIR)/wlan_qct_wdi_sta.o
-WDI_DP_INC := -I$(WLAN_PRIMA)/$(WDI_DIR)/DP/inc/
+WDI_DP_INC := -I$(WLAN_ROOT)/$(WDI_DIR)/DP/inc/
WDI_DP_SRC_DIR := $(WDI_DIR)/DP/src
WDI_DP_OBJS := $(WDI_DP_SRC_DIR)/wlan_qct_wdi_bd.o \
$(WDI_DP_SRC_DIR)/wlan_qct_wdi_ds.o
-WDI_TRP_INC := -I$(WLAN_PRIMA)/$(WDI_DIR)/TRP/CTS/inc/ \
- -I$(WLAN_PRIMA)/$(WDI_DIR)/TRP/DTS/inc/
+WDI_TRP_INC := -I$(WLAN_ROOT)/$(WDI_DIR)/TRP/CTS/inc/ \
+ -I$(WLAN_ROOT)/$(WDI_DIR)/TRP/DTS/inc/
WDI_TRP_CTS_SRC_DIR := $(WDI_DIR)/TRP/CTS/src
-WDI_TRP_CTS_OBJS := $(WDI_TRP_CTS_SRC_DIR)/wlan_qct_wdi_cts.o
+WDI_TRP_CTS_OBJS := $(WDI_TRP_CTS_SRC_DIR)/wlan_qct_wdi_cts.o
WDI_TRP_DTS_SRC_DIR := $(WDI_DIR)/TRP/DTS/src
-WDI_TRP_DTS_OBJS := $(WDI_TRP_DTS_SRC_DIR)/wlan_qct_wdi_dts.o
+WDI_TRP_DTS_OBJS := $(WDI_TRP_DTS_SRC_DIR)/wlan_qct_wdi_dts.o
WDI_TRP_OBJS := $(WDI_TRP_CTS_OBJS) \
$(WDI_TRP_DTS_OBJS)
-WDI_WPAL_INC := -I$(WLAN_PRIMA)/$(WDI_DIR)/WPAL/inc
+WDI_WPAL_INC := -I$(WLAN_ROOT)/$(WDI_DIR)/WPAL/inc
WDI_WPAL_SRC_DIR := $(WDI_DIR)/WPAL/src
WDI_WPAL_OBJS := $(WDI_WPAL_SRC_DIR)/wlan_qct_pal_api.o \
@@ -445,7 +442,7 @@
$(WDI_WPAL_OBJS)
-RIVA_INC := -I$(WLAN_PRIMA)/riva/inc
+RIVA_INC := -I$(WLAN_ROOT)/riva/inc
LINUX_INC := -Iinclude/linux
@@ -524,6 +521,11 @@
-DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \
-DWLAN_ACTIVEMODE_OFFLOAD_FEATURE
+ifneq ($(CONFIG_PRONTO_WLAN),)
+CDEFINES += -DWCN_PRONTO
+CDEFINES += -DWCN_PRONTO_V1
+endif
+
# there are still pieces of code which are conditional upon these
# need to investigate all of them to see which should also be
# conditional upon QC_WLAN_CHIPSET_PRIMA
@@ -622,4 +624,5 @@
# Module information used by KBuild framework
obj-$(CONFIG_PRIMA_WLAN) += $(MODNAME).o
+obj-$(CONFIG_PRONTO_WLAN) += $(MODNAME).o
$(MODNAME)-y := $(OBJS)