Merge pull request #3064 from zhangjun1996/master

[components][libc][compilers]移动time相关头文件到common目录，同时删除time.c中未使用的变量

2 files changed, 67 insertions, 26 deletions

diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h
new file mode 100644
index 0000000000..1d68eeafa3
--- /dev/null
+++ b/components/libc/compilers/common/sys/time.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ */
+#ifndef _SYS_TIME_H_
+#define _SYS_TIME_H_
+
+#include <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _TIMEVAL_DEFINED
+#define _TIMEVAL_DEFINED
+/*
+ * Structure returned by gettimeofday(2) system call,
+ * and used in other calls.
+ */
+struct timeval {
+    long    tv_sec;     /* seconds */
+    long    tv_usec;    /* and microseconds */
+};
+#endif /* _TIMEVAL_DEFINED */
+
+/*
+ * Skip define timespec for IAR version over 8.10.1 where __VER__ is 8010001.
+ */
+#if defined ( __ICCARM__ ) && (__VER__ >= 8010001)
+#define _TIMESPEC_DEFINED
+#endif
+
+#ifndef _TIMESPEC_DEFINED
+#define _TIMESPEC_DEFINED
+/*
+ * Structure defined by POSIX.1b to be like a timeval.
+ */
+struct timespec {
+    time_t  tv_sec;     /* seconds */
+    long    tv_nsec;    /* and nanoseconds */
+};
+#endif /* _TIMESPEC_DEFINED */ 
+
+struct timezone {
+  int tz_minuteswest;   /* minutes west of Greenwich */
+  int tz_dsttime;       /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tp, void *ignore);
+struct tm *gmtime_r(const time_t *timep, struct tm *r);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SYS_TIME_H_ */
diff --git a/components/libc/compilers/common/time.c b/components/libc/compilers/common/time.c
index 097faedfe5..50a800b259 100644
--- a/components/libc/compilers/common/time.c
+++ b/components/libc/compilers/common/time.c
@@ -8,7 +8,7 @@
  * 2019-08-21     zhangjun     copy from minilibc
  */
 
-#include <time.h>
+#include <sys/time.h>
 #include <rtthread.h>
 
 #if !defined (__IAR_SYSTEMS_ICC__)
@@ -30,7 +30,6 @@ const short __spm[13] =
     (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30),
     (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31),
 };
-static long int timezone;
 static const char days[] = "Sun Mon Tue Wed Thu Fri Sat ";
 static const char months[] = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ";
 
@@ -213,44 +212,26 @@ char* ctime(const time_t *timep)
 
 #endif /* __IAR_SYSTEMS_ICC__ */
 
-/*
- * Structure returned by gettimeofday(2) system call,
- * and used in other calls.
- */
-struct timeval {
-    long    tv_sec;     /* seconds */
-    long    tv_usec;    /* and microseconds */
-};
-
-#ifdef RT_USING_DEVICE
 int gettimeofday(struct timeval *tp, void *ignore)
 {
-    time_t time;
+    time_t time = 0;
+#ifdef RT_USING_DEVICE
     rt_device_t device;
-
     device = rt_device_find("rtc");
     RT_ASSERT(device != RT_NULL);
-
     rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
     if (tp != RT_NULL)
     {
         tp->tv_sec = time;
         tp->tv_usec = 0;
     }
-
-    return time;
-}
+#else
+    tv->tv_sec = 0;
+    tv->tv_usec = 0;
 #endif
 
-#ifndef _gettimeofday
-/* Dummy function when hardware do not have RTC */
-int _gettimeofday( struct timeval *tv, void *ignore)
-{
-    tv->tv_sec = 0;  // convert to seconds
-    tv->tv_usec = 0;  // get remaining microseconds
-    return 0;  // return non-zero for error
+    return time;
 }
-#endif
 
 
 /**