Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
人间散章
rt-thread
提交
c8b30bf3
R
rt-thread
项目概览
人间散章
/
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
c8b30bf3
编写于
3月 10, 2023
作者:
Z
Zxy
提交者:
GitHub
3月 09, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[device]修改i2c读写函数返回类型为rt_ssize_t (#7029)
上级
f6847af0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
20 deletion
+14
-20
bsp/lpc54114-lite/drivers/drv_i2c.c
bsp/lpc54114-lite/drivers/drv_i2c.c
+1
-1
components/drivers/i2c/i2c_core.c
components/drivers/i2c/i2c_core.c
+10
-16
components/drivers/include/drivers/i2c.h
components/drivers/include/drivers/i2c.h
+3
-3
未找到文件。
bsp/lpc54114-lite/drivers/drv_i2c.c
浏览文件 @
c8b30bf3
...
...
@@ -35,7 +35,7 @@ static uint32_t get_i2c_freq(I2C_Type *base)
static
rt_ssize_t
master_xfer
(
struct
rt_i2c_bus_device
*
bus
,
struct
rt_i2c_msg
msgs
[],
rt_uint32_t
num
)
{
rt_size_t
ret
=
(
0
);
rt_s
s
ize_t
ret
=
(
0
);
rt_uint32_t
index
=
0
;
struct
lpc_i2c
*
lpc_i2c
=
RT_NULL
;
...
...
components/drivers/i2c/i2c_core.c
浏览文件 @
c8b30bf3
...
...
@@ -51,11 +51,11 @@ struct rt_i2c_bus_device *rt_i2c_bus_device_find(const char *bus_name)
return
bus
;
}
rt_size_t
rt_i2c_transfer
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_transfer
(
struct
rt_i2c_bus_device
*
bus
,
struct
rt_i2c_msg
msgs
[],
rt_uint32_t
num
)
{
rt_size_t
ret
;
rt_s
s
ize_t
ret
;
if
(
bus
->
ops
->
master_xfer
)
{
...
...
@@ -78,7 +78,7 @@ rt_size_t rt_i2c_transfer(struct rt_i2c_bus_device *bus,
{
LOG_E
(
"I2C bus operation not supported"
);
return
0
;
return
-
RT_ERROR
;
}
}
...
...
@@ -98,17 +98,17 @@ rt_err_t rt_i2c_control(struct rt_i2c_bus_device *bus,
{
LOG_E
(
"I2C bus operation not supported"
);
return
0
;
return
-
RT_ERROR
;
}
}
rt_size_t
rt_i2c_master_send
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_master_send
(
struct
rt_i2c_bus_device
*
bus
,
rt_uint16_t
addr
,
rt_uint16_t
flags
,
const
rt_uint8_t
*
buf
,
rt_uint32_t
count
)
{
rt_size_t
ret
;
rt_s
s
ize_t
ret
;
struct
rt_i2c_msg
msg
;
msg
.
addr
=
addr
;
...
...
@@ -118,16 +118,16 @@ rt_size_t rt_i2c_master_send(struct rt_i2c_bus_device *bus,
ret
=
rt_i2c_transfer
(
bus
,
&
msg
,
1
);
return
(
ret
>
0
)
?
count
:
ret
;
return
ret
;
}
rt_size_t
rt_i2c_master_recv
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_master_recv
(
struct
rt_i2c_bus_device
*
bus
,
rt_uint16_t
addr
,
rt_uint16_t
flags
,
rt_uint8_t
*
buf
,
rt_uint32_t
count
)
{
rt_size_t
ret
;
rt_s
s
ize_t
ret
;
struct
rt_i2c_msg
msg
;
RT_ASSERT
(
bus
!=
RT_NULL
);
...
...
@@ -138,11 +138,5 @@ rt_size_t rt_i2c_master_recv(struct rt_i2c_bus_device *bus,
ret
=
rt_i2c_transfer
(
bus
,
&
msg
,
1
);
return
(
ret
>
0
)
?
count
:
ret
;
return
ret
;
}
int
rt_i2c_core_init
(
void
)
{
return
0
;
}
INIT_COMPONENT_EXPORT
(
rt_i2c_core_init
);
components/drivers/include/drivers/i2c.h
浏览文件 @
c8b30bf3
...
...
@@ -70,18 +70,18 @@ struct rt_i2c_client
rt_err_t
rt_i2c_bus_device_register
(
struct
rt_i2c_bus_device
*
bus
,
const
char
*
bus_name
);
struct
rt_i2c_bus_device
*
rt_i2c_bus_device_find
(
const
char
*
bus_name
);
rt_size_t
rt_i2c_transfer
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_transfer
(
struct
rt_i2c_bus_device
*
bus
,
struct
rt_i2c_msg
msgs
[],
rt_uint32_t
num
);
rt_err_t
rt_i2c_control
(
struct
rt_i2c_bus_device
*
bus
,
rt_uint32_t
cmd
,
rt_uint32_t
arg
);
rt_size_t
rt_i2c_master_send
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_master_send
(
struct
rt_i2c_bus_device
*
bus
,
rt_uint16_t
addr
,
rt_uint16_t
flags
,
const
rt_uint8_t
*
buf
,
rt_uint32_t
count
);
rt_size_t
rt_i2c_master_recv
(
struct
rt_i2c_bus_device
*
bus
,
rt_s
s
ize_t
rt_i2c_master_recv
(
struct
rt_i2c_bus_device
*
bus
,
rt_uint16_t
addr
,
rt_uint16_t
flags
,
rt_uint8_t
*
buf
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录