michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Allow multiple ctrl pkt enqueue

Browse source 
Scale the ctrl pkt enqueue implementation to allow multiple
ctrl packets to be enqueued. This will aid in the graceful
implementation of parallel control procedure collisions.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Chettimada 2017-05-03 10:02:23 +02:00 • committed by Johan Hedberg
commit f19a1a348e
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -6492,6 +6492,21 @@ static struct pdu_data *empty_tx_enqueue(struct connection *conn)
return pdu_data_tx;
}
static void ctrl_tx_enqueue_tail(struct connection *conn,
struct radio_pdu_node_tx *node_tx)
{
struct radio_pdu_node_tx *p;
/* TODO: optimise by having a ctrl_last member. */
p = conn->pkt_tx_ctrl;
while (p->next != conn->pkt_tx_data) {
p = p->next;
}
node_tx->next = p->next;
p->next = node_tx;
}
static void ctrl_tx_enqueue(struct connection *conn,
struct radio_pdu_node_tx *node_tx)
{
@ -6520,16 +6535,12 @@ static void ctrl_tx_enqueue(struct connection *conn,
/* if no ctrl packet already queued, new ctrl added will be
* the ctrl pointer and is inserted after head.
*/
if (conn->pkt_tx_ctrl == 0) {
if (!conn->pkt_tx_ctrl) {
node_tx->next = conn->pkt_tx_head->next;
conn->pkt_tx_head->next = node_tx;
conn->pkt_tx_ctrl = node_tx;
} else {
/* TODO support for more than 2 pending ctrl packets. */
LL_ASSERT(conn->pkt_tx_ctrl->next == conn->pkt_tx_data);
node_tx->next = conn->pkt_tx_ctrl->next;
conn->pkt_tx_ctrl->next = node_tx;
ctrl_tx_enqueue_tail(conn, node_tx);
}
} else {
/* No packet needing ACK. */
@ -6542,11 +6553,7 @@ static void ctrl_tx_enqueue(struct connection *conn,
conn->pkt_tx_head = node_tx;
conn->pkt_tx_ctrl = node_tx;
} else {
/* TODO support for more than 2 pending ctrl packets. */
LL_ASSERT(conn->pkt_tx_ctrl->next == conn->pkt_tx_data);
node_tx->next = conn->pkt_tx_ctrl->next;
conn->pkt_tx_ctrl->next = node_tx;
ctrl_tx_enqueue_tail(conn, node_tx);
}
}