libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-03-04 03:05:27 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1870 from hichard/master

Browse Source 
修复IAR的dlib时间映射，支持64bit的时间。
This commit is contained in:
Bernard Xiong 2018-10-09 09:42:42 +08:00 committed by GitHub
commit df6cf9b308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
components/libc/compilers/dlib/time.c
View File

@ -32,43 +32,42 @@ int gettimeofday(struct timeval *tp, void *ignore)
* @return time_t return timestamp current. * @return time_t return timestamp current.
* *
*/ */
/* for IAR 6.2 later Compiler */
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
#pragma module_name = "?time" #pragma module_name = "?time"
time_t (__time32)(time_t *t) /* Only supports 32-bit timestamp */ #if _DLIB_TIME_ALLOW_64
time_t __time64(time_t *t)
#else #else
time_t time(time_t *t) time_t __time32(time_t *t)
#endif #endif
{ {
time_t time_now = 0; time_t time_now = 0;
#ifdef RT_USING_RTC #ifdef RT_USING_RTC
static rt_device_t device = RT_NULL; static rt_device_t device = RT_NULL;
/* optimization: find rtc device only first. */ /* optimization: find rtc device only first. */
if (device == RT_NULL) if (device == RT_NULL)
{
device = rt_device_find("rtc");
}
/* read timestamp from RTC device. */
if (device != RT_NULL)
{
if (rt_device_open(device, 0) == RT_EOK)
{ {
device = rt_device_find("rtc"); rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
} rt_device_close(device);
/* read timestamp from RTC device. */
if (device != RT_NULL)
{
if (rt_device_open(device, 0) == RT_EOK)
{
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
rt_device_close(device);
}
} }
}
#endif /* RT_USING_RTC */ #endif /* RT_USING_RTC */
/* if t is not NULL, write timestamp to *t */ /* if t is not NULL, write timestamp to *t */
if (t != RT_NULL) if (t != RT_NULL)
{ {
*t = time_now; *t = time_now;
} }
return time_now; return time_now;
} }
RT_WEAK clock_t clock(void) RT_WEAK clock_t clock(void)