michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Make conn cancel and sync cancel impl. consistent

Browse source 
Make the connection cancel and periodic advertising sync
create cancel implementation consistent.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-11-04 05:37:33 +05:30 • committed by Carles Cufí
commit a5b489e2fa
2 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
subsys/bluetooth/controller/ll_sw/ull_master.c
View file

@ -392,25 +392,33 @@ uint8_t ll_connect_disable(void **rx)
status = ull_scan_disable(0, scan);
if (!status) {
struct ll_conn *conn = (void *)HDR_LLL2EVT(conn_lll);
struct node_rx_ftr *ftr;
struct node_rx_pdu *cc;
struct node_rx_pdu *node_rx;
struct node_rx_cc *cc;
memq_link_t *link;
cc = (void *)&conn->llcp_terminate.node_rx;
link = cc->hdr.link;
node_rx = (void *)&conn->llcp_terminate.node_rx;
link = node_rx->hdr.link;
LL_ASSERT(link);
/* free the memq link early, as caller could overwrite it */
ll_rx_link_release(link);
cc->hdr.type = NODE_RX_TYPE_CONNECTION;
cc->hdr.handle = 0xffff;
*((uint8_t *)cc->pdu) = BT_HCI_ERR_UNKNOWN_CONN_ID;
node_rx->hdr.type = NODE_RX_TYPE_CONNECTION;
node_rx->hdr.handle = 0xffff;
ftr = &(cc->hdr.rx_ftr);
ftr->param = &scan->lll;
/* NOTE: struct llcp_terminate.node_rx has uint8_t member
* following the struct node_rx_hdr to store the reason.
*/
cc = (void *)node_rx->pdu;
cc->status = BT_HCI_ERR_UNKNOWN_CONN_ID;
*rx = cc;
/* NOTE: Since NODE_RX_TYPE_CONNECTION is also generated from
* LLL context for other cases, pass LLL context as
* parameter.
*/
node_rx->hdr.rx_ftr.param = &scan->lll;
*rx = node_rx;
}
return status;

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

@ -211,13 +211,21 @@ uint8_t ll_sync_create_cancel(void **rx)
ll_rx_link_release(link_sync_estab);
ll_rx_release(node_rx);
node_rx = (void *)&sync->node_rx_lost.hdr;
node_rx = (void *)&sync->node_rx_lost;
node_rx->hdr.type = NODE_RX_TYPE_SYNC;
node_rx->hdr.handle = 0xffff;
node_rx->hdr.rx_ftr.param = sync;
se = (void *)&sync->node_rx_lost.reason;
/* NOTE: struct node_rx_lost has uint8_t member following the
* struct node_rx_hdr to store the reason.
*/
se = (void *)node_rx->pdu;
se->status = BT_HCI_ERR_OP_CANCELLED_BY_HOST;
/* NOTE: Since NODE_RX_TYPE_SYNC is only generated from ULL context,
* pass ULL context as parameter.
*/
node_rx->hdr.rx_ftr.param = sync;
*rx = node_rx;
return 0;