فهرست منبع

修复IAR的dlib时间映射,支持64bit的时间。

hichard 6 سال پیش
والد
کامیت
3b957d7516
1فایلهای تغییر یافته به همراه28 افزوده شده و 29 حذف شده
  1. 28 29
      components/libc/compilers/dlib/time.c

+ 28 - 29
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)