wifi: nrf_wifi: extract NRF70_SYSTEM_WITH_RAW_MODES
`NRF70_SYSTEM_WITH_RAW_MODES` is more accurately described as an additional option on top of `NRF70_SYSTEM_MODE`, not as a unique choice of `NRF70_OPER_MODES`. This allows the elimination of multiple `NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES` dependencies. Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
parent
9cebc199b7
commit
d95de82b94
3 changed files with 14 additions and 13 deletions
|
@ -79,13 +79,15 @@ if (CONFIG_NRF_WIFI_PATCHES_BUILTIN)
|
|||
zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
|
||||
# RPU FW patch binaries based on the selected configuration
|
||||
if(CONFIG_NRF70_SYSTEM_MODE)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
|
||||
if (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
|
||||
else()
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
|
||||
endif()
|
||||
elseif(CONFIG_NRF70_RADIO_TEST)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
|
||||
elseif(CONFIG_NRF70_SCAN_ONLY)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
|
||||
elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
|
||||
elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
|
||||
set(NRF70_PATCH ${FW_BINS_BASE}/offloaded_raw_tx/nrf70.bin)
|
||||
else()
|
||||
|
|
|
@ -40,8 +40,6 @@ config NRF70_QSPI_LOW_POWER
|
|||
|
||||
choice NRF70_OPER_MODES
|
||||
bool "nRF70 operating modes"
|
||||
default NRF70_SYSTEM_WITH_RAW_MODES if !WIFI_NRF7000 && \
|
||||
(NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
|
||||
default NRF70_SYSTEM_MODE if !WIFI_NRF7000
|
||||
default NRF70_SCAN_ONLY if WIFI_NRF7000
|
||||
help
|
||||
|
@ -65,17 +63,18 @@ config NRF70_RADIO_TEST
|
|||
config NRF70_OFFLOADED_RAW_TX
|
||||
bool "Offloaded raw TX mode of the nRF70 driver"
|
||||
|
||||
endchoice
|
||||
|
||||
config NRF70_SYSTEM_WITH_RAW_MODES
|
||||
bool "nRF70 system mode with raw modes"
|
||||
depends on WIFI_NRF7002 || WIFI_NRF7001
|
||||
select WIFI_NM_WPA_SUPPLICANT
|
||||
depends on NRF70_SYSTEM_MODE
|
||||
default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
|
||||
help
|
||||
Select this option to enable system mode of the nRF70 driver with raw modes.
|
||||
endchoice
|
||||
|
||||
config NRF70_SYSTEM_MODE_COMMON
|
||||
bool
|
||||
default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
|
||||
default y if NRF70_SYSTEM_MODE
|
||||
|
||||
config NET_L2_ETHERNET
|
||||
default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
|
||||
|
@ -86,7 +85,7 @@ config HEAP_MEM_POOL_ADD_SIZE_NRF70
|
|||
def_int 25000 if NRF70_SCAN_ONLY
|
||||
def_int 150000
|
||||
|
||||
if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
|
||||
if NRF70_SYSTEM_MODE
|
||||
config NRF70_STA_MODE
|
||||
bool "nRF70 STA mode"
|
||||
default y
|
||||
|
@ -100,7 +99,7 @@ config NRF70_AP_MODE
|
|||
|
||||
config NRF70_P2P_MODE
|
||||
bool "P2P support in driver"
|
||||
endif # NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
|
||||
endif # NRF70_SYSTEM_MODE
|
||||
|
||||
config NRF70_RAW_DATA_TX
|
||||
bool "RAW TX data path in the driver"
|
||||
|
@ -118,7 +117,7 @@ config NRF70_PROMISC_DATA_RX
|
|||
|
||||
config NRF70_DATA_TX
|
||||
bool "TX data path in the driver"
|
||||
default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
|
||||
default y if NRF70_SYSTEM_MODE
|
||||
|
||||
config NRF_WIFI_IF_AUTO_START
|
||||
bool "Wi-Fi interface auto start on boot"
|
||||
|
|
|
@ -730,7 +730,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
|
|||
#ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
|
||||
callbk_fns.rx_bcn_prb_resp_callbk_fn = nrf_wifi_rx_bcn_prb_resp_frm;
|
||||
#endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
|
||||
#if defined(CONFIG_NRF70_SYSTEM_MODE) || defined(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
|
||||
#ifdef CONFIG_NRF70_SYSTEM_MODE
|
||||
callbk_fns.set_if_callbk_fn = nrf_wifi_set_iface_event_handler;
|
||||
#endif /* CONFIG_NRF70_SYSTEM_MODE */
|
||||
#ifdef CONFIG_NRF70_STA_MODE
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue