Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
6d575153
R
rt-thread
项目概览
wwsmg1
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6d575153
编写于
5月 01, 2021
作者:
mysterywolf
提交者:
GitHub
5月 01, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #48 from RT-Thread/master
sycn
上级
79a452b2
be3b5a95
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
29 deletion
+24
-29
components/libc/Kconfig
components/libc/Kconfig
+7
-1
components/libc/compilers/common/sys/time.h
components/libc/compilers/common/sys/time.h
+1
-9
components/libc/compilers/common/time.c
components/libc/compilers/common/time.c
+12
-14
components/libc/compilers/newlib/SConscript
components/libc/compilers/newlib/SConscript
+4
-5
未找到文件。
components/libc/Kconfig
浏览文件 @
6d575153
...
...
@@ -55,8 +55,14 @@ endif
if RT_USING_LIBC != y
config RT_LIBC_USING_TIME
bool "Enable
TIME FUNCTIONS WITHOUT COMPILER'S LIBC
"
bool "Enable
time functions without compiler's libc
"
default y
endif
config RT_LIBC_FIXED_TIMEZONE
depends on (RT_LIBC_USING_TIME || RT_USING_LIBC)
int "Manually set a fixed time zone (UTC+)"
range -12 12
default 8
endmenu
components/libc/compilers/common/sys/time.h
浏览文件 @
6d575153
...
...
@@ -18,14 +18,6 @@
extern
"C"
{
#endif
/*
* Skip define timespec for IAR version over 8.10.1 where __VER__ is 8010001.
*/
#if defined ( __ICCARM__ ) && (__VER__ >= 8010001)
#define _TIMESPEC_DEFINED
#endif
#ifndef _TIMEVAL_DEFINED
#define _TIMEVAL_DEFINED
/*
...
...
@@ -40,7 +32,7 @@ struct timeval {
#endif
#endif
/* _TIMEVAL_DEFINED */
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)
/*GCC*/
) && !
defined (__ICCARM__) && !defined
(_WIN32)
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)
/*GCC*/
) && !
(defined(__ICCARM__) && (__VER__ >= 8010001)) && !defined
(_WIN32)
struct
timespec
{
time_t
tv_sec
;
/* seconds */
long
tv_nsec
;
/* and nanoseconds */
...
...
components/libc/compilers/common/time.c
浏览文件 @
6d575153
...
...
@@ -16,7 +16,7 @@
* 2012-12-08 Bernard <clock_time.c> fix the issue of _timevalue.tv_usec initialization,
* which found by Rob <rdent@iinet.net.au>
* 2021-02-12 Meco Man move all of the functions located in <clock_time.c> to this file
* 2021-03-15 Meco Man fixed
bug: https://club.rt-thread.org/ask/question/423650.html
* 2021-03-15 Meco Man fixed
a bug of leaking memory in asctime()
*/
#include <sys/time.h>
...
...
@@ -30,6 +30,10 @@
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifndef RT_LIBC_FIXED_TIMEZONE
#define RT_LIBC_FIXED_TIMEZONE 8
/* UTC+8 */
#endif
/* seconds per day */
#define SPD 24*60*60
...
...
@@ -104,7 +108,7 @@ static int get_timeval(struct timeval *tv)
}
else
{
/* LOG_W will cause a recursive printing if ulog timestamp function is
turned on
*/
/* LOG_W will cause a recursive printing if ulog timestamp function is
enabled
*/
rt_kprintf
(
"Cannot find a RTC device to provide time!
\r\n
"
);
return
-
1
;
}
...
...
@@ -112,7 +116,7 @@ static int get_timeval(struct timeval *tv)
return
(
rst
<
0
)
?
-
1
:
1
;
#else
/* LOG_W will cause a recursive printing if ulog timestamp function is
turned on
*/
/* LOG_W will cause a recursive printing if ulog timestamp function is
enabled
*/
rt_kprintf
(
"Cannot find a RTC device to provide time!
\r\n
"
);
return
-
1
;
#endif
/* RT_USING_RTC */
...
...
@@ -208,14 +212,11 @@ struct tm* gmtime(const time_t* t)
}
RTM_EXPORT
(
gmtime
);
/*TODO: timezone */
struct
tm
*
localtime_r
(
const
time_t
*
t
,
struct
tm
*
r
)
{
time_t
local_tz
;
int
utc_plus
;
utc_plus
=
8
;
/* GMT: UTC+8 */
local_tz
=
*
t
+
utc_plus
*
3600
;
local_tz
=
*
t
+
RT_LIBC_FIXED_TIMEZONE
*
3600
;
return
gmtime_r
(
&
local_tz
,
r
);
}
RTM_EXPORT
(
localtime_r
);
...
...
@@ -227,15 +228,12 @@ struct tm* localtime(const time_t* t)
}
RTM_EXPORT
(
localtime
);
/* TODO: timezone */
time_t
mktime
(
struct
tm
*
const
t
)
{
time_t
timestamp
;
int
utc_plus
;
utc_plus
=
8
;
/* GMT: UTC+8 */
timestamp
=
timegm
(
t
);
timestamp
=
timestamp
-
3600
*
utc_plus
;
timestamp
=
timestamp
-
3600
*
RT_LIBC_FIXED_TIMEZONE
;
return
timestamp
;
}
RTM_EXPORT
(
mktime
);
...
...
@@ -270,16 +268,16 @@ char* asctime(const struct tm *timeptr)
}
RTM_EXPORT
(
asctime
);
char
*
ctime_r
(
const
time_t
*
tim_p
,
char
*
result
)
char
*
ctime_r
(
const
time_t
*
tim_p
,
char
*
result
)
{
struct
tm
tm
;
return
asctime_r
(
localtime_r
(
tim_p
,
&
tm
),
result
);
return
asctime_r
(
localtime_r
(
tim_p
,
&
tm
),
result
);
}
RTM_EXPORT
(
ctime_r
);
char
*
ctime
(
const
time_t
*
tim_p
)
{
return
asctime
(
localtime
(
tim_p
));
return
asctime
(
localtime
(
tim_p
));
}
RTM_EXPORT
(
ctime
);
...
...
components/libc/compilers/newlib/SConscript
浏览文件 @
6d575153
...
...
@@ -4,17 +4,18 @@ Import('rtconfig')
src
=
[]
cwd
=
GetCurrentDir
()
group
=
[]
LIBS
=
[]
CPPDEFINES
=
[]
CPPPATH
=
[
cwd
]
if
rtconfig
.
PLATFORM
==
'gcc'
:
if
GetDepend
(
'RT_USING_LIBC'
):
CPPDEFINES
=
[
'RT_USING_NEWLIB'
]
CPPDEFINES
+
=
[
'RT_USING_NEWLIB'
]
# link with libc and libm:
# libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
# recent GCC tool chains. The linker would just link in the functions that have
# been referenced. So setting this won't result in bigger text size.
LIBS
=
[
'c'
,
'm'
]
LIBS
+
=
[
'c'
,
'm'
]
src
+=
Glob
(
'*.c'
)
SrcRemove
(
src
,
[
'minilib.c'
])
...
...
@@ -22,8 +23,6 @@ if rtconfig.PLATFORM == 'gcc':
SrcRemove
(
src
,
[
'libc_syms.c'
])
else
:
src
+=
[
'minilib.c'
]
CPPDEFINES
=
[]
LIBS
=
[]
group
=
DefineGroup
(
'libc'
,
src
,
depend
=
[],
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
,
LIBS
=
LIBS
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录