diff options
| author | hathach <[email protected]> | 2021-04-15 12:12:52 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-04-15 12:12:52 +0700 |
| commit | b687a4fc20742d4ce3b2d1183e68a93542d8c825 (patch) | |
| tree | 06bab46aaccaa9f949ca43fa126a0feed293c889 /src | |
| parent | 3c84776e0ac926cedfcbda4a3ecf72e2a7c1cde8 (diff) | |
| parent | 8411f5b5c9269da4767c645597ba12ac1a040ac7 (diff) | |
Merge branch 'master' into edpt_ISO_xfer
Diffstat (limited to 'src')
| -rw-r--r-- | src/portable/microchip/samd/dcd_samd.c | 6 | ||||
| -rw-r--r-- | src/tusb_option.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/portable/microchip/samd/dcd_samd.c b/src/portable/microchip/samd/dcd_samd.c index 3cff92fcd..13e56453d 100644 --- a/src/portable/microchip/samd/dcd_samd.c +++ b/src/portable/microchip/samd/dcd_samd.c @@ -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) { diff --git a/src/tusb_option.h b/src/tusb_option.h index 56950d364..7585a9ff6 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -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 |