michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Updates to prep to introduce new arch

Browse source 
Missing updates to old architecture implementation towards
introduction of new ULL LLL architecture.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-01-09 21:31:31 +05:30 • committed by Carles Cufí
commit 44d046ff8d
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4822,6 +4822,7 @@ static void mayfly_xtal_retain(u8_t caller_id, u8_t retain)
}
}
#if defined(CONFIG_BT_CONN)
static void prepare_reduced(u32_t status, void *op_context)
{
/* It is acceptable that ticker_update will fail, if ticker is stopped;
@ -4834,6 +4835,7 @@ static void prepare_reduced(u32_t status, void *op_context)
hdr->ticks_xtal_to_start |= XON_BITMASK;
}
}
#endif /* CONFIG_BT_CONN */
static void prepare_normal(u32_t status, void *op_context)
{
@ -4924,18 +4926,20 @@ static inline struct shdr *hdr_conn_get(u8_t ticker_id,
*/
static void mayfly_xtal_stop_calc(void *params)
{
u8_t ticker_id_curr = ((u32_t)params & 0xff);
u32_t volatile ret_cb = TICKER_STATUS_BUSY;
u32_t ticks_to_expire;
u8_t ticker_id_next;
u32_t ticks_current;
u32_t ret;
#if defined(CONFIG_BT_CONN)
u8_t ticker_id_curr = ((u32_t)params & 0xff);
struct connection *conn_curr = NULL;
struct connection *conn_next = NULL;
u32_t ticks_prepare_to_start_next;
struct shdr *hdr_curr = NULL;
struct shdr *hdr_next = NULL;
u32_t ticks_to_expire;
u32_t ticks_slot_abs;
u8_t ticker_id_next;
u32_t ticks_current;
u32_t ret;
ticker_id_next = 0xff;
ticks_to_expire = 0U;
@ -4967,6 +4971,7 @@ static void mayfly_xtal_stop_calc(void *params)
return;
}
#if defined(CONFIG_BT_CONN)
/* Select the current role's scheduling header */
hdr_curr = hdr_conn_get(ticker_id_curr, &conn_curr);
LL_ASSERT(hdr_curr);
@ -5082,6 +5087,7 @@ static void mayfly_xtal_stop_calc(void *params)
}
#endif /* CONFIG_BT_CONN && CONFIG_BT_CTLR_SCHED_ADVANCED */
}
#endif /* CONFIG_BT_CONN */
}
#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
@ -7038,7 +7044,7 @@ static inline u32_t event_conn_upd_prep(struct connection *conn,
event_master_prepare,
#endif
conn, ticker_start_conn_assert,
(void *)(u32_t)ticker_id);
(void *)__LINE__);
LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) ||
(ticker_status == TICKER_STATUS_BUSY));
@ -8967,8 +8973,8 @@ static void tx_packet_set(struct connection *conn, struct pdu_data *pdu_data_tx)
phy = conn->phy_tx;
flags = conn->phy_flags;
#else /* !CONFIG_BT_CTLR_PHY */
phy = 0;
flags = 0;
phy = 0U;
flags = 0U;
#endif /* !CONFIG_BT_CTLR_PHY */
radio_phy_set(phy, flags);