yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add usb3.0 speed support

Browse Source
This commit is contained in:
sakumisu
2022-09-17 21:58:06 +08:00
parent 946b978053
commit 887dbd33e3
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/usb_def.h
View File

@@ -13,11 +13,13 @@
#define USB_2_1 0x0210 #define USB_2_1 0x0210
/* Device speeds */ /* Device speeds */
#define USB_SPEED_UNKNOWN 0 /* Transfer rate not yet set */ #define USB_SPEED_UNKNOWN 0 /* Transfer rate not yet set */
#define USB_SPEED_LOW 1 /* USB 1.1 */ #define USB_SPEED_LOW 1 /* USB 1.1 */
#define USB_SPEED_FULL 2 /* USB 1.1 */ #define USB_SPEED_FULL 2 /* USB 1.1 */
#define USB_SPEED_HIGH 3 /* USB 2.0 */ #define USB_SPEED_HIGH 3 /* USB 2.0 */
#define USB_SPEED_VARIABLE 4 /* Wireless USB 2.5 */ #define USB_SPEED_WIRELESS 4 /* Wireless USB 2.5 */
#define USB_SPEED_SUPER 5 /* USB 3.0 */
#define USB_SPEED_SUPER_PLUS 5 /* USB 3.1 */
/* Maximum number of devices per controller */ /* Maximum number of devices per controller */
#define USB_MAX_DEVICES (127) #define USB_MAX_DEVICES (127)

31
core/usbh_core.c
View File

@@ -388,33 +388,24 @@ int usbh_enumerate(struct usbh_hubport *hport)
struct usb_setup_packet *setup; struct usb_setup_packet *setup;
uint8_t descsize; uint8_t descsize;
int dev_addr; int dev_addr;
uint8_t ep_mps; uint16_t ep_mps;
int ret; int ret;
#define USB_REQUEST_BUFFER_SIZE 256 #define USB_REQUEST_BUFFER_SIZE 256
setup = &hport->setup; setup = &hport->setup;
/* Pick an appropriate packet size for this device if ((hport->speed == USB_SPEED_SUPER) || (hport->speed == USB_SPEED_SUPER_PLUS)) {
* /* For super speed , we must use 512 bytes */
* USB 2.0, Paragraph 5.5.3 "Control Transfer Packet Size Constraints" ep_mps = 512;
* descsize = 8;
* "An endpoint for control transfers specifies the maximum data } else if (hport->speed == USB_SPEED_LOW) {
* payload size that the endpoint can accept from or transmit to /* For low speed, we use 8 bytes */
* the bus. The allowable maximum control transfer data payload
* sizes for full-speed devices is 8, 16, 32, or 64 bytes; for
* high-speed devices, it is 64 bytes and for low-speed devices,
* it is 8 bytes. This maximum applies to the data payloads of the
* Data packets following a Setup..."
*/
if (hport->speed == USB_SPEED_HIGH) {
/* For high-speed, we must use 64 bytes */
ep_mps = 64;
descsize = USB_SIZEOF_DEVICE_DESC;
} else {
/* For low or full, we use 8 bytes */
ep_mps = 8; ep_mps = 8;
descsize = 8; descsize = 8;
} else {
/* For full or high speed, we use 64 bytes */
ep_mps = 64;
descsize = 8;
} }
/* Configure EP0 with the initial maximum packet size */ /* Configure EP0 with the initial maximum packet size */