This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit eda99e35bb7f7f0778cc2c62dca237548887536d
Author: raiden00pl <raide...@railab.me>
AuthorDate: Wed Mar 1 19:27:36 2023 +0100
arch/nrf52: use the lates SoftDevice release (v2.3.0)
A list of breaking changes:
- SoftDevice libraries was renamed and libaries are now cmpatible with all
platfroms with a given faimily.
- The random number generator was decoupled from the controller and must
now be provided by the user.
We use arc4random_buf NuttX API for this.
- sdc_support_ API must be called before sdc_cfg_set()
- update public API terms to Bluetooth Core Specification v5.3 (mainly
change slave/master to central/peripheral)
NuttX NRF52 configuration options properly updated.
- BLE features are supported only if the proper BLE role is selected
- sdc_hci_evt_get() and sdc_hci_data_get() have been replaced by
sdc_hci_get()
---
arch/arm/src/nrf52/Kconfig | 54 ++-
arch/arm/src/nrf52/Make.defs | 19 +-
arch/arm/src/nrf52/nrf52_sdc.c | 577 +++++++++++++++++++++----------
arch/arm/src/nrf52/sdc/nrf_peripherals.h | 30 ++
4 files changed, 481 insertions(+), 199 deletions(-)
diff --git a/arch/arm/src/nrf52/Kconfig b/arch/arm/src/nrf52/Kconfig
index 31c5a169d6..118dc113be 100644
--- a/arch/arm/src/nrf52/Kconfig
+++ b/arch/arm/src/nrf52/Kconfig
@@ -664,6 +664,8 @@ menuconfig NRF52_SOFTDEVICE_CONTROLLER
select ARMV7M_USEBASEPRI
select ARCH_RAMVECTORS
select ARCH_IRQPRIO
+ select CRYPTO
+ select CRYPTO_RANDOM_POOL
depends on NRF52_LFCLK_XTAL
---help---
This enables use of Nordic SoftDevice controller
@@ -671,12 +673,27 @@ menuconfig NRF52_SOFTDEVICE_CONTROLLER
full SoftDevice, which only includes the BLE
controller implementation.
- It makes use of RTC0, TIMER0, RADIO and RNG, so
+ It makes use of RTC0, TIMER0 and RADIO so
these will be unavailable for direct use by user.
It also makes use of PPI channel range 17-31.
if NRF52_SOFTDEVICE_CONTROLLER
+choice
+ prompt "BLE Controller role"
+ default NRF52_SDC_PERIPHERAL
+
+config NRF52_SDC_PERIPHERAL
+ bool "BLE Peripheral role"
+
+config NRF52_SDC_MULTIROLE
+ bool "BLE Multi role"
+
+config NRF52_SDC_CENTRAL
+ bool "BLE Central role"
+
+endchoice
+
config NRF52_SDC_CLOCK_ACCURACY
int "Clock Accuracy [PPM]"
default 250
@@ -684,24 +701,37 @@ config NRF52_SDC_CLOCK_ACCURACY
Select the clock accuracy depending on the chosen low-frequency
clock
source
-config NRF52_SDC_SLAVE_COUNT
- int "Number of slave roles to support (also master)"
- default 1
+config NRF52_SDC_PERIPHERAL_COUNT
+ int "Number of peripheral roles to support (also central)"
+ default 1 if !NRF52_SDC_CENTRAL
+ default 0 if NRF52_SDC_CENTRAL
---help---
- This controls how many slave connections will be supported. It
also
- determines the number of master roles from the following:
+ This controls how many peripheral connections will be
supported. It also
+ determines the number of central roles from the following:
- MASTER_ROLES = CONFIG_BLUETOOTH_MAX_CONN - NRF52_SDC_SLAVE_COUNT
+ CENTRAL_ROLES = CONFIG_BLUETOOTH_MAX_CONN -
NRF52_SDC_PERIPHERAL_COUNT
So by choosing these two variables you can control both
capabilities.
config NRF52_SDC_ADVERTISING
bool "Support advertising"
default y
+ depends on !NRF52_SDC_CENTRAL
config NRF52_SDC_SCANNING
bool "Support scanning"
default y
+ depends on !NRF52_SDC_PERIPHERAL
+
+if NRF52_SDC_SCANNING
+
+config NRF52_SDC_SCAN_BUFFER_COUNT
+ int "Scanning buffer count"
+ default 3
+ ---help---
+ The minimum allowed number of buffers is 2.
+
+endif
config NRF52_SDC_LE_2M_PHY
bool "Support LE 2M PHY"
@@ -711,20 +741,12 @@ config NRF52_SDC_LE_CODED_PHY
bool "Support LE Coded PHY"
default n if ARCH_CHIP_NRF52832
default y if ARCH_CHIP_NRF52840
+ depends on NRF52_SDC_MULTIROLE
config NRF52_SDC_DLE
bool "Support Data Length Extension (DLE)"
default y
-config NRF52_SDC_VERSION
- int "SoftDevice version"
- default 132 if ARCH_CHIP_NRF52832
- default 140 if ARCH_CHIP_NRF52840
- ---help---
- The softdevice version to use. This depends on the particular
chip
- to use. See official Nordic documentation on which chips are
supported
- in each version.
-
config NRF52_BLE_TTY_NAME
string "BLE TTY device name"
default "/dev/ttyHCI0"
diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs
index 373494f0f9..9c7f6ff788 100644
--- a/arch/arm/src/nrf52/Make.defs
+++ b/arch/arm/src/nrf52/Make.defs
@@ -114,7 +114,7 @@ endif
ifeq ($(CONFIG_NRF52_SOFTDEVICE_CONTROLLER),y)
NRFXLIB_UNPACK := sdk-nrfxlib
-NRFXLIB_VER := 1.4.2
+NRFXLIB_VER := 2.3.0
NRFXLIB_REF := v$(NRFXLIB_VER)
NRFXLIB_TGZ := $(NRFXLIB_REF).tar.gz
NRFXLIB_URL := https://github.com/nrfconnect/sdk-nrfxlib/archive
@@ -148,13 +148,7 @@ INCLUDES += \
$(shell $(INCDIR) "$(CC)" $(NRFXLIB_DIR)$(DELIM)mpsl$(DELIM)include) \
$(shell $(INCDIR) "$(CC)"
$(NRFXLIB_DIR)$(DELIM)softdevice_controller$(DELIM)include)
-ifeq ($(CONFIG_ARCH_CHIP_NRF52832),y)
- CFLAGS += -DNRF52832_XXAB
-else
- ifeq ($(CONFIG_ARCH_CHIP_NRF52840),y)
- CFLAGS += -DNRF52840_XXAB
- endif
-endif
+CFLAGS += -DNRF52_SERIES
ifeq ($(CONFIG_ARCH_FPU),y)
LIB_VARIANT=hard-float
@@ -166,6 +160,13 @@ EXTRA_LIBPATHS += \
-L
$(NRFXLIB_DIR)$(DELIM)mpsl$(DELIM)lib$(DELIM)cortex-m4$(DELIM)$(LIB_VARIANT) \
-L
$(NRFXLIB_DIR)$(DELIM)softdevice_controller$(DELIM)lib$(DELIM)cortex-m4$(DELIM)$(LIB_VARIANT)
-EXTRA_LIBS += -lmpsl -lsoftdevice_controller_s$(CONFIG_NRF52_SDC_VERSION)
+EXTRA_LIBS += -lmpsl
+ifeq ($(CONFIG_NRF52_SDC_PERIPHERAL),y)
+ EXTRA_LIBS += -lsoftdevice_controller_peripheral
+else ifeq ($(CONFIG_NRF52_SDC_CENTRAL),y)
+ EXTRA_LIBS += -lsoftdevice_controller_central
+else ifeq ($(CONFIG_NRF52_SDC_MULTIROLE),y)
+ EXTRA_LIBS += -lsoftdevice_controller_multirole
+endif
endif
diff --git a/arch/arm/src/nrf52/nrf52_sdc.c b/arch/arm/src/nrf52/nrf52_sdc.c
index 12a9f7e2ef..ccf29369e7 100644
--- a/arch/arm/src/nrf52/nrf52_sdc.c
+++ b/arch/arm/src/nrf52/nrf52_sdc.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <debug.h>
+#include <stdlib.h>
#include <nuttx/net/bluetooth.h>
#include <nuttx/wireless/bluetooth/bt_hci.h>
@@ -49,46 +50,118 @@
#include <mpsl.h>
#include <sdc.h>
#include <sdc_hci.h>
+#include <sdc_soc.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_SDC_SLAVE_COUNT) && \
- CONFIG_SDC_SLAVE_COUNT > CONFIG_BLUETOOTH_MAX_CONN
-# error "Cannot support more BLE slave roles than connections"
+/* Connections configuration ************************************************/
+
+#if defined(CONFIG_SDC_PERIPHERAL_COUNT) && \
+ CONFIG_SDC_PERIPHERAL_COUNT > CONFIG_BLUETOOTH_MAX_CONN
+# error "Cannot support more BLE peripheral roles than connections"
+#endif
+
+#define SDC_CENTRAL_COUNT (CONFIG_BLUETOOTH_MAX_CONN - \
+ CONFIG_NRF52_SDC_PERIPHERAL_COUNT)
+
+/* Validate number of connections for Peripheral and Central roles */
+
+#ifdef CONFIG_NRF52_SDC_PERIPHERAL
+# if CONFIG_NRF52_SDC_PERIPHERAL_COUNT == 0
+# error Peripheral role configured but peripheral count is 0
+# endif
+#endif
+#ifdef CONFIG_NRF52_SDC_CENTRAL
+# if SDC_CENTRAL_COUNT == 0
+# error Central role configured but central count is 0
+# endif
+#endif
+
+/* Memory configuration *****************************************************/
+
+#define CENTRAL_MEM_SIZE (SDC_MEM_PER_CENTRAL_LINK( \
+ SDC_DEFAULT_TX_PACKET_SIZE, \
+ SDC_DEFAULT_RX_PACKET_SIZE, \
+ SDC_DEFAULT_TX_PACKET_COUNT, \
+ SDC_DEFAULT_RX_PACKET_COUNT) + \
+ SDC_MEM_CENTRAL_LINKS_SHARED)
+
+#define PERIPHERAL_MEM_SIZE (SDC_MEM_PER_PERIPHERAL_LINK( \
+ SDC_DEFAULT_TX_PACKET_SIZE, \
+ SDC_DEFAULT_RX_PACKET_SIZE, \
+ SDC_DEFAULT_TX_PACKET_COUNT, \
+ SDC_DEFAULT_RX_PACKET_COUNT) + \
+ SDC_MEM_PERIPHERAL_LINKS_SHARED)
+
+/* Scan supported if central present */
+
+#ifdef CONFIG_NRF52_SDC_SCANNING
+# if SDC_CENTRAL_COUNT == 0
+# error Scanning enabled but central count is 0
+# endif
+#endif
+
+/* Advertising supported if peripheral present */
+
+#ifdef CONFIG_NRF52_SDC_ADVERTISING
+# if CONFIG_NRF52_SDC_PERIPHERAL_COUNT == 0
+# error Advertising enabled but peripheral count is 0
+# endif
+#endif
+
+/* Observer configuration */
+
+#ifdef CONFIG_NRF52_SDC_SCANNING
+# if CONFIG_NRF52_SDC_SCAN_BUFFER_COUNT < 2
+# error The minimum allowed number of scan buffers is 2.
+# endif
+# define SCAN_MEM_SIZE
(SDC_MEM_SCAN_BUFFER(CONFIG_NRF52_SDC_SCAN_BUFFER_COUNT))
+#else
+# define SCAN_MEM_SIZE (0)
+#endif
+
+/* Broadcaster configuration */
+
+#ifdef CONFIG_NRF52_SDC_ADVERTISING
+/* Advertising extensions not supported for now */
+
+# define ADV_SET_COUNT (1)
+# define ADV_BUF_SIZE (SDC_DEFAULT_ADV_BUF_SIZE)
+# define ADV_MEM_SIZE (ADV_SET_COUNT * SDC_MEM_PER_ADV_SET(ADV_BUF_SIZE))
+#else
+# define ADV_SET_COUNT (0)
+# define ADV_MEM_SIZE (0)
#endif
-#define SDC_MASTER_COUNT (CONFIG_BLUETOOTH_MAX_CONN - \
- CONFIG_NRF52_SDC_SLAVE_COUNT)
+/* Periodic advertising not supported */
-/* Todo: check central/peripheral against master/slave count */
+#define PERIODIC_ADV_MEM_SIZE (0)
+#define PERIODIC_ADV_RESP_MEM_SIZE (0)
+#define PERIODIC_ADV_LIST_MEM_SIZE (0)
+#define PERIODIC_SYNC_MEM_SIZE (0)
-#define MASTER_MEM_SIZE (SDC_MEM_PER_MASTER_LINK( \
- SDC_DEFAULT_TX_PACKET_SIZE, \
- SDC_DEFAULT_RX_PACKET_SIZE, \
- SDC_DEFAULT_TX_PACKET_COUNT, \
- SDC_DEFAULT_RX_PACKET_COUNT) \
- + SDC_MEM_MASTER_LINKS_SHARED)
+/* Memory poll size */
-#define SLAVE_MEM_SIZE (SDC_MEM_PER_SLAVE_LINK( \
- SDC_DEFAULT_TX_PACKET_SIZE, \
- SDC_DEFAULT_RX_PACKET_SIZE, \
- SDC_DEFAULT_TX_PACKET_COUNT, \
- SDC_DEFAULT_RX_PACKET_COUNT) \
- + SDC_MEM_SLAVE_LINKS_SHARED)
+#define MEMPOOL_SIZE ((CONFIG_NRF52_SDC_PERIPHERAL_COUNT *
PERIPHERAL_MEM_SIZE) + \
+ (SDC_CENTRAL_COUNT * CENTRAL_MEM_SIZE)+ \
+ SCAN_MEM_SIZE+ \
+ ADV_MEM_SIZE + \
+ PERIODIC_ADV_MEM_SIZE + \
+ PERIODIC_ADV_RESP_MEM_SIZE + \
+ PERIODIC_ADV_LIST_MEM_SIZE +\
+ PERIODIC_SYNC_MEM_SIZE)
-#define MEMPOOL_SIZE ((CONFIG_NRF52_SDC_SLAVE_COUNT * SLAVE_MEM_SIZE) + \
- (SDC_MASTER_COUNT * MASTER_MEM_SIZE))
+/* BT address configuration *************************************************/
#if (CONFIG_NRF52_SDC_PUB_ADDR > 0) || \
defined(CONFIG_NRF52_SDC_FICR_STATIC_ADDR)
# define HAVE_BTADDR_CONFIGURE
#endif
-/* Calls to sdc */
+/* Calls to MPSL ************************************************************/
-#define SDC_RNG_IRQHANDLER sdc_RNG_IRQHandler
#define MPSL_IRQ_CLOCK_HANDLER MPSL_IRQ_CLOCK_Handler
#define MPSL_IRQ_RTC0_HANDLER MPSL_IRQ_RTC0_Handler
#define MPSL_IRQ_TIMER0_HANDLER MPSL_IRQ_TIMER0_Handler
@@ -100,7 +173,7 @@
struct nrf52_sdc_dev_s
{
- uint8_t mempool[MEMPOOL_SIZE];
+ uint8_t *mempool; /* Must be 8 bytes aligned */
uint8_t msg_buffer[HCI_MSG_BUFFER_MAX_SIZE];
mutex_t lock;
@@ -146,7 +219,6 @@ static void low_prio_worker(void *arg);
static int swi_isr(int irq, void *context, void *arg);
static int power_clock_isr(int irq, void *context, void *arg);
-static void rng_handler(void);
static void rtc0_handler(void);
static void timer0_handler(void);
static void radio_handler(void);
@@ -171,8 +243,13 @@ static const mpsl_clock_lfclk_cfg_t g_clock_config =
.skip_wait_lfclk_started = false
};
+/* Must be 8 bytes aligned */
+
+static uint8_t g_sdc_mempool[MEMPOOL_SIZE] aligned_data(8);
+
static struct nrf52_sdc_dev_s g_sdc_dev =
{
+ .mempool = g_sdc_mempool,
.lock = NXMUTEX_INITIALIZER,
};
@@ -286,6 +363,7 @@ static void on_hci_worker(void *arg)
static void on_hci(void)
{
+ sdc_hci_msg_type_t type;
bool check_again;
size_t len;
int ret;
@@ -298,56 +376,54 @@ static void on_hci(void)
* buffer and then create an actual bt_buf_s, depending on msg length
*/
- ret = sdc_hci_evt_get(g_sdc_dev.msg_buffer);
-
+ ret = sdc_hci_get(g_sdc_dev.msg_buffer, &type);
if (ret == 0)
{
- struct bt_hci_evt_hdr_s *hdr =
- (struct bt_hci_evt_hdr_s *)g_sdc_dev.msg_buffer;
+ if (type == SDC_HCI_MSG_TYPE_EVT)
+ {
+ struct bt_hci_evt_hdr_s *hdr =
+ (struct bt_hci_evt_hdr_s *)g_sdc_dev.msg_buffer;
- len = sizeof(*hdr) + hdr->len;
+ len = sizeof(*hdr) + hdr->len;
#ifdef CONFIG_DEBUG_WIRELESS_INFO
- if (hdr->evt == BT_HCI_EVT_CMD_COMPLETE)
- {
- struct hci_evt_cmd_complete_s *cmd_complete =
- (struct hci_evt_cmd_complete_s *)
- (g_sdc_dev.msg_buffer + sizeof(*hdr));
- uint8_t *status = (uint8_t *)cmd_complete + 3;
-
- wlinfo("received CMD_COMPLETE from softdevice "
- "(opcode: 0x%x, status: 0x%x)\n",
- cmd_complete->opcode, *status);
- }
- else
- {
- wlinfo("received HCI EVT from softdevice "
- "(evt: %d, len: %zu)\n", hdr->evt, len);
- }
+ if (hdr->evt == BT_HCI_EVT_CMD_COMPLETE)
+ {
+ struct hci_evt_cmd_complete_s *cmd_complete =
+ (struct hci_evt_cmd_complete_s *)
+ (g_sdc_dev.msg_buffer + sizeof(*hdr));
+ uint8_t *status = (uint8_t *)cmd_complete + 3;
+
+ wlinfo("received CMD_COMPLETE from softdevice "
+ "(opcode: 0x%x, status: 0x%x)\n",
+ cmd_complete->opcode, *status);
+ }
+ else
+ {
+ wlinfo("received HCI EVT from softdevice "
+ "(evt: %d, len: %zu)\n", hdr->evt, len);
+ }
#endif
- bt_netdev_receive(&g_bt_driver, BT_EVT,
- g_sdc_dev.msg_buffer, len);
- check_again = true;
- }
-
- /* Same for ACL */
-
- ret = sdc_hci_data_get(g_sdc_dev.msg_buffer);
+ bt_netdev_receive(&g_bt_driver, BT_EVT,
+ g_sdc_dev.msg_buffer, len);
+ check_again = true;
+ }
- if (ret == 0)
- {
- struct bt_hci_acl_hdr_s *hdr =
- (struct bt_hci_acl_hdr_s *)g_sdc_dev.msg_buffer;
+ if (type == SDC_HCI_MSG_TYPE_DATA)
+ {
+ struct bt_hci_acl_hdr_s *hdr =
+ (struct bt_hci_acl_hdr_s *)g_sdc_dev.msg_buffer;
- wlinfo("received HCI ACL from softdevice (handle: %d)\n",
- hdr->handle);
+ wlinfo("received HCI ACL from softdevice (handle: %d)\n",
+ hdr->handle);
- len = sizeof(*hdr) + hdr->len;
+ len = sizeof(*hdr) + hdr->len;
- bt_netdev_receive(&g_bt_driver, BT_ACL_IN,
- g_sdc_dev.msg_buffer, len);
- check_again = true;
+ bt_netdev_receive(&g_bt_driver, BT_ACL_IN,
+ g_sdc_dev.msg_buffer, len);
+ check_again = true;
+ }
}
}
while (check_again);
@@ -364,15 +440,6 @@ static int swi_isr(int irq, void *context, void *arg)
return 0;
}
-/****************************************************************************
- * Name: rng_handler
- ****************************************************************************/
-
-static void rng_handler(void)
-{
- SDC_RNG_IRQHANDLER();
-}
-
/****************************************************************************
* Name: power_clock_isr
****************************************************************************/
@@ -418,18 +485,15 @@ static void radio_handler(void)
static int nrf52_sdc_btaddr_configure(void)
{
-#ifdef CONFIG_NRF52_SDC_FICR_STATIC_ADDR
- struct sdc_hci_cmd_le_set_random_address_s rand_addr;
-#endif
#if CONFIG_NRF52_SDC_PUB_ADDR > 0
struct sdc_hci_cmd_vs_zephyr_write_bd_addr_s pub_addr;
#endif
#ifdef CONFIG_NRF52_SDC_FICR_STATIC_ADDR
- uint32_t regval = 0;
- uint32_t addr[2];
- uint32_t addrtype = 0;
+ struct sdc_hci_cmd_le_set_random_address_s rand_addr;
+ uint32_t addr[2];
+ uint32_t addrtype = 0;
#endif
- int ret = OK;
+ int ret = OK;
#ifdef CONFIG_NRF52_SDC_FICR_STATIC_ADDR
/* Get device address type */
@@ -491,90 +555,210 @@ errout:
#endif
/****************************************************************************
- * Public Functions
+ * Name: nrf52_rand_prio_low_get
****************************************************************************/
-int nrf52_sdc_initialize(void)
+static uint8_t nrf52_rand_prio_low_get(uint8_t *p_buff, uint8_t length)
{
- int ret;
- int32_t required_memory;
- sdc_cfg_t cfg;
+ arc4random_buf(p_buff, length);
+ return length;
+}
- /* Register interrupt handler for normal-priority events. SWI5 will be
- * used by MPSL to delegate low-priority work
- */
+/****************************************************************************
+ * Name: nrf52_rand_prio_high_get
+ ****************************************************************************/
- irq_attach(NRF52_IRQ_SWI5_EGU5, swi_isr, NULL);
- irq_attach(NRF52_IRQ_POWER_CLOCK, power_clock_isr, NULL);
+static uint8_t nrf52_rand_prio_high_get(uint8_t *p_buff, uint8_t length)
+{
+ arc4random_buf(p_buff, length);
+ return length;
+}
- up_enable_irq(NRF52_IRQ_SWI5_EGU5);
- up_enable_irq(NRF52_IRQ_POWER_CLOCK);
+/****************************************************************************
+ * Name: nrf52_rand_poll
+ ****************************************************************************/
- up_prioritize_irq(NRF52_IRQ_SWI5_EGU5, NVIC_SYSH_PRIORITY_DEFAULT);
- up_prioritize_irq(NRF52_IRQ_POWER_CLOCK, NVIC_SYSH_PRIORITY_DEFAULT);
+static void nrf52_rand_poll(uint8_t *p_buff, uint8_t length)
+{
+ arc4random_buf(p_buff, length);
+}
- /* Use zero-latency interrupt for RNG as we're expected to not add any
- * processing to the ISR
- */
+/****************************************************************************
+ * Name: nrf52_configure_features
+ ****************************************************************************/
- arm_ramvec_attach(NRF52_IRQ_RNG, rng_handler);
- up_prioritize_irq(NRF52_IRQ_RNG, NVIC_SYSH_MAXNORMAL_PRIORITY);
- up_enable_irq(NRF52_IRQ_RNG);
+static int nrf52_configure_features(void)
+{
+ int ret = OK;
- /* Register high-priority interrupts for specific peripherals */
+ /* Turn on specific features */
- arm_ramvec_attach(NRF52_IRQ_RTC0, rtc0_handler);
- arm_ramvec_attach(NRF52_IRQ_TIMER0, timer0_handler);
- arm_ramvec_attach(NRF52_IRQ_RADIO, radio_handler);
+#ifdef CONFIG_NRF52_SDC_ADVERTISING
+ ret = sdc_support_adv();
+ if (ret < 0)
+ {
+ wlerr("Could not enable advertising feature: %d\n", ret);
+ goto errout;
+ }
+#endif
- up_prioritize_irq(NRF52_IRQ_RTC0, MPSL_HIGH_IRQ_PRIORITY);
- up_prioritize_irq(NRF52_IRQ_TIMER0, MPSL_HIGH_IRQ_PRIORITY);
- up_prioritize_irq(NRF52_IRQ_RADIO, MPSL_HIGH_IRQ_PRIORITY);
+#ifdef CONFIG_NRF52_SDC_SCANNING
+ ret = sdc_support_scan();
+ if (ret < 0)
+ {
+ wlerr("Could not enable scanning feature: %d\n", ret);
+ goto errout;
+ }
+#endif
- up_enable_irq(NRF52_IRQ_RTC0);
- up_enable_irq(NRF52_IRQ_TIMER0);
- up_enable_irq(NRF52_IRQ_RADIO);
+#if SDC_CENTRAL_COUNT > 0
+ ret = sdc_support_central();
+ if (ret < 0)
+ {
+ wlerr("Could not enable central feature: %d\n", ret);
+ goto errout;
+ }
+#endif
- /* TODO: how do WFI again after high priority interrupt wakes MCU up? */
+#if CONFIG_NRF52_SDC_PERIPHERAL_COUNT > 0
+ ret = sdc_support_peripheral();
+ if (ret < 0)
+ {
+ wlerr("Could not enable peripheral feature: %d\n", ret);
+ goto errout;
+ }
+#endif
- /* Initialize MPSL */
+#ifdef CONFIG_NRF52_SDC_DLE
+# if SDC_CENTRAL_COUNT > 0
+ ret = sdc_support_dle_central();
+ if (ret < 0)
+ {
+ wlerr("Could not enable DLE central feature: %d\n", ret);
+ goto errout;
+ }
+# endif
- ret = mpsl_init(&g_clock_config, NRF52_IRQ_SWI5_EGU5 - NRF52_IRQ_EXTINT,
- &mpsl_assert_handler);
+# if CONFIG_NRF52_SDC_PERIPHERAL_COUNT > 0
+ ret = sdc_support_dle_peripheral();
if (ret < 0)
{
- wlerr("mpsl init failed: %d\n", ret);
- return ret;
+ wlerr("Could not enable DLE peripheral feature: %d\n", ret);
+ goto errout;
}
+# endif
+#endif
- /* Initialize SDC */
+#ifdef CONFIG_NRF52_SDC_LE_2M_PHY
+ ret = sdc_support_le_2m_phy();
+ if (ret < 0)
+ {
+ wlerr("Could not enable 2M PHY feature: %d\n", ret);
+ goto errout;
+ }
+#endif
- ret = sdc_init(&sdc_fault_handler);
+#ifdef CONFIG_NRF52_SDC_LE_CODED_PHY
+ ret = sdc_support_le_coded_phy();
if (ret < 0)
{
- wlerr("mpsl init failed: %d\n", ret);
- return ret;
+ wlerr("Could not enable Coded PHY feature: %d\n", ret);
+ goto errout;
+ }
+#endif
+
+#ifdef HAVE_BTADDR_CONFIGURE
+ /* Configure BT address */
+
+ ret = nrf52_sdc_btaddr_configure();
+ if (ret < 0)
+ {
+ wlerr("Could not configure BT addr: %d\n", ret);
+ goto errout;
+ }
+#endif
+
+errout:
+ return ret;
+}
+
+/****************************************************************************
+ * Name: nrf52_configure_memory
+ ****************************************************************************/
+
+static int nrf52_configure_memory(void)
+{
+ int32_t required_memory = 0;
+ int ret = OK;
+ sdc_cfg_t cfg;
+
+ /* Configure SoftDevice memory.
+ * NOTE: sdc_cfg_set() API must be set before sdc_enable() and
+ * sdc_support_*() calls.
+ */
+
+#ifdef CONFIG_NRF52_SDC_SCANNING
+ /* Configure scanner memory */
+
+ cfg.scan_buffer_cfg.count = CONFIG_NRF52_SDC_SCAN_BUFFER_COUNT;
+ ret = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
+ SDC_CFG_TYPE_SCAN_BUFFER_CFG, &cfg);
+ if (ret < 0)
+ {
+ wlerr("Failed to set scan count: %d\n", ret);
+ goto errout;
}
+#endif
- /* Set some parameters */
+#ifdef CONFIG_NRF52_SDC_ADVERTISING
+ /* Configure advertisers memory */
- cfg.master_count.count = SDC_MASTER_COUNT;
+ cfg.adv_count.count = ADV_SET_COUNT;
ret = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
- SDC_CFG_TYPE_MASTER_COUNT, &cfg);
+ SDC_CFG_TYPE_ADV_COUNT, &cfg);
if (ret < 0)
{
- wlerr("Failed to set master role count: %d\n", ret);
- return ret;
+ wlerr("Failed to set advertising count: %d\n", ret);
+ goto errout;
}
- cfg.slave_count.count = CONFIG_NRF52_SDC_SLAVE_COUNT;
+ cfg.adv_buffer_cfg.max_adv_data = ADV_BUF_SIZE;
ret = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
- SDC_CFG_TYPE_SLAVE_COUNT, &cfg);
+ SDC_CFG_TYPE_ADV_BUFFER_CFG, &cfg);
if (ret < 0)
{
- wlerr("Failed to set slave role count: %d\n", ret);
- return ret;
+ wlerr("Failed to set advertising buffer: %d\n", ret);
+ goto errout;
}
+#endif
+
+#if SDC_CENTRAL_COUNT > 0
+ /* Configure central connections memory */
+
+ cfg.central_count.count = SDC_CENTRAL_COUNT;
+ ret = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
+ SDC_CFG_TYPE_CENTRAL_COUNT, &cfg);
+ if (ret < 0)
+ {
+ wlerr("Failed to set central role count: %d\n", ret);
+ goto errout;
+ }
+#endif
+
+#if CONFIG_NRF52_SDC_PERIPHERAL_COUNT > 0
+ /* Configure peripheral connections memory */
+
+ cfg.peripheral_count.count = CONFIG_NRF52_SDC_PERIPHERAL_COUNT;
+ ret = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
+ SDC_CFG_TYPE_PERIPHERAL_COUNT, &cfg);
+ if (ret < 0)
+ {
+ wlerr("Failed to set peripheral role count: %d\n", ret);
+ goto errout;
+ }
+#endif
+
+ /* Configure buffers memory and get the final required memory */
cfg.buffer_cfg.rx_packet_size = SDC_DEFAULT_RX_PACKET_SIZE;
cfg.buffer_cfg.tx_packet_size = SDC_DEFAULT_TX_PACKET_SIZE;
@@ -588,95 +772,140 @@ int nrf52_sdc_initialize(void)
if (required_memory < 0)
{
wlerr("Failed to set packet size/count: %ld\n", required_memory);
- return ret;
+ goto errout;
}
/* Verify we have enough memory for our configuration */
- ASSERT(required_memory <= sizeof(g_sdc_dev.mempool));
+ ASSERT(required_memory <= MEMPOOL_SIZE);
- /* Turn on specific features */
+errout:
+ return ret;
+}
-#ifdef CONFIG_NRF52_SDC_ADVERTISING
- ret = sdc_support_adv();
- if (ret < 0)
- {
- wlerr("Could not enable advertising feature: %d\n", ret);
- return ret;
- }
-#endif
+/****************************************************************************
+ * Name: nrf52_configure_rand
+ ****************************************************************************/
-#ifdef CONFIG_NRF52_SDC_SCANNING
- ret = sdc_support_scan();
- if (ret < 0)
- {
- wlerr("Could not enable scanning feature: %d\n", ret);
- return ret;
- }
-#endif
+static int nrf52_configure_rand(void)
+{
+ sdc_rand_source_t rand_func;
+ int ret = OK;
-#if SDC_MASTER_COUNT > 0
- ret = sdc_support_master();
+ /* REVISIT: should we feed entropy poll with some data,
+ * or leave it to be handled by user ?
+ */
+
+ /* Enable rand source */
+
+ rand_func.rand_prio_low_get = nrf52_rand_prio_low_get;
+ rand_func.rand_prio_high_get = nrf52_rand_prio_high_get;
+ rand_func.rand_poll = nrf52_rand_poll;
+
+ ret = sdc_rand_source_register(&rand_func);
if (ret < 0)
{
- wlerr("Could not enable master feature: %d\n", ret);
- return ret;
+ wlerr("sdc_rand_source_register failed %d\n", ret);
+ goto errout;
}
-#endif
-#if CONFIG_NRF52_SDC_SLAVE_COUNT > 0
- ret = sdc_support_slave();
+errout:
+ return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nrf52_sdc_initialize
+ ****************************************************************************/
+
+int nrf52_sdc_initialize(void)
+{
+ int ret = OK;
+
+ /* Register interrupt handler for normal-priority events. SWI5 will be
+ * used by MPSL to delegate low-priority work
+ */
+
+ irq_attach(NRF52_IRQ_SWI5_EGU5, swi_isr, NULL);
+ irq_attach(NRF52_IRQ_POWER_CLOCK, power_clock_isr, NULL);
+
+ up_enable_irq(NRF52_IRQ_SWI5_EGU5);
+ up_enable_irq(NRF52_IRQ_POWER_CLOCK);
+
+ up_prioritize_irq(NRF52_IRQ_SWI5_EGU5, NVIC_SYSH_PRIORITY_DEFAULT);
+ up_prioritize_irq(NRF52_IRQ_POWER_CLOCK, NVIC_SYSH_PRIORITY_DEFAULT);
+
+ /* Configure SoftDevice random sources */
+
+ ret = nrf52_configure_rand();
if (ret < 0)
{
- wlerr("Could not enable slave feature: %d\n", ret);
+ wlerr("nrf52_configure_rand failed: %d\n", ret);
return ret;
}
-#endif
-#ifdef CONFIG_NRF52_SDC_DLE
- ret = sdc_support_dle();
+ /* Register high-priority interrupts for specific peripherals */
+
+ arm_ramvec_attach(NRF52_IRQ_RTC0, rtc0_handler);
+ arm_ramvec_attach(NRF52_IRQ_TIMER0, timer0_handler);
+ arm_ramvec_attach(NRF52_IRQ_RADIO, radio_handler);
+
+ up_prioritize_irq(NRF52_IRQ_RTC0, MPSL_HIGH_IRQ_PRIORITY);
+ up_prioritize_irq(NRF52_IRQ_TIMER0, MPSL_HIGH_IRQ_PRIORITY);
+ up_prioritize_irq(NRF52_IRQ_RADIO, MPSL_HIGH_IRQ_PRIORITY);
+
+ up_enable_irq(NRF52_IRQ_RTC0);
+ up_enable_irq(NRF52_IRQ_TIMER0);
+ up_enable_irq(NRF52_IRQ_RADIO);
+
+ /* TODO: how do WFI again after high priority interrupt wakes MCU up? */
+
+ /* Initialize MPSL */
+
+ ret = mpsl_init(&g_clock_config, NRF52_IRQ_SWI5_EGU5 - NRF52_IRQ_EXTINT,
+ &mpsl_assert_handler);
if (ret < 0)
{
- wlerr("Could not enable DLE feature: %d\n", ret);
+ wlerr("mpsl_init failed: %d\n", ret);
return ret;
}
-#endif
-#ifdef CONFIG_NRF52_SDC_LE_2M_PHY
- ret = sdc_support_le_2m_phy();
+ /* Initialize SDC */
+
+ ret = sdc_init(&sdc_fault_handler);
if (ret < 0)
{
- wlerr("Could not enable 2M PHY feature: %d\n", ret);
+ wlerr("sdc_init failed: %d\n", ret);
return ret;
}
-#endif
-#ifdef CONFIG_NRF52_SDC_LE_CODED_PHY
- ret = sdc_support_le_coded_phy();
+ /* Configure SoftDevice features */
+
+ ret = nrf52_configure_features();
if (ret < 0)
{
- wlerr("Could not enable Coded PHY feature: %d\n", ret);
+ wlerr("nrf52_configure_features failed: %d\n", ret);
return ret;
}
-#endif
-#ifdef HAVE_BTADDR_CONFIGURE
- /* Configure BT address */
+ /* Configure SoftDevice memory */
- ret = nrf52_sdc_btaddr_configure();
+ ret = nrf52_configure_memory();
if (ret < 0)
{
- wlerr("Could not configure BT addr: %d\n", ret);
+ wlerr("nrf52_configure_memory failed: %d\n", ret);
return ret;
}
-#endif
/* Finally enable SoftDevice Controller */
ret = sdc_enable(on_hci, g_sdc_dev.mempool);
if (ret < 0)
{
- wlerr("SoftDevice controller enable failed: %d\n", ret);
+ wlerr("sdc_enable failed: %d\n", ret);
return ret;
}
diff --git a/arch/arm/src/nrf52/sdc/nrf_peripherals.h
b/arch/arm/src/nrf52/sdc/nrf_peripherals.h
new file mode 100644
index 0000000000..b7af1e2abc
--- /dev/null
+++ b/arch/arm/src/nrf52/sdc/nrf_peripherals.h
@@ -0,0 +1,30 @@
+/****************************************************************************
+ * arch/arm/src/nrf52/sdc/nrf_peripherals.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_NRF52_SDC_NRF_PERIPHERALS_H
+#define __ARCH_ARM_SRC_NRF52_SDC_NRF_PERIPHERALS_H
+
+/****************************************************************************
+ * Public Definitions
+ ****************************************************************************/
+
+#define PPI_PRESENT 1
+
+#endif /* __ARCH_ARM_SRC_NRF52_SDC_NRF_PERIPHERALS_H */
