kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'dcd_same70' of https://github.com/HiFiPhile/tinyusb into dcd_same70

This commit is contained in:
MasterPhi 2021-07-19 22:04:34 +02:00
parent 75f61328ea 05f59fb8ed
commit 895c913aa9
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/bsp/same70_xplained/board.mk
View File

@ -43,11 +43,6 @@ INC += \
$(TOP)/$(ASF_DIR)/hri \ $(TOP)/$(ASF_DIR)/hri \
$(TOP)/$(ASF_DIR)/CMSIS/Core/Include $(TOP)/$(ASF_DIR)/CMSIS/Core/Include
# For TinyUSB port source
#SRC_C += src/portable/template/dcd_template.c
VENDOR = .
CHIP_FAMILY = template
# For freeRTOS port source # For freeRTOS port source
FREERTOS_PORT = ARM_CM7 FREERTOS_PORT = ARM_CM7

4
hw/bsp/same70_xplained/same70_xplained.c
View File

@ -111,9 +111,7 @@ void board_init(void)
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void USBHS_Handler(void) void USBHS_Handler(void)
{ {
#if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE tud_int_handler(0);
tud_int_handler(0);
#endif
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+

2
src/portable/microchip/samx7x/dcd_samx7x.c
View File

@ -542,8 +542,8 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr) void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr)
{ {
(void) rhport;
uint8_t const epnum = tu_edpt_number(ep_addr); uint8_t const epnum = tu_edpt_number(ep_addr);
(void) ep_addr;
// Disable endpoint interrupt // Disable endpoint interrupt
USBHS->USBHS_DEVIDR = 1 << (USBHS_DEVIDR_PEP_0_Pos + epnum); USBHS->USBHS_DEVIDR = 1 << (USBHS_DEVIDR_PEP_0_Pos + epnum);