Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
a987cfe0
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a987cfe0
编写于
10月 14, 2021
作者:
G
guo
提交者:
GitHub
10月 14, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5173 from cndabai/components
Components编译报错
上级
163b4648
f04941c9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
4 deletion
+12
-4
components/drivers/phy/phy.c
components/drivers/phy/phy.c
+1
-1
components/drivers/usb/usbdevice/class/cdc_vcom.c
components/drivers/usb/usbdevice/class/cdc_vcom.c
+7
-3
components/drivers/usb/usbdevice/class/ecm.c
components/drivers/usb/usbdevice/class/ecm.c
+4
-0
未找到文件。
components/drivers/phy/phy.c
浏览文件 @
a987cfe0
...
...
@@ -60,7 +60,7 @@ rt_err_t rt_hw_phy_register(struct rt_phy_device *phy, const char *name)
device
->
tx_complete
=
RT_NULL
;
#ifdef RT_USING_DEVICE_OPS
device
->
ops
=
phy_ops
;
device
->
ops
=
&
phy_ops
;
#else
device
->
init
=
NULL
;
device
->
open
=
NULL
;
...
...
components/drivers/usb/usbdevice/class/cdc_vcom.c
浏览文件 @
a987cfe0
...
...
@@ -10,11 +10,11 @@
* 2013-06-25 heyuanjie87 remove SOF mechinism
* 2013-07-20 Yi Qiu do more test
* 2016-02-01 Urey Fix some error
* 2021-10-14 mazhiyuan Fix some error
*/
#include <rthw.h>
#include <rtdevice.h>
#include <drivers/serial.h>
#include "drivers/usb_device.h"
#include "cdc.h"
...
...
@@ -738,7 +738,7 @@ static rt_size_t _vcom_rb_block_put(struct vcom *data, const rt_uint8_t *buf, rt
return
size
;
}
static
rt_size_t
_vcom_tx
(
struct
rt_serial_device
*
serial
,
rt_uint8_t
*
buf
,
rt_size_t
size
,
in
t
direction
)
static
rt_size_t
_vcom_tx
(
struct
rt_serial_device
*
serial
,
rt_uint8_t
*
buf
,
rt_size_t
size
,
rt_uint32_
t
direction
)
{
struct
ufunction
*
func
;
struct
vcom
*
data
;
...
...
@@ -939,8 +939,12 @@ static void rt_usb_vcom_init(struct ufunction *func)
config
.
parity
=
PARITY_NONE
;
config
.
bit_order
=
BIT_ORDER_LSB
;
config
.
invert
=
NRZ_NORMAL
;
#if defined(RT_USING_SERIAL_V1)
config
.
bufsz
=
CDC_RX_BUFSIZE
;
#elif defined(RT_USING_SERIAL_V2)
config
.
rx_bufsz
=
CDC_RX_BUFSIZE
;
config
.
tx_bufsz
=
CDC_TX_BUFSIZE
;
#endif
data
->
serial
.
ops
=
&
usb_vcom_ops
;
data
->
serial
.
serial_rx
=
RT_NULL
;
data
->
serial
.
config
=
config
;
...
...
components/drivers/usb/usbdevice/class/ecm.c
浏览文件 @
a987cfe0
...
...
@@ -644,12 +644,16 @@ ufunction_t rt_usbd_function_ecm_create(udevice_t device)
_ecm_eth
->
host_addr
[
4
]
=
0xEC
;
//*(const rt_uint8_t *)(0x1fff7a14);
_ecm_eth
->
host_addr
[
5
]
=
0xAB
;
//*(const rt_uint8_t *)(0x1fff7a18);
#ifdef RT_USING_DEVICE_OPS
_ecm_eth
->
parent
.
parent
.
ops
=
&
ecm_device_ops
;
#else
_ecm_eth
->
parent
.
parent
.
init
=
rt_ecm_eth_init
;
_ecm_eth
->
parent
.
parent
.
open
=
rt_ecm_eth_open
;
_ecm_eth
->
parent
.
parent
.
close
=
rt_ecm_eth_close
;
_ecm_eth
->
parent
.
parent
.
read
=
rt_ecm_eth_read
;
_ecm_eth
->
parent
.
parent
.
write
=
rt_ecm_eth_write
;
_ecm_eth
->
parent
.
parent
.
control
=
rt_ecm_eth_control
;
#endif
_ecm_eth
->
parent
.
parent
.
user_data
=
device
;
_ecm_eth
->
parent
.
eth_rx
=
rt_ecm_eth_rx
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录