Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-26 01:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复RTC驱动以及libc time.c库若干问题

Browse Source
This commit is contained in:
Meco Man
2021-02-05 13:13:22 +08:00
parent 97cc8a8f72
commit c2fca3dffe
4 changed files with 167 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

263
components/libc/compilers/common/time.c
View File

@@ -7,13 +7,21 @@
* Date Author Notes
* 2019-08-21 zhangjun copy from minilibc
* 2020-09-07 Meco Man combine gcc armcc iccarm
* 2021-02-05 Meco Man add timegm()
*/
#include <sys/time.h>
#include <rtthread.h>
#ifdef RT_USING_DEVICE
#include <rtdevice.h>
#endif
#if !defined (__IAR_SYSTEMS_ICC__)
/* seconds per day */
#define SPD 24*60*60
/* days per month -- nonleap! */
const short __spm[13] =
{
@@ -34,10 +42,7 @@ const short __spm[13] =
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 ";
/* seconds per day */
#define SPD 24*60*60
int __isleap(int year)
static int __isleap(int year)
{
/* every fourth year is a leap year except for century years that are
* not divisible by 400. */
@@ -45,6 +50,12 @@ int __isleap(int year)
return (!(year % 4) && ((year % 100) || !(year % 400)));
}
static void num2str(char *c, int i)
{
c[0] = i / 10 + '0';
c[1] = i % 10 + '0';
}
struct tm *gmtime_r(const time_t *timep, struct tm *r)
{
time_t i;
@@ -87,10 +98,15 @@ struct tm* gmtime(const time_t* t)
return gmtime_r(t, &tmp);
}
/*TODO timezone is not supprt now */
/*TODO: timezone */
struct tm* localtime_r(const time_t* t, struct tm* r)
{
return gmtime_r(t, r);
time_t local_tz;
int timezone;
timezone = 0 * 3600 * 8; /* GTM: UTC+0 */
local_tz = *t + timezone;
return gmtime_r(&local_tz, r);
}
struct tm* localtime(const time_t* t)
@@ -99,7 +115,124 @@ struct tm* localtime(const time_t* t)
return localtime_r(t, &tmp);
}
/* TODO: timezone */
time_t mktime(struct tm * const t)
{
return timegm(t);
}
char* asctime_r(const struct tm *t, char *buf)
{
/* "Wed Jun 30 21:49:08 1993\n" */
*(int*) buf = *(int*) (days + (t->tm_wday << 2));
*(int*) (buf + 4) = *(int*) (months + (t->tm_mon << 2));
num2str(buf + 8, t->tm_mday);
if (buf[8] == '0')
buf[8] = ' ';
buf[10] = ' ';
num2str(buf + 11, t->tm_hour);
buf[13] = ':';
num2str(buf + 14, t->tm_min);
buf[16] = ':';
num2str(buf + 17, t->tm_sec);
buf[19] = ' ';
num2str(buf + 20, (t->tm_year + 1900) / 100);
num2str(buf + 22, (t->tm_year + 1900) % 100);
buf[24] = '\n';
return buf;
}
char* asctime(const struct tm *timeptr)
{
static char buf[25];
return asctime_r(timeptr, buf);
}
char* ctime(const time_t *timep)
{
return asctime(localtime(timep));
}
#endif /* __IAR_SYSTEMS_ICC__ */
/**
* Returns the current time.
*
* @param time_t * t the timestamp pointer, if not used, keep NULL.
*
* @return time_t return timestamp current.
*
*/
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000 /* for IAR 6.2 later Compiler */
#pragma module_name = "?time"
#if _DLIB_TIME_USES_64
time_t __time64(time_t *t)
#else
time_t __time32(time_t *t)
#endif
#else /* Keil & GCC */
time_t time(time_t *t)
#endif
{
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)
{
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);
}
}
#endif /* RT_USING_RTC */
/* 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)
{
return rt_tick_get();
}
/* TODO: timezone */
int gettimeofday(struct timeval *tp, struct timezone *tz)
{
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;
}
#else
tv->tv_sec = 0;
tv->tv_usec = 0;
#endif
return time;
}
time_t timegm(struct tm * const t)
{
register time_t day;
register time_t i;
@@ -172,121 +305,3 @@ time_t mktime(struct tm * const t)
i = 60;
return ((day + t->tm_hour) * i + t->tm_min) * i + t->tm_sec;
}
static void num2str(char *c, int i)
{
c[0] = i / 10 + '0';
c[1] = i % 10 + '0';
}
char* asctime_r(const struct tm *t, char *buf)
{
/* "Wed Jun 30 21:49:08 1993\n" */
*(int*) buf = *(int*) (days + (t->tm_wday << 2));
*(int*) (buf + 4) = *(int*) (months + (t->tm_mon << 2));
num2str(buf + 8, t->tm_mday);
if (buf[8] == '0')
buf[8] = ' ';
buf[10] = ' ';
num2str(buf + 11, t->tm_hour);
buf[13] = ':';
num2str(buf + 14, t->tm_min);
buf[16] = ':';
num2str(buf + 17, t->tm_sec);
buf[19] = ' ';
num2str(buf + 20, (t->tm_year + 1900) / 100);
num2str(buf + 22, (t->tm_year + 1900) % 100);
buf[24] = '\n';
return buf;
}
char* asctime(const struct tm *timeptr)
{
static char buf[25];
return asctime_r(timeptr, buf);
}
char* ctime(const time_t *timep)
{
return asctime(localtime(timep));
}
#endif /* __IAR_SYSTEMS_ICC__ */
int gettimeofday(struct timeval *tp, void *ignore)
{
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;
}
#else
tv->tv_sec = 0;
tv->tv_usec = 0;
#endif
return time;
}
/**
* Returns the current time.
*
* @param time_t * t the timestamp pointer, if not used, keep NULL.
*
* @return time_t return timestamp current.
*
*/
/* for IAR 6.2 later Compiler */
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
#pragma module_name = "?time"
#if _DLIB_TIME_USES_64
time_t __time64(time_t *t)
#else
time_t __time32(time_t *t)
#endif
#else
time_t time(time_t *t)
#endif
{
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)
{
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);
}
}
#endif /* RT_USING_RTC */
/* 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)
{
return rt_tick_get();
}