Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2020fengziyang
rt-thread
提交
d6605e3f
R
rt-thread
项目概览
2020fengziyang
/
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 搜索 >>
提交
d6605e3f
编写于
2月 27, 2023
作者:
S
sheltonyu
提交者:
mysterywolf
2月 27, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed gcc compiling usb driver errors, update for including file position and adding macros
上级
26fab3e7
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
119 addition
and
60 deletion
+119
-60
bsp/at32/libraries/rt_drivers/drv_usbd.c
bsp/at32/libraries/rt_drivers/drv_usbd.c
+4
-4
bsp/at32/libraries/rt_drivers/drv_usbd.h
bsp/at32/libraries/rt_drivers/drv_usbd.h
+3
-1
bsp/at32/libraries/rt_drivers/drv_usbfs.h
bsp/at32/libraries/rt_drivers/drv_usbfs.h
+4
-1
bsp/at32/libraries/rt_drivers/drv_usbfsd.c
bsp/at32/libraries/rt_drivers/drv_usbfsd.c
+5
-5
bsp/at32/libraries/rt_drivers/drv_usbfsh.c
bsp/at32/libraries/rt_drivers/drv_usbfsh.c
+4
-4
bsp/at32/libraries/usbd_library/inc/usb_std.h
bsp/at32/libraries/usbd_library/inc/usb_std.h
+10
-0
bsp/at32/libraries/usbd_library/inc/usbd_core.h
bsp/at32/libraries/usbd_library/inc/usbd_core.h
+3
-0
bsp/at32/libraries/usbd_library/inc/usbd_int.h
bsp/at32/libraries/usbd_library/inc/usbd_int.h
+5
-0
bsp/at32/libraries/usbd_library/inc/usbd_sdr.h
bsp/at32/libraries/usbd_library/inc/usbd_sdr.h
+3
-0
bsp/at32/libraries/usbd_library/src/usbd_core.c
bsp/at32/libraries/usbd_library/src/usbd_core.c
+4
-0
bsp/at32/libraries/usbd_library/src/usbd_int.c
bsp/at32/libraries/usbd_library/src/usbd_int.c
+11
-7
bsp/at32/libraries/usbd_library/src/usbd_sdr.c
bsp/at32/libraries/usbd_library/src/usbd_sdr.c
+7
-3
bsp/at32/libraries/usbfs_library/inc/usb_std.h
bsp/at32/libraries/usbfs_library/inc/usb_std.h
+10
-0
bsp/at32/libraries/usbfs_library/inc/usbd_int.h
bsp/at32/libraries/usbfs_library/inc/usbd_int.h
+4
-4
bsp/at32/libraries/usbfs_library/inc/usbd_sdr.h
bsp/at32/libraries/usbfs_library/inc/usbd_sdr.h
+4
-4
bsp/at32/libraries/usbfs_library/inc/usbh_ctrl.h
bsp/at32/libraries/usbfs_library/inc/usbh_ctrl.h
+4
-0
bsp/at32/libraries/usbfs_library/inc/usbh_int.h
bsp/at32/libraries/usbfs_library/inc/usbh_int.h
+4
-0
bsp/at32/libraries/usbfs_library/src/usbd_core.c
bsp/at32/libraries/usbfs_library/src/usbd_core.c
+2
-2
bsp/at32/libraries/usbfs_library/src/usbd_int.c
bsp/at32/libraries/usbfs_library/src/usbd_int.c
+9
-9
bsp/at32/libraries/usbfs_library/src/usbd_sdr.c
bsp/at32/libraries/usbfs_library/src/usbd_sdr.c
+6
-12
bsp/at32/libraries/usbfs_library/src/usbh_core.c
bsp/at32/libraries/usbfs_library/src/usbh_core.c
+4
-1
bsp/at32/libraries/usbfs_library/src/usbh_ctrl.c
bsp/at32/libraries/usbfs_library/src/usbh_ctrl.c
+3
-0
bsp/at32/libraries/usbfs_library/src/usbh_int.c
bsp/at32/libraries/usbfs_library/src/usbh_int.c
+6
-3
未找到文件。
bsp/at32/libraries/rt_drivers/drv_usbd.c
浏览文件 @
d6605e3f
...
...
@@ -10,14 +10,14 @@
#include <rtthread.h>
#include <rtdevice.h>
#include "usbd_int.h"
#include "drv_common.h"
#include "drv_usbd.h"
#include "drv_config.h"
#if defined(BSP_USING_USBD)
#include "usbd_int.h"
#include "drv_usbd.h"
#include "drv_config.h"
static
struct
at32_usbd
*
p_usbd_instance
=
NULL
;
static
struct
at32_usbd
*
p_usbd_instance
=
RT_
NULL
;
static
struct
ep_id
endpoint_pool
[]
=
{
{
0x0
,
USB_EP_ATTR_CONTROL
,
USB_DIR_INOUT
,
64
,
ID_ASSIGNED
},
...
...
bsp/at32/libraries/rt_drivers/drv_usbd.h
浏览文件 @
d6605e3f
...
...
@@ -14,6 +14,8 @@
#include <rtthread.h>
#include <rtdevice.h>
#include "drv_common.h"
#if defined(BSP_USING_USBD)
#include "usbd_core.h"
struct
at32_usbd
{
...
...
@@ -21,7 +23,7 @@ struct at32_usbd {
usbd_core_type
*
p_usbd_core
;
IRQn_Type
irqn
;
};
#endif
#endif
/* __DRV_USBD_H__ */
/******************* end of file *******************/
bsp/at32/libraries/rt_drivers/drv_usbfs.h
浏览文件 @
d6605e3f
...
...
@@ -14,6 +14,9 @@
#include <rtthread.h>
#include <rtdevice.h>
#include "drv_common.h"
#if defined(BSP_USING_HOST_USBFS1) || defined(BSP_USING_HOST_USBFS2) || \
defined(BSP_USING_DEVICE_USBFS1) || defined(BSP_USING_DEVICE_USBFS2)
#include "usb_core.h"
struct
at32_usbfs
{
...
...
@@ -22,7 +25,7 @@ struct at32_usbfs {
otg_id_type
id
;
IRQn_Type
irqn
;
};
#endif
#endif
/* __DRV_USBFS_H__ */
/******************* end of file *******************/
bsp/at32/libraries/rt_drivers/drv_usbfsd.c
浏览文件 @
d6605e3f
...
...
@@ -10,14 +10,14 @@
#include <rtthread.h>
#include <rtdevice.h>
#include "usbd_int.h"
#include "drv_common.h"
#include "drv_usbfs.h"
#include "drv_config.h"
#if defined(BSP_USING_DEVICE_USBFS1) || defined(BSP_USING_DEVICE_USBFS2)
#include "usbd_int.h"
#include "drv_usbfs.h"
#include "drv_config.h"
static
struct
at32_usbfs
*
p_usbfs_instance
=
NULL
;
static
struct
at32_usbfs
*
p_usbfs_instance
=
RT_
NULL
;
static
struct
ep_id
endpoint_pool
[]
=
{
{
0x0
,
USB_EP_ATTR_CONTROL
,
USB_DIR_INOUT
,
64
,
ID_ASSIGNED
},
...
...
@@ -196,7 +196,7 @@ static rt_size_t _ep_write(rt_uint8_t address, void *buffer, rt_size_t size)
static
rt_err_t
_ep0_send_status
(
void
)
{
usbd_ept_send
(
&
p_usbfs_instance
->
p_otg_core
->
dev
,
0x00
,
NULL
,
0
);
usbd_ept_send
(
&
p_usbfs_instance
->
p_otg_core
->
dev
,
0x00
,
RT_
NULL
,
0
);
return
RT_EOK
;
}
...
...
bsp/at32/libraries/rt_drivers/drv_usbfsh.c
浏览文件 @
d6605e3f
...
...
@@ -10,12 +10,12 @@
#include <rtthread.h>
#include <rtdevice.h>
#include "usbh_int.h"
#include "drv_common.h"
#include "drv_usbfs.h"
#include "drv_config.h"
#if defined(BSP_USING_HOST_USBFS1) || defined(BSP_USING_HOST_USBFS2)
#include "usbh_int.h"
#include "drv_usbfs.h"
#include "drv_config.h"
//#define DRV_DEBUG
#define LOG_TAG "drv.usb"
...
...
@@ -23,7 +23,7 @@
static
struct
rt_completion
urb_completion
;
static
volatile
rt_bool_t
connect_status
=
RT_FALSE
;
static
struct
at32_usbfs
*
p_usbfs_instance
=
NULL
;
static
struct
at32_usbfs
*
p_usbfs_instance
=
RT_
NULL
;
enum
{
...
...
bsp/at32/libraries/usbd_library/inc/usb_std.h
浏览文件 @
d6605e3f
...
...
@@ -240,6 +240,16 @@ typedef struct
#define SWAPBYTE(addr) (uint16_t)(((uint16_t)(*((uint8_t *)(addr)))) + \
(((uint16_t)(*(((uint8_t *)(addr)) + 1))) << 8))
/*!< swap address */
/**
* @brief min and max define
*/
#ifndef MIN
#define MIN(a, b) (uint16_t)(((a) < (b)) ? (a) : (b))
/*!< min define*/
#endif
#ifndef MAX
#define MAX(a, b) (uint16_t)(((a) > (b)) ? (a) : (b))
/*!< max define*/
#endif
/**
* @brief low byte and high byte define
*/
...
...
bsp/at32/libraries/usbd_library/inc/usbd_core.h
浏览文件 @
d6605e3f
...
...
@@ -40,6 +40,8 @@ extern "C" {
* @{
*/
#ifdef BSP_USING_USBD
/**
* @brief usb device event
*/
...
...
@@ -164,6 +166,7 @@ void usbd_core_init(usbd_core_type *udev,
usb_reg_type
*
usb_reg
,
uint8_t
core_id
);
#endif
/**
* @}
...
...
bsp/at32/libraries/usbd_library/inc/usbd_int.h
浏览文件 @
d6605e3f
...
...
@@ -40,6 +40,9 @@ extern "C" {
/** @defgroup USBD_int_exported_functions
* @{
*/
#ifdef BSP_USING_USBD
void
usbd_irq_handler
(
usbd_core_type
*
udev
);
void
usbd_ept_loop_handler
(
usbd_core_type
*
udev
);
void
usbd_eptn_handler
(
usbd_core_type
*
udev
,
usb_ept_number_type
ept_num
);
...
...
@@ -57,6 +60,8 @@ void usbd_data_out_stage_callback(usbd_core_type *udev, uint32_t ept_num);
void
usbd_connectCallback
(
usbd_core_type
*
udev
);
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
);
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbd_library/inc/usbd_sdr.h
浏览文件 @
d6605e3f
...
...
@@ -41,11 +41,14 @@ extern "C" {
* @{
*/
#ifdef BSP_USING_USBD
void
usbd_setup_request_parse
(
usb_setup_type
*
setup
,
uint8_t
*
buf
);
usb_sts_type
usbd_device_request
(
usbd_core_type
*
udev
);
usb_sts_type
usbd_interface_request
(
usbd_core_type
*
udev
);
usb_sts_type
usbd_endpoint_request
(
usbd_core_type
*
udev
);
#endif
/**
* @}
...
...
bsp/at32/libraries/usbd_library/src/usbd_core.c
浏览文件 @
d6605e3f
...
...
@@ -35,6 +35,8 @@
* @{
*/
#ifdef BSP_USING_USBD
/**
* @brief usb core in transfer complete handler
* @param udev: to the structure of usbd_core_type
...
...
@@ -679,6 +681,8 @@ void usbd_core_init(usbd_core_type *udev,
usb_dev_init
(
udev
->
usb_reg
);
}
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbd_library/src/usbd_int.c
浏览文件 @
d6605e3f
...
...
@@ -33,6 +33,8 @@
* @{
*/
#ifdef BSP_USING_USBD
/**
* @brief usb device interrput request handler.
* @param udev: to the structure of usbd_core_type
...
...
@@ -309,34 +311,36 @@ void usbd_wakeup_handler(usbd_core_type *udev)
/* user define wakeup event */
}
__weak
void
usbd_reset_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_reset_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_setup_phase_done_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_setup_phase_done_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_data_in_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
RT_WEAK
void
usbd_data_in_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
{
}
__weak
void
usbd_sof_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_sof_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_data_out_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
RT_WEAK
void
usbd_data_out_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
{
}
__weak
void
usbd_connectCallback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_connectCallback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
)
{
}
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbd_library/src/usbd_sdr.c
浏览文件 @
d6605e3f
...
...
@@ -33,6 +33,8 @@
* @{
*/
#ifdef BSP_USING_USBD
static
usb_sts_type
usbd_get_descriptor
(
usbd_core_type
*
udev
);
static
usb_sts_type
usbd_set_address
(
usbd_core_type
*
udev
);
static
usb_sts_type
usbd_get_status
(
usbd_core_type
*
udev
);
...
...
@@ -66,10 +68,10 @@ static usb_sts_type usbd_get_descriptor(usbd_core_type *udev)
usb_sts_type
ret
=
USB_OK
;
uint16_t
len
=
0
;
uint8_t
desc_type
=
udev
->
setup
.
wValue
>>
8
;
usbd_desc_t
*
desc
=
NULL
,
usbd_desc
=
usbd_desc_t
*
desc
=
RT_
NULL
,
usbd_desc
=
{
.
length
=
0xA
,
.
descriptor
=
NULL
,
.
descriptor
=
RT_
NULL
,
};
switch
(
desc_type
)
...
...
@@ -108,7 +110,7 @@ static usb_sts_type usbd_get_descriptor(usbd_core_type *udev)
return
ret
;
}
if
(
desc
!=
NULL
)
if
(
desc
!=
RT_
NULL
)
{
if
((
desc
->
length
!=
0
)
&&
(
udev
->
setup
.
wLength
!=
0
))
{
...
...
@@ -523,6 +525,8 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev)
return
ret
;
}
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbfs_library/inc/usb_std.h
浏览文件 @
d6605e3f
...
...
@@ -239,6 +239,16 @@ typedef struct
#define SWAPBYTE(addr) (uint16_t)(((uint16_t)(*((uint8_t *)(addr)))) + \
(((uint16_t)(*(((uint8_t *)(addr)) + 1))) << 8))
/*!< swap address */
/**
* @brief min and max define
*/
#ifndef MIN
#define MIN(a, b) (uint16_t)(((a) < (b)) ? (a) : (b))
/*!< min define*/
#endif
#ifndef MAX
#define MAX(a, b) (uint16_t)(((a) > (b)) ? (a) : (b))
/*!< max define*/
#endif
/**
* @brief low byte and high byte define
*/
...
...
bsp/at32/libraries/usbfs_library/inc/usbd_int.h
浏览文件 @
d6605e3f
...
...
@@ -34,8 +34,6 @@ extern "C" {
#include "usbd_core.h"
#include "usb_core.h"
#ifdef USE_OTG_DEVICE_MODE
/** @addtogroup USBD_drivers_int
* @{
*/
...
...
@@ -44,6 +42,8 @@ extern "C" {
* @{
*/
#ifdef USE_OTG_DEVICE_MODE
void
usbd_irq_handler
(
otg_core_type
*
udev
);
void
usbd_ept_handler
(
usbd_core_type
*
udev
);
void
usbd_reset_handler
(
usbd_core_type
*
udev
);
...
...
@@ -68,6 +68,8 @@ void usbd_data_out_stage_callback(usbd_core_type *udev, uint32_t ept_num);
void
usbd_connectCallback
(
usbd_core_type
*
udev
);
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
);
#endif
/**
* @}
*/
...
...
@@ -81,5 +83,3 @@ void usbd_disconnectCallback(usbd_core_type *udev);
#endif
#endif
#endif
bsp/at32/libraries/usbfs_library/inc/usbd_sdr.h
浏览文件 @
d6605e3f
...
...
@@ -33,8 +33,6 @@ extern "C" {
/* includes ------------------------------------------------------------------*/
#include "usb_core.h"
#ifdef USE_OTG_DEVICE_MODE
/** @addtogroup USBD_drivers_standard_request
* @{
*/
...
...
@@ -43,11 +41,15 @@ extern "C" {
* @{
*/
#ifdef USE_OTG_DEVICE_MODE
void
usbd_setup_request_parse
(
usb_setup_type
*
setup
,
uint8_t
*
buf
);
usb_sts_type
usbd_device_request
(
usbd_core_type
*
udev
);
usb_sts_type
usbd_interface_request
(
usbd_core_type
*
udev
);
usb_sts_type
usbd_endpoint_request
(
usbd_core_type
*
udev
);
#endif
/**
* @}
*/
...
...
@@ -61,5 +63,3 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev);
#endif
#endif
#endif
bsp/at32/libraries/usbfs_library/inc/usbh_ctrl.h
浏览文件 @
d6605e3f
...
...
@@ -41,6 +41,8 @@ extern "C" {
* @{
*/
#ifdef USE_OTG_HOST_MODE
usb_sts_type
usbh_ctrl_send_setup
(
usbh_core_type
*
uhost
,
uint8_t
*
buffer
,
uint8_t
hc_num
);
usb_sts_type
usbh_ctrl_recv_data
(
usbh_core_type
*
uhost
,
uint8_t
*
buffer
,
uint16_t
length
,
uint16_t
hc_num
);
...
...
@@ -83,6 +85,8 @@ usb_sts_type usbh_set_feature(usbh_core_type *uhost, uint8_t feature, uint16_t i
usb_sts_type
usbh_clear_dev_feature
(
usbh_core_type
*
uhost
,
uint8_t
feature
,
uint16_t
index
);
usb_sts_type
usbh_clear_ept_feature
(
usbh_core_type
*
uhost
,
uint8_t
ept_num
,
uint8_t
hc_num
);
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbfs_library/inc/usbh_int.h
浏览文件 @
d6605e3f
...
...
@@ -42,6 +42,8 @@ extern "C" {
* @{
*/
#ifdef USE_OTG_HOST_MODE
void
usbh_irq_handler
(
otg_core_type
*
hdev
);
void
usbh_hch_handler
(
usbh_core_type
*
uhost
);
void
usbh_port_handler
(
usbh_core_type
*
uhost
);
...
...
@@ -55,6 +57,8 @@ void usbh_connect_callback(usbh_core_type *uhost);
void
usbh_disconnect_callback
(
usbh_core_type
*
uhost
);
void
usbd_notify_urbchange_callback
(
usbh_core_type
*
uhost
,
uint8_t
chnum
,
urb_sts_type
sts
);
#endif
/**
* @}
*/
...
...
bsp/at32/libraries/usbfs_library/src/usbd_core.c
浏览文件 @
d6605e3f
...
...
@@ -859,6 +859,8 @@ usb_sts_type usbd_core_init(usbd_core_type *udev,
}
#endif
/**
* @}
*/
...
...
@@ -866,5 +868,3 @@ usb_sts_type usbd_core_init(usbd_core_type *udev,
/**
* @}
*/
#endif
bsp/at32/libraries/usbfs_library/src/usbd_int.c
浏览文件 @
d6605e3f
...
...
@@ -521,34 +521,36 @@ void usbd_wakeup_handler(usbd_core_type *udev)
udev
->
class_handler
->
event_handler
(
udev
,
USBD_WAKEUP_EVENT
);
}
__weak
void
usbd_reset_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_reset_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_setup_phase_done_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_setup_phase_done_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_data_in_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
RT_WEAK
void
usbd_data_in_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
{
}
__weak
void
usbd_sof_callback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_sof_callback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_data_out_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
RT_WEAK
void
usbd_data_out_stage_callback
(
usbd_core_type
*
udev
,
uint32_t
ept_num
)
{
}
__weak
void
usbd_connectCallback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_connectCallback
(
usbd_core_type
*
udev
)
{
}
__weak
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
)
RT_WEAK
void
usbd_disconnectCallback
(
usbd_core_type
*
udev
)
{
}
#endif
/**
* @}
*/
...
...
@@ -556,5 +558,3 @@ __weak void usbd_disconnectCallback(usbd_core_type *udev)
/**
* @}
*/
#endif
bsp/at32/libraries/usbfs_library/src/usbd_sdr.c
浏览文件 @
d6605e3f
...
...
@@ -23,21 +23,17 @@
*/
#include "usbd_sdr.h"
/** @addtogroup AT32F435_437_middlewares_usbd_drivers
* @{
*/
/** @defgroup USBD_drivers_standard_request
* @brief usb device standard_request
* @{
*/
#ifdef USE_OTG_DEVICE_MODE
/** @defgroup USBD_sdr_private_functions
* @{
*/
#ifdef USE_OTG_DEVICE_MODE
static
usb_sts_type
usbd_get_descriptor
(
usbd_core_type
*
udev
);
static
usb_sts_type
usbd_set_address
(
usbd_core_type
*
udev
);
static
usb_sts_type
usbd_get_status
(
usbd_core_type
*
udev
);
...
...
@@ -70,7 +66,7 @@ static usb_sts_type usbd_get_descriptor(usbd_core_type *udev)
{
usb_sts_type
ret
=
USB_OK
;
uint16_t
len
=
0
;
usbd_desc_t
*
desc
=
NULL
;
usbd_desc_t
*
desc
=
RT_
NULL
;
uint8_t
desc_type
=
udev
->
setup
.
wValue
>>
8
;
switch
(
desc_type
)
{
...
...
@@ -120,7 +116,7 @@ static usb_sts_type usbd_get_descriptor(usbd_core_type *udev)
return
ret
;
}
if
(
desc
!=
NULL
)
if
(
desc
!=
RT_
NULL
)
{
if
((
desc
->
length
!=
0
)
&&
(
udev
->
setup
.
wLength
!=
0
))
{
...
...
@@ -520,9 +516,8 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev)
}
return
ret
;
}
/**
* @}
*/
#endif
/**
* @}
...
...
@@ -532,4 +527,3 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev)
* @}
*/
#endif
bsp/at32/libraries/usbfs_library/src/usbh_core.c
浏览文件 @
d6605e3f
...
...
@@ -26,6 +26,8 @@
#include "usb_core.h"
#include "usbh_ctrl.h"
#ifdef USE_OTG_HOST_MODE
/** @defgroup USBH_drivers_core
* @brief usb host drivers core
* @{
...
...
@@ -1105,7 +1107,7 @@ static void usbh_disconnect(usbh_core_type *uhost)
}
/* call class reset handler */
if
(
uhost
->
class_handler
->
reset_handler
!=
NULL
)
if
(
uhost
->
class_handler
->
reset_handler
!=
RT_
NULL
)
{
uhost
->
class_handler
->
reset_handler
(
uhost
);
}
...
...
@@ -1220,3 +1222,4 @@ usb_sts_type usbh_loop_handler(usbh_core_type *uhost)
* @}
*/
#endif
bsp/at32/libraries/usbfs_library/src/usbh_ctrl.c
浏览文件 @
d6605e3f
...
...
@@ -25,6 +25,8 @@
#include "usbh_core.h"
#include "usb_std.h"
#ifdef USE_OTG_HOST_MODE
/** @defgroup USBH_drivers_control
* @brief usb host drivers control
* @{
...
...
@@ -956,3 +958,4 @@ usb_sts_type usbh_clear_ept_feature(usbh_core_type *uhost, uint8_t ept_num, uint
* @}
*/
#endif
bsp/at32/libraries/usbfs_library/src/usbh_int.c
浏览文件 @
d6605e3f
...
...
@@ -23,6 +23,8 @@
*/
#include "usbh_int.h"
#ifdef USE_OTG_HOST_MODE
/** @defgroup USBH_drivers_interrupt
* @brief usb host interrupt
* @{
...
...
@@ -518,15 +520,15 @@ void usbh_port_handler(usbh_core_type *uhost)
usb_host
->
hprt
=
prt_0
;
}
__weak
void
usbh_connect_callback
(
usbh_core_type
*
uhost
)
RT_WEAK
void
usbh_connect_callback
(
usbh_core_type
*
uhost
)
{
}
__weak
void
usbh_disconnect_callback
(
usbh_core_type
*
uhost
)
RT_WEAK
void
usbh_disconnect_callback
(
usbh_core_type
*
uhost
)
{
}
__weak
void
usbd_notify_urbchange_callback
(
usbh_core_type
*
uhost
,
uint8_t
chnum
,
urb_sts_type
sts
)
RT_WEAK
void
usbd_notify_urbchange_callback
(
usbh_core_type
*
uhost
,
uint8_t
chnum
,
urb_sts_type
sts
)
{
}
...
...
@@ -538,3 +540,4 @@ __weak void usbd_notify_urbchange_callback(usbh_core_type *uhost, uint8_t chnum,
* @}
*/
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录