Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MPSL and SoftDevice Controller #1132

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Update MPSL and SoftDevice Controller #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff996d
mpsl: rev bebf5ea2431339a328992d81ddb657b2cf013307
sean-madigan Nov 27, 2023
c4ae444
softdevice_controller: rev 64fdd115d609c8b488f1ae5404f3ca6a0ba16a02
sean-madigan Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified mpsl/fem/common/lib/cortex-m33+nodsp/soft-float/libmpsl_fem_common.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/common/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:49:25Z'
timestamp: '2023-11-27T10:08:37Z'
Binary file modified mpsl/fem/common/lib/cortex-m4/hard-float/libmpsl_fem_common.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/common/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/common/lib/cortex-m4/soft-float/libmpsl_fem_common.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/common/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/common/lib/cortex-m4/softfp-float/libmpsl_fem_common.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/common/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio/lib/cortex-m33+nodsp/soft-float/libmpsl_fem_nrf21540_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:49:25Z'
timestamp: '2023-11-27T10:08:37Z'
Binary file modified mpsl/fem/nrf21540_gpio/lib/cortex-m4/hard-float/libmpsl_fem_nrf21540_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio/lib/cortex-m4/soft-float/libmpsl_fem_nrf21540_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio/lib/cortex-m4/softfp-float/libmpsl_fem_nrf21540_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio_spi/lib/cortex-m33+nodsp/soft-float/libmpsl_fem_nrf21540_gpio_spi.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio_spi/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:49:25Z'
timestamp: '2023-11-27T10:08:37Z'
Binary file modified mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/hard-float/libmpsl_fem_nrf21540_gpio_spi.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/soft-float/libmpsl_fem_nrf21540_gpio_spi.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/softfp-float/libmpsl_fem_nrf21540_gpio_spi.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/nrf21540_gpio_spi/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/simple_gpio/lib/cortex-m33+nodsp/soft-float/libmpsl_fem_simple_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/simple_gpio/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:49:25Z'
timestamp: '2023-11-27T10:08:37Z'
Binary file modified mpsl/fem/simple_gpio/lib/cortex-m4/hard-float/libmpsl_fem_simple_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/simple_gpio/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/simple_gpio/lib/cortex-m4/soft-float/libmpsl_fem_simple_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/simple_gpio/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/fem/simple_gpio/lib/cortex-m4/softfp-float/libmpsl_fem_simple_gpio.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/fem/simple_gpio/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/lib/cortex-m33+nodsp/soft-float/libmpsl.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:49:25Z'
timestamp: '2023-11-27T10:08:37Z'
Binary file modified mpsl/lib/cortex-m4/hard-float/libmpsl.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/lib/cortex-m4/soft-float/libmpsl.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
Binary file modified mpsl/lib/cortex-m4/softfp-float/libmpsl.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mpsl/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: bebf5ea2431339a328992d81ddb657b2cf013307
timestamp: '2023-11-23T11:47:28Z'
timestamp: '2023-11-27T10:04:22Z'
11 changes: 6 additions & 5 deletions softdevice_controller/include/sdc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
Expand All @@ -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 */
Expand Down
Binary file modified softdevice_controller/lib/cortex-m33+nodsp/soft-float/libsoftdevice_controller_multirole.a
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions softdevice_controller/lib/cortex-m33+nodsp/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Binary file modified softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_central.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_multirole.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/hard-float/libsoftdevice_controller_peripheral.a
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions softdevice_controller/lib/cortex-m4/hard-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Binary file modified softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_central.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_multirole.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/soft-float/libsoftdevice_controller_peripheral.a
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions softdevice_controller/lib/cortex-m4/soft-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Binary file modified softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_central.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_multirole.a
View file
Open in desktop
Binary file not shown.
Binary file modified softdevice_controller/lib/cortex-m4/softfp-float/libsoftdevice_controller_peripheral.a
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions softdevice_controller/lib/cortex-m4/softfp-float/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Loading