[nrf fromtree] drivers: nrf_wifi: Remove OSAL code handling

This is now taken care by the Zephyr module shim.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 459f972)

Author: krish2718

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -11,54 +11,20 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc
-  ${OS_AGNOSTIC_BASE}/utils/inc
-  ${OS_AGNOSTIC_BASE}/os_if/inc
-  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/inc
-  ${OS_AGNOSTIC_BASE}/bus_if/bal/inc
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc
-  ${OS_AGNOSTIC_BASE}/fw_load/mips/fw/inc
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc
   src/qspi/inc
   # for net_sprint_ll_addr
   ${ZEPHYR_BASE}/subsys/net/ip
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc/fw
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/fw
-)
-
-zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
 zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
   off_raw_tx/inc
 )
 
-if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
 
 zephyr_library_sources(
-  ${OS_AGNOSTIC_BASE}/os_if/src/osal.c
-  ${OS_AGNOSTIC_BASE}/utils/src/list.c
-  ${OS_AGNOSTIC_BASE}/utils/src/queue.c
-  ${OS_AGNOSTIC_BASE}/utils/src/util.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_api.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_interrupt.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_mem.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_reg.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hpqm.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/pal.c
-  ${OS_AGNOSTIC_BASE}/bus_if/bal/src/bal.c
-  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/src/qspi.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/cmd.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/event.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_api_common.c
   src/shim.c
   src/work.c
   src/timer.c
@@ -77,11 +43,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
 
 if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
   zephyr_library_sources(
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
 endif()
 
@@ -93,44 +55,18 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
   src/wifi_mgmt.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/radio_test/fmac_api.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   off_raw_tx/src/off_raw_tx_api.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c
   src/wifi_mgmt.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_ap.c
-)
-
-
 # Without WPA supplicant we only support scan
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  src/wpa_supp_if.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
-)
+  src/wpa_supp_if.c)
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
@@ -197,162 +133,3 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     ${gen_dir}/nrf70.bin.inc
   )
 endif()
-
-
-
-# Translate the configuration to the OS agnostic code
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_LOW_POWER
-  -DNRF_WIFI_LOW_POWER
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_RPU_RECOVERY
-  -DNRF_WIFI_RPU_RECOVERY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
-  -DNRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_IFACE_MTU
-  -DNRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_STA_MODE
-  -DNRF70_STA_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_DATA_TX
-  -DNRF70_DATA_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_TX
-  -DNRF70_RAW_DATA_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_RX
-  -DNRF70_RAW_DATA_RX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  -DNRF70_PROMISC_DATA_RX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_TX_DONE_WQ_ENABLED
-  -DNRF70_TX_DONE_WQ_ENABLED
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RX_WQ_ENABLED
-  -DNRF70_RX_WQ_ENABLED
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_UTIL
-  -DNRF70_UTIL
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
-  -DNRF70_RADIO_TEST
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF70_OFFLOADED_RAW_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
-  -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RPU_EXTEND_TWT_SP
-  -DNRF70_RPU_EXTEND_TWT_SP
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
-  -DNRF70_SYSTEM_WITH_RAW_MODES
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
-  -DNRF70_SCAN_ONLY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_MODE
-  -DNRF70_SYSTEM_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_2_4G_ONLY
-  -DNRF70_2_4G_ONLY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_LOG_VERBOSE
-  -DNRF70_LOG_VERBOSE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
-  -DNRF70_AP_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
-  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_FEAT_KEEPALIVE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
-  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF_NRF70_OFFLOADED_RAW_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
-  -DNRF70_PASSIVE_SCAN_ONLY
-)
-
-zephyr_compile_definitions(
-  -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  -DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  -DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  -DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  -DNRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  -DNRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  -DNRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  -DNRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-)