Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with Adafruit_TinyUSB_ArduinoCore #241

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
Submodule Adafruit_TinyUSB_ArduinoCore updated 47 files
+23 −0 Adafruit_USBD_Device.cpp
+0 −21 tinyusb/LICENSE
+0 −103 tinyusb/README.md
+252 −0 tinyusb/src/class/bth/bth_device.c
+110 −0 tinyusb/src/class/bth/bth_device.h
+24 −23 tinyusb/src/class/cdc/cdc_device.c
+14 −9 tinyusb/src/class/cdc/cdc_device.h
+142 −0 tinyusb/src/class/dfu/dfu_rt_device.c
+77 −0 tinyusb/src/class/dfu/dfu_rt_device.h
+26 −15 tinyusb/src/class/hid/hid_device.c
+17 −11 tinyusb/src/class/hid/hid_device.h
+36 −31 tinyusb/src/class/midi/midi_device.c
+14 −8 tinyusb/src/class/midi/midi_device.h
+22 −12 tinyusb/src/class/msc/msc_device.c
+22 −15 tinyusb/src/class/msc/msc_device.h
+464 −0 tinyusb/src/class/net/net_device.c
+87 −0 tinyusb/src/class/net/net_device.h
+23 −20 tinyusb/src/class/usbtmc/usbtmc_device.c
+6 −6 tinyusb/src/class/usbtmc/usbtmc_device.h
+13 −7 tinyusb/src/class/vendor/vendor_device.c
+4 −4 tinyusb/src/class/vendor/vendor_device.h
+27 −6 tinyusb/src/common/tusb_common.h
+20 −1 tinyusb/src/common/tusb_compiler.h
+72 −39 tinyusb/src/common/tusb_fifo.c
+3 −3 tinyusb/src/common/tusb_verify.h
+12 −3 tinyusb/src/device/dcd.h
+172 −57 tinyusb/src/device/usbd.c
+70 −0 tinyusb/src/device/usbd.h
+14 −6 tinyusb/src/device/usbd_control.c
+4 −1 tinyusb/src/device/usbd_pvt.h
+3 −2 tinyusb/src/osal/osal.h
+42 −5 tinyusb/src/osal/osal_freertos.h
+8 −2 tinyusb/src/osal/osal_mynewt.h
+10 −4 tinyusb/src/osal/osal_none.h
+842 −0 tinyusb/src/portable/dialog/da146xx/dcd_da146xx.c
+30 −13 tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c
+23 −15 tinyusb/src/portable/microchip/samd/dcd_samd.c
+56 −70 tinyusb/src/portable/microchip/samg/dcd_samg.c
+75 −21 tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c
+7 −2 tinyusb/src/portable/nuvoton/nuc505/dcd_nuc505.c
+12 −6 tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
+2 −1 tinyusb/src/portable/sony/cxd56/dcd_cxd56.c
+9 −2 tinyusb/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+559 −310 tinyusb/src/portable/st/synopsys/dcd_synopsys.c
+5 −3 tinyusb/src/tusb.c
+4 −0 tinyusb/src/tusb.h
+26 −15 tinyusb/src/tusb_option.h
7 changes: 7 additions & 0 deletions cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ static void usb_hardware_init(void)


GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK1_Val | (1 << GCLK_PCHCTRL_CHEN_Pos);

NVIC_SetPriority(USB_0_IRQn, 0UL);
NVIC_SetPriority(USB_1_IRQn, 0UL);
NVIC_SetPriority(USB_2_IRQn, 0UL);
NVIC_SetPriority(USB_3_IRQn, 0UL);
#else
PM->APBBMASK.reg |= PM_APBBMASK_USB;

Expand All @@ -181,6 +186,8 @@ static void usb_hardware_init(void)
GCLK_CLKCTRL_CLKEN;
while (GCLK->STATUS.bit.SYNCBUSY)
;

NVIC_SetPriority((IRQn_Type) USB_IRQn, 0UL);
#endif
}

Expand Down