Commit 23f03dcd authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by David Leach
Browse files

samples: Bluetooth: hci_uart hci_ipc configuration update 



Updates to project configuration extras to build with
Zephyr Controller.

Configure for 2 broadcast audio sources in 2 groups,
2 unicast audio source in 1 group and, 2 audio sinks
for 1 group for both broadcast and unicast usecases.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 7f4bfdfd

samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf

+17 −9
Original line number Diff line number Diff line
@@ -5,13 +5,10 @@ CONFIG_ISR_STACK_SIZE=1024 
CONFIG_IDLE_STACK_SIZE=256

CONFIG_MAIN_STACK_SIZE=512

CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512

CONFIG_HEAP_MEM_POOL_SIZE=8192



CONFIG_BT=y

CONFIG_BT_OBSERVER=y

CONFIG_BT_HCI_RAW=y

CONFIG_BT_MAX_CONN=2



# Workaround: Unable to allocate command buffer when using K_NO_WAIT since

# Host number of completed commands does not follow normal flow control.
@@ -24,11 +21,16 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 
CONFIG_BT_BUF_ACL_TX_SIZE=251

CONFIG_BT_BUF_CMD_TX_SIZE=255



# Host features

# Host and Controller common dependencies

CONFIG_BT_BROADCASTER=y

CONFIG_BT_OBSERVER=y

CONFIG_BT_EXT_ADV=y

CONFIG_BT_PER_ADV=y

CONFIG_BT_PER_ADV_SYNC=y

CONFIG_BT_PER_ADV_SYNC_MAX=2

CONFIG_BT_CENTRAL=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_MAX_CONN=2



# Broadcast and Connected ISO

CONFIG_BT_ISO_BROADCASTER=y
@@ -37,7 +39,9 @@ CONFIG_BT_ISO_CENTRAL=n 
CONFIG_BT_ISO_PERIPHERAL=n



# ISO Streams

CONFIG_BT_ISO_MAX_CHAN=2

CONFIG_BT_ISO_MAX_CHAN=4

CONFIG_BT_ISO_TX_BUF_COUNT=1

CONFIG_BT_ISO_RX_BUF_COUNT=1



# Controller

CONFIG_BT_LL_SW_SPLIT=y
@@ -79,21 +83,25 @@ CONFIG_BT_CTLR_ADV_EXT=y 
CONFIG_BT_CTLR_ADV_PERIODIC=y

CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y

CONFIG_BT_CTLR_ADV_ISO=y

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247

CONFIG_BT_CTLR_ADV_ISO_SET=2

CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4

CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247



# ISO Receive Controller

CONFIG_BT_CTLR_ADV_EXT=y

CONFIG_BT_CTLR_SYNC_PERIODIC=y

CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y

CONFIG_BT_CTLR_SYNC_ISO=y

CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251

CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1

CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2

CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2

CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251



# ISO Transmissions

CONFIG_BT_CTLR_ISO_TX_BUFFERS=8

CONFIG_BT_CTLR_ISOAL_SOURCES=4

CONFIG_BT_CTLR_ISO_TX_BUFFERS=12

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255

CONFIG_BT_CTLR_ISOAL_SOURCES=2



# ISO Receptions

CONFIG_BT_CTLR_ISO_RX_BUFFERS=8

samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf

+15 −8
Original line number Diff line number Diff line
@@ -5,12 +5,10 @@ CONFIG_ISR_STACK_SIZE=1024 
CONFIG_IDLE_STACK_SIZE=256

CONFIG_MAIN_STACK_SIZE=512

CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512

CONFIG_HEAP_MEM_POOL_SIZE=8192



CONFIG_BT=y

CONFIG_BT_HCI_RAW=y

CONFIG_BT_MAX_CONN=2



# Workaround: Unable to allocate command buffer when using K_NO_WAIT since

# Host number of completed commands does not follow normal flow control.
@@ -23,12 +21,15 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 
CONFIG_BT_BUF_ACL_TX_SIZE=251

CONFIG_BT_BUF_CMD_TX_SIZE=255



# Host features

# Host and Controller common dependencies

CONFIG_BT_BROADCASTER=y

CONFIG_BT_OBSERVER=y

CONFIG_BT_EXT_ADV=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_CENTRAL=y

CONFIG_BT_PER_ADV=n

CONFIG_BT_PER_ADV_SYNC=n

CONFIG_BT_CENTRAL=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_MAX_CONN=3



