From 3bf5079427b3ca6fdb0f906d9065d783be2b08cd Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 1 Mar 2021 06:59:51 -0800 Subject: [PATCH] fix(aysnc): don't set the timer's user data again (#2097) * fix(async): replace all task with timer * fix(aysnc): don't set the timer's user data again since lv_timer_create alreqdy do the same thing --- src/lv_misc/lv_async.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lv_misc/lv_async.c b/src/lv_misc/lv_async.c index 5147fa125..056767f71 100644 --- a/src/lv_misc/lv_async.c +++ b/src/lv_misc/lv_async.c @@ -26,7 +26,7 @@ typedef struct _lv_async_info_t { * STATIC PROTOTYPES **********************/ -static void lv_async_task_cb(lv_timer_t * task); +static void lv_async_timer_cb(lv_timer_t * timer); /********************** * STATIC VARIABLES @@ -48,11 +48,11 @@ lv_res_t lv_async_call(lv_async_cb_t async_xcb, void * user_data) if(info == NULL) return LV_RES_INV; - /* Create a new task */ + /* Create a new timer */ /* Use highest priority so that it will run before a refresh */ - lv_timer_t * task = lv_timer_create(lv_async_task_cb, 0, info); + lv_timer_t * timer = lv_timer_create(lv_async_timer_cb, 0, info); - if(task == NULL) { + if(timer == NULL) { lv_mem_free(info); return LV_RES_INV; } @@ -60,9 +60,7 @@ lv_res_t lv_async_call(lv_async_cb_t async_xcb, void * user_data) info->cb = async_xcb; info->user_data = user_data; - /* Set the task's user data */ - task->user_data = info; - lv_timer_set_repeat_count(task, 1); + lv_timer_set_repeat_count(timer, 1); return LV_RES_OK; } @@ -70,9 +68,9 @@ lv_res_t lv_async_call(lv_async_cb_t async_xcb, void * user_data) * STATIC FUNCTIONS **********************/ -static void lv_async_task_cb(lv_timer_t * task) +static void lv_async_timer_cb(lv_timer_t * timer) { - lv_async_info_t * info = (lv_async_info_t *)task->user_data; + lv_async_info_t * info = (lv_async_info_t *)timer->user_data; info->cb(info->user_data);