Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wifi: Pull nrf_wifi driver restructuring #19147

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/nrf/drivers/wifi/nrf70_native.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Design overview
***************

The nRF Wi-Fi driver follows an OS-agnostic design, and the driver implementation is split into OS-agnostic and OS (Zephyr)-specific code.
The OS-agnostic code is located in the :file:`${ZEPHYR_BASE}/../modules/hal/nordic/drivers/nrf_wifi/` folder, and the Zephyr OS port is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrfwifi/` folder.
The OS-agnostic code is located in the :file:`${ZEPHYR_BASE}/../modules/hal/nordic/drivers/nrf_wifi/` folder, and the Zephyr OS port is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/` folder.

The driver supports two modes of operation:

Expand Down Expand Up @@ -82,7 +82,7 @@ The nRF Wi-Fi driver has the following configuration options:
Kconfig configuration
=====================

.. options-from-kconfig:: /../../../../../zephyr/drivers/wifi/nrfwifi/Kconfig.nrfwifi
.. options-from-kconfig:: /../../../../../zephyr/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
:show-type:

Devicetree specification configuration
Expand Down
2 changes: 1 addition & 1 deletion doc/nrf/drivers/wifi/nrf70_portable.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ nRF Wi-Fi portable driver
The nRF Wi-Fi portable driver implements OS-agnostic code for the nRF70 FullMAC Series of devices.
This code can be used to implement OS-native drivers for the nRF70 Series devices.

The Zephyr native driver implementation is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrfwifi/` folder.
The Zephyr native driver implementation is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/` folder.

API documentation
*****************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Offloaded raw transmit API
The offloaded raw transmit functionality of nRF70 Series ICs can be utilized by using the APIs provided by the driver.
The API reference can be found at:

| Header file: :file:`zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h`
| Header file: :file:`zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h`


See the :ref:`Offloaded raw transmit sample <wifi_offloaded_raw_tx_packet_sample>` to know more about the offloaded raw transmit API.
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/offloaded_raw_tx/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
#include <zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h>

#ifdef CONFIG_GENERATE_MAC_ADDRESS
#include <zephyr/random/random.h>
Expand Down
4 changes: 2 additions & 2 deletions subsys/net/lib/nrf70_fw_ext/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif()

if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_DISABLED)
# The C source is same as that for built-in
zephyr_library_sources(${ZEPHYR_BASE}/drivers/wifi/nrfwifi/src/fw_load.c)
zephyr_library_sources(${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/src/fw_load.c)
else()
zephyr_library_sources(ext_fw_load.c)
if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP)
Expand Down Expand Up @@ -43,7 +43,7 @@ if(DEFINED CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_DISABLED OR
zephyr_include_directories(${gen_inc_dir})
set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
generate_inc_file_for_target(
nrfwifi
nrf_wifi
${NRF70_PATCH}
${gen_dir}/nrf70.bin.inc
)
Expand Down
3 changes: 2 additions & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 53f5e6dae760d95db2dcb5efac83b83023484043
revision: bc80cbda202a69435c7333544c9c5359e4aef0fc
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -105,6 +105,7 @@ manifest:
- nanopb
- net-tools
- nrf_hw_models
- nrf_wifi
- open-amp
- picolibc
- segger
Expand Down
Loading