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

!18 【轻量级 PR】：修复CPUP编译失败问题 

Merge pull request !18 from zhushengle/N/A
This commit is contained in:
openharmony_ci 2021-01-20 14:13:30 +08:00 committed by Gitee
parent 5ee1803849 e12055cfcc
commit 13355bb6a7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/cpup/los_cpup.c
View File

@ -32,7 +32,9 @@
#include "los_cpup.h" #include "los_cpup.h"
#include "securec.h" #include "securec.h"
#include "los_memory.h" #include "los_memory.h"
#include "los_timer.h"
#include "los_debug.h" #include "los_debug.h"
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
extern "C" { extern "C" {
@ -60,13 +62,11 @@ LITE_OS_SEC_BSS OsCpupCB *g_cpup = NULL;
LITE_OS_SEC_BSS UINT64 g_lastRecordTime; LITE_OS_SEC_BSS UINT64 g_lastRecordTime;
LITE_OS_SEC_BSS UINT16 g_hisPos; /* <current Sampling point of historyTime */ LITE_OS_SEC_BSS UINT16 g_hisPos; /* <current Sampling point of historyTime */
extern VOID LOS_GetCpuCycle(UINT32 *cntHi, UINT32 *cntLo);
LITE_OS_SEC_TEXT_MINOR STATIC INLINE UINT64 OsGetCurrentCyclesCount(VOID) LITE_OS_SEC_TEXT_MINOR STATIC INLINE UINT64 OsGetCurrentCyclesCount(VOID)
{ {
UINT32 high = 0; UINT32 high = 0;
UINT32 low = 0; UINT32 low = 0;
LOS_GetCpuCycle(&high, &low); HalGetCpuCycle(&high, &low);
return (((UINT64)high << 32) + low); // 32 means bits of word return (((UINT64)high << 32) + low); // 32 means bits of word
} }

5
kernel/src/los_init.c
View File

@ -50,6 +50,9 @@
#include "los_swtmr.h" #include "los_swtmr.h"
#endif #endif
#if (LOSCFG_BASE_CORE_CPUP == 1)
#include "los_cpup.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
@ -132,7 +135,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
} }
#if (LOSCFG_BASE_CORE_TSK_MONITOR == 1) #if (LOSCFG_BASE_CORE_TSK_MONITOR == 1)
OsTaskMonInit(); OsTaskMonInit();
#endif #endif
#if (LOSCFG_BASE_CORE_CPUP == 1) #if (LOSCFG_BASE_CORE_CPUP == 1)