update(osal): remove log

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

6 files changed, 40 insertions, 146 deletions

diff --git a/osal/usb_osal_freertos.c b/osal/usb_osal_freertos.c
index b30433cb..f1ebf7fc 100644
--- a/osal/usb_osal_freertos.c
+++ b/osal/usb_osal_freertos.c
@@ -18,9 +18,7 @@ usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size,
     stack_size /= sizeof(StackType_t);
     xTaskCreate(entry, name, stack_size, args, configMAX_PRIORITIES - 1 - prio, &htask);
     if (htask == NULL) {
-        USB_LOG_ERR("Create thread %s failed\r\n", name);
-        while (1) {
-        }
+        return NULL;
     }
     return (usb_osal_thread_t)htask;
 }
@@ -44,24 +42,12 @@ void usb_osal_thread_schedule_other(void)
 
 usb_osal_sem_t usb_osal_sem_create(uint32_t initial_count)
 {
-    usb_osal_sem_t sem = (usb_osal_sem_t)xSemaphoreCreateCounting(1, initial_count);
-    if (sem == NULL) {
-        USB_LOG_ERR("Create semaphore failed\r\n");
-        while (1) {
-        }
-    }
-    return sem;
+    return (usb_osal_sem_t)xSemaphoreCreateCounting(1, initial_count);
 }
 
 usb_osal_sem_t usb_osal_sem_create_counting(uint32_t max_count)
 {
-    usb_osal_sem_t sem = (usb_osal_sem_t)xSemaphoreCreateCounting(max_count, 0);
-    if (sem == NULL) {
-        USB_LOG_ERR("Create semaphore failed\r\n");
-        while (1) {
-        }
-    }
-    return sem;
+    return (usb_osal_sem_t)xSemaphoreCreateCounting(max_count, 0);
 }
 
 void usb_osal_sem_delete(usb_osal_sem_t sem)
@@ -102,13 +88,7 @@ void usb_osal_sem_reset(usb_osal_sem_t sem)
 
 usb_osal_mutex_t usb_osal_mutex_create(void)
 {
-    usb_osal_mutex_t mutex = (usb_osal_mutex_t)xSemaphoreCreateMutex();
-    if (mutex == NULL) {
-        USB_LOG_ERR("Create mutex failed\r\n");
-        while (1) {
-        }
-    }
-    return mutex;
+    return (usb_osal_mutex_t)xSemaphoreCreateMutex();
 }
 
 void usb_osal_mutex_delete(usb_osal_mutex_t mutex)
@@ -186,11 +166,8 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     (void)name;
 
     timer = pvPortMalloc(sizeof(struct usb_osal_timer));
-
     if (timer == NULL) {
-        USB_LOG_ERR("Create usb_osal_timer failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
     memset(timer, 0, sizeof(struct usb_osal_timer));
 
@@ -199,9 +176,8 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     timer->timer = (void *)xTimerCreate("usb_tim", pdMS_TO_TICKS(timeout_ms), is_period, timer, (TimerCallbackFunction_t)__usb_timeout);
     if (timer->timer == NULL) {
-        USB_LOG_ERR("Create timer failed\r\n");
-        while (1) {
-        }
+        vPortFree(timer);
+        return NULL;
     }
     return timer;
 }
diff --git a/osal/usb_osal_liteos_m.c b/osal/usb_osal_liteos_m.c
index 6eaf76d9..543af777 100644
--- a/osal/usb_osal_liteos_m.c
+++ b/osal/usb_osal_liteos_m.c
@@ -30,9 +30,7 @@ usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size,
 
     ret = LOS_TaskCreate(&task_id, &task_init_param);
     if (ret != LOS_OK) {
-        USB_LOG_ERR("Create task[%s] failed code[%u]\r\n", name, ret);
-        while (1) {
-        }
+        return NULL;
     }
 
     return (usb_osal_thread_t)task_id;
@@ -41,18 +39,12 @@ usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size,
 void usb_osal_thread_delete(usb_osal_thread_t thread)
 {
     UINT32 task_id = (UINT32)thread;
-    UINT32 ret;
 
     if (thread == NULL) {
         task_id = LOS_CurTaskIDGet();
     }
 
-    ret = LOS_TaskDelete(task_id);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Delete task id[%u] failed code[%u]\r\n", task_id, ret);
-        while (1) {
-        }
-    }
+    LOS_TaskDelete(task_id);
 }
 
 void usb_osal_thread_schedule_other(void)
