diff options
| author | MasterPhi <[email protected]> | 2021-07-19 22:04:34 +0200 |
|---|---|---|
| committer | MasterPhi <[email protected]> | 2021-07-19 22:04:34 +0200 |
| commit | 895c913aa9c78204ceefb796968b0e673b23e874 (patch) | |
| tree | 12228414b11f1f60fa49e1bcfb7f9b8250b89279 | |
| parent | 75f61328ea8aaffa0e666c56def4efdafcb63a12 (diff) | |
| parent | 05f59fb8edc301690042821d447c31631be8d911 (diff) | |
Merge branch 'dcd_same70' of https://github.com/HiFiPhile/tinyusb into dcd_same70
| -rw-r--r-- | hw/bsp/same70_xplained/board.mk | 5 | ||||
| -rw-r--r-- | hw/bsp/same70_xplained/same70_xplained.c | 4 | ||||
| -rw-r--r-- | src/portable/microchip/samx7x/dcd_samx7x.c | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/hw/bsp/same70_xplained/board.mk b/hw/bsp/same70_xplained/board.mk index 94b0bed98..c9bc0cea3 100644 --- a/hw/bsp/same70_xplained/board.mk +++ b/hw/bsp/same70_xplained/board.mk @@ -43,11 +43,6 @@ INC += \ $(TOP)/$(ASF_DIR)/hri \ $(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 FREERTOS_PORT = ARM_CM7 diff --git a/hw/bsp/same70_xplained/same70_xplained.c b/hw/bsp/same70_xplained/same70_xplained.c index f897798e7..ac682a89a 100644 --- a/hw/bsp/same70_xplained/same70_xplained.c +++ b/hw/bsp/same70_xplained/same70_xplained.c @@ -111,9 +111,7 @@ void board_init(void) //--------------------------------------------------------------------+ void USBHS_Handler(void) { - #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE - tud_int_handler(0); - #endif + tud_int_handler(0); } //--------------------------------------------------------------------+ diff --git a/src/portable/microchip/samx7x/dcd_samx7x.c b/src/portable/microchip/samx7x/dcd_samx7x.c index c91702c9f..bb69619d7 100644 --- a/src/portable/microchip/samx7x/dcd_samx7x.c +++ b/src/portable/microchip/samx7x/dcd_samx7x.c @@ -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) rhport; uint8_t const epnum = tu_edpt_number(ep_addr); - (void) ep_addr; // Disable endpoint interrupt USBHS->USBHS_DEVIDR = 1 << (USBHS_DEVIDR_PEP_0_Pos + epnum); |