Merge branch 'master' of https://gitee.com/kkup180/kernel_liteos_a

91b3d9f7 · SimonLi · acc1b904 · e04f7125 · 91b3d9f7
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

arch/arm/arm/src/los_hw_tick.c arch/arm/arm/src/los_hw_tick.c +3 -3

未找到文件。
--- a/arch/arm/arm/src/los_hw_tick.c
+++ b/arch/arm/arm/src/los_hw_tick.c
@@ -65,10 +65,10 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_GetCpuCycle(UINT32 *highCnt, UINT32 *lowCnt)

 LITE_OS_SEC_TEXT_MINOR UINT64 LOS_CurrNanosec(VOID)
 {
-    UINT64 nanos;
+    DOUBLE nanos;

-    nanos = (UINT64)HalClockGetCycles() * OS_SYS_NS_PER_SECOND / g_sysClock;
-    return nanos;
+    nanos = (DOUBLE)HalClockGetCycles() * OS_SYS_NS_PER_SECOND / g_sysClock;
+    return (UINT64)nanos;
 }

 LITE_OS_SEC_TEXT_MINOR VOID LOS_Udelay(UINT32 usecs)