diff --git a/softdevice_controller/include/sdc.h b/softdevice_controller/include/sdc.h index 7263048c47..0c30a14617 100644 --- a/softdevice_controller/include/sdc.h +++ b/softdevice_controller/include/sdc.h @@ -246,7 +246,7 @@ extern "C" { #define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITH_RX (465) #define __MEM_MINIMAL_PERIODIC_ADV_RSP_SET_SIZE_WITHOUT_RX (166) #define __MEM_FOR_PERIODIC_ADV_RSP_FAILURE_REPORTING (224) -#define __MEM_PER_ISO_PDU_POOL(count) ((count) > 0 ? (8 + (count) * 288) : 0) +#define __MEM_PER_ISO_PDU_POOL(count) ((count) > 0 ? (16 + (count) * 288) : 0) /** Memory required per periodic advertising with responses set. * @@ -280,17 +280,18 @@ extern "C" { #define SDC_MEM_PER_BIS(count) ((count) > 0 ? (13 + (count) * 275) : 0) /** @brief Maximum memory required for the ISO RX path PDUs. */ -#define SDC_MEM_ISO_RX_PDU_POOL_SIZE(count) __MEM_PER_ISO_PDU_POOL(count) +#define SDC_MEM_ISO_RX_PDU_POOL_SIZE(count) 0 /** @brief Maximum memory required for the ISO RX PDU pool per stream. * @param[in] rx_pdu_buffer_per_stream_count Number of RX PDU buffers allocated for each BIS or CIS stream. Minimum of 1. * For BIS, this value determines the number of pretransmission that can be stored. * @param[in] cis_count The number of supported CIS streams. * @param[in] bis_sink_count The number of supported sink BIS streams. */ -#define SDC_MEM_ISO_RX_PDU_POOL_PER_STREAM_SIZE(rx_pdu_buffer_per_stream_count, cis_count, bis_sink_count) 0 +#define SDC_MEM_ISO_RX_PDU_POOL_PER_STREAM_SIZE(rx_pdu_buffer_per_stream_count, cis_count, bis_sink_count) \ + (__MEM_PER_ISO_PDU_POOL(rx_pdu_buffer_per_stream_count) * ((cis_count) + (bis_sink_count))) /** @brief Maximum memory required for the ISO RX path SDUs. */ -#define SDC_MEM_ISO_RX_SDU_POOL_SIZE(count) ((count) > 0 ? (0 + (count) * 280) : 0) +#define SDC_MEM_ISO_RX_SDU_POOL_SIZE(count) ((count) > 0 ? (8 + (count) * 272) : 0) /** @brief Maximum memory required for the ISO TX pool. * @param[in] tx_hci_buffer_count Number of HCI ISO TX buffers. @@ -301,7 +302,7 @@ extern "C" { #define SDC_MEM_ISO_TX_POOL_SIZE(tx_hci_buffer_count, tx_pdu_buffer_per_stream_count, cis_count, bis_source_count) \ (((tx_hci_buffer_count) > 0 && (tx_pdu_buffer_per_stream_count) > 0) ? \ (__MEM_PER_ISO_PDU_POOL(tx_hci_buffer_count) \ - + __MEM_PER_ISO_PDU_POOL(((cis_count) + (bis_source_count)) * (tx_pdu_buffer_per_stream_count)) \ + + (__MEM_PER_ISO_PDU_POOL(tx_pdu_buffer_per_stream_count) * ((cis_count) + (bis_source_count))) \ ) : 0) /** @} end of sdc_mem_defines */ diff --git a/softdevice_controller/lib/cortex-m33+nodsp/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/cortex-m33+nodsp/soft-float/libsoftdevice_controller_multirole.a index 6eb0f21913..b714f9fb99 100644 Binary files a/softdevice_controller/lib/cortex-m33+nodsp/soft-float/libsoftdevice_controller_multirole.a and b/softdevice_controller/lib/cortex-m33+nodsp/soft-float/libsoftdevice_controller_multirole.a differ diff --git a/softdevice_controller/lib/cortex-m33+nodsp/soft-float/manifest.yaml b/softdevice_controller/lib/cortex-m33+nodsp/soft-float/manifest.yaml index d06678c8dc..c0a8189bc5 100644 --- a/softdevice_controller/lib/cortex-m33+nodsp/soft-float/manifest.yaml +++ b/softdevice_controller/lib/cortex-m33+nodsp/soft-float/manifest.yaml @@ -1,5 +1,5 @@ description: SoftDevice Controller -git_revision: 0ca35f6bea0aa26eaa113d3429384bf429a115b2 -ll_subversion_number: '0x2128' +git_revision: 64fdd115d609c8b488f1ae5404f3ca6a0ba16a02 +ll_subversion_number: '0x212C' ll_version_number: '0x0D' -timestamp: '2023-11-23T11:48:57Z' +timestamp: '2023-11-27T10:08:13Z' diff --git a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_central.a index 22de05470c..66e5f56629 100644 Binary files a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_central.a and b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_central.a differ diff --git a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_multirole.a index a98995b0e6..6f93ae5341 100644 Binary files a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_multirole.a and b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_multirole.a differ diff --git a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_peripheral.a index 6b14995d6f..d1b009f317 100644 Binary files a/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_peripheral.a and b/softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_peripheral.a differ diff --git a/softdevice_controller/lib/cortex-m4/hard-float/manifest.yaml b/softdevice_controller/lib/cortex-m4/hard-float/manifest.yaml index bf140fb137..5a1b1eec86 100644 --- a/softdevice_controller/lib/cortex-m4/hard-float/manifest.yaml +++ b/softdevice_controller/lib/cortex-m4/hard-float/manifest.yaml @@ -1,5 +1,5 @@ description: SoftDevice Controller -git_revision: 0ca35f6bea0aa26eaa113d3429384bf429a115b2 -ll_subversion_number: '0x1128' +git_revision: 64fdd115d609c8b488f1ae5404f3ca6a0ba16a02 +ll_subversion_number: '0x112C' ll_version_number: '0x0D' -timestamp: '2023-11-23T11:46:24Z' +timestamp: '2023-11-27T10:03:18Z' diff --git a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_central.a index c216720399..4ad976d6f7 100644 Binary files a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_central.a and b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_central.a differ diff --git a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_multirole.a index 1f59fbd171..5c8b8d5de1 100644 Binary files a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_multirole.a and b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_multirole.a differ diff --git a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_peripheral.a index 92f00c91aa..0fddb770a4 100644 Binary files a/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_peripheral.a and b/softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_peripheral.a differ diff --git a/softdevice_controller/lib/cortex-m4/soft-float/manifest.yaml b/softdevice_controller/lib/cortex-m4/soft-float/manifest.yaml index bf140fb137..5a1b1eec86 100644 --- a/softdevice_controller/lib/cortex-m4/soft-float/manifest.yaml +++ b/softdevice_controller/lib/cortex-m4/soft-float/manifest.yaml @@ -1,5 +1,5 @@ description: SoftDevice Controller -git_revision: 0ca35f6bea0aa26eaa113d3429384bf429a115b2 -ll_subversion_number: '0x1128' +git_revision: 64fdd115d609c8b488f1ae5404f3ca6a0ba16a02 +ll_subversion_number: '0x112C' ll_version_number: '0x0D' -timestamp: '2023-11-23T11:46:24Z' +timestamp: '2023-11-27T10:03:18Z' diff --git a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_central.a index e130c12f63..8746081878 100644 Binary files a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_central.a and b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_central.a differ diff --git a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_multirole.a index ffd642011d..3b9d0fa3d0 100644 Binary files a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_multirole.a and b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_multirole.a differ diff --git a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_peripheral.a index c34218891f..1c1ebaa961 100644 Binary files a/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_peripheral.a and b/softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_peripheral.a differ diff --git a/softdevice_controller/lib/cortex-m4/softfp-float/manifest.yaml b/softdevice_controller/lib/cortex-m4/softfp-float/manifest.yaml index bf140fb137..5a1b1eec86 100644 --- a/softdevice_controller/lib/cortex-m4/softfp-float/manifest.yaml +++ b/softdevice_controller/lib/cortex-m4/softfp-float/manifest.yaml @@ -1,5 +1,5 @@ description: SoftDevice Controller -git_revision: 0ca35f6bea0aa26eaa113d3429384bf429a115b2 -ll_subversion_number: '0x1128' +git_revision: 64fdd115d609c8b488f1ae5404f3ca6a0ba16a02 +ll_subversion_number: '0x112C' ll_version_number: '0x0D' -timestamp: '2023-11-23T11:46:24Z' +timestamp: '2023-11-27T10:03:18Z'