From 3ae472f739383d7b32ee376a4b2d5ae036217c3d Mon Sep 17 00:00:00 2001
From: zhushengle <star_rain@tom.com>
Date: Sat, 17 Apr 2021 10:49:39 +0800
Subject: [PATCH] IssueNo:#I3IK07 Description:HalGetCpuCycle cancel the weak
 attribute Sig:kernel Feature or Bugfix:Feature Binary Source:No

Change-Id: Ic88577e70626f760a8831ef98d7cda95b9dfaad4
---
 kernel/arch/arm/cortex-m3/keil/los_timer.c | 22 +++++++++++-----------
 kernel/arch/arm/cortex-m33/gcc/los_timer.c | 22 +++++++++++-----------
 kernel/arch/arm/cortex-m4/gcc/los_timer.c  | 22 +++++++++++-----------
 kernel/arch/arm/cortex-m4/iar/los_timer.c  | 22 +++++++++++-----------
 kernel/arch/arm/cortex-m7/gcc/los_timer.c  | 22 +++++++++++-----------
 kernel/arch/arm/cortex-m7/iar/los_timer.c  | 22 +++++++++++-----------
 6 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/kernel/arch/arm/cortex-m3/keil/los_timer.c b/kernel/arch/arm/cortex-m3/keil/los_timer.c
index a74bf0ac..9b0d392c 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_timer.c
+++ b/kernel/arch/arm/cortex-m3/keil/los_timer.c
@@ -99,7 +99,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -112,16 +122,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_timer.c b/kernel/arch/arm/cortex-m33/gcc/los_timer.c
index 6fae2dd1..f73cd37a 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_timer.c
+++ b/kernel/arch/arm/cortex-m33/gcc/los_timer.c
@@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_timer.c b/kernel/arch/arm/cortex-m4/gcc/los_timer.c
index e9a75e1a..5120261c 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_timer.c
+++ b/kernel/arch/arm/cortex-m4/gcc/los_timer.c
@@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)
diff --git a/kernel/arch/arm/cortex-m4/iar/los_timer.c b/kernel/arch/arm/cortex-m4/iar/los_timer.c
index e9a75e1a..5120261c 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_timer.c
+++ b/kernel/arch/arm/cortex-m4/iar/los_timer.c
@@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_timer.c b/kernel/arch/arm/cortex-m7/gcc/los_timer.c
index e9a75e1a..5120261c 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_timer.c
+++ b/kernel/arch/arm/cortex-m7/gcc/los_timer.c
@@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)
diff --git a/kernel/arch/arm/cortex-m7/iar/los_timer.c b/kernel/arch/arm/cortex-m7/iar/los_timer.c
index e9a75e1a..5120261c 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_timer.c
+++ b/kernel/arch/arm/cortex-m7/iar/los_timer.c
@@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
     return (UINT64)hwCycle;
 }
 
-WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
+WEAK VOID HalTickLock(VOID)
+{
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+}
+
+WEAK VOID HalTickUnlock(VOID)
+{
+    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+}
+
+VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
 {
     UINT64 cycle;
     if ((cntHi == NULL) || (cntLo == NULL)) {
@@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
     return;
 }
 
-WEAK VOID HalTickLock(VOID)
-{
-    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-}
-
-WEAK VOID HalTickUnlock(VOID)
-{
-    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-}
-
 VOID HalEnterSleep(LOS_SysSleepEnum sleep)
 {
 #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)