Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
人间散章
rt-thread
提交
5d9217eb
R
rt-thread
项目概览
人间散章
/
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,发现更多精彩内容 >>
提交
5d9217eb
编写于
10月 17, 2017
作者:
B
bernard
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/RT-Thread/rt-thread
上级
3c0fbf0c
2b36e6fc
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
33 addition
and
33 deletion
+33
-33
bsp/at91sam9260/applications/application.c
bsp/at91sam9260/applications/application.c
+0
-2
bsp/beaglebone/applications/board.c
bsp/beaglebone/applications/board.c
+1
-0
bsp/efm32/application.c
bsp/efm32/application.c
+0
-2
bsp/frdm-k64f/applications/application.c
bsp/frdm-k64f/applications/application.c
+2
-13
bsp/lm3s8962/applications/application.c
bsp/lm3s8962/applications/application.c
+0
-2
bsp/lm3s8962/rtconfig.h
bsp/lm3s8962/rtconfig.h
+1
-0
bsp/lm3s9b9x/rtconfig.h
bsp/lm3s9b9x/rtconfig.h
+1
-1
bsp/mini2440/applications/application.c
bsp/mini2440/applications/application.c
+0
-2
bsp/mini2440/drivers/sdcard.c
bsp/mini2440/drivers/sdcard.c
+2
-2
bsp/mini2440/rtconfig.h
bsp/mini2440/rtconfig.h
+1
-0
bsp/stm32f0x/drivers/led.c
bsp/stm32f0x/drivers/led.c
+4
-2
bsp/stm32f0x/drivers/led.h
bsp/stm32f0x/drivers/led.h
+2
-2
bsp/stm32f0x/rtconfig.h
bsp/stm32f0x/rtconfig.h
+1
-1
bsp/stm32f107/applications/application.c
bsp/stm32f107/applications/application.c
+0
-1
components/drivers/serial/serial.c
components/drivers/serial/serial.c
+2
-1
components/drivers/src/pipe.c
components/drivers/src/pipe.c
+2
-0
components/libc/compilers/minilibc/stdint.h
components/libc/compilers/minilibc/stdint.h
+2
-0
components/libc/compilers/minilibc/stdio.h
components/libc/compilers/minilibc/stdio.h
+10
-0
components/net/SConscript
components/net/SConscript
+2
-2
未找到文件。
bsp/at91sam9260/applications/application.c
浏览文件 @
5d9217eb
...
@@ -31,8 +31,6 @@
...
@@ -31,8 +31,6 @@
#include <rtdevice.h>
#include <rtdevice.h>
#ifdef RT_USING_DFS
#ifdef RT_USING_DFS
/* dfs init */
#include <dfs_init.h>
/* dfs filesystem:ELM FatFs filesystem init */
/* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h>
#include <dfs_elm.h>
/* dfs Filesystem APIs */
/* dfs Filesystem APIs */
...
...
bsp/beaglebone/applications/board.c
浏览文件 @
5d9217eb
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
#include <rthw.h>
#include <rthw.h>
#include <rtthread.h>
#include <rtthread.h>
#include <finsh.h>
#include "board.h"
#include "board.h"
#include <interrupt.h>
#include <interrupt.h>
...
...
bsp/efm32/application.c
浏览文件 @
5d9217eb
...
@@ -34,8 +34,6 @@
...
@@ -34,8 +34,6 @@
#include <board.h>
#include <board.h>
#if defined(RT_USING_DFS)
#if defined(RT_USING_DFS)
/* dfs init */
#include <dfs_init.h>
/* dfs filesystem:ELM filesystem init */
/* dfs filesystem:ELM filesystem init */
#include <dfs_elm.h>
#include <dfs_elm.h>
/* dfs Filesystem APIs */
/* dfs Filesystem APIs */
...
...
bsp/frdm-k64f/applications/application.c
浏览文件 @
5d9217eb
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
*/
*/
/*@{*/
/*@{*/
#include <stdint.h>
#include <stdio.h>
#include <stdio.h>
#include "MK64F12.h"
#include "MK64F12.h"
...
@@ -25,12 +26,6 @@
...
@@ -25,12 +26,6 @@
#include "led.h"
#include "led.h"
#ifdef RT_USING_LWIP
#include <lwip/sys.h>
#include <lwip/api.h>
#include <netif/ethernetif.h>
#endif
void
rt_init_thread_entry
(
void
*
parameter
)
void
rt_init_thread_entry
(
void
*
parameter
)
{
{
#ifdef RT_USING_COMPONENTS_INIT
#ifdef RT_USING_COMPONENTS_INIT
...
@@ -72,15 +67,9 @@ int rt_application_init()
...
@@ -72,15 +67,9 @@ int rt_application_init()
{
{
rt_thread_t
init_thread
;
rt_thread_t
init_thread
;
#if (RT_THREAD_PRIORITY_MAX == 32)
init_thread
=
rt_thread_create
(
"init"
,
init_thread
=
rt_thread_create
(
"init"
,
rt_init_thread_entry
,
RT_NULL
,
rt_init_thread_entry
,
RT_NULL
,
2048
,
8
,
20
);
2048
,
RT_THREAD_PRIORITY_MAX
/
3
,
20
);
#else
init_thread
=
rt_thread_create
(
"init"
,
rt_init_thread_entry
,
RT_NULL
,
2048
,
80
,
20
);
#endif
if
(
init_thread
!=
RT_NULL
)
if
(
init_thread
!=
RT_NULL
)
rt_thread_startup
(
init_thread
);
rt_thread_startup
(
init_thread
);
...
...
bsp/lm3s8962/applications/application.c
浏览文件 @
5d9217eb
...
@@ -21,8 +21,6 @@
...
@@ -21,8 +21,6 @@
#include <rtthread.h>
#include <rtthread.h>
#ifdef RT_USING_DFS
#ifdef RT_USING_DFS
/* dfs init */
#include <dfs_init.h>
/* dfs filesystem:ELM FatFs filesystem init */
/* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h>
#include <dfs_elm.h>
/* dfs Filesystem APIs */
/* dfs Filesystem APIs */
...
...
bsp/lm3s8962/rtconfig.h
浏览文件 @
5d9217eb
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
/* SECTION: Device System */
/* SECTION: Device System */
/* Using Device System*/
/* Using Device System*/
#define RT_USING_DEVICE
#define RT_USING_DEVICE
#define RT_USING_DEVICE_IPC
#define RT_USING_UART1
#define RT_USING_UART1
// #define RT_USING_UART2
// #define RT_USING_UART2
...
...
bsp/lm3s9b9x/rtconfig.h
浏览文件 @
5d9217eb
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
#define RT_LWIP_ETH_PAD_SIZE 2
#define RT_LWIP_ETH_PAD_SIZE 2
/* Enable SNMP protocol*/
/* Enable SNMP protocol*/
#define RT_LWIP_SNMP
//
#define RT_LWIP_SNMP
/* Using DHCP*/
/* Using DHCP*/
/* #define RT_LWIP_DHCP */
/* #define RT_LWIP_DHCP */
...
...
bsp/mini2440/applications/application.c
浏览文件 @
5d9217eb
...
@@ -26,8 +26,6 @@
...
@@ -26,8 +26,6 @@
#include "dm9000.h"
#include "dm9000.h"
#ifdef RT_USING_DFS
#ifdef RT_USING_DFS
/* dfs init */
#include <dfs_init.h>
/* dfs filesystem:ELM FatFs filesystem init */
/* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h>
#include <dfs_elm.h>
/* dfs Filesystem APIs */
/* dfs Filesystem APIs */
...
...
bsp/mini2440/drivers/sdcard.c
浏览文件 @
5d9217eb
...
@@ -398,7 +398,7 @@ static rt_size_t rt_sdcard_read(rt_device_t dev,
...
@@ -398,7 +398,7 @@ static rt_size_t rt_sdcard_read(rt_device_t dev,
if
(
dev
==
RT_NULL
)
if
(
dev
==
RT_NULL
)
{
{
rt_set_errno
(
-
DFS_STATUS_
EINVAL
);
rt_set_errno
(
-
EINVAL
);
return
0
;
return
0
;
}
}
...
@@ -429,7 +429,7 @@ static rt_size_t rt_sdcard_write(rt_device_t dev,
...
@@ -429,7 +429,7 @@ static rt_size_t rt_sdcard_write(rt_device_t dev,
if
(
dev
==
RT_NULL
)
if
(
dev
==
RT_NULL
)
{
{
rt_set_errno
(
-
DFS_STATUS_
EINVAL
);
rt_set_errno
(
-
EINVAL
);
return
0
;
return
0
;
}
}
...
...
bsp/mini2440/rtconfig.h
浏览文件 @
5d9217eb
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
// <section name="RT_USING_DEVICE" description="Using Device Driver Framework" default="true" >
// <section name="RT_USING_DEVICE" description="Using Device Driver Framework" default="true" >
#define RT_USING_DEVICE
#define RT_USING_DEVICE
#define RT_USING_DEVICE_IPC
// <bool name="RT_USING_UART0" description="Using UART0" default="true" />
// <bool name="RT_USING_UART0" description="Using UART0" default="true" />
#define RT_USING_UART0
#define RT_USING_UART0
// <integer name="RT_UART_RX_BUFFER_SIZE" description="The buffer size for UART reception" default="64" />
// <integer name="RT_UART_RX_BUFFER_SIZE" description="The buffer size for UART reception" default="64" />
...
...
bsp/stm32f0x/drivers/led.c
浏览文件 @
5d9217eb
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
* 2013-11-15 bright the first version
* 2013-11-15 bright the first version
*/
*/
#include <rtthread.h>
#include "led.h"
#include "led.h"
/*
/*
...
@@ -20,7 +21,7 @@ LED_RED : PC9
...
@@ -20,7 +21,7 @@ LED_RED : PC9
*/
*/
/* Initial led gpio pin */
/* Initial led gpio pin */
void
rt_hw_led_init
(
void
)
int
rt_hw_led_init
(
void
)
{
{
GPIO_InitTypeDef
GPIO_InitStructure
;
GPIO_InitTypeDef
GPIO_InitStructure
;
...
@@ -34,7 +35,8 @@ void rt_hw_led_init(void)
...
@@ -34,7 +35,8 @@ void rt_hw_led_init(void)
GPIO_InitStructure
.
GPIO_PuPd
=
GPIO_PuPd_NOPULL
;
GPIO_InitStructure
.
GPIO_PuPd
=
GPIO_PuPd_NOPULL
;
GPIO_InitStructure
.
GPIO_Speed
=
GPIO_Speed_50MHz
;
GPIO_InitStructure
.
GPIO_Speed
=
GPIO_Speed_50MHz
;
GPIO_Init
(
GPIOC
,
&
GPIO_InitStructure
);
GPIO_Init
(
GPIOC
,
&
GPIO_InitStructure
);
}
return
0
;
}
/* Initial components for device */
/* Initial components for device */
INIT_DEVICE_EXPORT
(
rt_hw_led_init
);
INIT_DEVICE_EXPORT
(
rt_hw_led_init
);
bsp/stm32f0x/drivers/led.h
浏览文件 @
5d9217eb
...
@@ -15,13 +15,13 @@
...
@@ -15,13 +15,13 @@
#ifndef __LED_H__
#ifndef __LED_H__
#define __LED_H__
#define __LED_H__
#include <rthw.h>
#include <rtthread.h>
#include <rtthread.h>
#include <stm32f0xx.h>
#include <stm32f0xx.h>
#define rt_hw_led_on() GPIO_SetBits(GPIOC, GPIO_Pin_9)
#define rt_hw_led_on() GPIO_SetBits(GPIOC, GPIO_Pin_9)
#define rt_hw_led_off() GPIO_ResetBits(GPIOC, GPIO_Pin_9)
#define rt_hw_led_off() GPIO_ResetBits(GPIOC, GPIO_Pin_9)
void
rt_hw_led_init
(
void
);
int
rt_hw_led_init
(
void
);
#endif
#endif
bsp/stm32f0x/rtconfig.h
浏览文件 @
5d9217eb
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#define RT_USING_SEMAPHORE
#define RT_USING_SEMAPHORE
/* Using Mutex */
/* Using Mutex */
/* #define RT_USING_MUTEX */
#define RT_USING_MUTEX
/* Using Event */
/* Using Event */
/* #define RT_USING_EVENT */
/* #define RT_USING_EVENT */
...
...
bsp/stm32f107/applications/application.c
浏览文件 @
5d9217eb
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
#ifdef RT_USING_DFS
#ifdef RT_USING_DFS
#include <dfs_fs.h>
#include <dfs_fs.h>
#include <dfs_init.h>
#include <dfs_elm.h>
#include <dfs_elm.h>
#endif
#endif
...
...
components/drivers/serial/serial.c
浏览文件 @
5d9217eb
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
#include <posix_termios.h>
#include <posix_termios.h>
#endif
#endif
#ifdef RT_USING_DFS
#ifdef RT_USING_DFS_DEVFS
#ifdef RT_USING_DFS_DEVFS
#include <dfs_posix.h>
#include <dfs_posix.h>
...
@@ -209,7 +210,7 @@ const static struct dfs_file_ops _serial_fops =
...
@@ -209,7 +210,7 @@ const static struct dfs_file_ops _serial_fops =
serial_fops_poll
,
serial_fops_poll
,
};
};
#endif
#endif
#endif
/*
/*
* Serial poll routines
* Serial poll routines
*/
*/
...
...
components/drivers/src/pipe.c
浏览文件 @
5d9217eb
...
@@ -23,8 +23,10 @@
...
@@ -23,8 +23,10 @@
*/
*/
#include <rthw.h>
#include <rthw.h>
#include <rtdevice.h>
#include <rtdevice.h>
#if defined(RT_USING_DFS)
#include <dfs_file.h>
#include <dfs_file.h>
#include <dfs_posix.h>
#include <dfs_posix.h>
#endif
#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS)
#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS)
static
int
pipe_open
(
struct
dfs_fd
*
fd
)
static
int
pipe_open
(
struct
dfs_fd
*
fd
)
...
...
components/libc/compilers/minilibc/stdint.h
浏览文件 @
5d9217eb
...
@@ -11,6 +11,8 @@ typedef rt_int32_t int32_t;
...
@@ -11,6 +11,8 @@ typedef rt_int32_t int32_t;
typedef
rt_uint32_t
uint32_t
;
typedef
rt_uint32_t
uint32_t
;
typedef
long
long
int64_t
;
typedef
long
long
int64_t
;
typedef
unsigned
long
long
uint64_t
;
typedef
unsigned
long
long
uint64_t
;
typedef
signed
long
intptr_t
;
typedef
unsigned
long
uintptr_t
;
/*
/*
* 7.18.2 Limits of specified-width integer types.
* 7.18.2 Limits of specified-width integer types.
...
...
components/libc/compilers/minilibc/stdio.h
浏览文件 @
5d9217eb
...
@@ -4,5 +4,15 @@
...
@@ -4,5 +4,15 @@
#define BUFSIZ 128
#define BUFSIZ 128
#define EOF (-1)
#define EOF (-1)
#ifndef SEEK_SET
#define SEEK_SET 0
/* set file offset to offset */
#endif
#ifndef SEEK_CUR
#define SEEK_CUR 1
/* set file offset to current plus offset */
#endif
#ifndef SEEK_END
#define SEEK_END 2
/* set file offset to EOF plus offset */
#endif
#endif
#endif
components/net/SConscript
浏览文件 @
5d9217eb
...
@@ -7,8 +7,8 @@ objs = []
...
@@ -7,8 +7,8 @@ objs = []
cwd
=
GetCurrentDir
()
cwd
=
GetCurrentDir
()
list
=
os
.
listdir
(
cwd
)
list
=
os
.
listdir
(
cwd
)
# the default version of LWIP is
1.4.1
# the default version of LWIP is
2.0.2
if
not
GetDepend
(
'RT_USING_LWIP132'
)
and
not
GetDepend
(
'RT_USING_LWIP14
0
'
)
and
not
GetDepend
(
'RT_USING_LWIP202'
):
if
not
GetDepend
(
'RT_USING_LWIP132'
)
and
not
GetDepend
(
'RT_USING_LWIP14
1
'
)
and
not
GetDepend
(
'RT_USING_LWIP202'
):
AddDepend
(
'RT_USING_LWIP202'
)
AddDepend
(
'RT_USING_LWIP202'
)
for
d
in
list
:
for
d
in
list
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录