michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename ull_tx_ack_put to ll_tx_ack_put

Browse source 
Rename ull_tx_ack_put to ll_tx_ack_put as ack is enqueued
into LL thread context from ULL ISR context.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-02-04 22:33:51 +05:30 • committed by Carles Cufí
commit e85c4d00b6
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -809,6 +809,22 @@ void ll_rx_sched(void)
k_sem_give(sem_recv); k_sem_give(sem_recv);
} }
#if defined(CONFIG_BT_CONN)
void ll_tx_ack_put(u16_t handle, struct node_tx *node_tx)
{
struct lll_tx *tx;
u8_t idx;
idx = MFIFO_ENQUEUE_GET(tx_ack, (void **)&tx);
LL_ASSERT(tx);
tx->handle = handle;
tx->node = node_tx;
MFIFO_ENQUEUE(tx_ack, idx);
}
#endif /* CONFIG_BT_CONN */
void ll_timeslice_ticker_id_get(u8_t * const instance_index, void ll_timeslice_ticker_id_get(u8_t * const instance_index,
u8_t * const user_id) u8_t * const user_id)
{ {
@ -943,22 +959,6 @@ void ull_rx_sched(void)
mayfly_enqueue(TICKER_USER_ID_LLL, TICKER_USER_ID_ULL_HIGH, 1, &mfy); mayfly_enqueue(TICKER_USER_ID_LLL, TICKER_USER_ID_ULL_HIGH, 1, &mfy);
} }
#if defined(CONFIG_BT_CONN)
void ull_tx_ack_put(u16_t handle, struct node_tx *node_tx)
{
struct lll_tx *tx;
u8_t idx;
idx = MFIFO_ENQUEUE_GET(tx_ack, (void **)&tx);
LL_ASSERT(tx);
tx->handle = handle;
tx->node = node_tx;
MFIFO_ENQUEUE(tx_ack, idx);
}
#endif /* CONFIG_BT_CONN */
int ull_prepare_enqueue(lll_is_abort_cb_t is_abort_cb, int ull_prepare_enqueue(lll_is_abort_cb_t is_abort_cb,
lll_abort_cb_t abort_cb, lll_abort_cb_t abort_cb,
struct lll_prepare_param *prepare_param, struct lll_prepare_param *prepare_param,
@ -1249,7 +1249,7 @@ static inline void rx_demux_conn_tx_ack(u8_t ack_last, u16_t handle,
ull_conn_tx_lll_enqueue(conn, 1); ull_conn_tx_lll_enqueue(conn, 1);
} else { } else {
/* Pass through Tx ack */ /* Pass through Tx ack */
ull_tx_ack_put(0xFFFF, node_tx); ll_tx_ack_put(0xFFFF, node_tx);
/* Release link mem */ /* Release link mem */
ull_conn_link_tx_release(link); ull_conn_link_tx_release(link);

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

@ -1126,7 +1126,7 @@ void ull_conn_tx_demux(u8_t count)
struct pdu_data *p = (void *)tx->pdu; struct pdu_data *p = (void *)tx->pdu;
p->ll_id = PDU_DATA_LLID_RESV; p->ll_id = PDU_DATA_LLID_RESV;
ull_tx_ack_put(0xFFFF, tx); ll_tx_ack_put(0xFFFF, tx);
} }
MFIFO_DEQUEUE(conn_tx); MFIFO_DEQUEUE(conn_tx);
@ -1198,7 +1198,7 @@ void ull_conn_tx_ack(struct ll_conn *conn, memq_link_t *link,
} }
} }
ull_tx_ack_put(conn->lll.handle, tx); ll_tx_ack_put(conn->lll.handle, tx);
} }
static int init_reset(void) static int init_reset(void)

2
subsys/bluetooth/controller/ll_sw/ull_internal.h
View file

@ -22,7 +22,7 @@ void *ll_pdu_rx_alloc_peek(u8_t count);
void *ll_pdu_rx_alloc(void); void *ll_pdu_rx_alloc(void);
void ll_rx_put(memq_link_t *link, void *rx); void ll_rx_put(memq_link_t *link, void *rx);
void ll_rx_sched(void); void ll_rx_sched(void);
void ull_tx_ack_put(u16_t handle, struct node_tx *node_tx); void ll_tx_ack_put(u16_t handle, struct node_tx *node_tx);
void ull_ticker_status_give(u32_t status, void *param); void ull_ticker_status_give(u32_t status, void *param);
u32_t ull_ticker_status_take(u32_t ret, u32_t volatile *ret_cb); u32_t ull_ticker_status_take(u32_t ret, u32_t volatile *ret_cb);
void *ull_disable_mark(void *param); void *ull_disable_mark(void *param);