michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Use define for invalid LLL context handle

Browse source 
Use a define for invalid LLL context handle instead of
0xFFFF magic value.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-08-26 19:44:01 +05:30 • committed by Christopher Friedt
commit 19099fc980
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/bluetooth/controller/ll_sw/lll.h
View file

@ -307,6 +307,9 @@ struct node_rx_iso_meta {
/* Define invalid/unassigned Controller state/role instance handle */ /* Define invalid/unassigned Controller state/role instance handle */
#define NODE_RX_HANDLE_INVALID 0xFFFF #define NODE_RX_HANDLE_INVALID 0xFFFF
/* Define invalid/unassigned Controller LLL context handle */
#define LLL_HANDLE_INVALID 0xFFFF
/* Header of node_rx_pdu */ /* Header of node_rx_pdu */
struct node_rx_hdr { struct node_rx_hdr {
union { union {

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

@ -1199,7 +1199,7 @@ void ull_conn_done(struct node_rx_event_done *done)
lll = &conn->lll; lll = &conn->lll;
/* Skip if connection terminated by local host */ /* Skip if connection terminated by local host */
if (unlikely(lll->handle == 0xFFFF)) { if (unlikely(lll->handle == LLL_HANDLE_INVALID)) {
return; return;
} }
@ -1541,7 +1541,7 @@ void ull_conn_tx_demux(uint8_t count)
struct pdu_data *p = (void *)tx->pdu; struct pdu_data *p = (void *)tx->pdu;
p->ll_id = PDU_DATA_LLID_RESV; p->ll_id = PDU_DATA_LLID_RESV;
ll_tx_ack_put(0xFFFF, tx); ll_tx_ack_put(LLL_HANDLE_INVALID, tx);
} }
#if defined(CONFIG_BT_CTLR_LLID_DATA_START_EMPTY) #if defined(CONFIG_BT_CTLR_LLID_DATA_START_EMPTY)
@ -1657,7 +1657,7 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
LL_ASSERT(pdu_tx->len); LL_ASSERT(pdu_tx->len);
if (pdu_tx->ll_id == PDU_DATA_LLID_CTRL) { if (pdu_tx->ll_id == PDU_DATA_LLID_CTRL) {
if (handle != 0xFFFF) { if (handle != LLL_HANDLE_INVALID) {
struct ll_conn *conn = ll_conn_get(handle); struct ll_conn *conn = ll_conn_get(handle);
ctrl_tx_ack(conn, &tx, pdu_tx); ctrl_tx_ack(conn, &tx, pdu_tx);
@ -1675,10 +1675,10 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
} else { } else {
LL_ASSERT(!link->next); LL_ASSERT(!link->next);
} }
} else if (handle == 0xFFFF) { } else if (handle == LLL_HANDLE_INVALID) {
pdu_tx->ll_id = PDU_DATA_LLID_RESV; pdu_tx->ll_id = PDU_DATA_LLID_RESV;
} else { } else {
LL_ASSERT(handle != 0xFFFF); LL_ASSERT(handle != LLL_HANDLE_INVALID);
} }
ll_tx_ack_put(handle, tx); ll_tx_ack_put(handle, tx);
@ -1982,7 +1982,7 @@ static void conn_cleanup_finalize(struct ll_conn *conn)
(ticker_status == TICKER_STATUS_BUSY)); (ticker_status == TICKER_STATUS_BUSY));
/* Invalidate the connection context */ /* Invalidate the connection context */
lll->handle = 0xFFFF; lll->handle = LLL_HANDLE_INVALID;
/* Demux and flush Tx PDUs that remain enqueued in thread context */ /* Demux and flush Tx PDUs that remain enqueued in thread context */
ull_conn_tx_demux(UINT8_MAX); ull_conn_tx_demux(UINT8_MAX);
@ -2123,7 +2123,7 @@ static void tx_lll_flush(void *param)
idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&lll_tx); idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&lll_tx);
LL_ASSERT(lll_tx); LL_ASSERT(lll_tx);
lll_tx->handle = 0xFFFF; lll_tx->handle = LLL_HANDLE_INVALID;
lll_tx->node = tx; lll_tx->node = tx;
/* TX node UPSTREAM, i.e. Tx node ack path */ /* TX node UPSTREAM, i.e. Tx node ack path */