From da26d02d63a45dbe7825e44b686f125770dbf78d Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 8 Nov 2024 02:14:53 +0530 Subject: [PATCH] nrf_wifi: Move shim files from driver to module The shim files should be part of the Zephyr module directory within Zephyr, as they are coupled with the module implementation which os OS agnostic. Signed-off-by: Chaitanya Tata --- drivers/wifi/nrf_wifi/CMakeLists.txt | 3 --- modules/nrf_wifi/CMakeLists.txt | 6 ++++++ {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.c | 0 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.h | 0 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.c | 0 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.h | 0 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.c | 0 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.h | 0 8 files changed, 6 insertions(+), 3 deletions(-) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.c (100%) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.h (100%) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.c (100%) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.h (100%) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.c (100%) rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.h (100%) diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt index 4e3878dfcfd..443b54796cd 100644 --- a/drivers/wifi/nrf_wifi/CMakeLists.txt +++ b/drivers/wifi/nrf_wifi/CMakeLists.txt @@ -25,9 +25,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX ) zephyr_library_sources( - src/shim.c - src/work.c - src/timer.c src/qspi/src/device.c src/qspi/src/rpu_hw_if.c src/qspi/src/ficr_prog.c diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt index 2d0e4c8a45e..ad04414b511 100644 --- a/modules/nrf_wifi/CMakeLists.txt +++ b/modules/nrf_wifi/CMakeLists.txt @@ -167,4 +167,10 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c ) +zephyr_library_sources( + shim.c + timer.c + work.c +) + target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface) diff --git a/drivers/wifi/nrf_wifi/src/shim.c b/modules/nrf_wifi/shim.c similarity index 100% rename from drivers/wifi/nrf_wifi/src/shim.c rename to modules/nrf_wifi/shim.c diff --git a/drivers/wifi/nrf_wifi/src/shim.h b/modules/nrf_wifi/shim.h similarity index 100% rename from drivers/wifi/nrf_wifi/src/shim.h rename to modules/nrf_wifi/shim.h diff --git a/drivers/wifi/nrf_wifi/src/timer.c b/modules/nrf_wifi/timer.c similarity index 100% rename from drivers/wifi/nrf_wifi/src/timer.c rename to modules/nrf_wifi/timer.c diff --git a/drivers/wifi/nrf_wifi/src/timer.h b/modules/nrf_wifi/timer.h similarity index 100% rename from drivers/wifi/nrf_wifi/src/timer.h rename to modules/nrf_wifi/timer.h diff --git a/drivers/wifi/nrf_wifi/src/work.c b/modules/nrf_wifi/work.c similarity index 100% rename from drivers/wifi/nrf_wifi/src/work.c rename to modules/nrf_wifi/work.c diff --git a/drivers/wifi/nrf_wifi/src/work.h b/modules/nrf_wifi/work.h similarity index 100% rename from drivers/wifi/nrf_wifi/src/work.h rename to modules/nrf_wifi/work.h