Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yunqingabc
rt-thread
提交
bab17630
R
rt-thread
项目概览
yunqingabc
/
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,发现更多精彩内容 >>
提交
bab17630
编写于
6月 18, 2014
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #287 from grissiom/device-fix
Device fix
上级
1dc376b2
aca8f8eb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
9 deletion
+12
-9
components/finsh/cmd.c
components/finsh/cmd.c
+5
-4
src/device.c
src/device.c
+7
-5
未找到文件。
components/finsh/cmd.c
浏览文件 @
bab17630
...
...
@@ -471,17 +471,18 @@ static long _list_device(struct rt_list_node *list)
"Unknown"
};
rt_kprintf
(
"device
type
\n
"
);
rt_kprintf
(
"-------- ----------
\n
"
);
rt_kprintf
(
"device
type ref count
\n
"
);
rt_kprintf
(
"-------- ----------
---------- ----------
\n
"
);
for
(
node
=
list
->
next
;
node
!=
list
;
node
=
node
->
next
)
{
device
=
(
struct
rt_device
*
)(
rt_list_entry
(
node
,
struct
rt_object
,
list
));
rt_kprintf
(
"%-8.*s %-
8s
\n
"
,
rt_kprintf
(
"%-8.*s %-
20s %-8d
\n
"
,
RT_NAME_MAX
,
device
->
parent
.
name
,
(
device
->
type
<=
RT_Device_Class_Unknown
)
?
device_type_str
[
device
->
type
]
:
device_type_str
[
RT_Device_Class_Unknown
]);
device_type_str
[
RT_Device_Class_Unknown
],
device
->
ref_count
);
}
return
0
;
...
...
src/device.c
浏览文件 @
bab17630
...
...
@@ -239,11 +239,6 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
return
-
RT_EBUSY
;
}
dev
->
ref_count
++
;
/* don't let bad things happen silently. If you are bitten by this assert,
* please set the ref_count to a bigger type. */
RT_ASSERT
(
dev
->
ref_count
!=
0
);
/* call device open interface */
if
(
dev
->
open
!=
RT_NULL
)
{
...
...
@@ -252,8 +247,15 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
/* set open flag */
if
(
result
==
RT_EOK
||
result
==
-
RT_ENOSYS
)
{
dev
->
open_flag
=
oflag
|
RT_DEVICE_OFLAG_OPEN
;
dev
->
ref_count
++
;
/* don't let bad things happen silently. If you are bitten by this assert,
* please set the ref_count to a bigger type. */
RT_ASSERT
(
dev
->
ref_count
!=
0
);
}
return
result
;
}
RTM_EXPORT
(
rt_device_open
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录