Bluetooth: Use CONFIG_BT_CONN_TX_USER_DATA_SIZE
Replace hardcoded value `8` with `CONFIG_BT_CONN_TX_USER_DATA_SIZE`, that is `8` but is going to change. Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
This commit is contained in:
parent
3fe9aaa0f1
commit
535e003a00
12 changed files with 22 additions and 19 deletions
|
@ -2561,7 +2561,7 @@ static int cmd_init(const struct shell *sh, size_t argc, char *argv[])
|
|||
|
||||
#if defined(CONFIG_BT_AUDIO_TX)
|
||||
#define DATA_MTU CONFIG_BT_ISO_TX_MTU
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_pool, 1, DATA_MTU, 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_pool, 1, DATA_MTU, CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static int cmd_send(const struct shell *sh, size_t argc, char *argv[])
|
||||
{
|
||||
|
|
|
@ -447,9 +447,10 @@ int bt_conn_send_cb(struct bt_conn *conn, struct net_buf *buf,
|
|||
user_data);
|
||||
|
||||
if (buf->user_data_size < CONFIG_BT_CONN_TX_USER_DATA_SIZE) {
|
||||
LOG_ERR("not enough room in user_data %d < %d",
|
||||
LOG_ERR("not enough room in user_data %d < %d pool %u",
|
||||
buf->user_data_size,
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE);
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE,
|
||||
buf->pool_id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ NET_BUF_POOL_FIXED_DEFINE(disc_pool, 1,
|
|||
BT_L2CAP_BUF_SIZE(
|
||||
sizeof(struct bt_l2cap_sig_hdr) +
|
||||
sizeof(struct bt_l2cap_disconn_req)),
|
||||
8, NULL);
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
#define l2cap_lookup_ident(conn, ident) __l2cap_lookup_ident(conn, ident, false)
|
||||
#define l2cap_remove_ident(conn, ident) __l2cap_lookup_ident(conn, ident, true)
|
||||
|
|
|
@ -70,8 +70,8 @@ static uint8_t num_services;
|
|||
static struct bt_sdp bt_sdp_pool[CONFIG_BT_MAX_CONN];
|
||||
|
||||
/* Pool for outgoing SDP packets */
|
||||
NET_BUF_POOL_FIXED_DEFINE(sdp_pool, CONFIG_BT_MAX_CONN,
|
||||
BT_L2CAP_BUF_SIZE(SDP_MTU), 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(sdp_pool, CONFIG_BT_MAX_CONN, BT_L2CAP_BUF_SIZE(SDP_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
#define SDP_CLIENT_CHAN(_ch) CONTAINER_OF(_ch, struct bt_sdp_client, chan.chan)
|
||||
|
||||
|
|
|
@ -33,10 +33,9 @@ LOG_MODULE_REGISTER(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
|
|||
*/
|
||||
#define BT_GATT_OTS_L2CAP_PSM 0x0025
|
||||
|
||||
|
||||
NET_BUF_POOL_FIXED_DEFINE(ot_chan_tx_pool, 1,
|
||||
BT_L2CAP_SDU_BUF_SIZE(CONFIG_BT_OTS_L2CAP_CHAN_TX_MTU), 8,
|
||||
NULL);
|
||||
BT_L2CAP_SDU_BUF_SIZE(CONFIG_BT_OTS_L2CAP_CHAN_TX_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
#if (CONFIG_BT_OTS_L2CAP_CHAN_RX_MTU > BT_L2CAP_SDU_RX_MTU)
|
||||
NET_BUF_POOL_FIXED_DEFINE(ot_chan_rx_pool, 1, CONFIG_BT_OTS_L2CAP_CHAN_RX_MTU, 8,
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
#define L2CAP_POLICY_ALLOWLIST 0x01
|
||||
#define L2CAP_POLICY_16BYTE_KEY 0x02
|
||||
|
||||
NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1,
|
||||
BT_L2CAP_SDU_BUF_SIZE(DATA_MTU), 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1, BT_L2CAP_SDU_BUF_SIZE(DATA_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(data_rx_pool, 1, DATA_MTU, 8, NULL);
|
||||
|
||||
static uint8_t l2cap_policy;
|
||||
|
|
|
@ -23,7 +23,7 @@ CREATE_FLAG(flag_l2cap_connected);
|
|||
#define L2CAP_MTU (2 * SDU_LEN)
|
||||
|
||||
/* Only one SDU transmitted or received at a time */
|
||||
NET_BUF_POOL_DEFINE(sdu_pool, 1, L2CAP_MTU, 8, NULL);
|
||||
NET_BUF_POOL_DEFINE(sdu_pool, 1, L2CAP_MTU, CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static uint8_t tx_data[SDU_LEN];
|
||||
static uint16_t rx_cnt;
|
||||
|
|
|
@ -21,7 +21,7 @@ CREATE_FLAG(flag_l2cap_connected);
|
|||
#define L2CAP_MTU (2 * SDU_LEN)
|
||||
|
||||
/* Only one SDU transmitted or received at a time */
|
||||
NET_BUF_POOL_DEFINE(sdu_pool, 1, L2CAP_MTU, 8, NULL);
|
||||
NET_BUF_POOL_DEFINE(sdu_pool, 1, L2CAP_MTU, CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static uint8_t tx_data[SDU_LEN];
|
||||
static uint16_t rx_cnt;
|
||||
|
|
|
@ -33,8 +33,10 @@ static const struct bt_data ad[] = {
|
|||
#define SHORT_MSG_CHAN_IDX 1
|
||||
|
||||
NET_BUF_POOL_FIXED_DEFINE(rx_data_pool, L2CAP_CHANNELS, BT_L2CAP_BUF_SIZE(DATA_BUF_SIZE), 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_data_pool_0, 1, BT_L2CAP_BUF_SIZE(DATA_MTU), 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_data_pool_1, 1, BT_L2CAP_BUF_SIZE(DATA_MTU), 8, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_data_pool_0, 1, BT_L2CAP_BUF_SIZE(DATA_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_data_pool_1, 1, BT_L2CAP_BUF_SIZE(DATA_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static struct bt_l2cap_server servers[SERVERS];
|
||||
void send_sdu_chan_worker(struct k_work *item);
|
||||
|
|
|
@ -22,7 +22,7 @@ CREATE_FLAG(data_received);
|
|||
#define DATA_BYTE_VAL 0xBB
|
||||
|
||||
/* L2CAP channel buffer pool */
|
||||
NET_BUF_POOL_DEFINE(buf_pool, 1, BT_L2CAP_SDU_BUF_SIZE(16), 8, NULL);
|
||||
NET_BUF_POOL_DEFINE(buf_pool, 1, BT_L2CAP_SDU_BUF_SIZE(16), CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static void chan_connected_cb(struct bt_l2cap_chan *l2cap_chan)
|
||||
{
|
||||
|
|
|
@ -26,12 +26,12 @@ CREATE_FLAG(flag_l2cap_connected);
|
|||
/* Only one SDU per link will be transmitted at a time */
|
||||
NET_BUF_POOL_DEFINE(sdu_tx_pool,
|
||||
CONFIG_BT_MAX_CONN, BT_L2CAP_SDU_BUF_SIZE(SDU_LEN),
|
||||
8, NULL);
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
NET_BUF_POOL_DEFINE(segment_pool,
|
||||
/* MTU + 4 l2cap hdr + 4 ACL hdr */
|
||||
NUM_SEGMENTS, BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_TX_MTU),
|
||||
8, NULL);
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
/* Only one SDU per link will be received at a time */
|
||||
NET_BUF_POOL_DEFINE(sdu_rx_pool,
|
||||
|
|
|
@ -106,7 +106,8 @@ static bt_addr_le_t peer_addr;
|
|||
|
||||
#define BUF_ALLOC_TIMEOUT (50) /* milliseconds */
|
||||
NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
|
||||
BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU), 8, NULL);
|
||||
BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
|
||||
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
|
||||
|
||||
static bool data_cb(struct bt_data *data, void *user_data)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue