Skip to content

Commit 3853e8a

Browse files
sachinthegreensachinthegreen
committed
Enable combining system and radio test modes
Changes to enable combining system and radio test code in a single build. Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
1 parent 8753de8 commit 3853e8a

File tree

9 files changed

+65
-71
lines changed

9 files changed

+65
-71
lines changed

‎nrf70_bm_lib/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ if (CONFIG_NRF70_BM_LIB)
2424
${ZEPHYR_BASE}/include/zephyr
2525
)
2626

27-
target_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
27+
target_compile_definitions_ifdef(CONFIG_NRF70_BM_SCAN_ONLY
2828
nrf70-bm-lib
2929
PRIVATE
3030
-DCONFIG_NRF_WIFI_SYS_FW_BIN=${NRF_WIFI_BINS_DIR}/scan_only/nrf70.bin
3131
)
3232

33-
target_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
33+
target_compile_definitions_ifdef(CONFIG_NRF70_BM_RADIO_TEST
3434
nrf70-bm-lib
3535
PRIVATE
3636
-DCONFIG_NRF_WIFI_RT_FW_BIN=${NRF_WIFI_BINS_DIR}/radio_test/nrf70.bin
3737
)
3838

39-
target_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
39+
target_compile_definitions_ifdef(CONFIG_NRF70_BM_RADIO_TEST
4040
nrf70-bm-lib
4141
PRIVATE
42-
-DCONFIG_NRF70_RADIO_TEST
42+
-DCONFIG_NRF70_BM_RADIO_TEST
4343
)
4444

45-
target_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
45+
target_compile_definitions_ifdef(CONFIG_NRF70_BM_SCAN_ONLY
4646
nrf70-bm-lib
4747
PRIVATE
48-
-DCONFIG_NRF70_SCAN_ONLY
48+
-DCONFIG_NRF70_BM_SCAN_ONLY
4949
)
5050

5151

@@ -55,7 +55,7 @@ if (CONFIG_NRF70_BM_LIB)
5555
source/common/nrf70_bm_core.c
5656
)
5757

58-
if(CONFIG_NRF70_RADIO_TEST)
58+
if(CONFIG_NRF70_BM_RADIO_TEST)
5959
target_sources(
6060
nrf70-bm-lib
6161
PRIVATE
@@ -64,7 +64,7 @@ if(CONFIG_NRF70_RADIO_TEST)
6464
)
6565
endif()
6666

