diff options
| author | Jean Gressmann <[email protected]> | 2020-10-07 19:12:34 +0200 |
|---|---|---|
| committer | Jean Gressmann <[email protected]> | 2020-10-07 19:19:30 +0200 |
| commit | f02b5bfdfaf20a76054dc2f57d37c46de4be6534 (patch) | |
| tree | 4e034b89507cd63f90ab3682380ac4d159f1a5eb /src | |
| parent | f92fe1e23e3e8689b6f001c5232a5960acdb3b7f (diff) | |
Address various issues raised by TinyUSB maintainers
- remove OPT_MCU_SAME51 in favor of OPT_MCU_SAME5X and working around
differences in the Atmel bsp locally in the D5035-01 bsp.
- rename board folder to d5035_01 for consistency with other boards
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, 2 insertions, 5 deletions
diff --git a/src/portable/microchip/samd/dcd_samd.c b/src/portable/microchip/samd/dcd_samd.c index 460be3ac2..f1dca88a5 100644 --- a/src/portable/microchip/samd/dcd_samd.c +++ b/src/portable/microchip/samd/dcd_samd.c @@ -28,8 +28,7 @@ #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_SAME51) + CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X) #include "sam.h" #include "device/dcd.h" @@ -95,8 +94,7 @@ void dcd_init (uint8_t rhport) USB->DEVICE.INTENSET.reg = /* USB_DEVICE_INTENSET_SOF | */ USB_DEVICE_INTENSET_EORST; } -#if CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X || \ - CFG_TUSB_MCU == OPT_MCU_SAME51 +#if CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X void dcd_int_enable(uint8_t rhport) { diff --git a/src/tusb_option.h b/src/tusb_option.h index 70ef4de8c..7e486bff0 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -59,7 +59,6 @@ #define OPT_MCU_SAMD21 200 ///< MicroChip SAMD21 #define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51 #define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x -#define OPT_MCU_SAME51 205 ///< MicroChip SAME51 #define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series // STM32 |