From 96c16b0cbff8817ac16d04b1173177d0f0125a69 Mon Sep 17 00:00:00 2001 From: yinjiaming Date: Tue, 18 Apr 2023 17:22:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgettimeofday=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BE=9D=E8=B5=96RTC=E9=92=A9=E5=AD=90=20gettimeofday=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BE=9D=E8=B5=96=E4=BA=8ERTC=E9=92=A9?= =?UTF-8?q?=E5=AD=90=EF=BC=8C=E9=80=A0=E6=88=90=E4=BA=86=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E7=9A=84=E5=B7=AE=E5=BC=82=EF=BC=8C=20=E7=8E=B0=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=85=B6=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: 修复gettimeofday接口获取时间方式依赖RTC钩子对外变更描述： 修改API： int gettimeofday(struct timeval *tv, void *ptz); Close #I6WV3V Signed-off-by: yinjiaming Change-Id: I87f46661a2b6edf9fd179e8c6e2cfe72da0c0c61 --- kal/posix/src/time.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/kal/posix/src/time.c b/kal/posix/src/time.c index f5dc1dc6..07bf4497 100644 --- a/kal/posix/src/time.c +++ b/kal/posix/src/time.c @@ -720,20 +720,11 @@ int gettimeofday(struct timeval *tv, void *ptz) struct timezone *tz = (struct timezone *)ptz; if (tv != NULL) { - INT32 rtcRet; UINT64 usec = 0; - UINT64 currentTime; - - if (g_rtcTimeFunc.RtcGetTimeHook != NULL) { - rtcRet = g_rtcTimeFunc.RtcGetTimeHook(&usec); - if (rtcRet != 0) { - currentTime = GetCurrentTime(); - tv->tv_sec = currentTime / OS_SYS_MS_PER_SECOND; - tv->tv_usec = (currentTime % OS_SYS_MS_PER_SECOND) * OS_SYS_MS_PER_SECOND; - } else { - tv->tv_sec = usec / OS_SYS_US_PER_SECOND; - tv->tv_usec = usec % OS_SYS_US_PER_SECOND; - } + + if ((g_rtcTimeFunc.RtcGetTimeHook != NULL) && (g_rtcTimeFunc.RtcGetTimeHook(&usec) == 0)) { + tv->tv_sec = usec / OS_SYS_US_PER_SECOND; + tv->tv_usec = usec % OS_SYS_US_PER_SECOND; } else { struct timespec ts; if (-1 == clock_gettime(CLOCK_REALTIME, &ts)) { -- GitLab