android/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix reg_db.h include path

Browse Source 
Currently in cds_regdomain.h the following file is included:
"../../qca-wifi-host-cmn/umac/regulatory/core/src/reg_db.h"

While transitioning to the Bazel DDK build system this results in a
build error because the build is done in a sandbox with the root at
the qcacld-3.0 folder, and hence there is no way to access
"../qca-wifi-host-cmn."

To address this issue add the following -I path to the Kbuild:
qcacld-3.0/cmn/umac/regulatory/core/src

And then cds_regdomain.h can just include "reg_db.h".

Change-Id: Ib33300f3593e39caeace1238f2b40c819539ff10
CRs-Fixed: 3497251
This commit is contained in:
Jeff Johnson 2023-05-14 19:16:23 -07:00 committed by Rahul Choudhary
parent bbfff086f4
commit 52dcf788de
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kbuild
View File

@ -2283,6 +2283,7 @@ REG_DISPATCHER_SRC_DIR := $(REGULATORY_DIR)/dispatcher/src
REG_CORE_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(REGULATORY_CORE_SRC_DIR)
REG_DISPATCHER_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(REG_DISPATCHER_SRC_DIR)
REGULATORY_INC := -I$(WLAN_COMMON_INC)/$(REGULATORY_CORE_INC_DIR)
REGULATORY_INC := -I$(WLAN_COMMON_INC)/$(REGULATORY_CORE_SRC_DIR)
REGULATORY_INC += -I$(WLAN_COMMON_INC)/$(REG_DISPATCHER_INC_DIR)
REGULATORY_INC += -I$(WLAN_COMMON_INC)/umac/cmn_services/regulatory/inc
REGULATORY_OBJS := $(REG_CORE_OBJ_DIR)/reg_build_chan_list.o \

4
core/cds/inc/cds_regdomain.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2011, 2014-2018, 2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -65,7 +65,7 @@
#include <wlan_cmn.h>
#include <reg_services_public_struct.h>
#include "../../qca-wifi-host-cmn/umac/regulatory/core/src/reg_db.h"
#include "reg_db.h"
#define MIN_TX_PWR_CAP 8
#define MAX_TX_PWR_CAP 24