Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
rt-thread
提交
f57eb4fe
R
rt-thread
项目概览
genary
/
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,发现更多精彩内容 >>
提交
f57eb4fe
编写于
11月 08, 2022
作者:
mysterywolf
提交者:
guo
11月 09, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sensor] 修改fetch_data方法的参数数据类型为rt_sensor_data_t
上级
f550fc58
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
7 addition
and
6 deletion
+7
-6
components/drivers/include/drivers/sensor.h
components/drivers/include/drivers/sensor.h
+3
-2
components/drivers/sensors/sensor.c
components/drivers/sensors/sensor.c
+4
-4
未找到文件。
components/drivers/include/drivers/sensor.h
浏览文件 @
f57eb4fe
...
...
@@ -160,6 +160,7 @@ struct rt_sensor_config
};
typedef
struct
rt_sensor_device
*
rt_sensor_t
;
typedef
struct
rt_sensor_data
*
rt_sensor_data_t
;
struct
rt_sensor_device
{
...
...
@@ -168,7 +169,7 @@ struct rt_sensor_device
struct
rt_sensor_info
info
;
/* The sensor info data */
struct
rt_sensor_config
config
;
/* The sensor config data */
void
*
data_buf
;
/* The buf of the data received */
rt_sensor_data_t
data_buf
;
/* The buf of the data received */
rt_size_t
data_len
;
/* The size of the data received */
const
struct
rt_sensor_ops
*
ops
;
/* The sensor ops */
...
...
@@ -238,7 +239,7 @@ struct rt_sensor_data
struct
rt_sensor_ops
{
rt_ssize_t
(
*
fetch_data
)(
rt_sensor_t
sensor
,
void
*
buf
,
rt_size_t
len
);
rt_ssize_t
(
*
fetch_data
)(
rt_sensor_t
sensor
,
rt_sensor_data_t
buf
,
rt_size_t
len
);
rt_err_t
(
*
control
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
);
};
...
...
components/drivers/sensors/sensor.c
浏览文件 @
f57eb4fe
...
...
@@ -123,7 +123,7 @@ static rt_err_t _sensor_irq_init(rt_sensor_t sensor)
}
/* sensor local ops */
static
rt_ssize_t
_local_fetch_data
(
rt_sensor_t
sensor
,
void
*
buf
,
rt_size_t
len
)
static
rt_ssize_t
_local_fetch_data
(
rt_sensor_t
sensor
,
rt_sensor_data_t
buf
,
rt_size_t
len
)
{
LOG_D
(
"Undefined fetch_data"
);
return
-
RT_EINVAL
;
...
...
@@ -250,7 +250,7 @@ static rt_err_t _sensor_close(rt_device_t dev)
/* Free memory for the sensor buffer */
for
(
i
=
0
;
i
<
sensor
->
module
->
sen_num
;
i
++
)
{
if
(
sensor
->
module
->
sen
[
i
]
->
data_buf
!=
RT_NULL
)
if
(
sensor
->
module
->
sen
[
i
]
->
data_buf
)
{
rt_free
(
sensor
->
module
->
sen
[
i
]
->
data_buf
);
sensor
->
module
->
sen
[
i
]
->
data_buf
=
RT_NULL
;
...
...
@@ -307,8 +307,8 @@ static rt_size_t _sensor_read(rt_device_t dev, rt_off_t pos, void *buf, rt_size_
}
else
{
/* If the buffer is empty read the data */
if
(
sensor
->
ops
->
fetch_data
!=
RT_NULL
)
/* If the buffer is empty
,
read the data */
if
(
sensor
->
ops
->
fetch_data
)
{
result
=
sensor
->
ops
->
fetch_data
(
sensor
,
buf
,
len
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录