# Broadcast and Connected ISO

CONFIG_BT_ISO_BROADCASTER=n
@@ -37,7 +38,9 @@ CONFIG_BT_ISO_CENTRAL=y 
CONFIG_BT_ISO_PERIPHERAL=y



# ISO Streams

CONFIG_BT_ISO_MAX_CHAN=2

CONFIG_BT_ISO_MAX_CHAN=4

CONFIG_BT_ISO_TX_BUF_COUNT=1

CONFIG_BT_ISO_RX_BUF_COUNT=1



# Controller

CONFIG_BT_LL_SW_SPLIT=y
@@ -79,13 +82,17 @@ CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 
# ISO Connection Oriented

CONFIG_BT_CTLR_CENTRAL_ISO=y

CONFIG_BT_CTLR_PERIPHERAL_ISO=y

CONFIG_BT_CTLR_CONN_ISO_STREAMS=2

CONFIG_BT_CTLR_CONN_ISO_GROUPS=1

CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2

CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247

CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251

CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y



# ISO Transmissions

CONFIG_BT_CTLR_ISO_TX_BUFFERS=8

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255

CONFIG_BT_CTLR_ISOAL_SOURCES=2

CONFIG_BT_CTLR_ISO_TX_BUFFERS=12

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255



# ISO Receptions

CONFIG_BT_CTLR_ISO_RX_BUFFERS=8

samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf

+6 −3
Original line number Diff line number Diff line
@@ -5,12 +5,10 @@ CONFIG_ISR_STACK_SIZE=1024 
CONFIG_IDLE_STACK_SIZE=256

CONFIG_MAIN_STACK_SIZE=512

CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512

CONFIG_HEAP_MEM_POOL_SIZE=8192



CONFIG_BT=y

CONFIG_BT_HCI_RAW=y

CONFIG_BT_MAX_CONN=2



# Workaround: Unable to allocate command buffer when using K_NO_WAIT since

# Host number of completed commands does not follow normal flow control.
@@ -23,11 +21,16 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 
CONFIG_BT_BUF_ACL_TX_SIZE=251

CONFIG_BT_BUF_CMD_TX_SIZE=255



# Host features

# Host and Controller common dependencies

CONFIG_BT_BROADCASTER=y

CONFIG_BT_OBSERVER=y

CONFIG_BT_EXT_ADV=y

CONFIG_BT_PER_ADV=y

CONFIG_BT_PER_ADV_SYNC=y

CONFIG_BT_PER_ADV_SYNC_MAX=2

CONFIG_BT_CENTRAL=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_MAX_CONN=2



# Controller

CONFIG_BT_LL_SW_SPLIT=y

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf

+27 −14
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ CONFIG_ISR_STACK_SIZE=1024 
CONFIG_IDLE_STACK_SIZE=256

CONFIG_MAIN_STACK_SIZE=512

CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512

CONFIG_HEAP_MEM_POOL_SIZE=8192

CONFIG_CBPRINTF_REDUCED_INTEGRAL=y
@@ -13,10 +12,7 @@ CONFIG_ISR_TABLES_LOCAL_DECLARATION=y 
CONFIG_LTO=y



CONFIG_BT=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_CENTRAL=y

CONFIG_BT_HCI_RAW=y

CONFIG_BT_MAX_CONN=3



# Workaround: Unable to allocate command buffer when using K_NO_WAIT since

# Host number of completed commands does not follow normal flow control.
@@ -29,11 +25,16 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 
CONFIG_BT_BUF_ACL_TX_SIZE=251

CONFIG_BT_BUF_CMD_TX_SIZE=255



# Host features

# Host and Controller common dependencies

CONFIG_BT_BROADCASTER=y

CONFIG_BT_OBSERVER=y

CONFIG_BT_EXT_ADV=y

CONFIG_BT_PER_ADV=y

CONFIG_BT_PER_ADV_SYNC=y

CONFIG_BT_PER_ADV_SYNC_MAX=2

CONFIG_BT_CENTRAL=y

CONFIG_BT_PERIPHERAL=y

CONFIG_BT_MAX_CONN=3



# Broadcast and Connected ISO

CONFIG_BT_ISO_BROADCASTER=y
@@ -42,7 +43,11 @@ CONFIG_BT_ISO_CENTRAL=y 
CONFIG_BT_ISO_PERIPHERAL=y



# ISO Streams

