Skip to content

Commit 459f972

Browse files
krish2718kartben
krish2718
authored and
kartben
committed
drivers: nrf_wifi: Remove OSAL code handling
This is now taken care by the Zephyr module shim. Signed-off-by: Chaitanya Tata <[email protected]>
1 parent 180df66 commit 459f972

File tree

1 file changed

+1
-224
lines changed

1 file changed

+1
-224
lines changed

‎drivers/wifi/nrf_wifi/CMakeLists.txt

Lines changed: 1 addition & 224 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,20 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
1111

1212
zephyr_include_directories(
1313
inc
14-
${OS_AGNOSTIC_BASE}/utils/inc
15-
${OS_AGNOSTIC_BASE}/os_if/inc
16-
${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/inc
17-
${OS_AGNOSTIC_BASE}/bus_if/bal/inc
18-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc
19-
${OS_AGNOSTIC_BASE}/fw_load/mips/fw/inc
20-
${OS_AGNOSTIC_BASE}/hw_if/hal/inc
2114
src/qspi/inc
2215
# for net_sprint_ll_addr
2316
${ZEPHYR_BASE}/subsys/net/ip
24-
${OS_AGNOSTIC_BASE}/hw_if/hal/inc/fw
25-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/fw
26-
)
27-
28-
zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
29-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
3017
)
3118

3219
zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
33-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
3420
off_raw_tx/inc
3521
)
3622

37-
if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
38-
zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
39-
endif()
40-
4123
zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
4224
src/coex.c
4325
)
4426

4527
zephyr_library_sources(
46-
${OS_AGNOSTIC_BASE}/os_if/src/osal.c
47-
${OS_AGNOSTIC_BASE}/utils/src/list.c
48-
${OS_AGNOSTIC_BASE}/utils/src/queue.c
49-
${OS_AGNOSTIC_BASE}/utils/src/util.c
50-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_api.c
51-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_fw_patch_loader.c
52-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_interrupt.c
53-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_mem.c
54-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_reg.c
55-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/hpqm.c
56-
${OS_AGNOSTIC_BASE}/hw_if/hal/src/pal.c
57-
${OS_AGNOSTIC_BASE}/bus_if/bal/src/bal.c
58-
${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/src/qspi.c
59-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/cmd.c
60-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/event.c
61-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_api_common.c
6228
src/shim.c
6329
src/work.c
6430
src/timer.c
@@ -77,11 +43,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
7743

7844
if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
7945
zephyr_library_sources(
80-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
81-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
82-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
8346
src/net_if.c
84-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
8547
)
8648
endif()
8749

@@ -93,44 +55,18 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
9355
src/wifi_mgmt.c
9456
)
9557

96-
zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
97-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/radio_test/fmac_api.c
98-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
99-
)
100-
10158
zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
102-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
103-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
10459
off_raw_tx/src/off_raw_tx_api.c
10560
)
10661

107-
zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
108-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
109-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
110-
)
111-
11262
zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
11363
src/wpa_supp_if.c
11464
src/wifi_mgmt.c
115-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
116-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
11765
)
11866

119-
zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
120-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_ap.c
121-
)
122-
123-
12467
# Without WPA supplicant we only support scan
12568
zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
126-
src/wpa_supp_if.c
127-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
128-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
129-
)
130-
131-
zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
132-
${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
133-
)
69+
src/wpa_supp_if.c)
13470

13571
zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
13672
src/qspi/src/qspi_if.c
@@ -197,162 +133,3 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
197133
${gen_dir}/nrf70.bin.inc
198134
)
199135
endif()
200-
201-
202-
203-
# Translate the configuration to the OS agnostic code
204-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_LOW_POWER
205-
-DNRF_WIFI_LOW_POWER
206-
)
207-
208-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_RPU_RECOVERY
209-
-DNRF_WIFI_RPU_RECOVERY
210-
)
211-
212-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
213-
-DNRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}
214-
)
215-
216-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_IFACE_MTU
217-
-DNRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}
218-
)
219-
220-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_STA_MODE
221-
-DNRF70_STA_MODE
222-
)
223-
224-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_DATA_TX
225-
-DNRF70_DATA_TX
226-
)
227-
228-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_TX
229-
-DNRF70_RAW_DATA_TX
230-
)
231-
232-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_RX
233-
-DNRF70_RAW_DATA_RX
234-
)
235-
236-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
237-
-DNRF70_PROMISC_DATA_RX
238-
)
239-
240-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_TX_DONE_WQ_ENABLED
241-
-DNRF70_TX_DONE_WQ_ENABLED
242-
)
243-
244-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_RX_WQ_ENABLED
245-
-DNRF70_RX_WQ_ENABLED
246-
)
247-
248-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_UTIL
249-
-DNRF70_UTIL
250-
)
251-
252-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
253-
-DNRF70_RADIO_TEST
254-
)
255-
256-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
257-
-DNRF70_OFFLOADED_RAW_TX
258-
)
259-
260-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
261-
-DNRF70_TCP_IP_CHECKSUM_OFFLOAD
262-
)
263-
264-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_RPU_EXTEND_TWT_SP
265-
-DNRF70_RPU_EXTEND_TWT_SP
266-
)
267-
268-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
269-
-DNRF70_SYSTEM_WITH_RAW_MODES
270-
)
271-
272-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
273-
-DNRF70_SCAN_ONLY
274-
)
275-
276-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_MODE
277-
-DNRF70_SYSTEM_MODE
278-
)
279-
280-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_2_4G_ONLY
281-
-DNRF70_2_4G_ONLY
282-
)
283-
284-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_LOG_VERBOSE
285-
-DNRF70_LOG_VERBOSE
286-
)
287-
288-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
289-
-DNRF70_AP_MODE
290-
)
291-
292-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
293-
-DNRF_WIFI_MGMT_BUFF_OFFLOAD
294-
)
295-
296-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
297-
-DNRF_WIFI_FEAT_KEEPALIVE
298-
)
299-
300-
zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
301-
-DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
302-
)
303-
304-
zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
305-
-DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
306-
)
307-
308-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
309-
-DNRF_NRF70_OFFLOADED_RAW_TX
310-
)
311-
312-
zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
313-
-DNRF70_PASSIVE_SCAN_ONLY
314-
)
315-
316-
zephyr_compile_definitions(
317-
-DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
318-
-DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
319-
-DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
320-
-DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
321-
-DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
322-
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
323-
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
324-
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
325-
-DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
326-
-DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
327-
-DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
328-
-DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
329-
-DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
330-
-DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
331-
-DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
332-
-DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
333-
-DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
334-
-DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
335-
-DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
336-
-DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
337-
-DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
338-
-DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
339-
-DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
340-
-DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
341-
-DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
342-
-DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
343-
-DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
344-
-DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
345-
-DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
346-
-DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
347-
-DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
348-
-DNRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
349-
-DNRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
350-
-DNRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
351-
-DNRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
352-
-DNRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
353-
-DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
354-
-DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
355-
-DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
356-
-DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
357-
-DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
358-
)

0 commit comments

Comments
 (0)