sdh: simplifications and improvements

applications/firmware_loader/ble_mcumgr/src/main.c

@@ -126,7 +126,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 	};
 }
 
-NRF_SDH_BLE_OBSERVER(sdh_ble, on_ble_evt, NULL, 0);
+NRF_SDH_BLE_OBSERVER(sdh_ble, on_ble_evt, NULL, USER_LOW);
 
 /**
  * @brief BLE advertising event handler

doc/nrf-bm/libraries/bluetooth/services/ble_cgms.rst

@@ -25,7 +25,6 @@ Set the :kconfig:option:`CONFIG_BLE_CGMS` Kconfig option to enable the service.
 
 The CGMS service can be configured by using the following Kconfig options:
 
-* :kconfig:option:`CONFIG_BLE_CGMS_BLE_OBSERVER_PRIO` - Sets the observer priority of the CGMS instance.
 * :kconfig:option:`CONFIG_BLE_CGMS_DB_RECORDS_MAX` - Sets the maximum number of records that can be stored in the database.
 
 Initialization

doc/nrf-bm/libraries/nrf_sdh.rst

@@ -0,0 +1,6 @@
+.. _lib_nrf_sdh:
+
+SoftDevice handler
+##################
+
+The SoftDevice handler is a library that handles SoftDevice initialization tasks, and pulls and dispatches the SoftDevice events to registered components.

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -32,8 +32,27 @@ S145 SoftDevice
 SoftDevice Handler
 ==================
 
-* Added the :kconfig:option:`NRF_SDH_CLOCK_HFINT_CALIBRATION_INTERVAL` Kconfig option to control the HFINT calibration interval.
-* Added the :kconfig:option:`NRF_SDH_CLOCK_HFCLK_LATENCY` Kconfig option to inform the SoftDevice about the ramp-up time of the high-frequency crystal oscillator.
+* Added:
+
+  * The :kconfig:option:`NRF_SDH_CLOCK_HFINT_CALIBRATION_INTERVAL` Kconfig option to control the HFINT calibration interval.
+  * The :kconfig:option:`NRF_SDH_CLOCK_HFCLK_LATENCY` Kconfig option to inform the SoftDevice about the ramp-up time of the high-frequency crystal oscillator.
+  * The :kconfig:option:`CONFIG_NRF_SDH_SOC_RAND_SEED` Kconfig option to control whether to automatically respond to SoftDevice random seed requests.
+  * Priority levels for SoftDevice event observers: HIGHEST, HIGH, USER, USER_LOW, LOWEST.
+  * The :c:func:`nrf_sdh_ble_evt_to_str` function to stringify a BLE event.
+  * The :c:func:`nrf_sdh_soc_evt_to_str` function to stringify a SoC event.
+
+* Changed:
+
+  * The return type of the :c:type:`nrf_sdh_state_evt_handler_t` event handler to ``int``.
+
+* Removed:
+
+  * The ``NRF_SDH_STATE_REQ_OBSERVER`` macro and relative data types.
+    Register a state event observer and return non-zero to :c:enum:`NRF_SDH_STATE_EVT_ENABLE_PREPARE`
+    or :c:enum:`NRF_SDH_STATE_EVT_DISABLE_PREPARE` to abort state changes instead.
+  * The ``nrf_sdh_ble_app_ram_start_get`` function, use ``DT_REG_ADDR(DT_CHOSEN(zephyr_sram))`` instead.
+  * The ``nrf_sdh_request_continue`` function.
+  * The ``nrf_sdh_is_enabled`` function, use the SoftDevice native function :c:func:`sd_softdevice_is_enabled` instead.
 
 Boards
 ======

include/bm/bluetooth/ble_adv.h

@@ -27,18 +27,12 @@
 extern "C" {
 #endif
 
-/**
- * @brief Advertising module BLE event observer priority.
- */
-#define BLE_ADV_BLE_OBSERVER_PRIO 0
-
 /**
  * @brief Declare an instance of a BLE advertising library.
  */
 #define BLE_ADV_DEF(instance)                                                                      \
 	static struct ble_adv instance;                                                            \
