Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
nix61
rt-thread
提交
c4175167
R
rt-thread
项目概览
nix61
/
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,发现更多精彩内容 >>
提交
c4175167
编写于
7月 07, 2015
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #515 from AubrCool/master
fix some can driver problems
上级
7de47e02
7051f01f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
21 deletion
+38
-21
components/drivers/can/can.c
components/drivers/can/can.c
+33
-19
components/drivers/include/drivers/can.h
components/drivers/include/drivers/can.h
+5
-2
未找到文件。
components/drivers/can/can.c
浏览文件 @
c4175167
...
...
@@ -56,7 +56,6 @@ rt_inline int _can_int_rx(struct rt_can_device *can, struct rt_can_msg *data, in
{
int
size
;
struct
rt_can_rx_fifo
*
rx_fifo
;
RT_ASSERT
(
can
!=
RT_NULL
);
size
=
msgs
;
...
...
@@ -67,6 +66,9 @@ rt_inline int _can_int_rx(struct rt_can_device *can, struct rt_can_msg *data, in
while
(
msgs
)
{
rt_base_t
level
;
#ifdef RT_CAN_USING_HDR
rt_int32_t
hdr
;
#endif
/*RT_CAN_USING_HDR*/
struct
rt_can_msg_list
*
listmsg
=
RT_NULL
;
/* disable interrupt */
...
...
@@ -189,6 +191,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 +211,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 +537,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 +596,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 +624,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
++
;
}
...
...
@@ -643,7 +645,11 @@ static rt_err_t rt_can_control(struct rt_device *dev,
}
break
;
#endif
/*RT_CAN_USING_HDR*/
#ifdef RT_CAN_USING_BUS_HOOK
case
RT_CAN_CMD_SET_BUS_HOOK
:
can
->
bus_hook
=
(
rt_can_bus_hook
)
args
;
break
;
#endif
/*RT_CAN_USING_BUS_HOOK*/
default
:
/* control device */
if
(
can
->
ops
->
control
!=
RT_NULL
)
...
...
@@ -664,15 +670,21 @@ static void cantimeout(void *arg)
rt_can_t
can
=
(
rt_can_t
)
arg
;
rt_device_control
((
rt_device_t
)
can
,
RT_CAN_CMD_GET_STATUS
,
(
void
*
)
&
can
->
status
);
if
(
can
->
timerinitflag
==
1
)
{
can
->
timerinitflag
=
0xFF
;
}
if
(
can
->
status_indicate
.
ind
!=
RT_NULL
)
{
can
->
status_indicate
.
ind
(
can
,
can
->
status_indicate
.
args
);
}
#ifdef RT_CAN_USING_BUS_HOOK
if
(
can
->
bus_hook
)
{
can
->
bus_hook
(
can
);
}
#endif
/*RT_CAN_USING_BUS_HOOK*/
if
(
can
->
timerinitflag
==
1
)
{
can
->
timerinitflag
=
0xFF
;
}
}
/*
...
...
@@ -697,7 +709,9 @@ rt_err_t rt_hw_can_register(struct rt_can_device *can,
can
->
can_rx
=
RT_NULL
;
can
->
can_tx
=
RT_NULL
;
rt_mutex_init
(
&
(
can
->
lock
),
"can"
,
RT_IPC_FLAG_PRIO
);
#ifdef RT_CAN_USING_BUS_HOOK
can
->
bus_hook
=
RT_NULL
;
#endif
/*RT_CAN_USING_BUS_HOOK*/
device
->
init
=
rt_can_init
;
device
->
open
=
rt_can_open
;
device
->
close
=
rt_can_close
;
...
...
components/drivers/include/drivers/can.h
浏览文件 @
c4175167
...
...
@@ -139,6 +139,7 @@ struct rt_can_ops;
#define RT_CAN_CMD_SET_PRIV 0x16
#define RT_CAN_CMD_GET_STATUS 0x17
#define RT_CAN_CMD_SET_STATUS_IND 0x18
#define RT_CAN_CMD_SET_BUS_HOOK 0x19
#define RT_DEVICE_CAN_INT_ERR 0x1000
...
...
@@ -195,7 +196,7 @@ typedef struct rt_can_status_ind_type
rt_canstatus_ind
ind
;
void
*
args
;
}
*
rt_can_status_ind_type_t
;
typedef
void
(
*
rt_can_bus_hook
)(
struct
rt_can_device
*
);
struct
rt_can_device
{
struct
rt_device
parent
;
...
...
@@ -211,7 +212,9 @@ struct rt_can_device
#ifdef RT_CAN_USING_HDR
struct
rt_can_hdr
*
hdr
;
#endif
#ifdef RT_CAN_USING_BUS_HOOK
rt_can_bus_hook
bus_hook
;
#endif
/*RT_CAN_USING_BUS_HOOK*/
struct
rt_mutex
lock
;
void
*
can_rx
;
void
*
can_tx
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录