update(osal): rename ticks to timeout_ms

Signed-off-by: sakumisu <[email protected]>

5 files changed, 12 insertions, 12 deletions

diff --git a/common/usb_osal.h b/common/usb_osal.h
index f6489f10..324d3ae3 100644
--- a/common/usb_osal.h
+++ b/common/usb_osal.h
@@ -33,7 +33,7 @@ struct usb_osal_timer {
     usb_timer_handler_t handler;
     void *argument;
     bool is_period;
-    uint32_t ticks;
+    uint32_t timeout_ms;
     void *timer;
 };
 
diff --git a/osal/usb_osal_liteos_m.c b/osal/usb_osal_liteos_m.c
index e65f5496..6f29fa0c 100644
--- a/osal/usb_osal_liteos_m.c
+++ b/osal/usb_osal_liteos_m.c
@@ -129,7 +129,7 @@ usb_osal_mutex_t usb_osal_mutex_create(void)
 {
     UINT32 mux_handle;
     UINT32 ret;
-    
+
     ret = LOS_MuxCreate(&mux_handle);
     if (ret != LOS_OK) {
         USB_LOG_ERR("Create mux failed code[%u]\r\n", ret);
@@ -144,7 +144,7 @@ void usb_osal_mutex_delete(usb_osal_mutex_t mutex)
     UINT32 mux_handle = (UINT32)mutex;
     UINT32 ret;
 
-    ret = LOS_MuxDelete(mux_handle); 
+    ret = LOS_MuxDelete(mux_handle);
     if (ret != LOS_OK) {
         USB_LOG_ERR("Delete mux handle[%u] failed code[%u]\r\n",\
                 mux_handle, ret);
@@ -263,7 +263,7 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     timer_handle->handler = handler;
     timer_handle->argument = argument;
     timer_handle->is_period = is_period;
-    timer_handle->ticks = timeout_ms;
+    timer_handle->timeout_ms = timeout_ms;
     timer_handle->timer = (void *)timer_id;
 
     return timer_handle;
diff --git a/osal/usb_osal_nuttx.c b/osal/usb_osal_nuttx.c
index 6732cb3a..3a4e7f0c 100644
--- a/osal/usb_osal_nuttx.c
+++ b/osal/usb_osal_nuttx.c
@@ -295,7 +295,7 @@ static void os_timer_callback(wdparm_t arg)
     }
 
     if (timer->is_period) {
-        wd_start(timer->timer, timer->ticks, os_timer_callback, arg);
+        wd_start(timer->timer, timer->timeout_ms, os_timer_callback, arg);
     }
 }
 
@@ -315,7 +315,7 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     timer->handler = handler;
     timer->argument = argument;
-    timer->ticks = MSEC2TICK(timeout_ms);
+    timer->timeout_ms = MSEC2TICK(timeout_ms);
     timer->is_period = is_period;
     timer->timer = (void *)wdog;
 
@@ -332,7 +332,7 @@ void usb_osal_timer_delete(struct usb_osal_timer *timer)
 
 void usb_osal_timer_start(struct usb_osal_timer *timer)
 {
-    wd_start(timer->timer, timer->ticks, os_timer_callback, (wdparm_t)timer);
+    wd_start(timer->timer, timer->timeout_ms, os_timer_callback, (wdparm_t)timer);
 }
 
 void usb_osal_timer_stop(struct usb_osal_timer *timer)
diff --git a/osal/usb_osal_threadx.c b/osal/usb_osal_threadx.c
index 0f0f99c4..5d2e13c7 100644
--- a/osal/usb_osal_threadx.c
+++ b/osal/usb_osal_threadx.c
@@ -236,7 +236,7 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     }
 
     timer->timer = timer_ptr;
-    timer->ticks = timeout_ms;
+    timer->timeout_ms = timeout_ms;
     timer->is_period = is_period;
     if (tx_timer_create(timer_ptr, (CHAR *)name, (void (*)(ULONG))handler, (uintptr_t)argument, 1, is_period ? 1 : 0,
                         TX_NO_ACTIVATE) != TX_SUCCESS) {
@@ -255,7 +255,7 @@ void usb_osal_timer_delete(struct usb_osal_timer *timer)
 
 void usb_osal_timer_start(struct usb_osal_timer *timer)
 {
-    if (tx_timer_change((TX_TIMER *)timer->timer, timer->ticks, timer->is_period ? timer->ticks : 0) == TX_SUCCESS) {
+    if (tx_timer_change((TX_TIMER *)timer->timer, timer->timeout_ms, timer->is_period ? timer->timeout_ms : 0) == TX_SUCCESS) {
         /* Call the tx_timer_activate to activates the specified application
              timer. The expiration routines of timers that expire at the same
              time are executed in the order they were activated. */
diff --git a/osal/usb_osal_zephyr.c b/osal/usb_osal_zephyr.c
index 68a14efe..92fcb253 100644
--- a/osal/usb_osal_zephyr.c
+++ b/osal/usb_osal_zephyr.c
@@ -182,7 +182,7 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     timer->handler = handler;
     timer->argument = argument;
     timer->is_period = is_period;
-    timer->ticks = timeout_ms;
+    timer->timeout_ms = timeout_ms;
 
     k_timer_init(timer->timer, zephyr_timer_wrapper, NULL);
     k_timer_user_data_set(timer->timer, timer);
@@ -200,9 +200,9 @@ void usb_osal_timer_delete(struct usb_osal_timer *timer)
 void usb_osal_timer_start(struct usb_osal_timer *timer)
 {
     if (timer->is_period) {
-        k_timer_start(timer->timer, K_MSEC(timer->ticks), K_MSEC(timer->ticks));
+        k_timer_start(timer->timer, K_MSEC(timer->timeout_ms), K_MSEC(timer->timeout_ms));
     } else {
-        k_timer_start(timer->timer, K_MSEC(timer->ticks), K_NO_WAIT);
+        k_timer_start(timer->timer, K_MSEC(timer->timeout_ms), K_NO_WAIT);
     }
 }