michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: hal_nordic: Improve reservation of resources for BT_CTLR

Browse source 
Instead of including from nrfx_glue.h a specific Zephyr Bluetooth
controller header file that defines PPI and GPIOTE resources to be
reserved for exclusive use by the controller, include a file with
only a fixed name and expect the chosen Bluetooth controller to
provide the location of this file in include paths. This way, when
a different Bluetooth controller implementation is used downstream,
a different file can be easily pointed to.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2022-02-24 09:47:23 +01:00 • committed by Carles Cufí
commit 222d42c22a
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/hal_nordic/nrfx/nrfx_glue.h
View file

@ -275,8 +275,14 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
#define NRFX_GPIOTE_CHANNELS_USED NRFX_GPIOTE_CHANNELS_USED_BY_BT_CTLR #define NRFX_GPIOTE_CHANNELS_USED NRFX_GPIOTE_CHANNELS_USED_BY_BT_CTLR
#if defined(CONFIG_BT_CTLR) #if defined(CONFIG_BT_CTLR)
#include <../subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h> /*
* The enabled Bluetooth controller subsystem is responsible for providing
* definitions of the BT_CTLR_USED_* symbols used below in a file named
* bt_ctlr_used_resources.h and for adding its location to global include
* paths so that the file can be included here for all Zephyr libraries that
* are to be built.
*/
#include <bt_ctlr_used_resources.h>
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS #define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS #define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
#define NRFX_GPIOTE_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_GPIOTE_CHANNELS #define NRFX_GPIOTE_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_GPIOTE_CHANNELS

6
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h → subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/nrfx_glue/bt_ctlr_used_resources.h
View file

@ -3,12 +3,12 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "radio_nrf5_fem.h" #include "../radio/radio_nrf5_fem.h"
#ifdef DPPI_PRESENT #ifdef DPPI_PRESENT
#include "radio_nrf5_dppi_resources.h" #include "../radio/radio_nrf5_dppi_resources.h"
#else #else
#include "radio_nrf5_ppi_resources.h" #include "../radio/radio_nrf5_ppi_resources.h"
#endif #endif
#if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || \ #if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || \

6
subsys/bluetooth/controller/ll_sw/nrf.cmake
View file

@ -100,3 +100,9 @@ zephyr_library_include_directories(
ll_sw/nordic ll_sw/nordic
hci/nordic hci/nordic
) )
# This path needs to be added globally as it is supposed to be used
# in nrfx_glue.h when other libraries are built.
zephyr_include_directories(
ll_sw/nordic/hal/nrf5/nrfx_glue
)