wiced_ -> run_loop_wiced_

This commit is contained in:
Matthias Ringwald 2016-01-06 15:57:30 +01:00
parent 420c236ebc
commit 13a2efaf0f
3 changed files with 25 additions and 25 deletions

View File

@ -156,7 +156,7 @@ static wiced_result_t h4_rx_worker_receive_packet(void * arg){
#endif #endif
// deliver packet on main thread // deliver packet on main thread
wiced_execute_code_on_run_loop(&h4_main_deliver_packet, NULL); run_loop_wiced_execute_code_on_main_thread(&h4_main_deliver_packet, NULL);
return WICED_SUCCESS; return WICED_SUCCESS;
} }
} }
@ -173,7 +173,7 @@ static wiced_result_t h4_tx_worker_send_packet(void * arg){
// blocking send // blocking send
platform_uart_transmit_bytes(wiced_bt_uart_driver, tx_worker_data_buffer, tx_worker_data_size); platform_uart_transmit_bytes(wiced_bt_uart_driver, tx_worker_data_buffer, tx_worker_data_size);
// let stack know // let stack know
wiced_execute_code_on_run_loop(&h4_main_notify_packet_send, NULL); run_loop_wiced_execute_code_on_main_thread(&h4_main_notify_packet_send, NULL);
return WICED_SUCCESS; return WICED_SUCCESS;
} }

View File

@ -64,33 +64,33 @@ static bk_linked_list_t timers;
/** /**
* Add data_source to run_loop * Add data_source to run_loop
*/ */
static void wiced_add_data_source(data_source_t *ds){ static void run_loop_wiced_add_data_source(data_source_t *ds){
log_error("run_loop_add_data_source not supported in run_loop_wiced"); log_error("run_loop_add_data_source not supported in run_loop_wiced");
} }
/** /**
* Remove data_source from run loop * Remove data_source from run loop
*/ */
static int wiced_remove_data_source(data_source_t *ds){ static int run_loop_wiced_remove_data_source(data_source_t *ds){
log_error("run_loop_add_data_source not supported in run_loop_wiced"); log_error("run_loop_add_data_source not supported in run_loop_wiced");
return 0; return 0;
} }
static uint32_t wiced_get_time_ms(void){ static uint32_t run_loop_wiced_get_time_ms(void){
wiced_time_t time; wiced_time_t time;
wiced_time_get_time(&time); wiced_time_get_time(&time);
return time; return time;
} }
// set timer // set timer
static void wiced_set_timer(timer_source_t *ts, uint32_t timeout_in_ms){ static void run_loop_wiced_set_timer(timer_source_t *ts, uint32_t timeout_in_ms){
ts->timeout = wiced_get_time_ms() + timeout_in_ms + 1; ts->timeout = run_loop_wiced_get_time_ms() + timeout_in_ms + 1;
} }
/** /**
* Add timer to run_loop (keep list sorted) * Add timer to run_loop (keep list sorted)
*/ */
static void wiced_add_timer(timer_source_t *ts){ static void run_loop_wiced_add_timer(timer_source_t *ts){
linked_item_t *it; linked_item_t *it;
for (it = (linked_item_t *) &timers; it->next ; it = it->next){ for (it = (linked_item_t *) &timers; it->next ; it = it->next){
// don't add timer that's already in there // don't add timer that's already in there
@ -109,11 +109,11 @@ static void wiced_add_timer(timer_source_t *ts){
/** /**
* Remove timer from run loop * Remove timer from run loop
*/ */
static int wiced_remove_timer(timer_source_t *ts){ static int run_loop_wiced_remove_timer(timer_source_t *ts){
return linked_list_remove(&timers, (linked_item_t *) ts); return linked_list_remove(&timers, (linked_item_t *) ts);
} }
static void wiced_dump_timer(void){ static void run_loop_wiced_dump_timer(void){
#ifdef ENABLE_LOG_INFO #ifdef ENABLE_LOG_INFO
linked_item_t *it; linked_item_t *it;
int i = 0; int i = 0;
@ -125,7 +125,7 @@ static void wiced_dump_timer(void){
} }
// schedules execution similar to wiced_rtos_send_asynchronous_event for worker threads // schedules execution similar to wiced_rtos_send_asynchronous_event for worker threads
void wiced_execute_code_on_run_loop(wiced_result_t (*fn)(void *arg), void * arg){ void run_loop_wiced_execute_code_on_main_thread(wiced_result_t (*fn)(void *arg), void * arg){
function_call_t message; function_call_t message;
message.fn = fn; message.fn = fn;
message.arg = arg; message.arg = arg;
@ -135,13 +135,13 @@ void wiced_execute_code_on_run_loop(wiced_result_t (*fn)(void *arg), void * arg)
/** /**
* Execute run_loop * Execute run_loop
*/ */
static void wiced_execute(void) { static void run_loop_wiced_execute(void) {
while (1) { while (1) {
// get next timeout // get next timeout
uint32_t timeout_ms = WICED_NEVER_TIMEOUT; uint32_t timeout_ms = WICED_NEVER_TIMEOUT;
if (timers) { if (timers) {
timer_source_t * ts = (timer_source_t *) timers; timer_source_t * ts = (timer_source_t *) timers;
uint32_t now = wiced_get_time_ms(); uint32_t now = run_loop_wiced_get_time_ms();
if (ts->timeout < now){ if (ts->timeout < now){
// remove timer before processing it to allow handler to re-register with run loop // remove timer before processing it to allow handler to re-register with run loop
run_loop_remove_timer(ts); run_loop_remove_timer(ts);
@ -163,7 +163,7 @@ static void wiced_execute(void) {
} }
} }
static void wiced_run_loop_init(void){ static void run_loop_wiced_run_loop_init(void){
timers = NULL; timers = NULL;
// queue to receive events: up to 2 calls from transport, up to 3 for app // queue to receive events: up to 2 calls from transport, up to 3 for app
@ -171,13 +171,13 @@ static void wiced_run_loop_init(void){
} }
const run_loop_t run_loop_wiced = { const run_loop_t run_loop_wiced = {
&wiced_run_loop_init, &run_loop_wiced_run_loop_init,
&wiced_add_data_source, &run_loop_wiced_add_data_source,
&wiced_remove_data_source, &run_loop_wiced_remove_data_source,
&wiced_set_timer, &run_loop_wiced_set_timer,
&wiced_add_timer, &run_loop_wiced_add_timer,
&wiced_remove_timer, &run_loop_wiced_remove_timer,
&wiced_execute, &run_loop_wiced_execute,
&wiced_dump_timer, &run_loop_wiced_dump_timer,
&wiced_get_time_ms, &run_loop_wiced_get_time_ms,
}; };

View File

@ -155,9 +155,9 @@ void run_loop_embedded_execute_once(void);
#ifdef HAVE_WICED #ifdef HAVE_WICED
/* /*
* @brief Execute code on BTsatck run loop. Can be used to control BTstack from a different thread * @brief Execute code on BTstack run loop. Can be used to control BTstack from a different thread
*/ */
void wiced_execute_code_on_run_loop(wiced_result_t (*fn)(void *arg), void * arg); void run_loop_wiced_execute_code_on_main_thread(wiced_result_t (*fn)(void *arg), void * arg);
#endif #endif
/* API_END */ /* API_END */