[components][libc][compilers]移动time相关头文件到common目录

This commit is contained in:
zhangjun 2019-09-10 09:59:11 +08:00
parent 4ba5fe5ab5
commit a186ada6da
3 changed files with 7 additions and 80 deletions

View File

@ -1,54 +0,0 @@
/*
* 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>
#include <sys/types.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 */
#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_ */

View File

@ -10,7 +10,6 @@
#define _SYS_TIME_H_ #define _SYS_TIME_H_
#include <time.h> #include <time.h>
#include <sys/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -8,7 +8,7 @@
* 2019-08-21 zhangjun copy from minilibc * 2019-08-21 zhangjun copy from minilibc
*/ */
#include <time.h> #include <sys/time.h>
#include <rtthread.h> #include <rtthread.h>
#if !defined (__IAR_SYSTEMS_ICC__) #if !defined (__IAR_SYSTEMS_ICC__)
@ -213,44 +213,26 @@ char* ctime(const time_t *timep)
#endif /* __IAR_SYSTEMS_ICC__ */ #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) int gettimeofday(struct timeval *tp, void *ignore)
{ {
time_t time; time_t time = 0;
#ifdef RT_USING_DEVICE
rt_device_t device; rt_device_t device;
device = rt_device_find("rtc"); device = rt_device_find("rtc");
RT_ASSERT(device != RT_NULL); RT_ASSERT(device != RT_NULL);
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time); rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
if (tp != RT_NULL) if (tp != RT_NULL)
{ {
tp->tv_sec = time; tp->tv_sec = time;
tp->tv_usec = 0; tp->tv_usec = 0;
} }
#else
tv->tv_sec = 0;
tv->tv_usec = 0;
#endif
return time; return time;
} }
#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
}
#endif
/** /**