-	NRF_SDH_BLE_OBSERVER(ble_adv_##instance, ble_adv_on_ble_evt, &instance,                    \
-			     BLE_ADV_BLE_OBSERVER_PRIO)
+	NRF_SDH_BLE_OBSERVER(ble_adv_##instance, ble_adv_on_ble_evt, &instance, HIGH)
 
 /**
  * @brief Advertising modes.

include/bm/bluetooth/ble_gq.h

@@ -75,7 +75,7 @@ extern "C" {
 		.data_pool = &CONCAT(_name, _heap),                                                \
 	};                                                                                         \
 	NRF_SDH_BLE_OBSERVER(CONCAT(_name, _obs), ble_gq_on_ble_evt, (void *)&_name,               \
-			     CONFIG_BLE_GQ_OBSERVER_PRIO)
+			     HIGH)
 
 /**
  * @brief Helper macro for initializing connection handle array. Used in @ref BLE_GQ_CUSTOM_DEF.

include/bm/bluetooth/ble_qwr.h

@@ -41,7 +41,7 @@ extern "C" {
 	NRF_SDH_BLE_OBSERVER(_name ## _obs,                                                        \
 			     ble_qwr_on_ble_evt,                                                   \
 			     &_name,                                                               \
-			     CONFIG_BLE_QWR_BLE_OBSERVER_PRIO)
+			     HIGH)
 
 /* Error code used by the module to reject prepare write requests on non-registered attributes. */
 #define BLE_QWR_REJ_REQUEST_ERR_CODE BLE_GATT_STATUS_ATTERR_APP_BEGIN + 0

include/bm/bluetooth/services/ble_bas.h

@@ -29,7 +29,7 @@ extern "C" {
 #define BLE_BAS_DEF(_name)                                                                         \
 	static struct ble_bas _name;                                                               \
 	extern void ble_bas_on_ble_evt(const ble_evt_t *ble_evt, void *ctx);                       \
-	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_bas_on_ble_evt, &_name, 0)
+	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_bas_on_ble_evt, &_name, HIGH)
 
 /**
  * @brief Battery service event types.

include/bm/bluetooth/services/ble_cgms.h

@@ -17,14 +17,6 @@
  *          of the sensor. Session Run Time and Session Start Time can be used to convey timing
  *          information between the sensor and the collector. The Specific Ops Control Point
  *          is used to stop and start monitoring sessions, among other things.
- *
- * @note    The application must register this module as BLE event observer using the
- *          NRF_SDH_BLE_OBSERVER macro. Example:
- *          @code
- *              struct ble_cgms instance;
- *              NRF_SDH_BLE_OBSERVER(anything, BLE_CGMS_BLE_OBSERVER_PRIO,
- *                                   ble_cgms_on_ble_evt, &instance);
- *          @endcode
  */
 
 #ifndef BLE_CGMS_H__
@@ -51,7 +43,7 @@ extern "C" {
 	static struct ble_cgms _name;                                                              \
 	NRF_SDH_BLE_OBSERVER(_name ## _obs,                                                        \
 			     ble_cgms_on_ble_evt, &_name,                                          \
-			     CONFIG_BLE_CGMS_BLE_OBSERVER_PRIO)
+			     HIGH)
 
 #define OPCODE_LENGTH 1
 #define HANDLE_LENGTH 2

include/bm/bluetooth/services/ble_hids.h

@@ -41,7 +41,7 @@ extern "C" {
 					sizeof(uint32_t) * BYTES_TO_WORDS(BLE_HIDS_LINK_CTX_SIZE), \
 			},                                                                         \
 	};                                                                                         \
-	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hids_on_ble_evt, &_name, 0)
+	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hids_on_ble_evt, &_name, HIGH)
 
 /**
  * @brief HID boot keyboard input report maximum size, in bytes.

include/bm/bluetooth/services/ble_hrs.h

@@ -30,7 +30,7 @@ extern "C" {
 #define BLE_HRS_DEF(_name)                                                                         \
 	static struct ble_hrs _name;                                                               \
 	extern void ble_hrs_on_ble_evt(const ble_evt_t *ble_evt, void *ctx);                       \
-	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hrs_on_ble_evt, &_name, 0)
+	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hrs_on_ble_evt, &_name, HIGH)
 
 /**
  * @defgroup BLE_HRS_BODY_SENSOR_LOCATION HRS Body sensor location

include/bm/bluetooth/services/ble_lbs.h

@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#define BLE_LBS_BLE_OBSERVER_PRIO 2
-
 #define BLE_UUID_LBS_BASE	{ 0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,                  \
 				  0xDE, 0xEF, 0x12, 0x12, 0x00, 0x00, 0x00, 0x00 }
 #define BLE_UUID_LBS_SERVICE	 0x1523
@@ -39,7 +37,7 @@ struct ble_lbs;
 #define BLE_LBS_DEF(_name)                                                                         \
 	static struct ble_lbs _name;                                                               \
 	extern void ble_lbs_on_ble_evt(const ble_evt_t *ble_evt, void *lbs_instance);              \
-	NRF_SDH_BLE_OBSERVER(_name ## _obs, ble_lbs_on_ble_evt, &_name, BLE_LBS_BLE_OBSERVER_PRIO)
+	NRF_SDH_BLE_OBSERVER(_name ## _obs, ble_lbs_on_ble_evt, &_name, HIGH)
 
 enum ble_lbs_evt_type {
 	BLE_LBS_EVT_LED_WRITE,

include/bm/bluetooth/services/ble_nus.h

@@ -48,7 +48,7 @@ void ble_nus_on_ble_evt(ble_evt_t const *ble_evt, void *context);
 	NRF_SDH_BLE_OBSERVER(_name ## _obs,                                                        \
 			     ble_nus_on_ble_evt,                                                   \
 			     &_name,                                                               \
-			     0)
+			     HIGH)
 
 #define OPCODE_LENGTH 1
 #define HANDLE_LENGTH 2