@@ -74,9 +66,7 @@ usb_osal_sem_t usb_osal_sem_create(uint32_t initial_count)
 
     ret = LOS_SemCreate(initial_count, &sem_handle);
     if (ret != LOS_OK) {
-        USB_LOG_ERR("Create Sem failed code[%u]\r\n", ret);
-        while (1) {
-        }
+        return NULL;
     }
     return (usb_osal_sem_t)sem_handle;
 }
@@ -89,15 +79,8 @@ usb_osal_sem_t usb_osal_sem_create_counting(uint32_t max_count)
 void usb_osal_sem_delete(usb_osal_sem_t sem)
 {
     UINT32 sem_handle = (UINT32)sem;
-    UINT32 ret;
 
-    ret = LOS_SemDelete(sem_handle);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Delete sem handle[%u] failed code[%u]\r\n",
-                    sem_handle, ret);
-        while (1) {
-        }
-    }
+    LOS_SemDelete(sem_handle);
 }
 
 int usb_osal_sem_take(usb_osal_sem_t sem, uint32_t timeout)
@@ -134,9 +117,7 @@ usb_osal_mutex_t usb_osal_mutex_create(void)
 
     ret = LOS_MuxCreate(&mux_handle);
     if (ret != LOS_OK) {
-        USB_LOG_ERR("Create mux failed code[%u]\r\n", ret);
-        while (1) {
-        }
+        return NULL;
     }
     return (usb_osal_mutex_t)mux_handle;
 }
@@ -144,15 +125,8 @@ usb_osal_mutex_t usb_osal_mutex_create(void)
 void usb_osal_mutex_delete(usb_osal_mutex_t mutex)
 {
     UINT32 mux_handle = (UINT32)mutex;
-    UINT32 ret;
 
-    ret = LOS_MuxDelete(mux_handle);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Delete mux handle[%u] failed code[%u]\r\n",
-                    mux_handle, ret);
-        while (1) {
-        }
-    }
+    LOS_MuxDelete(mux_handle);
 }
 
 int usb_osal_mutex_take(usb_osal_mutex_t mutex)
@@ -182,9 +156,7 @@ usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
 
     ret = LOS_QueueCreate(NULL, max_msgs, &queue_id, 0, sizeof(uintptr_t));
     if (ret != LOS_OK) {
-        USB_LOG_ERR("Create queue failed code[%u]\r\n", ret);
-        while (1) {
-        }
+        return NULL;
     }
     return (usb_osal_mq_t)queue_id;
 }
@@ -192,15 +164,8 @@ usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
 void usb_osal_mq_delete(usb_osal_mq_t mq)
 {
     UINT32 queue_id = (UINT32)mq;
-    UINT32 ret;
 
-    ret = LOS_QueueDelete(queue_id);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Delete queue id[%u] failed code[%u]\r\n",
-                    queue_id, ret);
-        while (1) {
-        }
-    }
+    LOS_QueueDelete(queue_id);
 }
 
 int usb_osal_mq_send(usb_osal_mq_t mq, uintptr_t addr)
@@ -242,9 +207,7 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     timer_handle = usb_osal_malloc(sizeof(struct usb_osal_timer));
     if (timer_handle == NULL) {
-        USB_LOG_ERR("Malloc usb_osal_timer failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
     memset(timer_handle, 0x00, sizeof(struct usb_osal_timer));
 
@@ -258,9 +221,8 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     );
 
     if (ret != LOS_OK) {
-        USB_LOG_ERR("Create software timer failed code[%u]\r\n", ret);
-        while (1) {
-        }
+        usb_osal_free(timer_handle);
+        return NULL;
     }
 
     timer_handle->handler = handler;
@@ -275,44 +237,23 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 void usb_osal_timer_delete(struct usb_osal_timer *timer)
 {
     UINT32 timer_id = (UINT32)timer->timer;
-    UINT32 ret;
 
-    ret = LOS_SwtmrDelete(timer_id);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Delete software timer id[%u] failed code[%u]\r\n",
-                    timer_id, ret);
-        while (1) {
-        }
-    }
+    LOS_SwtmrDelete(timer_id);
     usb_osal_free(timer);
 }
 
 void usb_osal_timer_start(struct usb_osal_timer *timer)
 {
     UINT32 timer_id = (UINT32)timer->timer;
-    UINT32 ret;
 
-    ret = LOS_SwtmrStart(timer_id);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Start software timer id[%u] failed code[%u]\r\n",
-                    timer_id, ret);
-        while (1) {
-        }
-    }
+    LOS_SwtmrStart(timer_id);
 }
 
 void usb_osal_timer_stop(struct usb_osal_timer *timer)
 {
     UINT32 timer_id = (UINT32)timer->timer;
-    UINT32 ret;
 
-    ret = LOS_SwtmrStop(timer_id);
-    if (ret != LOS_OK) {
-        USB_LOG_ERR("Stop software timer id[%u] failed code[%u]\r\n",
-                    timer_id, ret);
-        while (1) {
-        }
-    }
+    LOS_SwtmrStop(timer_id);
 }
 
 size_t usb_osal_enter_critical_section(void)
