A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 20:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Remove direct attach reference in makefile

Browse source 
Remove direct attach directory references in Kbuild
of spectral source code.

Also, remove DA_SUPPORT macro specific code changes

Change-Id: I5a06e9bd3f40ee6d177951562836c4ea7647f98b
This commit is contained in:
suresh 2020-08-21 23:13:19 +05:30 • committed by snandini
commit a8d0770765
2 changed files with 1 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spectral/Kbuild
View file

@ -57,8 +57,7 @@ HOST_CMN_CONVG_HAL_INC := $(DEPTH)/cmn_dev/hal/inc
HOST_CMN_CONVG_HAL_WIFI_INC := $(DEPTH)/cmn_dev/hal/wifi3.0
INCS += -I$(obj)/$(DEPTH)/include -I$(obj)/$(DEPTH)/umac/include \
-I$(obj)/$(DEPTH)/direct_attach/umac/include \
-I$(obj)/$(DEPTH)/direct_attach/umac/if_lmac -I$(obj)/$(DEPTH)/umac/crypto \
-I$(obj)/$(DEPTH)/umac/crypto \
-I$(obj)/$(DEPTH)/umac/scan -I$(obj)/$(DEPTH)/umac/resmgr \
-I$(obj)/$(DEPTH)/umac/pm -I$(obj)/$(DEPTH)/umac/txrx \
-I$(obj)/$(DEPTH)/umac/acs -I$(obj)/$(DEPTH)/umac/txbf \
@ -67,14 +66,11 @@ INCS += -I$(obj)/$(DEPTH)/include -I$(obj)/$(DEPTH)/umac/include \
-I$(obj)/$(DEPTH)/umac/rpt_placement \
-I$(obj)/$(DEPTH)/umac/wifipos \
-I$(obj)/$(DEPTH)/umac/wds -I$(obj)/$(DEPTH)/umac/ique \
-I$(obj)/$(DEPTH)/direct_attach/hal -I$(obj)/$(DEPTH)/direct_attach/lmac/ath_dev \
-I$(obj)/$(DEPTH)/direct_attach/hal/$(OS) \
-I$(obj)/$(DEPTH)/umac/vi_dbg \
-I$(obj)/$(DEPTH)/umac/smart_antenna \
-I$(obj)/$(DEPTH)/umac/smart_ant \
-I$(obj)/$(DEPTH)/umac/ald \
-I$(obj)/$(DEPTH)/lmac/ath_pktlog \
-I$(obj)/$(DEPTH)/direct_attach/lmac/ratectrl \
-I$(obj)/$(DEPTH)/os/linux/mem/ \
-I$(obj)/$(DEPTH)/umac/base \
-I$(obj)/$(DEPTH)/qca_ol \
@ -171,11 +167,6 @@ INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/mgmt_txrx/dispatcher/inc
INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/regulatory/dispatcher/inc
INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/dfs/dispatcher/inc
SPECTRAL_DA_OBJS := $(DEPTH)/direct_attach/lmac/spectral/spectral.o \
$(DEPTH)/direct_attach/lmac/spectral/spectral_netlink.o \
$(DEPTH)/direct_attach/lmac/spectral/spectral_cmds.o \
$(DEPTH)/direct_attach/lmac/spectral/spectral_process_data.o \
$(DEPTH)/direct_attach/lmac/spectral/spectral_phyerr.o
#End of legacy spectral defines
ifeq ($(QCA_AIRTIME_FAIRNESS), 1)
@ -223,18 +214,8 @@ SPECTRAL_CMN_OBJS += core/spectral_offload.o \
$(DEPTH)/cmn_dev/os_if/linux/spectral/src/wlan_cfg80211_spectral.o \
$(DEPTH)/cmn_dev/os_if/linux/spectral/src/os_if_spectral_netlink.o
ifeq ($(strip ${DA_SUPPORT}),1)
SPECTRAL_CMN_OBJS += $(DEPTH)/component_dev/direct_attach/spectral/core/spectral_direct_attach.o
endif
ifeq ($(strip ${DA_SUPPORT}),1)
qca_spectral-objs += ${SPECTRAL_CMN_OBJS} \
${SPECTRAL_TIF_OBJS} \
${SPECTRAL_DA_OBJS}
else
qca_spectral-objs += ${SPECTRAL_CMN_OBJS} \
${SPECTRAL_TIF_OBJS}
endif
ifeq ($(strip ${QCA_PARTNER_MAKE_F_SUPPORT}),1)
all: qca_spectral.ko

25
spectral/core/spectral_common.c
View file

@ -21,9 +21,6 @@
#include "spectral_ol_api_i.h"
#include <qdf_mem.h>
#include <qdf_types.h>
#ifdef DA_SUPPORT
#include "spectral_da_api_i.h"
#endif
#include <wlan_spectral_public_structs.h>
#include <wlan_cfg80211_spectral.h>
#include <cfg_ucfg_api.h>
@ -495,26 +492,6 @@ spectral_ctx_deinit(struct spectral_context *sc)
}
}
#ifdef DA_SUPPORT
/**
* wlan_spectral_init_da() - init context of DA devices
*
* init context of DA device
*
* Return: void
*/
static void
wlan_spectral_init_da(struct spectral_context *sc)
{
spectral_ctx_init_da(sc);
}
#else
static void
wlan_spectral_init_da(struct spectral_context *sc)
{
}
#endif
QDF_STATUS
wlan_spectral_psoc_obj_create_handler(struct wlan_objmgr_psoc *psoc, void *arg)
{
@ -540,8 +517,6 @@ wlan_spectral_psoc_obj_create_handler(struct wlan_objmgr_psoc *psoc, void *arg)
sc->psoc_obj = psoc;
if (wlan_objmgr_psoc_get_dev_type(psoc) == WLAN_DEV_OL)
spectral_ctx_init_ol(sc);
else if (wlan_objmgr_psoc_get_dev_type(psoc) == WLAN_DEV_DA)
wlan_spectral_init_da(sc);
wlan_objmgr_psoc_component_obj_attach(psoc, WLAN_UMAC_COMP_SPECTRAL,
(void *)sc, QDF_STATUS_SUCCESS);