Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码肥人壮
rt-thread
提交
baeb63db
R
rt-thread
项目概览
码肥人壮
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
baeb63db
编写于
11月 30, 2017
作者:
B
Bernard Xiong
提交者:
GitHub
11月 30, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1066 from BernardXiong/master
[DFS] fix the filesystem_operation_table issue.
上级
f004ff16
ae7237dc
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
58 addition
and
33 deletion
+58
-33
bsp/simulator/applications/application.c
bsp/simulator/applications/application.c
+6
-4
bsp/simulator/applications/mnt.c
bsp/simulator/applications/mnt.c
+3
-1
bsp/simulator/applications/platform.c
bsp/simulator/applications/platform.c
+7
-2
bsp/simulator/applications/startup.c
bsp/simulator/applications/startup.c
+15
-9
bsp/simulator/rtconfig.h
bsp/simulator/rtconfig.h
+1
-1
bsp/simulator/rtconfig.py
bsp/simulator/rtconfig.py
+2
-4
components/dfs/src/dfs_fs.c
components/dfs/src/dfs_fs.c
+2
-1
include/libc/libc_errno.h
include/libc/libc_errno.h
+1
-1
include/libc/libc_fcntl.h
include/libc/libc_fcntl.h
+6
-1
include/libc/libc_fdset.h
include/libc/libc_fdset.h
+1
-1
include/libc/libc_ioctl.h
include/libc/libc_ioctl.h
+6
-0
include/rtlibc.h
include/rtlibc.h
+1
-1
src/kservice.c
src/kservice.c
+7
-7
未找到文件。
bsp/simulator/applications/application.c
浏览文件 @
baeb63db
...
...
@@ -26,13 +26,15 @@
#include <stdio.h>
#include <board.h>
extern
int
platform_init
(
void
);
extern
int
mnt_init
(
void
);
void
rt_init_thread_entry
(
void
*
parameter
)
{
#ifdef RT_USING_COMPONENTS_INIT
rt_components_init
();
#endif
rt_kprintf
(
"Hello RT-Thread!
\n
"
);
platform_init
();
mnt_init
();
}
int
rt_application_init
()
...
...
bsp/simulator/applications/mnt.c
浏览文件 @
baeb63db
...
...
@@ -15,6 +15,8 @@
int
mnt_init
(
void
)
{
dfs_init
();
#ifdef RT_USING_DFS_WINSHAREDIR
dfs_win32_init
();
rt_win_sharedir_init
(
"wshare"
);
...
...
@@ -47,7 +49,7 @@ int mnt_init(void)
}
#endif
return
0
;
}
INIT_ENV_EXPORT
(
mnt_init
);
#endif
bsp/simulator/applications/platform.c
浏览文件 @
baeb63db
#include <rtthread.h>
#include "board.h"
void
platform_init
(
void
)
#include <shell.h>
int
platform_init
(
void
)
{
finsh_system_init
();
#ifdef RT_USING_LWIP
#ifdef RT_USING_TAPNETIF
tap_netif_hw_init
();
...
...
@@ -24,5 +28,6 @@ void platform_init(void)
#endif
#endif
/* RT_USING_DFS */
return
0
;
}
INIT_DEVICE_EXPORT
(
platform_init
);
bsp/simulator/applications/startup.c
浏览文件 @
baeb63db
/*
* File : startup.c
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006
, RT-Thread Develop
Team
* COPYRIGHT (C) 2006
- 2017, RT-Thread Development
Team
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://openlab.rt-thread.com/license/LICENSE
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
...
...
@@ -24,12 +34,8 @@
/*@{*/
extern
int
rt_application_init
(
void
);
#ifdef RT_USING_FINSH
extern
int
finsh_system_init
(
void
);
extern
void
finsh_set_device
(
const
char
*
device
);
#endif
extern
rt_uint8_t
*
heap
;
/**
* This function will startup RT-Thread RTOS.
*/
...
...
bsp/simulator/rtconfig.h
浏览文件 @
baeb63db
...
...
@@ -99,7 +99,7 @@
// <bool name="RT_USING_PTHREADS" description="Using POSIX threads library" default="true" />
// #define RT_USING_PTHREADS
// <bool name="RT_USING_COMPONENTS_INIT" description="Using automatically component initialization." default="true" />
#define RT_USING_COMPONENTS_INIT
//
#define RT_USING_COMPONENTS_INIT
// <bool name="RT_USING_MODULE" description="Enable Moudle Application" default="true" />
// #define RT_USING_MODULE
// </section>
...
...
bsp/simulator/rtconfig.py
浏览文件 @
baeb63db
...
...
@@ -67,7 +67,7 @@ if PLATFORM == 'gcc':
POST_ACTION
=
''
elif
PLATFORM
==
'mingw'
:
# toolchains
# toolchains
PREFIX
=
''
CC
=
PREFIX
+
'gcc'
CXX
=
PREFIX
+
'g++'
...
...
@@ -79,11 +79,9 @@ elif PLATFORM == 'mingw':
OBJDUMP
=
PREFIX
+
'objdump'
OBJCPY
=
PREFIX
+
'objcopy'
# DEVICE = ' -ffunction-sections -fdata-sections'
DEVICE
=
''
CFLAGS
=
DEVICE
+
' -D_Win32 -DNO_OLDNAMES -fno-pic -fno-builtin -fno-exceptions -fno-omit-frame-pointer'
AFLAGS
=
' -c'
+
DEVICE
+
' -x assembler-with-cpp'
LFLAGS
=
DEVICE
+
' -static-libgcc -Wl,--gc-sections,-Map=rtthread-win32.map -T mingw.ld '
CPATH
=
''
...
...
@@ -117,7 +115,7 @@ elif PLATFORM == 'cl':
CFLAGS
+=
' /MT'
LFLAGS
+=
''
CFLAGS
+=
' /Zi /Od /W 3 /WL '
CFLAGS
+=
' /Zi /Od /W 3 /WL
/D_Win32
'
LFLAGS
+=
' /SUBSYSTEM:CONSOLE /MACHINE:X86 /INCREMENTAL:NO'
CPATH
=
''
...
...
components/dfs/src/dfs_fs.c
浏览文件 @
baeb63db
...
...
@@ -22,6 +22,7 @@
* 2005-02-22 Bernard The first version.
* 2010-06-30 Bernard Optimize for RT-Thread RTOS
* 2011-03-12 Bernard fix the filesystem lookup issue.
* 2017-11-30 Bernard fix the filesystem_operation_table issue.
*/
#include <dfs_fs.h>
...
...
@@ -252,7 +253,7 @@ int dfs_mount(const char *device_name,
for
(
ops
=
&
filesystem_operation_table
[
0
];
ops
<
&
filesystem_operation_table
[
DFS_FILESYSTEM_TYPES_MAX
];
ops
++
)
if
((
ops
!=
NULL
)
&&
(
strcmp
((
*
ops
)
->
name
,
filesystemtype
)
==
0
))
if
((
*
ops
!=
NULL
)
&&
(
strcmp
((
*
ops
)
->
name
,
filesystemtype
)
==
0
))
break
;
dfs_unlock
();
...
...
include/libc/libc_errno.h
浏览文件 @
baeb63db
...
...
@@ -27,7 +27,7 @@
#include <rtconfig.h>
#if
def RT_USING_NEWLIB
#if
defined(RT_USING_NEWLIB) || defined(_WIN32)
/* use errno.h file in newlib */
#include <errno.h>
#else
...
...
include/libc/libc_fcntl.h
浏览文件 @
baeb63db
...
...
@@ -4,13 +4,18 @@
#ifndef LIBC_FCNTL_H__
#define LIBC_FCNTL_H__
#if
def RT_USING_NEWLIB
#if
defined(RT_USING_NEWLIB) || defined(_WIN32)
#include <fcntl.h>
#ifndef O_NONBLOCK
#define O_NONBLOCK 04000
#endif
#if defined(_WIN32)
#define O_DIRECTORY 0200000
#define O_ACCMODE (_O_RDONLY | _O_WRONLY | _O_RDWR)
#endif
#else
#define O_RDONLY 00
#define O_WRONLY 01
...
...
include/libc/libc_fdset.h
浏览文件 @
baeb63db
...
...
@@ -27,7 +27,7 @@
#include <rtconfig.h>
#if
def RT_USING_NEWLIB
#if
defined(RT_USING_NEWLIB) || defined(_WIN32)
#include <sys/types.h>
#else
...
...
include/libc/libc_ioctl.h
浏览文件 @
baeb63db
...
...
@@ -30,6 +30,7 @@
#define _IOC_WRITE 1U
#define _IOC_READ 2U
#ifndef _WIN32
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
...
...
@@ -39,6 +40,7 @@
#define FIONBIO _IOW('f', 126, int)
/* set/clear non-blocking i/o */
#define FIONWRITE _IOR('f', 121, int)
/* get # bytes outstanding
* in send queue. */
#endif
#define TCGETS 0x5401
#define TCSETS 0x5402
...
...
@@ -98,7 +100,11 @@
#define FIONCLEX 0x5450
#define FIOCLEX 0x5451
#ifndef _WIN32
#define FIOASYNC 0x5452
#endif
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
#define TIOCSERSWILD 0x5455
...
...
include/rtlibc.h
浏览文件 @
baeb63db
...
...
@@ -40,7 +40,7 @@ typedef signed long off_t;
typedef
int
mode_t
;
#endif
#if defined(__MINGW32__)
#if defined(__MINGW32__)
|| defined(_WIN32)
typedef
signed
long
off_t
;
typedef
int
mode_t
;
#endif
...
...
src/kservice.c
浏览文件 @
baeb63db
...
...
@@ -46,7 +46,7 @@
/**@{*/
/* global errno in RT-Thread */
static
volatile
int
_errno
;
static
volatile
int
_
_rt_
errno
;
#if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE)
static
rt_device_t
_console_device
=
RT_NULL
;
...
...
@@ -64,12 +64,12 @@ rt_err_t rt_get_errno(void)
if
(
rt_interrupt_get_nest
()
!=
0
)
{
/* it's in interrupt context */
return
_errno
;
return
_
_rt_
errno
;
}
tid
=
rt_thread_self
();
if
(
tid
==
RT_NULL
)
return
_errno
;
return
_
_rt_
errno
;
return
tid
->
error
;
}
...
...
@@ -87,7 +87,7 @@ void rt_set_errno(rt_err_t error)
if
(
rt_interrupt_get_nest
()
!=
0
)
{
/* it's in interrupt context */
_errno
=
error
;
_
_rt_
errno
=
error
;
return
;
}
...
...
@@ -95,7 +95,7 @@ void rt_set_errno(rt_err_t error)
tid
=
rt_thread_self
();
if
(
tid
==
RT_NULL
)
{
_errno
=
error
;
_
_rt_
errno
=
error
;
return
;
}
...
...
@@ -114,13 +114,13 @@ int *_rt_errno(void)
rt_thread_t
tid
;
if
(
rt_interrupt_get_nest
()
!=
0
)
return
(
int
*
)
&
_errno
;
return
(
int
*
)
&
_
_rt_
errno
;
tid
=
rt_thread_self
();
if
(
tid
!=
RT_NULL
)
return
(
int
*
)
&
(
tid
->
error
);
return
(
int
*
)
&
_errno
;
return
(
int
*
)
&
_
_rt_
errno
;
}
RTM_EXPORT
(
_rt_errno
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录