67-
if(CONFIG_NRF70_SCAN_ONLY)
67+
if(CONFIG_NRF70_BM_SCAN_ONLY)
6868
target_sources(
6969
nrf70-bm-lib
7070
PRIVATE

‎nrf70_bm_lib/Kconfig

+5-11
Original file line numberDiff line numberDiff line change
@@ -363,26 +363,20 @@ config NRF_WIFI_DISPLAY_SCAN_BSS_LIMIT
363363
# Display scan BSS entries limit
364364
# By default, the limit is 250 in scan-only mode and 150 in regular mode.
365365
int "Display scan bss limit"
366-
range 1 450 if NRF70_SCAN_ONLY
367-
def_int 250 if NRF70_SCAN_ONLY
366+
range 1 450 if NRF70_BM_SCAN_ONLY
367+
def_int 250 if NRF70_BM_SCAN_ONLY
368368
range 1 160
369369
def_int 150
370370
help
371371
Number of BSS entries in scan result.
372372

373-
choice NRF70_OPER_MODES
374-
bool "nRF70 operating modes"
375-
default NRF70_SCAN_ONLY
376-
help
377-
Select the operating mode of the nRF70 driver
378-
379-
config NRF70_SCAN_ONLY
373+
config NRF70_BM_SCAN_ONLY
380374
bool "nRF70 scan only mode"
375+
default y
381376
help
382377
Select this option to enable scan only mode of the nRF70 driver
383378

384-
config NRF70_RADIO_TEST
379+
config NRF70_BM_RADIO_TEST
385380
bool "Radio test mode of the nRF70 driver"
386-
endchoice
387381

388382
endmenu

‎nrf70_bm_lib/include/radio_test/nrf70_bm_lib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern "C" {
2121
#include <stdio.h>
2222
#include "radio_test/nrf70_bm_core.h"
2323

24-
extern struct nrf70_bm_rt_wifi_drv_priv nrf70_bm_priv;
24+
extern struct nrf70_bm_rt_wifi_drv_priv nrf70_bm_rt_priv;
2525

2626
/**@brief Initialize the WiFi module in the radio test mode of operation.
2727
*

‎nrf70_bm_lib/include/system/nrf70_bm_lib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern "C" {
2121
#include <stdio.h>
2222
#include "common/nrf70_bm_lib.h"
2323

24-
extern struct nrf70_bm_sys_wifi_drv_priv nrf70_bm_priv;
24+
extern struct nrf70_bm_sys_wifi_drv_priv nrf70_bm_sys_priv;
2525

2626
#define NR70_SCAN_SSID_MAX_LEN 33
2727
#define NR70_MAC_ADDR_LEN 6

‎nrf70_bm_lib/source/radio_test/nrf70_bm_core.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
#include "radio_test/fmac_api.h"
1313
#include "common/fmac_util.h"
1414

15-
struct nrf70_bm_rt_wifi_drv_priv nrf70_bm_priv;
15+
struct nrf70_bm_rt_wifi_drv_priv nrf70_bm_rt_priv;
1616
extern const struct nrf_wifi_osal_ops nrf_wifi_os_bm_ops;
1717
INCBIN(_bin, nrf70_bm_rt_fw, STR(CONFIG_NRF_WIFI_RT_FW_BIN));
1818

1919
int nrf70_bm_rt_fmac_init(void)
2020
{
2121
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
2222
unsigned int fw_ver = 0;
23-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
23+
void *rpu_ctx = nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx;
2424
struct nrf_wifi_tx_pwr_ctrl_params tx_pwr_ctrl_params = { 0 };
2525
/* TODO: Hardcoded to 10 dBm, take as parameter */
2626
struct nrf_wifi_tx_pwr_ceil_params tx_pwr_ceil_params;
@@ -35,22 +35,22 @@ int nrf70_bm_rt_fmac_init(void)
3535

3636
nrf_wifi_osal_init(&nrf_wifi_os_bm_ops);
3737

38-
nrf70_bm_priv.fmac_priv = nrf_wifi_rt_fmac_init();
38+
nrf70_bm_rt_priv.fmac_priv = nrf_wifi_rt_fmac_init();
3939

40-
if (!nrf70_bm_priv.fmac_priv) {
40+
if (!nrf70_bm_rt_priv.fmac_priv) {
4141
NRF70_LOG_ERR("Failed to initialize FMAC module\n");
4242
goto err;
4343
}
4444

45-
rpu_ctx = nrf_wifi_rt_fmac_dev_add(nrf70_bm_priv.fmac_priv,
46-
&nrf70_bm_priv.rpu_ctx_bm);
45+
rpu_ctx = nrf_wifi_rt_fmac_dev_add(nrf70_bm_rt_priv.fmac_priv,
46+
&nrf70_bm_rt_priv.rpu_ctx_bm);
4747

4848
if (!rpu_ctx) {
4949
NRF70_LOG_ERR("Failed to add device\n");
5050
goto deinit;
5151
}
5252

53-
nrf70_bm_priv.rpu_ctx_bm.rpu_ctx = rpu_ctx;
53+
nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx = rpu_ctx;
5454

5555
status = nrf70_bm_rt_fw_load(rpu_ctx);
5656
if (status != NRF_WIFI_STATUS_SUCCESS) {
@@ -110,18 +110,18 @@ int nrf70_bm_rt_fmac_deinit(void)
110110
{
111111
NRF70_LOG_DBG("Deinitializing FMAC module");
112112

113-
if (nrf70_bm_priv.rpu_ctx_bm.rpu_ctx) {
114-
nrf_wifi_rt_fmac_dev_deinit(nrf70_bm_priv.rpu_ctx_bm.rpu_ctx);
115-
nrf_wifi_fmac_dev_rem(nrf70_bm_priv.rpu_ctx_bm.rpu_ctx);
113+
if (nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx) {
114+
nrf_wifi_rt_fmac_dev_deinit(nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx);
115+
nrf_wifi_fmac_dev_rem(nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx);
116116
}
117117

118-
if (nrf70_bm_priv.fmac_priv) {
119-
nrf_wifi_fmac_deinit(nrf70_bm_priv.fmac_priv);
118+
if (nrf70_bm_rt_priv.fmac_priv) {
119+
nrf_wifi_fmac_deinit(nrf70_bm_rt_priv.fmac_priv);
120120
}
121121

122122
nrf_wifi_osal_deinit();
123-
nrf70_bm_priv.fmac_priv = NULL;
124-
nrf70_bm_priv.rpu_ctx_bm.rpu_ctx = NULL;
123+
nrf70_bm_rt_priv.fmac_priv = NULL;
124+
nrf70_bm_rt_priv.rpu_ctx_bm.rpu_ctx = NULL;
125125

126126
NRF70_LOG_DBG("FMAC module deinitialized");
127127

‎nrf70_bm_lib/source/system/nrf70_bm_core.c

+26-26
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "system/fmac_api.h"
1414
#include "common/fmac_util.h"
1515

16-
struct nrf70_bm_sys_wifi_drv_priv nrf70_bm_priv;
16+
struct nrf70_bm_sys_wifi_drv_priv nrf70_bm_sys_priv;
1717
extern const struct nrf_wifi_osal_ops nrf_wifi_os_bm_ops;
1818
INCBIN(_bin, nrf70_bm_sys_fw, STR(CONFIG_NRF_WIFI_SYS_FW_BIN));
1919

@@ -38,7 +38,7 @@ static enum nrf_wifi_status nrf70_bm_sys_get_mac_addr(struct nrf70_bm_sys_wifi_v
3838
{
3939
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
4040
#ifdef CONFIG_NRF70_OTP_MAC_ADDRESS
41-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
41+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
4242
#endif /* CONFIG_NRF70_OTP_MAC_ADDRESS */
4343
unsigned char mac_addr_str[13];
4444
#ifdef CONFIG_NRF70_FIXED_MAC_ADDRESS_ENABLED
@@ -110,7 +110,7 @@ static void reg_change_callbk_fn(void *vif_ctx,
110110

111111
NRF70_LOG_DBG("Regulatory change event received");
112112

113-
fmac_dev_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
113+
fmac_dev_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
114114

115115
if (!fmac_dev_ctx) {
116116
NRF70_LOG_ERR("%s: Invalid FMAC device context", __func__);
@@ -149,7 +149,7 @@ static void nrf_wifi_event_proc_scan_done_zep(void *vif_ctx,
149149
{
150150
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
151151
struct nrf70_bm_sys_wifi_vif *vif = vif_ctx;
152-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
152+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
153153
NRF70_LOG_DBG("Scan done event received");
154154

155155
status = nrf_wifi_sys_fmac_scan_res_get(rpu_ctx,
@@ -274,7 +274,7 @@ static void nrf70_bm_event_get_reg(void *vif_ctx,
274274
get_reg_event->nrf_wifi_alpha2[0],
275275
get_reg_event->nrf_wifi_alpha2[1]);
276276

277-
fmac_dev_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
277+
fmac_dev_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
278278

279279
if (fmac_dev_ctx->alpha2_valid) {
280280
NRF70_LOG_ERR("%s: Unsolicited regulatory get!", __func__);
@@ -301,9 +301,9 @@ int nrf70_bm_sys_fmac_init(void)
301301
struct nrf_wifi_fmac_callbk_fns callbk_fns = { 0 };
302302
struct nrf_wifi_data_config_params data_config = { 0 };
303303
struct rx_buf_pool_params rx_buf_pools[MAX_NUM_OF_RX_QUEUES] = { 0 };
304-
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_priv.rpu_ctx_bm.vifs[0];
304+
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_sys_priv.rpu_ctx_bm.vifs[0];
305305
unsigned int fw_ver = 0;
306-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
306+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
307307
struct nrf_wifi_tx_pwr_ctrl_params tx_pwr_ctrl_params = { 0 };
308308
/* TODO: Hardcoded to 10 dBm, take as parameter */
309309
struct nrf_wifi_tx_pwr_ceil_params tx_pwr_ceil_params;
@@ -336,22 +336,22 @@ int nrf70_bm_sys_fmac_init(void)
336336
nrf_wifi_osal_init(&nrf_wifi_os_bm_ops);
337337

338338
// Initialize the FMAC module
339-
nrf70_bm_priv.fmac_priv = nrf_wifi_sys_fmac_init(&data_config,
339+
nrf70_bm_sys_priv.fmac_priv = nrf_wifi_sys_fmac_init(&data_config,
340340
rx_buf_pools,
341341
&callbk_fns);
342-
if (!nrf70_bm_priv.fmac_priv) {
342+
if (!nrf70_bm_sys_priv.fmac_priv) {
343343
NRF70_LOG_ERR("Failed to initialize FMAC module\n");
344344
goto err;
345345
}
346346

347-
rpu_ctx = nrf_wifi_sys_fmac_dev_add(nrf70_bm_priv.fmac_priv,
348-
&nrf70_bm_priv.rpu_ctx_bm);
347+
rpu_ctx = nrf_wifi_sys_fmac_dev_add(nrf70_bm_sys_priv.fmac_priv,
348+
&nrf70_bm_sys_priv.rpu_ctx_bm);
349349
if (!rpu_ctx) {
350350
NRF70_LOG_ERR("Failed to add device\n");
351351
goto deinit;
352352
}
353353

354-
nrf70_bm_priv.rpu_ctx_bm.rpu_ctx = rpu_ctx;
354+
nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx = rpu_ctx;
355355

356356
status = nrf70_bm_sys_fw_load(rpu_ctx);
357357
if (status != NRF_WIFI_STATUS_SUCCESS) {
@@ -412,8 +412,8 @@ int nrf70_bm_sys_fmac_add_vif_sta(uint8_t *mac_addr)
412412
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
413413
struct nrf_wifi_umac_add_vif_info add_vif_info;
414414
struct nrf_wifi_umac_chg_vif_state_info vif_info;
415-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
416-
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_priv.rpu_ctx_bm.vifs[0];
415+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
416+
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_sys_priv.rpu_ctx_bm.vifs[0];
417417

418418
if (!rpu_ctx) {
419419
NRF70_LOG_ERR("%s: RPU context is NULL", __func__);
@@ -475,8 +475,8 @@ int nrf70_bm_sys_fmac_del_vif_sta(void)
475475
{
476476
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
477477
struct nrf_wifi_umac_chg_vif_state_info vif_info;
478-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
479-
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_priv.rpu_ctx_bm.vifs[0];
478+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
479+
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_sys_priv.rpu_ctx_bm.vifs[0];
480480

481481
if (!rpu_ctx) {
482482
NRF70_LOG_ERR("%s: RPU context is NULL", __func__);
@@ -509,7 +509,7 @@ int nrf70_bm_sys_fmac_del_vif_sta(void)
509509
int nrf70_bm_sys_fmac_get_reg(struct nrf70_bm_regulatory_info *reg_info)
510510
{
511511
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
512-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
512+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
513513
struct nrf_wifi_fmac_reg_info reg_info_fmac = { 0 };
514514
struct nrf70_bm_reg_chan_info *tmp_chan_info_out = NULL;
515515
struct nrf_wifi_get_reg_chn_info *tmp_chan_info_in = NULL;
@@ -557,7 +557,7 @@ int nrf70_bm_sys_fmac_get_reg(struct nrf70_bm_regulatory_info *reg_info)
557557
int nrf70_bm_sys_fmac_set_reg(struct nrf70_bm_regulatory_info *reg_info)
558558
{
559559
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
560-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
560+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
561561
struct nrf_wifi_fmac_reg_info reg_info_fmac = { 0 };
562562

563563
if (!rpu_ctx) {
@@ -583,21 +583,21 @@ int nrf70_bm_sys_fmac_deinit(void)
583583
{
584584
NRF70_LOG_DBG("Deinitializing FMAC module");
585585

586-
if (nrf70_bm_priv.rpu_ctx_bm.rpu_ctx) {
587-
nrf_wifi_sys_fmac_dev_deinit(nrf70_bm_priv.rpu_ctx_bm.rpu_ctx);
586+
if (nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx) {
587+
nrf_wifi_sys_fmac_dev_deinit(nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx);
588588
}
589589

590-
if (nrf70_bm_priv.rpu_ctx_bm.rpu_ctx) {
591-
nrf_wifi_fmac_dev_rem(nrf70_bm_priv.rpu_ctx_bm.rpu_ctx);
590+
if (nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx) {
591+
nrf_wifi_fmac_dev_rem(nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx);
592592
}
593593

594-
if (nrf70_bm_priv.fmac_priv) {
595-
nrf_wifi_fmac_deinit(nrf70_bm_priv.fmac_priv);
594+
if (nrf70_bm_sys_priv.fmac_priv) {
595+
nrf_wifi_fmac_deinit(nrf70_bm_sys_priv.fmac_priv);
596596
}
597597

598598
nrf_wifi_osal_deinit();
599-
nrf70_bm_priv.fmac_priv = NULL;
600-
nrf70_bm_priv.rpu_ctx_bm.rpu_ctx = NULL;
599+
nrf70_bm_sys_priv.fmac_priv = NULL;
600+
nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx = NULL;
601601

602602
NRF70_LOG_DBG("FMAC module deinitialized");
603603

‎nrf70_bm_lib/source/system/nrf70_bm_lib.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ int nrf70_bm_sys_scan_start(struct nrf70_bm_sys_scan_params *params,
191191
uint8_t k = 0;
192192
uint16_t num_scan_channels = 0;
193193
int ret = -1;
194-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
195-
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_priv.rpu_ctx_bm.vifs[0];
196-
struct nrf_wifi_fmac_priv *fmac_priv = nrf70_bm_priv.fmac_priv;
194+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
195+
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_sys_priv.rpu_ctx_bm.vifs[0];
196+
struct nrf_wifi_fmac_priv *fmac_priv = nrf70_bm_sys_priv.fmac_priv;
197197

198198
if (!params) {
199199
NRF70_LOG_DBG("No scan parameters provided, using default values");
@@ -356,7 +356,7 @@ int nrf70_bm_sys_scan_start(struct nrf70_bm_sys_scan_params *params,
356356

357357
bool nrf70_bm_sys_scan_done(void)
358358
{
359-
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_priv.rpu_ctx_bm.vifs[0];
359+
struct nrf70_bm_sys_wifi_vif *vif = &nrf70_bm_sys_priv.rpu_ctx_bm.vifs[0];
360360

361361
return vif->scan_done;
362362
}
@@ -367,7 +367,7 @@ int nrf70_bm_sys_dump_stats(const char *type)
367367
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
368368
struct rpu_sys_op_stats stats;
369369
enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
370-
void *rpu_ctx = nrf70_bm_priv.rpu_ctx_bm.rpu_ctx;
370+
void *rpu_ctx = nrf70_bm_sys_priv.rpu_ctx_bm.rpu_ctx;
371371

372372
if (!strcmp(type, "umac")) {
373373
stats_type = RPU_STATS_TYPE_UMAC;

‎nrf70_zephyr_shim/source/os/shim.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ struct nwb {
212212
bool chksum_done;
213213
};
214214

215-
#ifndef CONFIG_NRF70_RADIO_TEST
215+
#ifdef CONFIG_NRF70_BM_SCAN_ONLY
216216
static void *zep_shim_nbuf_alloc(unsigned int size)
217217
{
218218
struct nwb *nwb;
@@ -442,7 +442,7 @@ void *net_raw_pkt_from_nbuf(void *iface, void *frm,
442442
return pkt;
443443
}
444444
#endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
445-
#endif /* CONFIG_NRF70_RADIO_TEST */
445+
#endif /* CONFIG_NRF70_BM_SCAN_ONLY */
446446

447447
static void *zep_shim_llist_node_alloc(void)
448448
{
@@ -924,7 +924,7 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_bm_ops = {
924924
.llist_get_node_nxt = zep_shim_llist_get_node_nxt,
925925
.llist_del_node = zep_shim_llist_del_node,
926926
.llist_len = zep_shim_llist_len,
927-
#ifndef CONFIG_NRF70_RADIO_TEST
927+
#ifdef CONFIG_NRF70_BM_SCAN_ONLY
928928
.nbuf_alloc = zep_shim_nbuf_alloc,
929929
.nbuf_free = zep_shim_nbuf_free,
930930
.nbuf_headroom_res = zep_shim_nbuf_headroom_res,
@@ -937,7 +937,7 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_bm_ops = {
937937
.nbuf_get_priority = zep_shim_nbuf_get_priority,
938938
.nbuf_get_chksum_done = zep_shim_nbuf_get_chksum_done,
939939
.nbuf_set_chksum_done = zep_shim_nbuf_set_chksum_done,
940-
#endif /* CONFIG_NRF70_RADIO_TEST */
940+
#endif /* CONFIG_NRF70_BM_SCAN_ONLY */
941941
.tasklet_alloc = zep_shim_work_alloc,
942942
.tasklet_free = zep_shim_work_free,
943943
.tasklet_init = zep_shim_work_init,

0 commit comments

Comments
 (0)