Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
u010088926
rt-thread
提交
4107d7be
R
rt-thread
项目概览
u010088926
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
4107d7be
编写于
10月 27, 2021
作者:
G
guo
提交者:
GitHub
10月 27, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5236 from mysterywolf/posix
[libc][posix] 解决RT_LIBC_USING_FILEIO范围过大的问题
上级
00c39bb9
372858f9
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
68 addition
and
22 deletion
+68
-22
bsp/lm3s8962/applications/startup.c
bsp/lm3s8962/applications/startup.c
+1
-1
components/dfs/src/dfs.c
components/dfs/src/dfs.c
+4
-4
components/finsh/shell.c
components/finsh/shell.c
+13
-6
components/finsh/shell.h
components/finsh/shell.h
+1
-1
components/libc/compilers/gcc/newlib/libc.c
components/libc/compilers/gcc/newlib/libc.c
+2
-2
components/libc/compilers/gcc/newlib/libc.h
components/libc/compilers/gcc/newlib/libc.h
+2
-2
components/libc/compilers/gcc/newlib/stdio.c
components/libc/compilers/gcc/newlib/stdio.c
+45
-6
未找到文件。
bsp/lm3s8962/applications/startup.c
浏览文件 @
4107d7be
...
...
@@ -119,7 +119,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init
();
#if !defined(RT_
LIBC_USING_FILEIO
) && defined(RT_USING_DEVICE)
#if !defined(RT_
USING_POSIX
) && defined(RT_USING_DEVICE)
finsh_set_device
(
"uart1"
);
#endif
#endif
...
...
components/dfs/src/dfs.c
浏览文件 @
4107d7be
...
...
@@ -18,9 +18,9 @@
#include <lwp.h>
#endif
#ifdef RT_
LIBC_USING_FILEIO
#ifdef RT_
USING_POSIX
#include <libc.h>
#endif
#endif
/* RT_USING_POSIX */
/* Global variables */
const
struct
dfs_filesystem_ops
*
filesystem_operation_table
[
DFS_FILESYSTEM_TYPES_MAX
];
...
...
@@ -216,10 +216,10 @@ struct dfs_fd *fd_get(int fd)
struct
dfs_fd
*
d
;
struct
dfs_fdtable
*
fdt
;
#ifdef RT_
LIBC_USING_FILEIO
#ifdef RT_
USING_POSIX
if
((
0
<=
fd
)
&&
(
fd
<=
2
))
fd
=
libc_stdio_get_console
();
#endif
#endif
/* RT_USING_POSIX */
fdt
=
dfs_fdtable_get
();
fd
=
fd
-
DFS_FD_OFFSET
;
...
...
components/finsh/shell.c
浏览文件 @
4107d7be
...
...
@@ -145,10 +145,17 @@ void finsh_set_prompt_mode(rt_uint32_t prompt_mode)
int
finsh_getchar
(
void
)
{
#ifdef RT_USING_DEVICE
#ifdef RT_LIBC_USING_FILEIO
return
getchar
();
#else
char
ch
=
0
;
#ifdef RT_USING_POSIX
if
(
read
(
STDIN_FILENO
,
&
ch
,
1
)
>
0
)
{
return
ch
;
}
else
{
return
-
1
;
/* EOF */
}
#else
rt_device_t
device
;
RT_ASSERT
(
shell
!=
RT_NULL
);
...
...
@@ -163,14 +170,14 @@ int finsh_getchar(void)
rt_sem_take
(
&
shell
->
rx_sem
,
RT_WAITING_FOREVER
);
return
ch
;
#endif
/* RT_
LIBC_USING_FILEIO
*/
#endif
/* RT_
USING_POSIX
*/
#else
extern
char
rt_hw_console_getchar
(
void
);
return
rt_hw_console_getchar
();
#endif
/* RT_USING_DEVICE */
}
#if !defined(RT_
LIBC_USING_FILEIO
) && defined(RT_USING_DEVICE)
#if !defined(RT_
USING_POSIX
) && defined(RT_USING_DEVICE)
static
rt_err_t
finsh_rx_ind
(
rt_device_t
dev
,
rt_size_t
size
)
{
RT_ASSERT
(
shell
!=
RT_NULL
);
...
...
@@ -436,7 +443,7 @@ void finsh_thread_entry(void *parameter)
shell
->
echo_mode
=
0
;
#endif
#if !defined(RT_
LIBC_USING_FILEIO
) && defined(RT_USING_DEVICE)
#if !defined(RT_
USING_POSIX
) && defined(RT_USING_DEVICE)
/* set console device as shell device */
if
(
shell
->
device
==
RT_NULL
)
{
...
...
components/finsh/shell.h
浏览文件 @
4107d7be
...
...
@@ -78,7 +78,7 @@ struct finsh_shell
rt_uint16_t
line_position
;
rt_uint16_t
line_curpos
;
#if !defined(RT_
LIBC_USING_FILEIO
) && defined(RT_USING_DEVICE)
#if !defined(RT_
USING_POSIX
) && defined(RT_USING_DEVICE)
rt_device_t
device
;
#endif
...
...
components/libc/compilers/gcc/newlib/libc.c
浏览文件 @
4107d7be
...
...
@@ -20,7 +20,7 @@
int
libc_system_init
(
void
)
{
#ifdef RT_
LIBC_USING_FILEIO
#ifdef RT_
USING_POSIX
rt_device_t
dev_console
;
dev_console
=
rt_console_get_device
();
...
...
@@ -28,7 +28,7 @@ int libc_system_init(void)
{
libc_stdio_set_console
(
dev_console
->
parent
.
name
,
O_RDWR
);
}
#endif
/* RT_
LIBC_USING_FILEIO
*/
#endif
/* RT_
USING_POSIX
*/
#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
pthread_system_init
();
...
...
components/libc/compilers/gcc/newlib/libc.h
浏览文件 @
4107d7be
...
...
@@ -15,10 +15,10 @@ extern "C" {
#endif
int
libc_system_init
(
void
);
#ifdef RT_
LIBC_USING_FILEIO
#ifdef RT_
USING_POSIX
int
libc_stdio_get_console
(
void
);
int
libc_stdio_set_console
(
const
char
*
device_name
,
int
mode
);
#endif
/* RT_
LIBC_USING_FILEIO
*/
#endif
/* RT_
USING_POSIX
*/
#ifdef __cplusplus
}
...
...
components/libc/compilers/gcc/newlib/stdio.c
浏览文件 @
4107d7be
...
...
@@ -8,15 +8,15 @@
* 2017/10/15 bernard the first version
*/
#include <rtthread.h>
#ifdef RT_LIBC_USING_FILEIO
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include "libc.h"
#define STDIO_DEVICE_NAME_MAX 32
#ifdef RT_LIBC_USING_FILEIO
#include <stdlib.h>
static
FILE
*
std_console
=
NULL
;
int
libc_stdio_set_console
(
const
char
*
device_name
,
int
mode
)
...
...
@@ -28,9 +28,18 @@ int libc_stdio_set_console(const char* device_name, int mode)
snprintf
(
name
,
sizeof
(
name
)
-
1
,
"/dev/%s"
,
device_name
);
name
[
STDIO_DEVICE_NAME_MAX
-
1
]
=
'\0'
;
if
(
mode
==
O_RDWR
)
file_mode
=
"r+"
;
else
if
(
mode
==
O_WRONLY
)
file_mode
=
"wb"
;
else
file_mode
=
"rb"
;
if
(
mode
==
O_RDWR
)
{
file_mode
=
"r+"
;
}
else
if
(
mode
==
O_WRONLY
)
{
file_mode
=
"wb"
;
}
else
{
file_mode
=
"rb"
;
}
fp
=
fopen
(
name
,
file_mode
);
if
(
fp
)
...
...
@@ -80,4 +89,34 @@ int libc_stdio_get_console(void)
return
-
1
;
}
#elif defined(RT_USING_POSIX)
#include <unistd.h>
static
int
std_fd
=
-
1
;
int
libc_stdio_set_console
(
const
char
*
device_name
,
int
mode
)
{
int
fd
;
char
name
[
STDIO_DEVICE_NAME_MAX
];
snprintf
(
name
,
sizeof
(
name
)
-
1
,
"/dev/%s"
,
device_name
);
name
[
STDIO_DEVICE_NAME_MAX
-
1
]
=
'\0'
;
fd
=
open
(
name
,
mode
,
0
);
if
(
fd
>=
0
)
{
if
(
std_fd
>=
0
)
{
close
(
std_fd
);
}
std_fd
=
fd
;
}
return
std_fd
;
}
int
libc_stdio_get_console
(
void
)
{
return
std_fd
;
}
#endif
/* RT_LIBC_USING_FILEIO */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录