Skip to content

Commit 1d1d442

Browse files
ryanjhde-nordic
authored andcommitted
softdevice_controller: rev 6dfb5a0c9ed62b9ff28b865276ee4fce67066156
CHANGELOG.rst contains the list of changes. Signed-off-by: Ryan Chu <[email protected]>
1 parent cf2eef7 commit 1d1d442

16 files changed

+20
-28
lines changed

softdevice_controller/CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Added
2323
* Support for up to 255 addresses in the Filter Accept List (DRGN-18967).
2424
* Support for configuring the Filter Accept List to have an arbitrary size (DRGN-18967).
2525
* Support for sync handles in the :c:func:`sdc_hci_cmd_vs_zephyr_write_tx_power` and :c:func:`sdc_hci_cmd_vs_zephyr_read_tx_power` commands (DRGN-18805).
26+
* Support for reading channel map updates that are not at the beginning of an ACAD (DRGN-19067).
2627

2728
Changes
2829
=======
@@ -46,6 +47,7 @@ Bug fixes
4647
* Fixed an issue where the peripheral would disconnect with DIFFERENT_TRANSACTION_COLLISION when a collision of a connection update and a PHY update occurs even when central asks for no change (DRGN-18840).
4748
* Fixed a rare issue where the controller would assert when multiple instances of the same Bluetooth role were running and one of the instances was being stopped (DRGN-18424).
4849
* Fixed an issue where the SoftDevice Controller would not accept an ``adv_handle`` provided in HCI commands with values above the configured number of advertising sets (DRGN-19058).
50+
* Fixed an issue where the controller could assert while synchronized to a Periodic Advertiser (DRGN-18883).
4951

5052
nRF Connect SDK v2.3.0
5153
**********************

softdevice_controller/include/sdc.h

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ extern "C" {
118118
*/
119119

120120
/** @brief Auxiliary defines, not to be used outside of this file. */
121-
#define __MEM_MINIMAL_CENTRAL_LINK_SIZE 1125
122-
#define __MEM_MINIMAL_PERIPHERAL_LINK_SIZE 1269
121+
#define __MEM_MINIMAL_CENTRAL_LINK_SIZE 1136
122+
#define __MEM_MINIMAL_PERIPHERAL_LINK_SIZE 1280
123123
#define __MEM_TX_BUFFER_OVERHEAD_SIZE 16
124124
#define __MEM_RX_BUFFER_OVERHEAD_SIZE 14
125125

@@ -213,35 +213,25 @@ extern "C" {
213213
/** @brief Auxiliary defines, not to be used outside of this file */
214214
#define __MEM_PER_PERIODIC_ADV_RSP_TX_BUFFER(max_tx_data_size) ((max_tx_data_size) + 5)
215215
#define __MEM_PER_PERIODIC_ADV_RSP_RX_BUFFER (282)
216+
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX (465)
217+
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX (160)
216218
#define __MEM_FOR_PERIODIC_ADV_RSP_FAILURE_REPORTING (224)
217219

218220
/** Memory required per periodic advertising with responses set.
219221
*
222+
* @param[in] max_adv_data The maximum size of data whcih can be sent in chains.
220223
* @param[in] tx_buffer_count The number of buffers for sending data. Minimum of 1.
221224
* @param[in] rx_buffer_count The number of buffers for receiving data.
222-
* @param[in] max_tx_data_size The maximum size of data which can be sent.
225+
* @param[in] max_tx_data_size The maximum size of data which can be sent in subevents.
223226
* @param[in] failure_reporting_enabled Whether failure reporting is enabled.
224227
*/
225-
#ifdef SDC_USE_NEW_MEM_API
226-
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX (465)
227-
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX (160)
228228
#define SDC_MEM_PER_PERIODIC_ADV_RSP_SET(max_adv_data, tx_buffer_count, rx_buffer_count, max_tx_data_size, failure_reporting_enabled) \
229229
(SDC_MEM_PER_PERIODIC_ADV_SET(max_adv_data) \
230230
+ ((rx_buffer_count) > 0 ? __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX : \
231231
__MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX ) \
232232
+ (tx_buffer_count) * __MEM_PER_PERIODIC_ADV_RSP_TX_BUFFER(max_tx_data_size) \
233233
+ (rx_buffer_count) * __MEM_PER_PERIODIC_ADV_RSP_RX_BUFFER \
234234
+ ((failure_reporting_enabled) ? __MEM_FOR_PERIODIC_ADV_RSP_FAILURE_REPORTING : 0))
235-
#else
236-
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX (624)
237-
#define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX (320)
238-
#define SDC_MEM_PER_PERIODIC_ADV_RSP_SET(tx_buffer_count, rx_buffer_count, max_tx_data_size, failure_reporting_enabled) \
239-
(((rx_buffer_count) > 0 ? __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX : \
240-
__MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX ) \
241-
+ (tx_buffer_count) * __MEM_PER_PERIODIC_ADV_RSP_TX_BUFFER(max_tx_data_size) \
242-
+ (rx_buffer_count) * __MEM_PER_PERIODIC_ADV_RSP_RX_BUFFER \
243-
+ ((failure_reporting_enabled) ? __MEM_FOR_PERIODIC_ADV_RSP_FAILURE_REPORTING : 0))
244-
#endif
245235

246236
/** @} end of sdc_mem_defines */
247237

Binary file not shown.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
description: SoftDevice Controller
2-
git_revision: 75b19fe48bbe794deaed28a987cce358f6f5586e
3-
ll_subversion_number: '0x2069'
2+
git_revision: 6dfb5a0c9ed62b9ff28b865276ee4fce67066156
3+
ll_subversion_number: '0x2071'
44
ll_version_number: '0x0D'
5-
timestamp: '2023-05-16T18:38:50Z'
5+
timestamp: '2023-05-24T10:04:30Z'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
description: SoftDevice Controller
2-
git_revision: 75b19fe48bbe794deaed28a987cce358f6f5586e
3-
ll_subversion_number: '0x1069'
2+
git_revision: 6dfb5a0c9ed62b9ff28b865276ee4fce67066156
3+
ll_subversion_number: '0x1071'
44
ll_version_number: '0x0D'
5-
timestamp: '2023-05-16T18:38:45Z'
5+
timestamp: '2023-05-24T10:03:51Z'
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)