andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into edpt_ISO_xfer

Browse Source
This commit is contained in:
hathach
2021-04-15 12:12:52 +07:00
parent 3c84776e0a 8411f5b5c9
commit b687a4fc20
34 changed files with 715 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/portable/microchip/samd/dcd_samd.c
View File

@@ -28,7 +28,8 @@
#if TUSB_OPT_DEVICE_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \
CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X)
CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X || \
CFG_TUSB_MCU == OPT_MCU_SAML22)
#include "sam.h"
#include "device/dcd.h"
@@ -123,7 +124,8 @@ void dcd_int_disable(uint8_t rhport)
NVIC_DisableIRQ(USB_0_IRQn);
}
#elif CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21
#elif CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \
CFG_TUSB_MCU == OPT_MCU_SAML22
void dcd_int_enable(uint8_t rhport)
{

1
src/tusb_option.h
View File

@@ -60,6 +60,7 @@
#define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51
#define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x
#define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series
#define OPT_MCU_SAML22 205 ///< MicroChip SAML22
// STM32
#define OPT_MCU_STM32F0 300 ///< ST STM32F0