!1120 【修复】OAT告警

Merge pull request !1120 from 石子怡/master
修复OAT告警
2024-06-05 08:04:36 +00:00 · 2024-06-05 06:47:40 +00:00 · 2024-05-29 05:00:53 +00:00 · 2024-05-27 11:39:31 +00:00 · 2024-05-25 11:03:53 +08:00 · 2024-05-25 02:21:53 +00:00
14 changed files with 13 additions and 24 deletions
--- a/README.OpenSource
+++ b/README.OpenSource
@@ -1,11 +0,0 @@
-[
-    {
-        "Name"                  : "LiteOS-M Kernel",
-        "License"               : "BSD-3-Clause",
-        "License File"          : "LICENSE",
-        "Version Number"        : "openharmony 1.0.1",
-        "Owner"                 : "liu.limin@huawei.com ",
-        "Upstream URL"          : "https://gitee.com/openharmony/kernel_liteos_m",
-        "Description"           : "OpenHarmony LiteOS-M is a lightweight operating system kernel designed for the Internet of Things (IoT) field. It features small footprint, low power consumption, and high performance. It has a simple code structure, including the minimum kernel function set, kernel abstraction layer, optional components, and project directory."
-    }
-]
--- a/arch/arm/cortex-m3/keil/los_timer.c
+++ b/arch/arm/cortex-m3/keil/los_timer.c
@@ -86,7 +86,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;

    return nextResponseTime;
--- a/arch/arm/cortex-m33/gcc/NTZ/los_timer.c
+++ b/arch/arm/cortex-m33/gcc/NTZ/los_timer.c
@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/iar/NTZ/los_timer.c
+++ b/arch/arm/cortex-m33/iar/NTZ/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m33/iar/TZ/non_secure/los_timer.c
@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m4/gcc/los_timer.c
+++ b/arch/arm/cortex-m4/gcc/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m4/iar/los_timer.c
+++ b/arch/arm/cortex-m4/iar/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/gcc/NTZ/los_timer.c
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/iar/NTZ/los_timer.c
+++ b/arch/arm/cortex-m55/iar/NTZ/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m55/iar/TZ/non_secure/los_timer.c
@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m7/gcc/los_timer.c
+++ b/arch/arm/cortex-m7/gcc/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m7/iar/los_timer.c
+++ b/arch/arm/cortex-m7/iar/los_timer.c
@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
Author	SHA1	Message	Date
openharmony_ci	10e00b3047	!1120 【修复】OAT告警 Merge pull request !1120 from 石子怡/master	2024-06-05 08:04:36 +00:00
石子怡	88fd668b8f	修复OAT告警 Signed-off-by: 石子怡 <z15319797139@163.com>	2024-06-05 06:47:40 +00:00
openharmony_ci	ddaad05097	!1116 clear systick pending status Merge pull request !1116 from hw_llm/master	2024-05-29 05:00:53 +00:00
openharmony_ci	c739d4a164	!1114 【修复】OAT告警 Merge pull request !1114 from 石子怡/master	2024-05-27 11:39:31 +00:00
hw_llm	92fbcaf074	Description: clear systick pending status IssueNo: https://gitee.com/openharmony/kernel_liteos_m/issues/I93ZUQ Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-05-25 11:03:53 +08:00
石子怡	441d552355	修复OAT告警 Signed-off-by: 石子怡 <z15319797139@163.com>	2024-05-25 02:21:53 +00:00
石子怡	e151e8369b	修复OAT告警 Signed-off-by: 石子怡 <z15319797139@163.com>	2024-05-25 01:17:11 +00:00