From 91903a37165ef364750916104be4f7dfd1d8f9a6 Mon Sep 17 00:00:00 2001
From: zhushengle <zhushengle@huawei.com>
Date: Mon, 29 Nov 2021 11:45:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=A3=8E=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #I4K8M7

Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: If34d5c632cbb06f639434d8c35fb226a0253f4a7
Signed-off-by: zhushengle <zhushengle@huawei.com>
---
 components/power/los_pm.h | 17 ++++++++++-------
 kernel/include/los_task.h |  2 +-
 kernel/include/los_tick.h |  2 +-
 kernel/src/los_sched.c    |  6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/power/los_pm.h b/components/power/los_pm.h
index f421219e..ccaca6ee 100644
--- a/components/power/los_pm.h
+++ b/components/power/los_pm.h
@@ -164,7 +164,7 @@ typedef struct {
      * All modes except normal mode are invoked.
      * Unlocked task scheduling.
      */
-    VOID   (*late)(UINT32 mode);
+    VOID (*late)(UINT32 mode);
     /* The system enters the Normal sleep mode.
      * In normal mode, the value cannot be NULL.
      */
@@ -172,7 +172,7 @@ typedef struct {
     /* The system recovers from normal sleep.
      * The value can be NULL.
      */
-    VOID   (*normalResume)(VOID);
+    VOID (*normalResume)(VOID);
     /* The system enters the light sleep mode.
      * In light sleep mode, the value cannot be NULL.
      */
@@ -180,7 +180,7 @@ typedef struct {
     /* The system recovers from light sleep.
      * The value can be NULL.
      */
-    VOID   (*lightResume)(VOID);
+    VOID (*lightResume)(VOID);
     /* The system enters the deep sleep mode.
      * In deep sleep mode, the value cannot be NULL.
      */
@@ -188,7 +188,7 @@ typedef struct {
     /* The system recovers from deep sleep.
      * The value can be NULL.
      */
-    VOID   (*deepResume)(VOID);
+    VOID (*deepResume)(VOID);
     /* The system enters the shutdown mode.
      * In shutdown mode, the value cannot be NULL.
      */
@@ -196,7 +196,7 @@ typedef struct {
     /* The system recovers from shutdown.
      * In shutdown mode, the value cannot be NULL.
      */
-    VOID   (*shutdownResume)(VOID);
+    VOID (*shutdownResume)(VOID);
 } LosPmSysctrl;
 
 /**
@@ -236,7 +236,10 @@ UINT32 OsPmInit(VOID);
 #if (LOSCFG_KERNEL_PM == 1)
 BOOL OsIsPmMode(VOID);
 #else
-#define OsIsPmMode() (0)
+STATIC INLINE BOOL OsIsPmMode(VOID)
+{
+    return FALSE;
+}
 #endif
 
 /**
@@ -399,7 +402,7 @@ UINT32 LOS_PmLockRelease(const CHAR *name);
  *
  * @attention None.
  *
- * @param NA.
+ * @param None.
  *
  * @retval Number of awakening sources of the device.
  * @par Dependency:
diff --git a/kernel/include/los_task.h b/kernel/include/los_task.h
index 6753f360..eea6b591 100644
--- a/kernel/include/los_task.h
+++ b/kernel/include/los_task.h
@@ -1299,7 +1299,7 @@ extern UINT32 LOS_TaskDetach(UINT32 taskID);
  *
  * The delayed operation of this task is frozen.
  */
-#define OS_TASK_FALG_FREEZE                         0x4000
+#define OS_TASK_FLAG_FREEZE                         0x4000
 
 /**
  * @ingroup los_task
diff --git a/kernel/include/los_tick.h b/kernel/include/los_tick.h
index a11931f8..00cee93e 100644
--- a/kernel/include/los_tick.h
+++ b/kernel/include/los_tick.h
@@ -128,7 +128,7 @@ extern UINT64 LOS_SysCycleGet(VOID);
     ((cycle) % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / (freq))
 
 #define OS_SYS_NS_TO_CYCLE(time, freq) (((time) / OS_SYS_NS_PER_SECOND) * (freq) +     \
-    (time % OS_SYS_NS_PER_SECOND) * (freq) / OS_SYS_NS_PER_SECOND)
+    ((time) % OS_SYS_NS_PER_SECOND) * (freq) / OS_SYS_NS_PER_SECOND)
 
 /**
  * @ingroup los_tick
diff --git a/kernel/src/los_sched.c b/kernel/src/los_sched.c
index 421396d8..405970c0 100644
--- a/kernel/src/los_sched.c
+++ b/kernel/src/los_sched.c
@@ -415,7 +415,7 @@ STATIC VOID OsSchedFreezeTask(LosTaskCB *taskCB)
     UINT64 responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
     OsDeleteSortLink(&taskCB->sortList, OS_SORT_LINK_TASK);
     SET_SORTLIST_VALUE(&taskCB->sortList, responseTime);
-    taskCB->taskStatus |= OS_TASK_FALG_FREEZE;
+    taskCB->taskStatus |= OS_TASK_FLAG_FREEZE;
     return;
 }
 
@@ -424,7 +424,7 @@ STATIC VOID OsSchedUnfreezeTask(LosTaskCB *taskCB)
     UINT64 currTime, responseTime;
     UINT32 remainTick;
 
-    taskCB->taskStatus &= ~OS_TASK_FALG_FREEZE;
+    taskCB->taskStatus &= ~OS_TASK_FLAG_FREEZE;
     currTime = OsGetCurrSchedTimeCycle();
     responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
     if (responseTime > currTime) {
@@ -457,7 +457,7 @@ VOID OsSchedSuspend(LosTaskCB *taskCB)
 
 BOOL OsSchedResume(LosTaskCB *taskCB)
 {
-    if (taskCB->taskStatus & OS_TASK_FALG_FREEZE) {
+    if (taskCB->taskStatus & OS_TASK_FLAG_FREEZE) {
         OsSchedUnfreezeTask(taskCB);
     }