Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
luozhenger
rt-thread
提交
6c814db1
R
rt-thread
项目概览
luozhenger
/
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,发现更多精彩内容 >>
提交
6c814db1
编写于
4月 10, 2018
作者:
lymzzyh
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/master'
上级
f95d28a6
10a4de16
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
843 addition
and
1526 deletion
+843
-1526
bsp/gd32450z-eval/project.ewp
bsp/gd32450z-eval/project.ewp
+180
-320
bsp/gd32450z-eval/project.uvproj
bsp/gd32450z-eval/project.uvproj
+195
-499
bsp/gd32450z-eval/project.uvprojx
bsp/gd32450z-eval/project.uvprojx
+126
-390
bsp/imxrt1052-evk/Libraries/drivers/fsl_enet.c
bsp/imxrt1052-evk/Libraries/drivers/fsl_enet.c
+7
-1
bsp/imxrt1052-evk/drivers/drv_eth.c
bsp/imxrt1052-evk/drivers/drv_eth.c
+327
-308
components/drivers/rtc/rtc.c
components/drivers/rtc/rtc.c
+2
-2
components/drivers/src/pipe.c
components/drivers/src/pipe.c
+2
-2
components/finsh/msh.c
components/finsh/msh.c
+2
-2
src/mempool.c
src/mempool.c
+2
-2
未找到文件。
bsp/gd32450z-eval/project.ewp
浏览文件 @
6c814db1
此差异已折叠。
点击以展开。
bsp/gd32450z-eval/project.uvproj
浏览文件 @
6c814db1
此差异已折叠。
点击以展开。
bsp/gd32450z-eval/project.uvprojx
浏览文件 @
6c814db1
此差异已折叠。
点击以展开。
bsp/imxrt1052-evk/Libraries/drivers/fsl_enet.c
浏览文件 @
6c814db1
...
@@ -1345,7 +1345,13 @@ status_t ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const uint8_t *d
...
@@ -1345,7 +1345,13 @@ status_t ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const uint8_t *d
#else
#else
address
=
(
uint32_t
)
curBuffDescrip
->
buffer
;
address
=
(
uint32_t
)
curBuffDescrip
->
buffer
;
#endif
/* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
#endif
/* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
memcpy
((
void
*
)
address
,
data
,
length
);
{
// Change SDK to reduce memory copy
extern
void
pbuf2mem
(
const
uint8_t
*
data
,
void
*
dataptr
,
uint32_t
len
);
pbuf2mem
(
data
,
(
void
*
)
address
,
length
);
}
//memcpy((void *)address, data, length);
/* Set data length. */
/* Set data length. */
curBuffDescrip
->
length
=
length
;
curBuffDescrip
->
length
=
length
;
#ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE
#ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE
...
...
bsp/imxrt1052-evk/drivers/drv_eth.c
浏览文件 @
6c814db1
此差异已折叠。
点击以展开。
components/drivers/rtc/rtc.c
浏览文件 @
6c814db1
...
@@ -247,7 +247,7 @@ FINSH_FUNCTION_EXPORT(list_date, show date and time.)
...
@@ -247,7 +247,7 @@ FINSH_FUNCTION_EXPORT(list_date, show date and time.)
FINSH_FUNCTION_EXPORT
(
set_date
,
set
date
.
e
.
g
:
set_date
(
2010
,
2
,
28
))
FINSH_FUNCTION_EXPORT
(
set_date
,
set
date
.
e
.
g
:
set_date
(
2010
,
2
,
28
))
FINSH_FUNCTION_EXPORT
(
set_time
,
set
time
.
e
.
g
:
set_time
(
23
,
59
,
59
))
FINSH_FUNCTION_EXPORT
(
set_time
,
set
time
.
e
.
g
:
set_time
(
23
,
59
,
59
))
#if defined(RT_USING_FINSH)
#if defined(RT_USING_FINSH)
&& defined(FINSH_USING_MSH)
static
void
date
(
uint8_t
argc
,
char
**
argv
)
static
void
date
(
uint8_t
argc
,
char
**
argv
)
{
{
if
(
argc
==
1
)
if
(
argc
==
1
)
...
@@ -308,6 +308,6 @@ static void date(uint8_t argc, char **argv)
...
@@ -308,6 +308,6 @@ static void date(uint8_t argc, char **argv)
}
}
}
}
MSH_CMD_EXPORT
(
date
,
get
date
and
time
or
set
[
year
month
day
hour
min
sec
]);
MSH_CMD_EXPORT
(
date
,
get
date
and
time
or
set
[
year
month
day
hour
min
sec
]);
#endif
/* defined(RT_USING_FINSH) */
#endif
/* defined(RT_USING_FINSH)
&& defined(FINSH_USING_MSH)
*/
#endif
/* RT_USING_FINSH */
#endif
/* RT_USING_FINSH */
components/drivers/src/pipe.c
浏览文件 @
6c814db1
...
@@ -358,7 +358,7 @@ rt_err_t rt_pipe_close (rt_device_t device)
...
@@ -358,7 +358,7 @@ rt_err_t rt_pipe_close (rt_device_t device)
rt_size_t
rt_pipe_read
(
rt_device_t
device
,
rt_off_t
pos
,
void
*
buffer
,
rt_size_t
count
)
rt_size_t
rt_pipe_read
(
rt_device_t
device
,
rt_off_t
pos
,
void
*
buffer
,
rt_size_t
count
)
{
{
uint8_t
*
pbuf
;
uint8_t
*
pbuf
;
in
t
read_bytes
=
0
;
rt_size_
t
read_bytes
=
0
;
rt_pipe_t
*
pipe
=
(
rt_pipe_t
*
)
device
;
rt_pipe_t
*
pipe
=
(
rt_pipe_t
*
)
device
;
if
(
device
==
RT_NULL
)
if
(
device
==
RT_NULL
)
...
@@ -386,7 +386,7 @@ rt_size_t rt_pipe_read (rt_device_t device, rt_off_t pos, void *buffer, rt_siz
...
@@ -386,7 +386,7 @@ rt_size_t rt_pipe_read (rt_device_t device, rt_off_t pos, void *buffer, rt_siz
rt_size_t
rt_pipe_write
(
rt_device_t
device
,
rt_off_t
pos
,
const
void
*
buffer
,
rt_size_t
count
)
rt_size_t
rt_pipe_write
(
rt_device_t
device
,
rt_off_t
pos
,
const
void
*
buffer
,
rt_size_t
count
)
{
{
uint8_t
*
pbuf
;
uint8_t
*
pbuf
;
in
t
write_bytes
=
0
;
rt_size_
t
write_bytes
=
0
;
rt_pipe_t
*
pipe
=
(
rt_pipe_t
*
)
device
;
rt_pipe_t
*
pipe
=
(
rt_pipe_t
*
)
device
;
if
(
device
==
RT_NULL
)
if
(
device
==
RT_NULL
)
...
...
components/finsh/msh.c
浏览文件 @
6c814db1
...
@@ -282,7 +282,7 @@ RTM_EXPORT(system);
...
@@ -282,7 +282,7 @@ RTM_EXPORT(system);
static
int
_msh_exec_cmd
(
char
*
cmd
,
rt_size_t
length
,
int
*
retp
)
static
int
_msh_exec_cmd
(
char
*
cmd
,
rt_size_t
length
,
int
*
retp
)
{
{
int
argc
;
int
argc
;
in
t
cmd0_size
=
0
;
rt_size_
t
cmd0_size
=
0
;
cmd_function_t
cmd_func
;
cmd_function_t
cmd_func
;
char
*
argv
[
RT_FINSH_ARG_MAX
];
char
*
argv
[
RT_FINSH_ARG_MAX
];
...
@@ -448,7 +448,7 @@ void msh_auto_complete_path(char *path)
...
@@ -448,7 +448,7 @@ void msh_auto_complete_path(char *path)
}
}
else
else
{
{
in
t
length
,
min_length
;
rt_size_
t
length
,
min_length
;
min_length
=
0
;
min_length
=
0
;
for
(;;)
for
(;;)
...
...
src/mempool.c
浏览文件 @
6c814db1
...
@@ -95,7 +95,7 @@ rt_err_t rt_mp_init(struct rt_mempool *mp,
...
@@ -95,7 +95,7 @@ rt_err_t rt_mp_init(struct rt_mempool *mp,
rt_size_t
block_size
)
rt_size_t
block_size
)
{
{
rt_uint8_t
*
block_ptr
;
rt_uint8_t
*
block_ptr
;
register
rt_
bas
e_t
offset
;
register
rt_
siz
e_t
offset
;
/* parameter check */
/* parameter check */
RT_ASSERT
(
mp
!=
RT_NULL
);
RT_ASSERT
(
mp
!=
RT_NULL
);
...
@@ -200,7 +200,7 @@ rt_mp_t rt_mp_create(const char *name,
...
@@ -200,7 +200,7 @@ rt_mp_t rt_mp_create(const char *name,
{
{
rt_uint8_t
*
block_ptr
;
rt_uint8_t
*
block_ptr
;
struct
rt_mempool
*
mp
;
struct
rt_mempool
*
mp
;
register
rt_
bas
e_t
offset
;
register
rt_
siz
e_t
offset
;
RT_DEBUG_NOT_IN_INTERRUPT
;
RT_DEBUG_NOT_IN_INTERRUPT
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录