CONFIG_BT_ISO_TX_MTU=310

CONFIG_BT_ISO_RX_MTU=310

CONFIG_BT_ISO_MAX_CHAN=4

CONFIG_BT_ISO_TX_BUF_COUNT=1

CONFIG_BT_ISO_RX_BUF_COUNT=1



# Controller

CONFIG_BT_LL_SW_SPLIT=y
@@ -71,8 +76,12 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 


# Increase the below to receive interleaved advertising chains

CONFIG_BT_CTLR_SCAN_AUX_SET=1

# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y

# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1



CONFIG_BT_CTLR_ADV_RESERVE_MAX=n

CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX=n

CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n

CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n

CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
@@ -91,38 +100,42 @@ CONFIG_BT_CTLR_ADV_EXT=y 
CONFIG_BT_CTLR_ADV_PERIODIC=y

CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y

CONFIG_BT_CTLR_ADV_ISO=y

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247

CONFIG_BT_CTLR_ADV_ISO_SET=2

CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4

CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2

CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=2

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247



# ISO Receive Controller

CONFIG_BT_CTLR_ADV_EXT=y

CONFIG_BT_CTLR_SYNC_PERIODIC=y

CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y

CONFIG_BT_CTLR_SYNC_ISO=y

CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251

CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1

CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2

CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2

CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251



# ISO Connection Oriented

CONFIG_BT_CTLR_CENTRAL_ISO=y

CONFIG_BT_CTLR_PERIPHERAL_ISO=y

CONFIG_BT_CTLR_CONN_ISO_STREAMS=2

CONFIG_BT_CTLR_CONN_ISO_GROUPS=1

CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2

CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247

CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251

CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y



# ISO Transmissions

CONFIG_BT_ISO_TX_MTU=310

CONFIG_BT_ISO_TX_BUF_COUNT=4

CONFIG_BT_CTLR_ISO_TX_BUFFERS=8

CONFIG_BT_CTLR_ISOAL_SOURCES=4

CONFIG_BT_CTLR_ISO_TX_BUFFERS=12

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255

CONFIG_BT_CTLR_ISOAL_SOURCES=2



# ISO Receptions

CONFIG_BT_ISO_RX_MTU=310

CONFIG_BT_CTLR_ISO_RX_BUFFERS=8

CONFIG_BT_CTLR_ISOAL_SINKS=2

CONFIG_BT_CTLR_ISO_RX_BUFFERS=8



# Tx Power Dynamic Control

CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y



# Ignore HCI ISO data Tx sequence numbers

# CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf

+12 −9
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ CONFIG_ISR_STACK_SIZE=1024 
CONFIG_IDLE_STACK_SIZE=256

CONFIG_MAIN_STACK_SIZE=512

CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512

CONFIG_HEAP_MEM_POOL_SIZE=8192



CONFIG_BT=y
@@ -15,26 +14,30 @@ CONFIG_BT_HCI_RAW=y 
# Host number of completed commands does not follow normal flow control.

CONFIG_BT_BUF_CMD_TX_COUNT=10



# Host

# Host and Controller common dependencies

CONFIG_BT_BROADCASTER=y

CONFIG_BT_PERIPHERAL=n

CONFIG_BT_OBSERVER=n

CONFIG_BT_CENTRAL=n

CONFIG_BT_EXT_ADV=y

CONFIG_BT_PER_ADV=y

CONFIG_BT_ISO_BROADCASTER=y

CONFIG_BT_ISO_MAX_CHAN=2

CONFIG_BT_ISO_MAX_CHAN=4

CONFIG_BT_ISO_TX_BUF_COUNT=1

CONFIG_BT_CENTRAL=n

CONFIG_BT_PERIPHERAL=n



# ISO Broadcast Controller

CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_CTLR_ADV_PERIODIC=y

CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191

CONFIG_BT_CTLR_ADV_ISO=y

CONFIG_BT_CTLR_ISO_TX_BUFFERS=16

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247

CONFIG_BT_CTLR_ADV_ISO_SET=2

CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4

CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2

CONFIG_BT_CTLR_ISOAL_SOURCES=2

CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247

CONFIG_BT_CTLR_ISOAL_SOURCES=4



CONFIG_BT_CTLR_ISO_TX_BUFFERS=12

CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255



CONFIG_BT_CTLR_ADVANCED_FEATURES=y

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n

CRA Git | Maintained and supported by SUSTech CRA and CCSE