summaryrefslogtreecommitdiff
path: root/components/libc
diff options
context:
space:
mode:
authorhichard <[email protected]>2018-10-08 22:13:38 +0800
committerhichard <[email protected]>2018-10-08 22:13:38 +0800
commit3b957d7516334bf735f6577f77793b158cc4980e (patch)
tree4e5f05621470cbd7b36c83a67f215e868dbbc237 /components/libc
parent37d25e32a1e5ef179298f51aa7ba1fb682a49d6f (diff)
修复IAR的dlib时间映射,支持64bit的时间。
Diffstat (limited to 'components/libc')
-rw-r--r--components/libc/compilers/dlib/time.c57
1 files changed, 28 insertions, 29 deletions
diff --git a/components/libc/compilers/dlib/time.c b/components/libc/compilers/dlib/time.c
index e7ad19ad3c..f61bd5cfca 100644
--- a/components/libc/compilers/dlib/time.c
+++ b/components/libc/compilers/dlib/time.c
@@ -32,43 +32,42 @@ int gettimeofday(struct timeval *tp, void *ignore)
* @return time_t return timestamp current.
*
*/
-/* for IAR 6.2 later Compiler */
-#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
#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
-time_t time(time_t *t)
+time_t __time32(time_t *t)
#endif
{
- time_t time_now = 0;
-
+ time_t time_now = 0;
+
#ifdef RT_USING_RTC
- static rt_device_t device = RT_NULL;
-
- /* optimization: find rtc device only first. */
- if (device == RT_NULL)
+ static rt_device_t device = RT_NULL;
+
+ /* optimization: find rtc device only first. */
+ 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");
- }
-
- /* 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);
- }
+ rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
+ rt_device_close(device);
}
+ }
#endif /* RT_USING_RTC */
-
- /* if t is not NULL, write timestamp to *t */
- if (t != RT_NULL)
- {
- *t = time_now;
- }
-
- return time_now;
+
+ /* if t is not NULL, write timestamp to *t */
+ if (t != RT_NULL)
+ {
+ *t = time_now;
+ }
+
+ return time_now;
}
RT_WEAK clock_t clock(void)