Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
0f20bf12
R
rt-thread
项目概览
BaiXuePrincess
/
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看板
提交
0f20bf12
编写于
7月 07, 2015
作者:
A
Aubr.Cool
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[DeviceDriver]correct can critical problems
上级
7de47e02
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
12 deletion
+12
-12
components/drivers/can/can.c
components/drivers/can/can.c
+12
-12
未找到文件。
components/drivers/can/can.c
浏览文件 @
0f20bf12
...
...
@@ -189,6 +189,7 @@ rt_inline int _can_int_tx(struct rt_can_device *can, const struct rt_can_msg *da
rt_list_remove
(
&
tx_tosnd
->
list
);
}
rt_list_insert_before
(
&
tx_fifo
->
freelist
,
&
tx_tosnd
->
list
);
rt_completion_done
(
&
(
tx_fifo
->
completion
));
rt_hw_interrupt_enable
(
level
);
if
(
result
==
RT_CAN_SND_RESULT_OK
)
...
...
@@ -208,13 +209,6 @@ rt_inline int _can_int_tx(struct rt_can_device *can, const struct rt_can_msg *da
rt_hw_interrupt_enable
(
level
);
break
;
}
level
=
rt_hw_interrupt_disable
();
if
(
rt_list_isempty
(
&
tx_fifo
->
freelist
))
{
rt_completion_done
(
&
(
tx_fifo
->
completion
));
}
rt_hw_interrupt_enable
(
level
);
}
return
(
size
-
msgs
);
...
...
@@ -541,12 +535,12 @@ static rt_err_t rt_can_control(struct rt_device *dev,
{
rt_completion_done
(
&
(
tx_fifo
->
completion
));
level
=
rt_hw_interrupt_disable
();
for
(
i
=
0
;
i
<
can
->
config
.
sndboxnumber
;
i
++
)
{
level
=
rt_hw_interrupt_disable
();
rt_list_remove
(
&
tx_fifo
->
buffer
[
i
].
list
);
rt_hw_interrupt_enable
(
level
);
}
rt_hw_interrupt_enable
(
level
);
}
else
{
...
...
@@ -600,8 +594,10 @@ static rt_err_t rt_can_control(struct rt_device *dev,
level
=
rt_hw_interrupt_disable
();
if
(
!
can
->
hdr
[
pitem
->
hdr
].
connected
)
{
rt_hw_interrupt_enable
(
level
);
rt_memcpy
(
&
can
->
hdr
[
pitem
->
hdr
].
filter
,
pitem
,
sizeof
(
struct
rt_can_filter_item
));
level
=
rt_hw_interrupt_disable
();
can
->
hdr
[
pitem
->
hdr
].
connected
=
1
;
can
->
hdr
[
pitem
->
hdr
].
msgs
=
0
;
rt_list_init
(
&
can
->
hdr
[
pitem
->
hdr
].
list
);
...
...
@@ -626,16 +622,20 @@ static rt_err_t rt_can_control(struct rt_device *dev,
if
(
can
->
hdr
[
pitem
->
hdr
].
connected
)
{
rt_memset
(
&
can
->
hdr
[
pitem
->
hdr
].
filter
,
0
,
sizeof
(
struct
rt_can_filter_item
));
can
->
hdr
[
pitem
->
hdr
].
connected
=
0
;
can
->
hdr
[
pitem
->
hdr
].
msgs
=
0
;
if
(
!
rt_list_isempty
(
&
can
->
hdr
[
pitem
->
hdr
].
list
))
{
rt_list_remove
(
can
->
hdr
[
pitem
->
hdr
].
list
.
next
);
}
rt_hw_interrupt_enable
(
level
);
rt_memset
(
&
can
->
hdr
[
pitem
->
hdr
].
filter
,
0
,
sizeof
(
struct
rt_can_filter_item
));
}
rt_hw_interrupt_enable
(
level
);
else
{
rt_hw_interrupt_enable
(
level
);
}
count
--
;
pitem
++
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录