Make smp and sidewalk parallel

Kconfig.dependencies

@@ -34,9 +34,22 @@ config SIDEWALK_BLE
 	imply BT_CTLR_CONN_RSSI
 	imply BT_CTLR_TX_PWR_DYNAMIC_CONTROL
 	imply BT_CTLR_ADVANCED_FEATURES
+	imply BT_EXT_ADV
 	help
 		Sidewalk Bluetooth Low Energy (BLE) module
 
+config SIDEWALK_BLE_NAME
+	string "BLE name adverticed for Sidewalk"
+	default "SID_APP"
+
+config BT_ID_MAX
+	default 3 if SIDEWALK_DFU
+	default 2 
+
+config BT_APP_IFC
+	bool "Enable BT app wrapper"
+	default y if SIDEWALK_BLE
+
 config SIDEWALK_ASSERT
 	bool
 	default SIDEWALK

samples/sid_end_device/Kconfig.defconfig

@@ -42,6 +42,14 @@ config BT_PERIPHERAL_PREF_LATENCY
 config BT_PERIPHERAL_PREF_TIMEOUT
 	default 400
 
+config BT_EXT_ADV_MAX_ADV_SET
+	default 3 if SIDEWALK_DFU
+	default 2
+
+config BT_MAX_CONN
+	default 2 if SIDEWALK_DFU
+	default 1
+
 config NVS_LOOKUP_CACHE_SIZE
     default 256 if NVS
 

samples/sid_end_device/src/hello/app.c

@@ -269,13 +269,9 @@ static void app_btn_dfu_state(uint32_t unused)
 	ARG_UNUSED(unused);
 	static bool go_to_dfu_state = true;
 	if (go_to_dfu_state) {
-		sidewalk_event_send(sidewalk_event_exit, NULL, NULL);
 		sidewalk_event_send(app_event_enter_dfu_mode, NULL, NULL);
-		application_state_working(&global_state_notifier, false);
 	} else {
 		sidewalk_event_send(app_event_exit_dfu_mode, NULL, NULL);
-		sidewalk_event_send(sidewalk_event_autostart, NULL, NULL);
-		application_state_working(&global_state_notifier, true);
 	}
 
 	go_to_dfu_state = !go_to_dfu_state;

samples/sid_end_device/src/sensor_monitoring/app.c

@@ -182,11 +182,9 @@ static void app_btn_dfu_state(uint32_t unused)
 	ARG_UNUSED(unused);
 	static bool go_to_dfu_state = true;
 	if (go_to_dfu_state) {
-		sidewalk_event_send(sidewalk_event_exit, NULL, NULL);
 		sidewalk_event_send(app_event_enter_dfu_mode, NULL, NULL);
 	} else {
 		sidewalk_event_send(app_event_exit_dfu_mode, NULL, NULL);
-		sidewalk_event_send(sidewalk_event_autostart, NULL, NULL);
 	}
 
 	go_to_dfu_state = !go_to_dfu_state;

samples/sid_end_device/sysbuild/ipc_radio/prj.conf

@@ -13,11 +13,14 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=n
-CONFIG_BT_MAX_CONN=1
+CONFIG_BT_MAX_CONN=2
 CONFIG_BT_BUF_ACL_RX_SIZE=502
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 
+CONFIG_BT_CTLR_ADV_SET=3
+CONFIG_BT_CTLR_ADV_EXT=y
+
 # IPC
 CONFIG_IPC_SERVICE=y
 CONFIG_MBOX=y

scripts/ci/license.yml

@@ -41,7 +41,7 @@ licenses:
   - sidewalk.*/subsys/config/common/src/.*(c|h)$
   - sidewalk.*/subsys/hal(/.*)+h$
   - sidewalk.*/subsys/hal/src/memory.c$
-  - sidewalk.*/subsys/sal/common/.*(c|h)$
+  - sidewalk.*/subsys/sal/common/.*/sid_.*(c|h)$
   - sidewalk.*/subsys/semtech/include/semtech_radio_ifc.h$
   - sidewalk.*/tools/.*
   - sidewalk.*/tests/validation/storage_kv/.*(c|h)$

subsys/config/common/src/app_ble_config.c

