Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up driver

Browse Source
This commit is contained in:
Greg Davill 2022-03-23 00:00:06 +10:30
parent 325923b6c6
commit cdb8a1a2a1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/tusb_mcu.h
View File

@ -268,7 +268,7 @@
//------------- WCH -------------// //------------- WCH -------------//
#elif TU_CHECK_MCU(OPT_MCU_CH32V307) #elif TU_CHECK_MCU(OPT_MCU_CH32V307)
#define TUP_DCD_ENDPOINT_MAX 8 #define TUP_DCD_ENDPOINT_MAX 16
#endif #endif

10
src/portable/wch/ch32v307/usb_dc_usbhs.c
View File

@ -56,10 +56,8 @@ static xfer_ctl_t xfer_status[EP_MAX][2];
#define EP_RX_DMA_ADDR(ep) *(volatile uint32_t *)((volatile uint32_t *)&(USBHSD->UEP1_RX_DMA) + (ep - 1)) #define EP_RX_DMA_ADDR(ep) *(volatile uint32_t *)((volatile uint32_t *)&(USBHSD->UEP1_RX_DMA) + (ep - 1))
/* Endpoint Buffer */ /* Endpoint Buffer */
__attribute__((aligned(4))) uint8_t setup[8]; // ep0(64) TU_ATTR_ALIGNED(4) uint8_t EP0_DatabufHD[64]; // ep0(64)
__attribute__((aligned(4))) uint8_t EP0_DatabufHD[64]; // ep0(64)
volatile uint8_t mps_over_flag = 0;
volatile uint8_t USBHS_Dev_Endp0_Tog = 0x01; volatile uint8_t USBHS_Dev_Endp0_Tog = 0x01;
void dcd_init(uint8_t rhport) { void dcd_init(uint8_t rhport) {
@ -67,15 +65,15 @@ void dcd_init(uint8_t rhport) {
memset(&xfer_status, 0, sizeof(xfer_status)); memset(&xfer_status, 0, sizeof(xfer_status));
// usb_dc_low_level_init();
USBHSD->HOST_CTRL = 0x00; USBHSD->HOST_CTRL = 0x00;
USBHSD->HOST_CTRL = USBHS_PHY_SUSPENDM; USBHSD->HOST_CTRL = USBHS_PHY_SUSPENDM;
USBHSD->CONTROL = 0; USBHSD->CONTROL = 0;
#if 1
#if (BOARD_DEVICE_RHPORT_SPEED == OPT_MODE_HIGH_SPEED)
USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_HIGH_SPEED; USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_HIGH_SPEED;
#else #else
#error OPT_MODE_FULL_SPEED not currently supported on CH32V307
USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_FULL_SPEED; USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_FULL_SPEED;
#endif #endif