michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix compile error in periodic adv code

Browse source 
Fix copy-paste compile error in the implementation of the
periodic advertising.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-05-04 14:21:40 +05:30 • committed by Carles Cufí
commit 1aa9ca244f
11 changed files with 56 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,17 +17,18 @@ uint8_t ll_addr_set(uint8_t addr_type, uint8_t const *const p_bdaddr);
uint8_t ll_adv_params_set(uint8_t handle, uint16_t evt_prop, uint32_t interval,
uint8_t adv_type, uint8_t own_addr_type,
uint8_t direct_addr_type, uint8_t const *const direct_addr,
uint8_t chan_map, uint8_t filter_policy, uint8_t *tx_pwr,
uint8_t phy_p, uint8_t skip, uint8_t phy_s, uint8_t sid, uint8_t sreq);
uint8_t chan_map, uint8_t filter_policy,
uint8_t *const tx_pwr, uint8_t phy_p, uint8_t skip,
uint8_t phy_s, uint8_t sid, uint8_t sreq);
uint8_t ll_adv_data_set(uint8_t handle, uint8_t len,
uint8_t const *const p_data);
uint8_t ll_adv_scan_rsp_set(uint8_t handle, uint8_t len,
uint8_t const *const p_data);
uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t *addr);
uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t const *const addr);
uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref,
uint8_t len, uint8_t *data);
uint8_t len, uint8_t const *const data);
uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref,
uint8_t len, uint8_t *data);
uint8_t len, uint8_t const *const data);
uint16_t ll_adv_aux_max_data_length_get(void);
uint8_t ll_adv_aux_set_count_get(void);
uint8_t ll_adv_aux_set_remove(uint8_t handle);
@ -35,7 +36,7 @@ uint8_t ll_adv_aux_set_clear(void);
uint8_t ll_adv_sync_param_set(uint8_t handle, uint16_t interval,
uint16_t flags);
uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref,
uint8_t len, uint8_t *data);
uint8_t len, uint8_t const *const data);
uint8_t ll_adv_sync_enable(uint8_t handle, uint8_t enable);
#else /* !CONFIG_BT_CTLR_ADV_EXT */
uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
@ -83,45 +84,48 @@ uint8_t ll_priv_mode_set(bt_addr_le_t *id_addr, uint8_t mode);
#if defined(CONFIG_BT_CTLR_ADV_EXT)
uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
uint8_t filter_policy, uint8_t peer_addr_type,
uint8_t *peer_addr, uint8_t own_addr_type,
uint8_t const *const peer_addr, uint8_t own_addr_type,
uint16_t interval, uint16_t latency, uint16_t timeout,
uint8_t phy);
uint8_t ll_connect_enable(uint8_t is_coded_included);
#else /* !CONFIG_BT_CTLR_ADV_EXT */
uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
uint8_t filter_policy, uint8_t peer_addr_type,
uint8_t *peer_addr, uint8_t own_addr_type,
uint8_t const *const peer_addr, uint8_t own_addr_type,
uint16_t interval, uint16_t latency, uint16_t timeout);
#endif /* !CONFIG_BT_CTLR_ADV_EXT */
uint8_t ll_connect_disable(void **rx);
uint8_t ll_conn_update(uint16_t handle, uint8_t cmd, uint8_t status, uint16_t interval_min,
uint16_t interval_max, uint16_t latency, uint16_t timeout);
uint8_t ll_chm_update(uint8_t *chm);
uint8_t ll_chm_get(uint16_t handle, uint8_t *chm);
uint8_t ll_enc_req_send(uint16_t handle, uint8_t *rand, uint8_t *ediv,
uint8_t *ltk);
uint8_t ll_chm_update(uint8_t const *const chm);
uint8_t ll_chm_get(uint16_t handle, uint8_t *const chm);
uint8_t ll_enc_req_send(uint16_t handle, uint8_t const *const rand,
uint8_t const *const ediv, uint8_t const *const ltk);
uint8_t ll_start_enc_req_send(uint16_t handle, uint8_t err_code,
uint8_t const *const ltk);
uint8_t ll_feature_req_send(uint16_t handle);
uint8_t ll_version_ind_send(uint16_t handle);
uint8_t ll_terminate_ind_send(uint16_t handle, uint8_t reason);
uint8_t ll_rssi_get(uint16_t handle, uint8_t *rssi);
uint8_t ll_rssi_get(uint16_t handle, uint8_t *const rssi);
uint8_t ll_tx_pwr_lvl_get(uint8_t handle_type,
uint16_t handle, uint8_t type, int8_t *tx_pwr_lvl);
void ll_tx_pwr_get(int8_t *min, int8_t *max);
uint16_t handle, uint8_t type, int8_t *const tx_pwr_lvl);
void ll_tx_pwr_get(int8_t *const min, int8_t *const max);
uint8_t ll_tx_pwr_lvl_set(uint8_t handle_type,
uint16_t handle, int8_t *tx_pwr_lvl);
uint16_t handle, int8_t const *const tx_pwr_lvl);
uint8_t ll_apto_get(uint16_t handle, uint16_t *apto);
uint8_t ll_apto_get(uint16_t handle, uint16_t *const apto);
uint8_t ll_apto_set(uint16_t handle, uint16_t apto);
uint32_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time);
void ll_length_default_get(uint16_t *max_tx_octets, uint16_t *max_tx_time);
void ll_length_default_get(uint16_t *const max_tx_octets,
uint16_t *const max_tx_time);
uint32_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time);
void ll_length_max_get(uint16_t *max_tx_octets, uint16_t *max_tx_time,
uint16_t *max_rx_octets, uint16_t *max_rx_time);
void ll_length_max_get(uint16_t *const max_tx_octets,
uint16_t *const max_tx_time,
uint16_t *const max_rx_octets,
uint16_t *const max_rx_time);
uint8_t ll_phy_get(uint16_t handle, uint8_t *tx, uint8_t *rx);
uint8_t ll_phy_get(uint16_t handle, uint8_t *const tx, uint8_t *const rx);
uint8_t ll_phy_default_set(uint8_t tx, uint8_t rx);
uint8_t ll_phy_req_send(uint16_t handle, uint8_t tx, uint8_t flags, uint8_t rx);

