kernel文件夹合并提交

diff --git a/code/sdk/kernel/dpal/src/dpal.c b/code/sdk/kernel/dpal/src/dpal.c
index d2866be..04f2694 100644 (file)
--- a/code/sdk/kernel/dpal/src/dpal.c
+++ b/code/sdk/kernel/dpal/src/dpal.c
@@ -828,19 +828,17 @@ uint32_t dpal_task_create(uint32_t *taskid, const dpal_task_attr_t *attr, dpal_t
     if (task == NULL) {
         return DPAL_FAIL;
     }
-    *taskid = (uint32_t)task->task;
+    *taskid = (uint32_t)task;
 
     uint32_t ret = (uint32_t)osal_kthread_set_priority(task, attr->task_prio);
 
     return ret;
 }
 
-uint32_t dpal_task_delete(uint32_t taskid)
+uint32_t dpal_task_delete(uint32_t task)
 {
     debug_printf();
-    osal_task task;
-    task.task = &taskid;
-    osal_kthread_destroy(&task, 0);
+    osal_kthread_destroy(task, 0);
     return DPAL_OK;
 }
 

diff --git a/code/sdk/kernel/osal/src/liteos/osal_event.c b/code/sdk/kernel/osal/src/liteos/osal_event.c
index 13a069d..5f5e2cb 100644 (file)
--- a/code/sdk/kernel/osal/src/liteos/osal_event.c
+++ b/code/sdk/kernel/osal/src/liteos/osal_event.c
@@ -59,10 +59,8 @@ int osal_event_read(osal_event *event_obj, unsigned int mask, unsigned int timeo
     ret = LOS_EventRead(event_obj->event, mask, mode, timeout);\r
     if (!ret || (ret & LOS_ERRTYPE_ERROR)) {\r
         osal_log("LOS_EventRead failed! ret=%#x. mask=%#x. mode=%#x\n", ret, mask, mode);\r
-        return OSAL_FAILURE;\r
-    } else {\r
-        return (int)ret;\r
     }\r
+    return (int)ret;\r
 }\r
 int osal_event_clear(osal_event *event_obj, unsigned int mask)\r
 {\r