diff --git a/osal/usb_osal_nuttx.c b/osal/usb_osal_nuttx.c
index 36b53fa2..e2b6c0f3 100644
--- a/osal/usb_osal_nuttx.c
+++ b/osal/usb_osal_nuttx.c
@@ -333,6 +333,10 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     (void)name;
 
     if (!timer || !wdog) {
+        if(timer)
+            kmm_free(timer);
+        if(wdog)
+            kmm_free(wdog);
         return NULL;
     }
 
diff --git a/osal/usb_osal_rtthread.c b/osal/usb_osal_rtthread.c
index cf0e683e..d649bba3 100644
--- a/osal/usb_osal_rtthread.c
+++ b/osal/usb_osal_rtthread.c
@@ -15,9 +15,7 @@ usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size,
     rt_thread_t htask;
     htask = rt_thread_create(name, entry, args, stack_size, prio, 10);
     if (htask == NULL) {
-        USB_LOG_ERR("Create thread %s failed\r\n", name);
-        while (1) {
-        }
+        return NULL;
     }
     rt_thread_startup(htask);
     return (usb_osal_thread_t)htask;
@@ -53,13 +51,7 @@ void usb_osal_thread_schedule_other(void)
 
 usb_osal_sem_t usb_osal_sem_create(uint32_t initial_count)
 {
-    usb_osal_sem_t sem = (usb_osal_sem_t)rt_sem_create("usbh_sem", initial_count, RT_IPC_FLAG_FIFO);
-    if (sem == NULL) {
-        USB_LOG_ERR("Create semaphore failed\r\n");
-        while (1) {
-        }
-    }
-    return sem;
+    return (usb_osal_sem_t)rt_sem_create("usbh_sem", initial_count, RT_IPC_FLAG_FIFO);
 }
 
 usb_osal_sem_t usb_osal_sem_create_counting(uint32_t max_count)
@@ -105,13 +97,7 @@ void usb_osal_sem_reset(usb_osal_sem_t sem)
 
 usb_osal_mutex_t usb_osal_mutex_create(void)
 {
-    usb_osal_mutex_t mutex = (usb_osal_mutex_t)rt_mutex_create("usbh_mutex", RT_IPC_FLAG_FIFO);
-    if (mutex == NULL) {
-        USB_LOG_ERR("Create mutex failed\r\n");
-        while (1) {
-        }
-    }
-    return mutex;
+    return (usb_osal_mutex_t)rt_mutex_create("usbh_mutex", RT_IPC_FLAG_FIFO);
 }
 
 void usb_osal_mutex_delete(usb_osal_mutex_t mutex)
