michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Use proper handle in advertising events

Browse source 
If handle mapping is enabled, we need to use proper advertising set
handle in HCI event.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
This commit is contained in:
Andrzej Kaczmarek 2020-11-05 13:12:23 +01:00 • committed by Anas Nashif
commit 85adca4be3
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5144,7 +5144,7 @@ static void le_adv_ext_terminate(struct pdu_data *pdu_data,
sep = meta_evt(buf, BT_HCI_EVT_LE_ADV_SET_TERMINATED, sizeof(*sep)); sep = meta_evt(buf, BT_HCI_EVT_LE_ADV_SET_TERMINATED, sizeof(*sep));
sep->status = node_rx->hdr.rx_ftr.param_adv_term.status; sep->status = node_rx->hdr.rx_ftr.param_adv_term.status;
sep->adv_handle = node_rx->hdr.handle & 0xff; sep->adv_handle = ll_adv_set_hci_handle_get(node_rx->hdr.handle & 0xff);
sep->conn_handle = sep->conn_handle =
sys_cpu_to_le16(node_rx->hdr.rx_ftr.param_adv_term.conn_handle); sys_cpu_to_le16(node_rx->hdr.rx_ftr.param_adv_term.conn_handle);
sep->num_completed_ext_adv_evts = sep->num_completed_ext_adv_evts =
@ -5171,7 +5171,7 @@ static void le_scan_req_received(struct pdu_data *pdu_data,
uint8_t handle; uint8_t handle;
int8_t rssi; int8_t rssi;
handle = node_rx->hdr.handle & 0xff; handle = ll_adv_set_hci_handle_get(node_rx->hdr.handle & 0xff);
addr.type = adv->tx_addr; addr.type = adv->tx_addr;
memcpy(&addr.a.val[0], &adv->scan_req.scan_addr[0], memcpy(&addr.a.val[0], &adv->scan_req.scan_addr[0],
sizeof(bt_addr_t)); sizeof(bt_addr_t));
@ -5186,7 +5186,7 @@ static void le_scan_req_received(struct pdu_data *pdu_data,
} }
sep = meta_evt(buf, BT_HCI_EVT_LE_SCAN_REQ_RECEIVED, sizeof(*sep)); sep = meta_evt(buf, BT_HCI_EVT_LE_SCAN_REQ_RECEIVED, sizeof(*sep));
sep->handle = node_rx->hdr.handle & 0xff; sep->handle = ll_adv_set_hci_handle_get(node_rx->hdr.handle & 0xff);
sep->addr.type = adv->tx_addr; sep->addr.type = adv->tx_addr;
memcpy(&sep->addr.a.val[0], &adv->scan_req.scan_addr[0], memcpy(&sep->addr.a.val[0], &adv->scan_req.scan_addr[0],
sizeof(bt_addr_t)); sizeof(bt_addr_t));

7
subsys/bluetooth/controller/include/ll.h
View file

@ -21,6 +21,7 @@ uint8_t ll_addr_set(uint8_t addr_type, uint8_t const *const p_bdaddr);
uint8_t ll_adv_set_by_hci_handle_get(uint8_t hci_handle, uint8_t *handle); uint8_t ll_adv_set_by_hci_handle_get(uint8_t hci_handle, uint8_t *handle);
uint8_t ll_adv_set_by_hci_handle_get_or_new(uint8_t hci_handle, uint8_t ll_adv_set_by_hci_handle_get_or_new(uint8_t hci_handle,
uint8_t *handle); uint8_t *handle);
uint8_t ll_adv_set_hci_handle_get(uint8_t handle);
uint8_t ll_adv_iso_by_hci_handle_get(uint8_t hci_handle, uint8_t *handle); uint8_t ll_adv_iso_by_hci_handle_get(uint8_t hci_handle, uint8_t *handle);
uint8_t ll_adv_iso_by_hci_handle_new(uint8_t hci_handle, uint8_t *handle); uint8_t ll_adv_iso_by_hci_handle_new(uint8_t hci_handle, uint8_t *handle);
#else #else
@ -37,6 +38,12 @@ static inline uint8_t ll_adv_set_by_hci_handle_get_or_new(uint8_t hci_handle,
*handle = hci_handle; *handle = hci_handle;
return 0; return 0;
} }
static inline uint8_t ll_adv_set_hci_handle_get(uint8_t handle)
{
return handle;
}
static inline uint8_t ll_adv_iso_by_hci_handle_get(uint8_t hci_handle, static inline uint8_t ll_adv_iso_by_hci_handle_get(uint8_t hci_handle,
uint8_t *handle) uint8_t *handle)
{ {

10
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -160,6 +160,16 @@ uint8_t ll_adv_set_by_hci_handle_get_or_new(uint8_t hci_handle, uint8_t *handle)
return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED; return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
} }
uint8_t ll_adv_set_hci_handle_get(uint8_t handle)
{
struct ll_adv_set *adv;
adv = ull_adv_set_get(handle);
LL_ASSERT(adv && adv->is_created);
return adv->hci_handle;
}
#endif #endif
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)