Bluetooth: Controller: Fix alignment issues from new integer types
The switch from C99 integer types to u16_t, etc. caused misalignment in structs and function definitions with multi-line parameter lists. Change-Id: I1448b159ab1afe50ff88b7a6bd1b254c44858d4c Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi
Anas Nashif
parent
d1bb961bcf
commit
a6e157b61a
17 changed files with 362 additions and 422 deletions
|
|
@ -8,8 +8,7 @@
|
|||
#ifndef _ECB_H_
|
||||
#define _ECB_H_
|
||||
|
||||
typedef void (*ecb_fp) (u32_t status, u8_t *cipher_be,
|
||||
void *context);
|
||||
typedef void (*ecb_fp) (u32_t status, u8_t *cipher_be, void *context);
|
||||
|
||||
struct ecb {
|
||||
u8_t in_key_be[16];
|
||||
|
|
@ -23,13 +22,10 @@ struct ecb {
|
|||
void *context;
|
||||
};
|
||||
|
||||
void ecb_encrypt_be(u8_t const *const key_be,
|
||||
u8_t const *const clear_text_be,
|
||||
u8_t * const cipher_text_be);
|
||||
void ecb_encrypt(u8_t const *const key_le,
|
||||
u8_t const *const clear_text_le,
|
||||
u8_t * const cipher_text_le,
|
||||
void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
|
||||
u8_t * const cipher_text_be);
|
||||
void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
|
||||
u8_t * const cipher_text_le, u8_t * const cipher_text_be);
|
||||
u32_t ecb_encrypt_nonblocking(struct ecb *ecb);
|
||||
void isr_ecb(void *param);
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,7 @@ static void do_ecb(struct ecb_param *ecb)
|
|||
NRF_ECB->ECBDATAPTR = 0;
|
||||
}
|
||||
|
||||
void ecb_encrypt_be(u8_t const *const key_be,
|
||||
u8_t const *const clear_text_be,
|
||||
void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
|
||||
u8_t * const cipher_text_be)
|
||||
{
|
||||
struct ecb_param ecb;
|
||||
|
|
@ -54,10 +53,8 @@ void ecb_encrypt_be(u8_t const *const key_be,
|
|||
memcpy(cipher_text_be, &ecb.cipher_text[0], sizeof(ecb.cipher_text));
|
||||
}
|
||||
|
||||
void ecb_encrypt(u8_t const *const key_le,
|
||||
u8_t const *const clear_text_le,
|
||||
u8_t * const cipher_text_le,
|
||||
u8_t * const cipher_text_be)
|
||||
void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
|
||||
u8_t * const cipher_text_le, u8_t * const cipher_text_be)
|
||||
{
|
||||
struct ecb_param ecb;
|
||||
|
||||
|
|
@ -162,12 +159,11 @@ static void ecb_cb(u32_t status, u8_t *cipher_be, void *context)
|
|||
|
||||
u32_t ecb_ut(void)
|
||||
{
|
||||
u8_t key[16] = {
|
||||
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00,
|
||||
0x11, 0x22, 0x33, 0x44, 0x55 };
|
||||
u8_t clear_text[16] = {
|
||||
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00,
|
||||
0x11, 0x22, 0x33, 0x44, 0x55 };
|
||||
u8_t key[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
|
||||
0x99, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 };
|
||||
u8_t clear_text[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
|
||||
0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44,
|
||||
0x55 };
|
||||
u8_t cipher_text[16];
|
||||
u32_t status = 0;
|
||||
struct ecb ecb;
|
||||
|
|
|
|||
|
|
@ -261,8 +261,7 @@ u32_t radio_rssi_is_ready(void)
|
|||
return NRF_RADIO->EVENTS_RSSIEND;
|
||||
}
|
||||
|
||||
void radio_filter_configure(u8_t bitmask_enable,
|
||||
u8_t bitmask_addr_type,
|
||||
void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
|
||||
u8_t *bdaddr)
|
||||
{
|
||||
u8_t index;
|
||||
|
|
|
|||
|
|
@ -59,8 +59,7 @@ u32_t radio_rssi_get(void);
|
|||
void radio_rssi_status_reset(void);
|
||||
u32_t radio_rssi_is_ready(void);
|
||||
|
||||
void radio_filter_configure(u8_t bitmask_enable,
|
||||
u8_t bitmask_addr_type,
|
||||
void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
|
||||
u8_t *bdaddr);
|
||||
void radio_filter_disable(void);
|
||||
void radio_filter_status_reset(void);
|
||||
|
|
|
|||
|
|
@ -229,20 +229,18 @@ static void chan_sel_2_ut(void);
|
|||
#endif /* CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */
|
||||
|
||||
static void adv_setup(void);
|
||||
static void event_adv(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
static void event_obs(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
static void event_slave_prepare(u32_t ticks_at_expire,
|
||||
u32_t remainder, u16_t lazy,
|
||||
static void event_adv(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context);
|
||||
static void event_slave(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
static void event_master_prepare(u32_t ticks_at_expire,
|
||||
u32_t remainder, u16_t lazy,
|
||||
static void event_obs(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context);
|
||||
static void event_master(u32_t ticks_at_expire, u32_t remainder,
|
||||
static void event_slave_prepare(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context);
|
||||
static void event_master_prepare(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context);
|
||||
static void rx_packet_set(struct connection *conn,
|
||||
struct pdu_data *pdu_data_rx);
|
||||
static void tx_packet_set(struct connection *conn,
|
||||
|
|
@ -264,8 +262,7 @@ static void ctrl_tx_enqueue(struct connection *conn,
|
|||
static void pdu_node_tx_release(u16_t handle,
|
||||
struct radio_pdu_node_tx *node_tx);
|
||||
static void connection_release(struct connection *conn);
|
||||
static u32_t conn_update(struct connection *conn,
|
||||
struct pdu_data *pdu_data_rx);
|
||||
static u32_t conn_update(struct connection *conn, struct pdu_data *pdu_data_rx);
|
||||
static u32_t is_peer_compatible(struct connection *conn);
|
||||
static u32_t conn_update_req(struct connection *conn);
|
||||
static u32_t chan_map_update(struct connection *conn,
|
||||
|
|
@ -285,18 +282,15 @@ static void version_ind_send(struct connection *conn);
|
|||
static void ping_resp_send(struct connection *conn);
|
||||
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
|
||||
|
||||
static void reject_ind_ext_send(struct connection *conn,
|
||||
u8_t reject_opcode,
|
||||
static void reject_ind_ext_send(struct connection *conn, u8_t reject_opcode,
|
||||
u8_t error_code);
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH)
|
||||
static void length_resp_send(struct connection *conn,
|
||||
u16_t eff_rx_octets,
|
||||
static void length_resp_send(struct connection *conn, u16_t eff_rx_octets,
|
||||
u16_t eff_tx_octets);
|
||||
#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */
|
||||
|
||||
static u32_t role_disable(u8_t ticker_id_primary,
|
||||
u8_t ticker_id_stop);
|
||||
static u32_t role_disable(u8_t ticker_id_primary, u8_t ticker_id_stop);
|
||||
static void rx_fc_lock(u16_t handle);
|
||||
|
||||
/*****************************************************************************
|
||||
|
|
@ -2433,8 +2427,7 @@ static inline u32_t isr_close_adv(void)
|
|||
|
||||
radio_filter_disable();
|
||||
|
||||
pdu_adv =
|
||||
(struct pdu_adv *)
|
||||
pdu_adv = (struct pdu_adv *)
|
||||
&_radio.advertiser.adv_data.data[_radio.advertiser.adv_data.first][0];
|
||||
if ((_radio.state == STATE_CLOSE) &&
|
||||
(pdu_adv->type != PDU_ADV_TYPE_DIRECT_IND)) {
|
||||
|
|
@ -3210,8 +3203,7 @@ static void prepare_normal(u32_t status, void *op_context)
|
|||
}
|
||||
}
|
||||
|
||||
static void prepare_normal_set(struct shdr *hdr,
|
||||
u8_t ticker_user_id,
|
||||
static void prepare_normal_set(struct shdr *hdr, u8_t ticker_user_id,
|
||||
u8_t ticker_id)
|
||||
{
|
||||
if (hdr->ticks_xtal_to_start & ((u32_t)1 << 31)) {
|
||||
|
|
@ -4082,8 +4074,7 @@ static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index)
|
|||
return chan_next;
|
||||
}
|
||||
|
||||
static u8_t chan_sel_1(u8_t *chan_use, u8_t hop,
|
||||
u16_t latency, u8_t *chan_map,
|
||||
static u8_t chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map,
|
||||
u8_t chan_count)
|
||||
{
|
||||
u8_t chan_next;
|
||||
|
|
@ -4147,8 +4138,8 @@ static u16_t chan_prn(u16_t counter, u16_t chan_id)
|
|||
return prn_e;
|
||||
}
|
||||
|
||||
static u8_t chan_sel_2(u16_t counter, u16_t chan_id,
|
||||
u8_t *chan_map, u8_t chan_count)
|
||||
static u8_t chan_sel_2(u16_t counter, u16_t chan_id, u8_t *chan_map,
|
||||
u8_t chan_count)
|
||||
{
|
||||
u8_t chan_next;
|
||||
u16_t prn_e;
|
||||
|
|
@ -4443,8 +4434,8 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder,
|
|||
DEBUG_RADIO_START_A(0);
|
||||
}
|
||||
|
||||
void event_adv_stop(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context)
|
||||
void event_adv_stop(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context)
|
||||
{
|
||||
u32_t ticker_status;
|
||||
struct radio_pdu_node_rx *radio_pdu_node_rx;
|
||||
|
|
@ -4553,8 +4544,8 @@ static void event_obs_prepare(u32_t ticks_at_expire, u32_t remainder,
|
|||
DEBUG_RADIO_PREPARE_O(0);
|
||||
}
|
||||
|
||||
static void event_obs(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context)
|
||||
static void event_obs(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context)
|
||||
{
|
||||
u32_t ticker_status;
|
||||
|
||||
|
|
@ -5843,8 +5834,8 @@ static void event_slave_prepare(u32_t ticks_at_expire, u32_t remainder,
|
|||
DEBUG_RADIO_PREPARE_S(0);
|
||||
}
|
||||
|
||||
static void event_slave(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context)
|
||||
static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context)
|
||||
{
|
||||
u8_t data_chan_use = 0;
|
||||
struct connection *conn;
|
||||
|
|
@ -5973,8 +5964,8 @@ static void event_master_prepare(u32_t ticks_at_expire, u32_t remainder,
|
|||
DEBUG_RADIO_PREPARE_M(0);
|
||||
}
|
||||
|
||||
static void event_master(u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context)
|
||||
static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
|
||||
void *context)
|
||||
{
|
||||
u8_t data_chan_use = 0;
|
||||
struct pdu_data *pdu_data_tx;
|
||||
|
|
@ -6132,8 +6123,7 @@ static void rx_packet_set(struct connection *conn, struct pdu_data *pdu_data_rx)
|
|||
}
|
||||
}
|
||||
|
||||
static void tx_packet_set(struct connection *conn,
|
||||
struct pdu_data *pdu_data_tx)
|
||||
static void tx_packet_set(struct connection *conn, struct pdu_data *pdu_data_tx)
|
||||
{
|
||||
u8_t phy;
|
||||
u16_t max_tx_octets;
|
||||
|
|
@ -6658,8 +6648,7 @@ static void terminate_ind_rx_enqueue(struct connection *conn, u8_t reason)
|
|||
packet_rx_callback();
|
||||
}
|
||||
|
||||
static u32_t conn_update(struct connection *conn,
|
||||
struct pdu_data *pdu_data_rx)
|
||||
static u32_t conn_update(struct connection *conn, struct pdu_data *pdu_data_rx)
|
||||
{
|
||||
if (((pdu_data_rx->payload.llctrl.ctrldata.conn_update_ind.instant -
|
||||
conn->event_counter) & 0xFFFF) > 0x7FFF) {
|
||||
|
|
@ -7236,8 +7225,7 @@ static inline void role_active_disable(u8_t ticker_id_stop,
|
|||
}
|
||||
}
|
||||
|
||||
static u32_t role_disable(u8_t ticker_id_primary,
|
||||
u8_t ticker_id_stop)
|
||||
static u32_t role_disable(u8_t ticker_id_primary, u8_t ticker_id_stop)
|
||||
{
|
||||
u32_t volatile ret_cb = TICKER_STATUS_BUSY;
|
||||
u32_t ticks_active_to_start = 0;
|
||||
|
|
@ -7324,8 +7312,7 @@ role_disable_cleanup:
|
|||
return ret_cb;
|
||||
}
|
||||
|
||||
u32_t radio_adv_enable(u16_t interval, u8_t chl_map,
|
||||
u8_t filter_policy)
|
||||
u32_t radio_adv_enable(u16_t interval, u8_t chl_map, u8_t filter_policy)
|
||||
{
|
||||
u32_t volatile ret_cb = TICKER_STATUS_BUSY;
|
||||
u32_t ticks_slot_offset;
|
||||
|
|
@ -7543,9 +7530,8 @@ u32_t radio_adv_disable(void)
|
|||
return status;
|
||||
}
|
||||
|
||||
u32_t radio_scan_enable(u8_t scan_type, u8_t init_addr_type,
|
||||
u8_t *init_addr, u16_t interval,
|
||||
u16_t window, u8_t filter_policy)
|
||||
u32_t radio_scan_enable(u8_t scan_type, u8_t init_addr_type, u8_t *init_addr,
|
||||
u16_t interval, u16_t window, u8_t filter_policy)
|
||||
{
|
||||
u32_t volatile ret_cb = TICKER_STATUS_BUSY;
|
||||
u32_t ticks_slot_offset;
|
||||
|
|
@ -7652,9 +7638,8 @@ u32_t radio_scan_disable(void)
|
|||
return status;
|
||||
}
|
||||
|
||||
u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr,
|
||||
u16_t interval, u16_t latency,
|
||||
u16_t timeout)
|
||||
u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval,
|
||||
u16_t latency, u16_t timeout)
|
||||
{
|
||||
void *link;
|
||||
struct connection *conn;
|
||||
|
|
@ -7791,9 +7776,8 @@ u32_t ll_connect_disable(void)
|
|||
return status;
|
||||
}
|
||||
|
||||
u32_t ll_conn_update(u16_t handle, u8_t cmd, u8_t status,
|
||||
u16_t interval, u16_t latency,
|
||||
u16_t timeout)
|
||||
u32_t ll_conn_update(u16_t handle, u8_t cmd, u8_t status, u16_t interval,
|
||||
u16_t latency, u16_t timeout)
|
||||
{
|
||||
struct connection *conn;
|
||||
|
||||
|
|
@ -7878,8 +7862,7 @@ u32_t ll_chm_get(u16_t handle, u8_t *chm)
|
|||
return 0;
|
||||
}
|
||||
|
||||
u32_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv,
|
||||
u8_t *ltk)
|
||||
u32_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk)
|
||||
{
|
||||
struct connection *conn;
|
||||
struct radio_pdu_node_tx *node_tx;
|
||||
|
|
@ -8148,8 +8131,7 @@ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last)
|
|||
return cmplt;
|
||||
}
|
||||
|
||||
u8_t radio_rx_get(struct radio_pdu_node_rx **radio_pdu_node_rx,
|
||||
u16_t *handle)
|
||||
u8_t radio_rx_get(struct radio_pdu_node_rx **radio_pdu_node_rx, u16_t *handle)
|
||||
{
|
||||
u8_t cmplt;
|
||||
|
||||
|
|
@ -8316,8 +8298,7 @@ static void rx_fc_lock(u16_t handle)
|
|||
}
|
||||
}
|
||||
|
||||
u8_t do_radio_rx_fc_set(u16_t handle, u8_t req,
|
||||
u8_t ack)
|
||||
u8_t do_radio_rx_fc_set(u16_t handle, u8_t req, u8_t ack)
|
||||
{
|
||||
if (req == ack) {
|
||||
if (_radio.link_rx_head == _radio.link_rx_tail) {
|
||||
|
|
@ -8397,8 +8378,7 @@ void radio_tx_mem_release(struct radio_pdu_node_tx *node_tx)
|
|||
mem_release(node_tx, &_radio.pkt_tx_data_free);
|
||||
}
|
||||
|
||||
static void ticker_op_latency_cancelled(u32_t ticker_status,
|
||||
void *params)
|
||||
static void ticker_op_latency_cancelled(u32_t ticker_status, void *params)
|
||||
{
|
||||
struct connection *conn;
|
||||
|
||||
|
|
@ -8408,8 +8388,7 @@ static void ticker_op_latency_cancelled(u32_t ticker_status,
|
|||
conn->role.slave.latency_cancel = 0;
|
||||
}
|
||||
|
||||
u32_t radio_tx_mem_enqueue(u16_t handle,
|
||||
struct radio_pdu_node_tx *node_tx)
|
||||
u32_t radio_tx_mem_enqueue(u16_t handle, struct radio_pdu_node_tx *node_tx)
|
||||
{
|
||||
u8_t last;
|
||||
struct connection *conn;
|
||||
|
|
|
|||
|
|
@ -405,8 +405,8 @@ void ll_scan_data_set(u8_t len, u8_t const *const data)
|
|||
pdu->tx_addr = _ll_adv_params.tx_addr;
|
||||
pdu->rx_addr = 0;
|
||||
pdu->len = BDADDR_SIZE + len;
|
||||
memcpy(&pdu->payload.scan_rsp.addr[0],
|
||||
&_ll_adv_params.adv_addr[0], BDADDR_SIZE);
|
||||
memcpy(&pdu->payload.scan_rsp.addr[0], &_ll_adv_params.adv_addr[0],
|
||||
BDADDR_SIZE);
|
||||
memcpy(&pdu->payload.scan_rsp.data[0], data, len);
|
||||
pdu->resv = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -130,8 +130,7 @@ static struct ticker_instance _instance[2];
|
|||
/*****************************************************************************
|
||||
* Static Functions
|
||||
****************************************************************************/
|
||||
static u8_t ticker_by_slot_get(struct ticker_node *node,
|
||||
u8_t ticker_id_head,
|
||||
static u8_t ticker_by_slot_get(struct ticker_node *node, u8_t ticker_id_head,
|
||||
u32_t ticks_slot)
|
||||
{
|
||||
while (ticker_id_head != TICKER_NULL) {
|
||||
|
|
@ -157,8 +156,7 @@ static u8_t ticker_by_slot_get(struct ticker_node *node,
|
|||
}
|
||||
|
||||
static void ticker_by_next_slot_get(struct ticker_instance *instance,
|
||||
u8_t *ticker_id_head,
|
||||
u32_t *ticks_current,
|
||||
u8_t *ticker_id_head, u32_t *ticks_current,
|
||||
u32_t *ticks_to_expire)
|
||||
{
|
||||
struct ticker_node *node;
|
||||
|
|
@ -195,8 +193,7 @@ static void ticker_by_next_slot_get(struct ticker_instance *instance,
|
|||
*ticks_to_expire = _ticks_to_expire;
|
||||
}
|
||||
|
||||
static u8_t ticker_enqueue(struct ticker_instance *instance,
|
||||
u8_t id)
|
||||
static u8_t ticker_enqueue(struct ticker_instance *instance, u8_t id)
|
||||
{
|
||||
struct ticker_node *node;
|
||||
struct ticker_node *ticker_new;
|
||||
|
|
@ -269,8 +266,7 @@ static u8_t ticker_enqueue(struct ticker_instance *instance,
|
|||
return id;
|
||||
}
|
||||
|
||||
static u32_t ticker_dequeue(struct ticker_instance *instance,
|
||||
u8_t id)
|
||||
static u32_t ticker_dequeue(struct ticker_instance *instance, u8_t id)
|
||||
{
|
||||
struct ticker_node *ticker_current;
|
||||
struct ticker_node *node;
|
||||
|
|
@ -418,8 +414,7 @@ static inline void ticker_worker(struct ticker_instance *instance)
|
|||
}
|
||||
|
||||
static void prepare_ticks_to_expire(struct ticker_node *ticker,
|
||||
u32_t ticks_current,
|
||||
u32_t ticks_at_start)
|
||||
u32_t ticks_current, u32_t ticks_at_start)
|
||||
{
|
||||
u32_t ticks_to_expire = ticker->ticks_to_expire;
|
||||
u16_t ticks_to_expire_minus = ticker->ticks_to_expire_minus;
|
||||
|
|
@ -545,8 +540,7 @@ static inline void ticker_job_node_update(struct ticker_node *ticker,
|
|||
*insert_head = user_op->id;
|
||||
}
|
||||
|
||||
static inline u8_t ticker_job_list_manage(
|
||||
struct ticker_instance *instance,
|
||||
static inline u8_t ticker_job_list_manage(struct ticker_instance *instance,
|
||||
u32_t ticks_elapsed,
|
||||
u8_t *insert_head)
|
||||
{
|
||||
|
|
@ -778,8 +772,7 @@ static inline void ticker_job_worker_bottom_half(
|
|||
}
|
||||
}
|
||||
|
||||
static inline void ticker_job_list_insert(
|
||||
struct ticker_instance *instance,
|
||||
static inline void ticker_job_list_insert(struct ticker_instance *instance,
|
||||
u8_t insert_head)
|
||||
{
|
||||
struct ticker_node *node;
|
||||
|
|
@ -936,8 +929,7 @@ static inline void ticker_job_list_insert(
|
|||
}
|
||||
}
|
||||
|
||||
static inline void ticker_job_list_inquire(
|
||||
struct ticker_instance *instance)
|
||||
static inline void ticker_job_list_inquire(struct ticker_instance *instance)
|
||||
{
|
||||
struct ticker_user *users;
|
||||
u8_t count_user;
|
||||
|
|
@ -1002,8 +994,7 @@ static inline void ticker_job_list_inquire(
|
|||
}
|
||||
}
|
||||
|
||||
static inline void ticker_job_compare_update(
|
||||
struct ticker_instance *instance,
|
||||
static inline void ticker_job_compare_update(struct ticker_instance *instance,
|
||||
u8_t ticker_id_old_head)
|
||||
{
|
||||
struct ticker_node *ticker;
|
||||
|
|
@ -1218,8 +1209,7 @@ static u8_t ticker_instance1_caller_id_get(u8_t user_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void ticker_instance0_sched(u8_t caller_id, u8_t callee_id,
|
||||
u8_t chain)
|
||||
static void ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain)
|
||||
{
|
||||
/* return value not checked as we allow multiple calls to schedule
|
||||
* before being actually needing the work to complete before new
|
||||
|
|
@ -1345,8 +1335,7 @@ static void ticker_instance0_sched(u8_t caller_id, u8_t callee_id,
|
|||
}
|
||||
}
|
||||
|
||||
static void ticker_instance1_sched(u8_t caller_id, u8_t callee_id,
|
||||
u8_t chain)
|
||||
static void ticker_instance1_sched(u8_t caller_id, u8_t callee_id, u8_t chain)
|
||||
{
|
||||
/* return value not checked as we allow multiple calls to schedule
|
||||
* before being actually needing the work to complete before new
|
||||
|
|
@ -1486,8 +1475,7 @@ static void ticker_instance1_cmp_set(u32_t value)
|
|||
* Public Interface
|
||||
****************************************************************************/
|
||||
u32_t ticker_init(u8_t instance_index, u8_t count_node, void *node,
|
||||
u8_t count_user, void *user, u8_t count_op,
|
||||
void *user_op)
|
||||
u8_t count_user, void *user, u8_t count_op, void *user_op)
|
||||
{
|
||||
struct ticker_instance *instance = &_instance[instance_index];
|
||||
struct ticker_user *users;
|
||||
|
|
@ -1559,11 +1547,9 @@ void ticker_trigger(u8_t instance_index)
|
|||
DEBUG_TICKER_ISR(0);
|
||||
}
|
||||
|
||||
u32_t ticker_start(u8_t instance_index, u8_t user_id,
|
||||
u8_t _ticker_id, u32_t ticks_anchor,
|
||||
u32_t ticks_first, u32_t ticks_periodic,
|
||||
u32_t remainder_periodic, u16_t lazy,
|
||||
u16_t ticks_slot,
|
||||
u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t _ticker_id,
|
||||
u32_t ticks_anchor, u32_t ticks_first, u32_t ticks_periodic,
|
||||
u32_t remainder_periodic, u16_t lazy, u16_t ticks_slot,
|
||||
ticker_timeout_func ticker_timeout_func, void *context,
|
||||
ticker_op_func fp_op_func, void *op_context)
|
||||
{
|
||||
|
|
@ -1605,11 +1591,10 @@ u32_t ticker_start(u8_t instance_index, u8_t user_id,
|
|||
return user_op->status;
|
||||
}
|
||||
|
||||
u32_t ticker_update(u8_t instance_index, u8_t user_id,
|
||||
u8_t _ticker_id, u16_t ticks_drift_plus,
|
||||
u16_t ticks_drift_minus, u16_t ticks_slot_plus,
|
||||
u16_t ticks_slot_minus, u16_t lazy, u8_t force,
|
||||
ticker_op_func fp_op_func, void *op_context)
|
||||
u32_t ticker_update(u8_t instance_index, u8_t user_id, u8_t _ticker_id,
|
||||
u16_t ticks_drift_plus, u16_t ticks_drift_minus,
|
||||
u16_t ticks_slot_plus, u16_t ticks_slot_minus, u16_t lazy,
|
||||
u8_t force, ticker_op_func fp_op_func, void *op_context)
|
||||
{
|
||||
struct ticker_instance *instance = &_instance[instance_index];
|
||||
u8_t last;
|
||||
|
|
@ -1647,9 +1632,8 @@ u32_t ticker_update(u8_t instance_index, u8_t user_id,
|
|||
return user_op->status;
|
||||
}
|
||||
|
||||
u32_t ticker_stop(u8_t instance_index, u8_t user_id,
|
||||
u8_t _ticker_id, ticker_op_func fp_op_func,
|
||||
void *op_context)
|
||||
u32_t ticker_stop(u8_t instance_index, u8_t user_id, u8_t _ticker_id,
|
||||
ticker_op_func fp_op_func, void *op_context)
|
||||
{
|
||||
struct ticker_instance *instance = &_instance[instance_index];
|
||||
u8_t last;
|
||||
|
|
@ -1681,10 +1665,8 @@ u32_t ticker_stop(u8_t instance_index, u8_t user_id,
|
|||
return user_op->status;
|
||||
}
|
||||
|
||||
u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id,
|
||||
u8_t *_ticker_id,
|
||||
u32_t *ticks_current,
|
||||
u32_t *ticks_to_expire,
|
||||
u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id, u8_t *_ticker_id,
|
||||
u32_t *ticks_current, u32_t *ticks_to_expire,
|
||||
ticker_op_func fp_op_func, void *op_context)
|
||||
{
|
||||
struct ticker_instance *instance = &_instance[instance_index];
|
||||
|
|
|
|||
|
|
@ -76,9 +76,8 @@
|
|||
|
||||
/** \brief Timer timeout function type.
|
||||
*/
|
||||
typedef void (*ticker_timeout_func) (u32_t ticks_at_expire,
|
||||
u32_t remainder, u16_t lazy,
|
||||
void *context);
|
||||
typedef void (*ticker_timeout_func) (u32_t ticks_at_expire, u32_t remainder,
|
||||
u16_t lazy, void *context);
|
||||
|
||||
/** \brief Timer operation complete function type.
|
||||
*/
|
||||
|
|
@ -96,27 +95,21 @@ typedef void (*ticker_op_func) (u32_t status, void *op_context);
|
|||
* \param[in] user_op
|
||||
*/
|
||||
u32_t ticker_init(u8_t instance_index, u8_t count_node, void *node,
|
||||
u8_t count_user, void *user, u8_t count_op,
|
||||
void *user_op);
|
||||
u8_t count_user, void *user, u8_t count_op, void *user_op);
|
||||
void ticker_trigger(u8_t instance_index);
|
||||
u32_t ticker_start(u8_t instance_index, u8_t user_id,
|
||||
u8_t ticker_id, u32_t ticks_anchor,
|
||||
u32_t ticks_first, u32_t ticks_periodic,
|
||||
u32_t remainder_periodic, u16_t lazy,
|
||||
u16_t ticks_slot,
|
||||
u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
|
||||
u32_t ticks_anchor, u32_t ticks_first, u32_t ticks_periodic,
|
||||
u32_t remainder_periodic, u16_t lazy, u16_t ticks_slot,
|
||||
ticker_timeout_func ticker_timeout_func, void *context,
|
||||
ticker_op_func fp_op_func, void *op_context);
|
||||
u32_t ticker_update(u8_t instance_index, u8_t user_id,
|
||||
u8_t ticker_id, u16_t ticks_drift_plus,
|
||||
u16_t ticks_drift_minus, u16_t ticks_slot_plus,
|
||||
u16_t ticks_slot_minus, u16_t lazy, u8_t force,
|
||||
u32_t ticker_update(u8_t instance_index, u8_t user_id, u8_t ticker_id,
|
||||
u16_t ticks_drift_plus, u16_t ticks_drift_minus,
|
||||
u16_t ticks_slot_plus, u16_t ticks_slot_minus, u16_t lazy,
|
||||
u8_t force, ticker_op_func fp_op_func, void *op_context);
|
||||
u32_t ticker_stop(u8_t instance_index, u8_t user_id, u8_t ticker_id,
|
||||
ticker_op_func fp_op_func, void *op_context);
|
||||
u32_t ticker_stop(u8_t instance_index, u8_t user_id,
|
||||
u8_t ticker_id, ticker_op_func fp_op_func,
|
||||
void *op_context);
|
||||
u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id,
|
||||
u8_t *ticker_id_head,
|
||||
u32_t *ticks_current,
|
||||
u8_t *ticker_id_head, u32_t *ticks_current,
|
||||
u32_t *ticks_to_expire,
|
||||
ticker_op_func fp_op_func, void *op_context);
|
||||
u32_t ticker_job_idle_get(u8_t instance_index, u8_t user_id,
|
||||
|
|
|
|||
|
|
@ -29,8 +29,7 @@ u32_t mayfly_enqueue(u8_t caller_id, u8_t callee_id, u8_t chain,
|
|||
struct mayfly *m);
|
||||
void mayfly_run(u8_t callee_id);
|
||||
|
||||
extern void mayfly_enable_cb(u8_t caller_id, u8_t callee_id,
|
||||
u8_t enable);
|
||||
extern void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable);
|
||||
extern u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id);
|
||||
extern u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id);
|
||||
extern void mayfly_pend(u8_t caller_id, u8_t callee_id);
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count,
|
|||
/* Store free mem_count after the list's next pointer at an aligned
|
||||
* memory location to ensure atomic read/write (in ARM for now).
|
||||
*/
|
||||
*((u16_t *)MROUND((u8_t *)mem_pool + sizeof(mem_pool))) =
|
||||
mem_count;
|
||||
*((u16_t *)MROUND((u8_t *)mem_pool + sizeof(mem_pool))) = mem_count;
|
||||
|
||||
/* Initialize next pointers to form a free list,
|
||||
* next pointer is stored in the first 32-bit of each block
|
||||
|
|
@ -105,8 +104,7 @@ void *mem_get(void *mem_pool, u16_t mem_size, u16_t index)
|
|||
|
||||
u16_t mem_index_get(void *mem, void *mem_pool, u16_t mem_size)
|
||||
{
|
||||
return ((u16_t)((u8_t *)mem - (u8_t *)mem_pool) /
|
||||
mem_size);
|
||||
return ((u16_t)((u8_t *)mem - (u8_t *)mem_pool) / mem_size);
|
||||
}
|
||||
|
||||
void mem_rcopy(u8_t *dst, u8_t const *src, u16_t len)
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@
|
|||
#define MROUND(x) (((u32_t)(x)+3) & (~((u32_t)3)))
|
||||
#endif
|
||||
|
||||
void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count,
|
||||
void **mem_head);
|
||||
void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count, void **mem_head);
|
||||
void *mem_acquire(void **mem_head);
|
||||
void mem_release(void *mem, void **mem_head);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue