michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix Rx and Tx buffer sizes

Browse source 
Fix incorrectly defined Rx and Tx buffer sizes. Wrong
calculation allocated more memory than necessary.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-05-01 17:12:27 +05:30 • committed by Alberto Escolar
commit 06ddc2bbec
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -145,16 +145,12 @@ static struct {
static MFIFO_DEFINE(pdu_rx_free, sizeof(void *), PDU_RX_CNT); static MFIFO_DEFINE(pdu_rx_free, sizeof(void *), PDU_RX_CNT);
static MFIFO_DEFINE(ll_pdu_rx_free, sizeof(void *), LL_PDU_RX_CNT); static MFIFO_DEFINE(ll_pdu_rx_free, sizeof(void *), LL_PDU_RX_CNT);
#if defined(CONFIG_BT_RX_BUF_LEN)
#define PDU_RX_OCTETS_MAX (CONFIG_BT_RX_BUF_LEN - 11)
#endif
#define NODE_RX_HEADER_SIZE (offsetof(struct node_rx_pdu, pdu)) #define NODE_RX_HEADER_SIZE (offsetof(struct node_rx_pdu, pdu))
#define NODE_RX_FOOTER_SIZE (sizeof(struct node_rx_ftr)) #define NODE_RX_FOOTER_SIZE (sizeof(struct node_rx_ftr))
#define NODE_RX_STRUCT_OVERHEAD (NODE_RX_HEADER_SIZE + NODE_RX_FOOTER_SIZE) #define NODE_RX_STRUCT_OVERHEAD (NODE_RX_HEADER_SIZE + NODE_RX_FOOTER_SIZE)
#define PDU_ADVERTIZE_SIZE (PDU_AC_SIZE_MAX + PDU_AC_SIZE_EXTRA) #define PDU_ADVERTIZE_SIZE (PDU_AC_SIZE_MAX + PDU_AC_SIZE_EXTRA)
#define PDU_DATA_SIZE (PDU_DC_LL_HEADER_SIZE + PDU_RX_OCTETS_MAX) #define PDU_DATA_SIZE (PDU_DC_LL_HEADER_SIZE + LL_LENGTH_OCTETS_RX_MAX)
#define PDU_RX_NODE_POOL_ELEMENT_SIZE \ #define PDU_RX_NODE_POOL_ELEMENT_SIZE \
MROUND( \ MROUND( \

5
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -95,10 +95,9 @@ static void ticker_op_cb(u32_t status, void *params);
CONFIG_BT_CTLR_TX_BUFFER_SIZE) CONFIG_BT_CTLR_TX_BUFFER_SIZE)
#define CONN_TX_CTRL_BUFFERS 2 #define CONN_TX_CTRL_BUFFERS 2
#define CONN_TX_CTRL_BUF_SIZE (MROUND(offsetof(struct node_tx, pdu) + \ #define CONN_TX_CTRL_BUF_SIZE MROUND(offsetof(struct node_tx, pdu) + \
offsetof(struct pdu_data, llctrl) + \ offsetof(struct pdu_data, llctrl) + \
sizeof(struct pdu_data_llctrl)) * \ sizeof(struct pdu_data_llctrl))
CONN_TX_CTRL_BUFFERS)
static MFIFO_DEFINE(conn_tx, sizeof(struct lll_tx), CONFIG_BT_CTLR_TX_BUFFERS); static MFIFO_DEFINE(conn_tx, sizeof(struct lll_tx), CONFIG_BT_CTLR_TX_BUFFERS);
static MFIFO_DEFINE(conn_ack, sizeof(struct lll_tx), CONFIG_BT_CTLR_TX_BUFFERS); static MFIFO_DEFINE(conn_ack, sizeof(struct lll_tx), CONFIG_BT_CTLR_TX_BUFFERS);