2
subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
View file

@ -119,7 +119,7 @@ uint8_t ll_tx_pwr_lvl_get(uint8_t handle_type,
uint8_t ll_tx_pwr_lvl_set(uint8_t handle_type, uint16_t handle,
int8_t *tx_pwr_lvl)
int8_t const *const tx_pwr_lvl)
{
#if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
if (*tx_pwr_lvl == BT_HCI_VS_LL_TX_POWER_LEVEL_NO_PREF) {

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

@ -84,8 +84,9 @@ static struct ticker_ext ll_adv_ticker_ext[BT_CTLR_ADV_SET];
uint8_t ll_adv_params_set(uint8_t handle, uint16_t evt_prop, uint32_t interval,
uint8_t adv_type, uint8_t own_addr_type,
uint8_t direct_addr_type, uint8_t const *const direct_addr,
uint8_t chan_map, uint8_t filter_policy, uint8_t *tx_pwr,
uint8_t phy_p, uint8_t skip, uint8_t phy_s, uint8_t sid, uint8_t sreq)
uint8_t chan_map, uint8_t filter_policy,
uint8_t *const tx_pwr, uint8_t phy_p, uint8_t skip,
uint8_t phy_s, uint8_t sid, uint8_t sreq)
{
uint8_t const pdu_adv_type[] = {PDU_ADV_TYPE_ADV_IND,
PDU_ADV_TYPE_DIRECT_IND,
@ -517,12 +518,13 @@ uint8_t ll_adv_enable(uint8_t enable)
/* AdvA, fill here at enable */
if (h->adv_addr) {
uint8_t *tx_addr =
uint8_t const *tx_addr =
ll_adv_aux_random_addr_get(adv, NULL);
/* TODO: Privacy */
if (pdu_adv->tx_addr && !mem_nz(tx_addr, BDADDR_SIZE)) {
if (pdu_adv->tx_addr &&
!mem_nz((void *)tx_addr, BDADDR_SIZE)) {
return BT_HCI_ERR_INVALID_PARAM;
}
@ -541,13 +543,13 @@ uint8_t ll_adv_enable(uint8_t enable)
ps = (uint8_t *)hs + sizeof(*hs);
if (hs->adv_addr) {
uint8_t *tx_addr =
uint8_t const *tx_addr =
ll_adv_aux_random_addr_get(adv, NULL);
/* TODO: Privacy */
if (pdu_aux->tx_addr &&
!mem_nz(tx_addr, BDADDR_SIZE)) {
!mem_nz((void *)tx_addr, BDADDR_SIZE)) {
return BT_HCI_ERR_INVALID_PARAM;
}
@ -591,7 +593,7 @@ uint8_t ll_adv_enable(uint8_t enable)
#endif /* !CONFIG_BT_CTLR_PRIVACY */
if (!priv) {
uint8_t *tx_addr;
uint8_t const *tx_addr;
#if defined(CONFIG_BT_CTLR_ADV_EXT)
if ((adv->is_created & BIT(1)) && pdu_adv->tx_addr) {
tx_addr = ll_adv_aux_random_addr_get(adv, NULL);
@ -977,12 +979,6 @@ uint8_t ll_adv_enable(uint8_t enable)
sync = (void *)HDR_LLL2EVT(lll_sync);
if (sync->is_enabled && !sync->is_started) {
ret = ull_ticker_status_take(ret,
&ret_cb);
if (ret != TICKER_STATUS_SUCCESS) {
goto failure_cleanup;
}
ull_hdr_init(&sync->ull);
ret = ull_adv_sync_start(sync,

9
subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
View file

@ -51,7 +51,7 @@ static struct ll_adv_aux_set ll_adv_aux_pool[CONFIG_BT_CTLR_ADV_AUX_SET];
static void *adv_aux_free;
#endif /* (CONFIG_BT_CTLR_ADV_AUX_SET > 0) */
uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t *addr)
uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t const *const addr)
{
struct ll_adv_set *adv;
@ -70,7 +70,8 @@ uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t *addr)
return 0;
}
uint8_t *ll_adv_aux_random_addr_get(struct ll_adv_set *adv, uint8_t *addr)
uint8_t const *ll_adv_aux_random_addr_get(struct ll_adv_set const *const adv,
uint8_t *const addr)
{
if (addr) {
memcpy(addr, adv->rnd_addr, BDADDR_SIZE);
@ -81,7 +82,7 @@ uint8_t *ll_adv_aux_random_addr_get(struct ll_adv_set *adv, uint8_t *addr)
#if (CONFIG_BT_CTLR_ADV_AUX_SET > 0)
uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
uint8_t *data)
uint8_t const *const data)
{
struct pdu_adv_com_ext_adv *p, *_p, *s, *_s;
uint8_t pri_len, _pri_len, sec_len, _sec_len;
@ -444,7 +445,7 @@ uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
}
uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
uint8_t *data)
uint8_t const *const data)
{
struct ll_adv_set *adv;
struct pdu_adv *_pri;

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

@ -40,7 +40,8 @@ int ull_adv_aux_init(void);
int ull_adv_aux_reset(void);
/* Helper to read back random address */
uint8_t *ll_adv_aux_random_addr_get(struct ll_adv_set *adv, uint8_t *addr);
uint8_t const *ll_adv_aux_random_addr_get(struct ll_adv_set const *const adv,
uint8_t *const addr);
/* helper function to start auxiliary advertising */
uint32_t ull_adv_aux_start(struct ll_adv_aux_set *aux, uint32_t ticks_anchor,

2
subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
View file

@ -444,7 +444,7 @@ uint8_t ll_adv_sync_param_set(uint8_t handle, uint16_t interval, uint16_t flags)
}
uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref,
uint8_t len, uint8_t *data)
uint8_t len, uint8_t const *const data)
{
/* TODO */
return BT_HCI_ERR_CMD_DISALLOWED;

4
subsys/bluetooth/controller/ll_sw/ull_chan.c
View file

@ -26,14 +26,14 @@ int ull_chan_reset(void)
return 0;
}
uint8_t ull_chan_map_get(uint8_t *chan_map)
uint8_t ull_chan_map_get(uint8_t *const chan_map)
{
memcpy(chan_map, map, sizeof(map));
return count;
}
void ull_chan_map_set(uint8_t *chan_map)
void ull_chan_map_set(uint8_t const *const chan_map)
{
memcpy(map, chan_map, sizeof(map));
count = util_ones_count_get(map, sizeof(map));

4
subsys/bluetooth/controller/ll_sw/ull_chan_internal.h
View file

@ -5,5 +5,5 @@
*/
int ull_chan_reset(void);
uint8_t ull_chan_map_get(uint8_t *chan_map);
void ull_chan_map_set(uint8_t *chan_map);
uint8_t ull_chan_map_get(uint8_t *const chan_map);
void ull_chan_map_set(uint8_t const *const chan_map);

3
subsys/bluetooth/controller/ll_sw/ull_filter.c
View file

@ -613,7 +613,8 @@ void ull_filter_adv_pdu_update(struct ll_adv_set *adv, struct pdu_adv *pdu)
}
#endif /* CONFIG_BT_BROADCASTER */
uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t *id_addr, uint8_t *free)
uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t const *const id_addr,
uint8_t *const free)
{
uint8_t i;

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

@ -9,5 +9,6 @@ void ull_filter_adv_update(uint8_t adv_fp);
void ull_filter_scan_update(uint8_t scan_fp);
void ull_filter_rpa_update(bool timeout);
void ull_filter_adv_pdu_update(struct ll_adv_set *adv, struct pdu_adv *pdu);
uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t *id_addr, uint8_t *free);
uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t const *const id_addr,
uint8_t *const free);
void ull_filter_reset(bool init);

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

@ -56,13 +56,13 @@ static inline void conn_release(struct ll_scan_set *scan);
#if defined(CONFIG_BT_CTLR_ADV_EXT)
uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
uint8_t filter_policy, uint8_t peer_addr_type,
uint8_t *peer_addr, uint8_t own_addr_type,
uint8_t const *const peer_addr, uint8_t own_addr_type,
uint16_t interval, uint16_t latency, uint16_t timeout,
uint8_t phy)
#else /* !CONFIG_BT_CTLR_ADV_EXT */
uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
uint8_t filter_policy, uint8_t peer_addr_type,
uint8_t *peer_addr, uint8_t own_addr_type,
uint8_t const *const peer_addr, uint8_t own_addr_type,
uint16_t interval, uint16_t latency, uint16_t timeout)
#endif /* !CONFIG_BT_CTLR_ADV_EXT */
{
@ -414,7 +414,7 @@ uint8_t ll_connect_disable(void **rx)
return status;
}
uint8_t ll_chm_update(uint8_t *chm)
uint8_t ll_chm_update(uint8_t const *const chm)
{
uint16_t handle;
uint8_t ret;
@ -448,7 +448,8 @@ uint8_t ll_chm_update(uint8_t *chm)
}
#if defined(CONFIG_BT_CTLR_LE_ENC)
uint8_t ll_enc_req_send(uint16_t handle, uint8_t *rand, uint8_t *ediv, uint8_t *ltk)
uint8_t ll_enc_req_send(uint16_t handle, uint8_t const *const rand,
uint8_t const *const ediv, uint8_t const *const ltk)
{
struct ll_conn *conn;
struct node_tx *tx;