patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: flash: nRF: Move sync ticker to Subsys Bluetooth Controller

Browse source 
Move the SoC Flash nRF sync ticker implementation into
Bluetooth Controller Subsystem folder, as internal headers
are included.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2023-03-15 09:39:29 +05:30 committed by Carles Cufí
parent b9f9f1ba9c
commit 643723479f
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/flash/CMakeLists.txt
View file

@ -10,7 +10,6 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_SIMULATOR flash_simulator.c)
zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER soc_flash_nrf_ticker.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
@ -84,11 +83,5 @@ zephyr_library_include_directories_ifdef(
${ZEPHYR_BASE}/drivers/memc
)
zephyr_library_include_directories_ifdef(
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER
${ZEPHYR_BASE}/subsys/bluetooth
${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/nordic
)
zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)

10
subsys/bluetooth/controller/CMakeLists.txt
View file

@ -160,6 +160,11 @@ zephyr_library_sources_ifdef(
crypto/crypto.c
)
zephyr_library_sources_ifdef(
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER
flash/soc_flash_nrf_ticker.c
)
add_subdirectory_ifdef(
CONFIG_BT_CTLR_COEX_DRIVERS
coex
@ -181,6 +186,11 @@ zephyr_library_include_directories_ifdef(
../crypto
)
zephyr_library_include_directories_ifdef(
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER
${ZEPHYR_BASE}/drivers/flash
)
zephyr_library_compile_options_ifdef(
CONFIG_BT_CTLR_OPTIMIZE_FOR_SPEED
${OPTIMIZE_FOR_SPEED_FLAG}

14
drivers/flash/soc_flash_nrf_ticker.c → subsys/bluetooth/controller/flash/soc_flash_nrf_ticker.c
View file

@ -6,18 +6,18 @@
#include <errno.h>
#include <soc.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <soc.h>
#include "soc_flash_nrf.h"
#include <zephyr/sys/__assert.h>
#include <zephyr/bluetooth/hci.h>
#include "controller/hal/ticker.h"
#include "controller/ticker/ticker.h"
#include "controller/include/ll.h"
#include "hal/ticker.h"
#include "ticker/ticker.h"
#include "ll.h"
#include "soc_flash_nrf.h"
#define FLASH_RADIO_ABORT_DELAY_US 1500
#define FLASH_RADIO_WORK_DELAY_US 200