michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Use actual user_data size

Browse source 
Use actual user_data size not default by 8.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2023-12-06 14:53:42 +08:00 • committed by Carles Cufí
commit 0ddb6aa82e
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/bluetooth/controller/hci/hci.c
View file

@ -4953,7 +4953,8 @@ static void vs_read_tx_power_level(struct net_buf *buf, struct net_buf **evt)
#if defined(CONFIG_BT_HCI_VS_FATAL_ERROR) #if defined(CONFIG_BT_HCI_VS_FATAL_ERROR)
/* A memory pool for vandor specific events for fatal error reporting purposes. */ /* A memory pool for vandor specific events for fatal error reporting purposes. */
NET_BUF_POOL_FIXED_DEFINE(vs_err_tx_pool, 1, BT_BUF_EVT_RX_SIZE, 8, NULL); NET_BUF_POOL_FIXED_DEFINE(vs_err_tx_pool, 1, BT_BUF_EVT_RX_SIZE,
sizeof(struct bt_buf_data), NULL);
/* The alias for convenience of Controller HCI implementation. Controller is build for /* The alias for convenience of Controller HCI implementation. Controller is build for
* a particular architecture hence the alias will allow to avoid conditional compilation. * a particular architecture hence the alias will allow to avoid conditional compilation.

11
subsys/bluetooth/host/buf.c
View file

@ -33,12 +33,13 @@
* Having a dedicated pool for it ensures that exhaustion of the RX pool * Having a dedicated pool for it ensures that exhaustion of the RX pool
* cannot block the delivery of this priority event. * cannot block the delivery of this priority event.
*/ */
NET_BUF_POOL_FIXED_DEFINE(num_complete_pool, 1, NUM_COMLETE_EVENT_SIZE, 8, NULL); NET_BUF_POOL_FIXED_DEFINE(num_complete_pool, 1, NUM_COMLETE_EVENT_SIZE,
sizeof(struct bt_buf_data), NULL);
#endif /* CONFIG_BT_CONN || CONFIG_BT_ISO */ #endif /* CONFIG_BT_CONN || CONFIG_BT_ISO */
NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT, NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT,
BT_BUF_EVT_SIZE(CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE), 8, BT_BUF_EVT_SIZE(CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE),
NULL); sizeof(struct bt_buf_data), NULL);
#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_BUF_ACL_RX_COUNT, NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_BUF_ACL_RX_COUNT,
@ -46,11 +47,11 @@ NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_BUF_ACL_RX_COUNT,
sizeof(struct acl_data), bt_hci_host_num_completed_packets); sizeof(struct acl_data), bt_hci_host_num_completed_packets);
NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT, NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT,
BT_BUF_EVT_RX_SIZE, 8, BT_BUF_EVT_RX_SIZE, sizeof(struct bt_buf_data),
NULL); NULL);
#else #else
NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
BT_BUF_RX_SIZE, 8, BT_BUF_RX_SIZE, sizeof(struct bt_buf_data),
NULL); NULL);
#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */ #endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */

2
subsys/bluetooth/host/hci_core.c
View file

@ -130,7 +130,7 @@ void bt_hci_cmd_state_set_init(struct net_buf *buf,
*/ */
#define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE) #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
CMD_BUF_SIZE, 8, NULL); CMD_BUF_SIZE, sizeof(struct bt_buf_data), NULL);
struct event_handler { struct event_handler {
uint8_t event; uint8_t event;

11
subsys/bluetooth/host/hci_raw.c
View file

@ -41,14 +41,17 @@ static uint8_t raw_mode;
#endif #endif
NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
BT_BUF_RX_SIZE, 8, NULL); BT_BUF_RX_SIZE, sizeof(struct bt_buf_data), NULL);
NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE), 8, NULL); BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE),
sizeof(struct bt_buf_data), NULL);
NET_BUF_POOL_FIXED_DEFINE(hci_acl_pool, CONFIG_BT_BUF_ACL_TX_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_acl_pool, CONFIG_BT_BUF_ACL_TX_COUNT,
BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_TX_SIZE), 8, NULL); BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_TX_SIZE),
sizeof(struct bt_buf_data), NULL);
#if defined(CONFIG_BT_ISO) #if defined(CONFIG_BT_ISO)
NET_BUF_POOL_FIXED_DEFINE(hci_iso_pool, CONFIG_BT_ISO_TX_BUF_COUNT, NET_BUF_POOL_FIXED_DEFINE(hci_iso_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),
sizeof(struct bt_buf_data), NULL);
#endif /* CONFIG_BT_ISO */ #endif /* CONFIG_BT_ISO */
struct bt_dev_raw bt_dev; struct bt_dev_raw bt_dev;

2
subsys/bluetooth/host/hfp_hf.c
View file

@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(bt_hfp_hf);
struct bt_hfp_hf_cb *bt_hf; struct bt_hfp_hf_cb *bt_hf;
NET_BUF_POOL_FIXED_DEFINE(hf_pool, CONFIG_BT_MAX_CONN + 1, NET_BUF_POOL_FIXED_DEFINE(hf_pool, CONFIG_BT_MAX_CONN + 1,
BT_RFCOMM_BUF_SIZE(BT_HF_CLIENT_MAX_PDU), 8, NULL); BT_RFCOMM_BUF_SIZE(BT_HF_CLIENT_MAX_PDU), 0, NULL);
static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BT_MAX_CONN]; static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BT_MAX_CONN];

3
subsys/bluetooth/host/iso.c
View file

@ -36,7 +36,8 @@ LOG_MODULE_REGISTER(bt_iso);
#if defined(CONFIG_BT_ISO_UNICAST) || defined(CONFIG_BT_ISO_SYNC_RECEIVER) #if defined(CONFIG_BT_ISO_UNICAST) || defined(CONFIG_BT_ISO_SYNC_RECEIVER)
NET_BUF_POOL_FIXED_DEFINE(iso_rx_pool, CONFIG_BT_ISO_RX_BUF_COUNT, NET_BUF_POOL_FIXED_DEFINE(iso_rx_pool, CONFIG_BT_ISO_RX_BUF_COUNT,
BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU), 8, NULL); BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU),
sizeof(struct iso_data), NULL);
static struct bt_iso_recv_info iso_info_data[CONFIG_BT_ISO_RX_BUF_COUNT]; static struct bt_iso_recv_info iso_info_data[CONFIG_BT_ISO_RX_BUF_COUNT];
#define iso_info(buf) (&iso_info_data[net_buf_id(buf)]) #define iso_info(buf) (&iso_info_data[net_buf_id(buf)])

2
subsys/bluetooth/shell/rfcomm.c
View file

@ -33,7 +33,7 @@
#define DATA_MTU 48 #define DATA_MTU 48
NET_BUF_POOL_FIXED_DEFINE(pool, 1, DATA_MTU, 8, NULL); NET_BUF_POOL_FIXED_DEFINE(pool, 1, DATA_MTU, 0, NULL);
static struct bt_sdp_attribute spp_attrs[] = { static struct bt_sdp_attribute spp_attrs[] = {
BT_SDP_NEW_SERVICE, BT_SDP_NEW_SERVICE,