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

bluetooth: host: downstream bluetooth/buf.h API change #19412

Merged
merged 3 commits into from
Jan 7, 2025
Merged

bluetooth: host: downstream bluetooth/buf.h API change #19412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa5aa6b
manifest: Update sdk-zephyr revision
PavelVPV Dec 11, 2024
34913ec
samples: Remove BT_BUF_ACL_RX_COUNT
PavelVPV Dec 11, 2024
dc92ed9
manifest: Update sidewalk revision
PavelVPV Dec 12, 2024
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
4 changes: 0 additions & 4 deletions applications/matter_bridge/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ config BT_SCAN
config BT_MAX_CONN
default 10

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
config BT_BUF_ACL_RX_COUNT
default 11

config BT_SCAN_FILTER_ENABLE
default y

Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time.
CONFIG_BT_MAX_CONN=10

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
CONFIG_BT_BUF_ACL_RX_COUNT=11

# Set buffer sizes in a consistent way with the ones used by the network core.
#id if oncomment it there is an error that rx buffer is out of range (minimal value is 69)
CONFIG_BT_BUF_ACL_RX_SIZE=69
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/overlay-bt_max_connections_app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller.
CONFIG_BT_MAX_CONN=20

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
CONFIG_BT_BUF_ACL_RX_COUNT=21

# Set buffer sizes in a consistent way with the ones used by the network core.
CONFIG_BT_BUF_ACL_RX_SIZE=84
CONFIG_BT_BUF_ACL_TX_SIZE=84
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time.
CONFIG_BT_MAX_CONN=10

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
CONFIG_BT_BUF_ACL_RX_COUNT=11

# Decrease stack and buffer sizes to free some RAM and support 10 BLE connections
CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller
CONFIG_BT_MAX_CONN=20

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
CONFIG_BT_BUF_ACL_RX_COUNT=21

# Decrease stack and buffer sizes to free some RAM and support 20 BLE connections
CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/sysbuild/ipc_radio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
CONFIG_BT_CTLR_PHY_2M=n

# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN.
CONFIG_BT_BUF_ACL_RX_COUNT=11

# Debug and assert configuration
CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
Expand Down
1 change: 0 additions & 1 deletion samples/bluetooth/peripheral_with_multiple_identities/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
CONFIG_BT_EXT_ADV_MAX_ADV_SET=20
CONFIG_BT_MAX_CONN=20
CONFIG_BT_ID_MAX=20
CONFIG_BT_BUF_ACL_RX_COUNT=21
1 change: 0 additions & 1 deletion samples/bluetooth/scanning_while_connecting/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ CONFIG_BT_CTLR_FAL_SIZE=255
CONFIG_LOG=y

CONFIG_BT_MAX_CONN=16
CONFIG_BT_BUF_ACL_RX_COUNT=17
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: ba1d06f7241c1a899b43bdef7b731fa244646a2f
revision: 7f8d857bf1f57b07e832d52263beaa23c91fef24
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -206,7 +206,7 @@ manifest:
compare-by-default: false
- name: sidewalk
repo-path: sdk-sidewalk
revision: 1a811c356150a4ccc58d644d110524c33342e3a1
revision: f274ce8ab97d1504de4c6b372bb98d4dc41bacc5
groups:
- sidewalk
- name: find-my
Expand Down
Loading