@@ -105,7 +105,7 @@ static const sid_ble_cfg_gatt_profile_t ble_profile[] = {
 };
 
 static const sid_ble_config_t ble_cfg = {
-	.name = CONFIG_BT_DEVICE_NAME,
+	.name = CONFIG_SIDEWALK_BLE_NAME,
 	.mtu = CONFIG_BT_L2CAP_TX_MTU,
 	.is_adv_available = true,
 	.mac_addr_type = SID_BLE_CFG_MAC_ADDRESS_TYPE_STATIC_RANDOM,

subsys/sal/common/CMakeLists.txt

@@ -9,3 +9,5 @@ zephyr_include_directories(sid_pal_ifc)
 zephyr_include_directories(sid_time_ops)
 
 add_subdirectory_ifdef(CONFIG_SIDEWALK_ON_DEV_CERT sid_on_dev_cert)
+
+zephyr_library_sources(sid_ifc/bt_app_callbacks.c)

subsys/sal/common/sid_ifc/bt_app_callbacks.c

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+#include <bt_app_callbacks.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <stdbool.h>
+#include <zephyr/kernel.h>
+
+static uint32_t bt_enable_count = 0;
+
+int app_bt_enable(bt_ready_cb_t cb)
+{
+	if (bt_enable_count == 0) {
+		int ret = bt_enable(cb);
+		if (ret == 0) {
+			bt_enable_count++;
+		}
+		return ret;
+	}
+
+	bt_enable_count++;
+	if (cb) {
+		cb(0);
+	}
+	return 0;
+}
+
+int app_bt_disable()
+{
+	if (bt_enable_count <= 0) {
+		bt_enable_count = 0;
+		return -EALREADY;
+	}
+	if (bt_enable_count == 1) {
+		bt_enable_count = 0;
+		return bt_disable();
+	} else {
+		bt_enable_count--;
+		return 0;
+	}
+}

subsys/sal/common/sid_ifc/bt_app_callbacks.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef SID_PAL_APP_CALLBACKS_H
+#define SID_PAL_APP_CALLBACKS_H
+
+#include <stdbool.h>
+#include <zephyr/bluetooth/bluetooth.h>
+
+#if defined (CONFIG_BT_APP_IFC)
+
+/**
+ * @brief Wrapper for @bt_enable, with reference tracking.
+ * Real @bt_enable is called only of first call to app_bt_enable
+ * 
+ * @param cb callback passed to @bt_enable
+ * @return int result from @bt_enable call or 0 if called multiple times
+ */
+int app_bt_enable(bt_ready_cb_t cb);
+
+
+/**
+ * @brief Wrapper for @bt_disable.
+ * This function removes internal reference.
+ * If the internal reference counter shows 0, real @bt_disable is called
+ * 
+ * @return int result from @bt_disable or 0 if app_bt_enable has been called more than app_bt_disable
+ */
+int app_bt_disable();
+
+
+/**
+ * @brief BT ids used for extended advertising. 
+ * This allows to identify connections from different extended adverticements.
+ */
+enum BT_id_values{
+        _BT_ID_DEFAULT = BT_ID_DEFAULT,
+        BT_ID_SIDEWALK,
+        #if defined (CONFIG_SIDEWALK_DFU)
+        BT_ID_SMP_DFU,
+        #endif
+        _BT_ID_MAX
+};
+
+BUILD_ASSERT(_BT_ID_MAX <= CONFIG_BT_ID_MAX, "Too many BT Ids! increase CONFIG_BT_ID_MAX, to match _BT_ID_MAX");
+#endif
+#endif

subsys/sal/sid_pal/include/sid_ble_advert.h

@@ -9,6 +9,20 @@
 
 #include <stdint.h>
 
+/**
+ * @brief Initialize Bluetooth Advertising.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int sid_ble_advert_init(void);
+
+/**
+ * @brief Deinitialize Bluetooth Advertising.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int sid_ble_advert_deinit(void);
+
 /**
  * @brief Start Bluetooth advertising.
  *

subsys/sal/sid_pal/src/sid_ble_adapter.c

@@ -24,6 +24,7 @@
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <bt_app_callbacks.h>
 
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/uuid.h>
@@ -213,14 +214,35 @@ static sid_error_t ble_adapter_set_tx_pwr(int8_t tx_power)
 	return SID_ERROR_NONE;
 }
 
+static int create_ble_id(void)
+{
+	int ret;
+	size_t count = 0;
+
+	/* Check if Bluetooth identites weren't already created. */
+	bt_id_get(NULL, &count);
+	if (count > BT_ID_SIDEWALK) {
+		return 0;
+	}
+
+	do {
+		ret = bt_id_create(NULL, NULL);
+		if (ret < 0) {
+			return ret;
+		}
+	} while (ret != BT_ID_SIDEWALK);
+
+	return 0;
+}
+
 static sid_error_t ble_adapter_init(const sid_ble_config_t *cfg)
 {
 	LOG_DBG("Sidewalk -> BLE");
 	ARG_UNUSED(cfg);
 
 	LOG_INF("Enable BT");
 	int err_code;
-	err_code = bt_enable(NULL);
+	err_code = app_bt_enable(NULL);
 	switch (err_code) {
 	case -EALREADY:
 	case 0:
@@ -231,6 +253,18 @@ static sid_error_t ble_adapter_init(const sid_ble_config_t *cfg)
 		return SID_ERROR_GENERIC;
 	}
 
+	err_code = create_ble_id();
+	if (err_code) {
+		LOG_ERR("BT ID init failed (err: %d)", err_code);
+		return SID_ERROR_GENERIC;
+	}
+
+	err_code = sid_ble_advert_init();
+	if (err_code) {
+		LOG_ERR("BT Advertisement failed (err: %d)", err_code);
+		return SID_ERROR_GENERIC;
+	}
+
 	sid_ble_conn_init();
 
 	return SID_ERROR_NONE;
@@ -404,8 +438,10 @@ static sid_error_t ble_adapter_deinit(void)
 {
 	LOG_DBG("Sidewalk -> BLE");
 	sid_ble_conn_deinit();
-
-	int err = bt_disable();
+	sid_ble_advert_deinit();
+	bt_id_delete(BT_ID_SIDEWALK);
+	bt_id_reset(BT_ID_SIDEWALK, NULL, NULL);
+	int err = app_bt_disable();
 
 	if (err) {
 		LOG_ERR("BT disable failed (error %d)", err);