yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IssueNo:#I3IK07 

Description:HalGetCpuCycle cancel the weak attribute
Sig:kernel
Feature or Bugfix:Feature
Binary Source:No

Change-Id: Ic88577e70626f760a8831ef98d7cda95b9dfaad4
This commit is contained in:
zhushengle 2021-04-17 10:49:39 +08:00
parent 49be405820
commit 3ae472f739
6 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/arch/arm/cortex-m3/keil/los_timer.c
View File

@ -99,7 +99,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -112,16 +122,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)

22
kernel/arch/arm/cortex-m33/gcc/los_timer.c
View File

@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)

22
kernel/arch/arm/cortex-m4/gcc/los_timer.c
View File

@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)

22
kernel/arch/arm/cortex-m4/iar/los_timer.c
View File

@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)

22
kernel/arch/arm/cortex-m7/gcc/los_timer.c
View File

@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)

22
kernel/arch/arm/cortex-m7/iar/los_timer.c
View File

@ -98,7 +98,17 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
return (UINT64)hwCycle; 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; UINT64 cycle;
if ((cntHi == NULL) || (cntLo == NULL)) { if ((cntHi == NULL) || (cntLo == NULL)) {
@ -111,16 +121,6 @@ WEAK VOID HalGetCpuCycle(UINT32 *cntHi, UINT32 *cntLo)
return; 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) VOID HalEnterSleep(LOS_SysSleepEnum sleep)
{ {
#if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1) #if (LOSCFG_BASE_CORE_SCHED_SLEEP == 1)