@@ -171,17 +157,14 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     timer = rt_malloc(sizeof(struct usb_osal_timer));
     if (timer == NULL) {
-        USB_LOG_ERR("Create usb_osal_timer failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
     memset(timer, 0, sizeof(struct usb_osal_timer));
 
     timer->timer = (void *)rt_timer_create(name, handler, argument, timeout_ms, is_period ? (RT_TIMER_FLAG_PERIODIC | RT_TIMER_FLAG_SOFT_TIMER) : (RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER));
     if (timer->timer == NULL) {
-        USB_LOG_ERR("Create timer failed\r\n");
-        while (1) {
-        }
+        rt_free(timer);
+        return NULL;
     }
     return timer;
 }
diff --git a/osal/usb_osal_threadx.c b/osal/usb_osal_threadx.c
index 2a6d0057..aa855e68 100644
--- a/osal/usb_osal_threadx.c
+++ b/osal/usb_osal_threadx.c
@@ -117,9 +117,7 @@ usb_osal_mutex_t usb_osal_mutex_create(void)
 
     tx_byte_allocate(&usb_byte_pool, (VOID **)&mutex_ptr, sizeof(TX_MUTEX), TX_NO_WAIT);
     if (mutex_ptr == TX_NULL) {
-        USB_LOG_ERR("Create mutex failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
 
     tx_mutex_create(mutex_ptr, "usbh_mutex", TX_INHERIT);
@@ -159,9 +157,7 @@ usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
 
     tx_byte_allocate(&usb_byte_pool, (VOID **)&queue_ptr, USB_ALIGN_UP(sizeof(TX_QUEUE), 4) + sizeof(uintptr_t) * max_msgs, TX_NO_WAIT);
     if (queue_ptr == TX_NULL) {
-        USB_LOG_ERR("Create TX_QUEUE failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
 
     tx_queue_create(queue_ptr, "usbh_mq", sizeof(uintptr_t) / 4, (CHAR *)queue_ptr + USB_ALIGN_UP(sizeof(TX_QUEUE), 4), sizeof(uintptr_t) * max_msgs);
@@ -202,17 +198,14 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     tx_byte_allocate(&usb_byte_pool, (VOID **)&timer, sizeof(struct usb_osal_timer), TX_NO_WAIT);
     if (timer == TX_NULL) {
-        USB_LOG_ERR("Create usb_osal_timer failed\r\n");
-        while (1) {
-        }
+        return NULL;
     }
     memset(timer, 0, sizeof(struct usb_osal_timer));
 
     tx_byte_allocate(&usb_byte_pool, (VOID **)&timer_ptr, sizeof(TX_TIMER), TX_NO_WAIT);
     if (timer_ptr == TX_NULL) {
-        USB_LOG_ERR("Create TX_TIMER failed\r\n");
-        while (1) {
-        }
+        tx_byte_release(timer);
+        return NULL;
     }
 
     timer->timer = timer_ptr;
@@ -220,6 +213,8 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
     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) {
+        tx_byte_release(timer_ptr);
+        tx_byte_release(timer);
         return NULL;
     }
     return timer;
diff --git a/osal/usb_osal_zephyr.c b/osal/usb_osal_zephyr.c
index b65d7523..fe2dc641 100644
--- a/osal/usb_osal_zephyr.c
+++ b/osal/usb_osal_zephyr.c
@@ -27,7 +27,6 @@ usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size,
     k_thread_stack_t *stack = (k_thread_stack_t *)thread;
 
     if (thread == NULL) {
-        USB_LOG_ERR("Create thread faild\r\n");
         return NULL;
     }
 
@@ -96,7 +95,6 @@ usb_osal_sem_t usb_osal_sem_create(uint32_t initial_count)
 
     sem = k_malloc(sizeof(struct k_sem));
     if (sem == NULL) {
-        USB_LOG_ERR("Create semaphore faild\r\n");
         return NULL;
     }
     k_sem_init(sem, initial_count, 1);
@@ -110,7 +108,6 @@ usb_osal_sem_t usb_osal_sem_create_counting(uint32_t max_count)
 
     sem = k_malloc(sizeof(struct k_sem));
     if (sem == NULL) {
-        USB_LOG_ERR("Create semaphore faild\r\n");
         return NULL;
     }
     k_sem_init(sem, 0, max_count);
@@ -153,7 +150,6 @@ usb_osal_mutex_t usb_osal_mutex_create(void)
 
     mutex = k_malloc(sizeof(struct k_mutex));
     if (mutex == NULL) {
-        USB_LOG_ERR("Create mutex faild\r\n");
         return NULL;
     }
     k_mutex_init(mutex);
@@ -182,10 +178,10 @@ usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
 
     msgq = k_malloc(sizeof(struct k_msgq));
     if (msgq == NULL) {
-        USB_LOG_ERR("Create message queue faild\r\n");
         return NULL;
     }
     if (k_msgq_alloc_init(msgq, sizeof(uintptr_t), max_msgs) != 0) {
+        k_free(msgq);
         return NULL;
     }
 
@@ -248,14 +244,13 @@ struct usb_osal_timer *usb_osal_timer_create(const char *name, uint32_t timeout_
 
     timer = k_malloc(sizeof(struct usb_osal_timer));
     if (timer == NULL) {
-        USB_LOG_ERR("Create timer faild\r\n");
         return NULL;
     }
     memset(timer, 0, sizeof(struct usb_osal_timer));
 
     timer->timer = k_malloc(sizeof(struct k_timer));
     if (timer->timer == NULL) {
-        USB_LOG_ERR("Create timer faild\r\n");
+        k_free(timer);
         return NULL;
     }