Skip to content

Commit 4161db7

Browse files
cvinayakfabiobaltieri
authored andcommitted
Bluetooth: Controller: Rename to BT_CTLR_ISO_TX_PDU_BUFFERS
Rename the internal BT_CTLR_ISO_TX_BUFFERS to BT_CTLR_ISO_TX_PDU_BUFFERS correct represent the number of actual ISO PDU buffers allocated in the Controller. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
1 parent ee82667 commit 4161db7

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

subsys/bluetooth/controller/ll_sw/ull.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ static void *mark_update;
544544
#endif /* CONFIG_BT_CONN */
545545

546546
static MFIFO_DEFINE(tx_ack, sizeof(struct lll_tx),
547-
BT_CTLR_TX_BUFFERS + BT_CTLR_ISO_TX_BUFFERS);
547+
BT_CTLR_TX_BUFFERS + BT_CTLR_ISO_TX_PDU_BUFFERS);
548548
#endif /* CONFIG_BT_CONN || CONFIG_BT_CTLR_ADV_ISO */
549549

550550
static void *mark_disable;

subsys/bluetooth/controller/ll_sw/ull_iso.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ void ll_iso_tx_mem_release(void *node_tx);
156156

157157
static struct {
158158
void *free;
159-
uint8_t pool[NODE_TX_BUFFER_SIZE * BT_CTLR_ISO_TX_BUFFERS];
159+
uint8_t pool[NODE_TX_BUFFER_SIZE * BT_CTLR_ISO_TX_PDU_BUFFERS];
160160
} mem_iso_tx;
161161

162162
static struct {
163163
void *free;
164-
uint8_t pool[sizeof(memq_link_t) * BT_CTLR_ISO_TX_BUFFERS];
164+
uint8_t pool[sizeof(memq_link_t) * BT_CTLR_ISO_TX_PDU_BUFFERS];
165165
} mem_link_iso_tx;
166166

167167
#endif /* CONFIG_BT_CTLR_ADV_ISO || CONFIG_BT_CTLR_CONN_ISO */
@@ -1960,12 +1960,12 @@ static int init_reset(void)
19601960

19611961
#if defined(CONFIG_BT_CTLR_ADV_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
19621962
/* Initialize tx pool. */
1963-
mem_init(mem_iso_tx.pool, NODE_TX_BUFFER_SIZE, BT_CTLR_ISO_TX_BUFFERS,
1963+
mem_init(mem_iso_tx.pool, NODE_TX_BUFFER_SIZE, BT_CTLR_ISO_TX_PDU_BUFFERS,
19641964
&mem_iso_tx.free);
19651965

19661966
/* Initialize tx link pool. */
1967-
mem_init(mem_link_iso_tx.pool, sizeof(memq_link_t),
1968-
BT_CTLR_ISO_TX_BUFFERS, &mem_link_iso_tx.free);
1967+
mem_init(mem_link_iso_tx.pool, sizeof(memq_link_t), BT_CTLR_ISO_TX_PDU_BUFFERS,
1968+
&mem_link_iso_tx.free);
19691969
#endif /* CONFIG_BT_CTLR_ADV_ISO || CONFIG_BT_CTLR_CONN_ISO */
19701970

19711971
#if BT_CTLR_ISO_STREAMS

subsys/bluetooth/controller/ll_sw/ull_iso_internal.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
* fragmentation.
1111
*/
1212
#if defined(CONFIG_BT_CTLR_CONN_ISO)
13-
#define BT_CTLR_ISO_TX_BUFFERS (((CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX + \
14-
CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX - 1U) / \
15-
CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX) * \
16-
CONFIG_BT_CTLR_ISO_TX_BUFFERS)
13+
#define BT_CTLR_ISO_TX_PDU_BUFFERS (((CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX + \
14+
CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX - 1U) / \
15+
CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX) * \
16+
CONFIG_BT_CTLR_ISO_TX_BUFFERS)
1717
#else /* !CONFIG_BT_CTLR_CONN_ISO */
18-
#define BT_CTLR_ISO_TX_BUFFERS CONFIG_BT_CTLR_ISO_TX_BUFFERS
18+
#define BT_CTLR_ISO_TX_PDU_BUFFERS CONFIG_BT_CTLR_ISO_TX_BUFFERS
1919
#endif /* !CONFIG_BT_CTLR_CONN_ISO */
2020
#else /* !CONFIG_BT_CTLR_ADV_ISO && !CONFIG_BT_CTLR_CONN_ISO */
21-
#define BT_CTLR_ISO_TX_BUFFERS 0
21+
#define BT_CTLR_ISO_TX_PDU_BUFFERS 0
2222
#endif /* !CONFIG_BT_CTLR_ADV_ISO && !CONFIG_BT_CTLR_CONN_ISO */
2323

2424
int ull_iso_init(void);

0 commit comments

Comments
 (0)