kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #493 from hathach/followup-490-samd11 

add OPT_MCU_SAMD11
This commit is contained in:
Ha Thach 2020-08-22 19:12:11 +07:00 committed by GitHub
parent 97ca7a9549 9d3a9cf546
commit 88da422c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
examples/device/cdc_msc/.skip.MCU_SAMD11 Normal file
View File

0
examples/device/cdc_msc_freertos/.skip.MCU_SAMD11 Normal file
View File

0
examples/device/dynamic_configuration/.skip.MCU_SAMD11 Normal file
View File

0
examples/device/hid_composite_freertos/.skip.MCU_SAMD11 Normal file
View File

0
examples/device/msc_dual_lun/.skip.MCU_SAMD11 Normal file
View File

0
examples/device/net_lwip_webserver/.skip.MCU_SAMD11 Normal file
View File

2
hw/bsp/board_mcu.h
View File

@ -52,7 +52,7 @@
#elif CFG_TUSB_MCU == OPT_MCU_NRF5X
#include "nrf.h"
#elif CFG_TUSB_MCU == OPT_MCU_SAMD21 || CFG_TUSB_MCU == OPT_MCU_SAMD51
#elif CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || CFG_TUSB_MCU == OPT_MCU_SAMD51
#include "sam.h"
#elif CFG_TUSB_MCU == OPT_MCU_SAMG

2
hw/bsp/samd11_xplained/board.mk
View File

@ -9,7 +9,7 @@ CFLAGS += \
-D__SAMD11D14AM__ \
-DCONF_DFLL_OVERWRITE_CALIBRATION=0 \
-DOSC32K_OVERWRITE_CALIBRATION=0 \
-DCFG_TUSB_MCU=OPT_MCU_SAMD21 \
-DCFG_TUSB_MCU=OPT_MCU_SAMD11 \
-fshort-enums \
-Os

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

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

3
src/tusb_option.h
View File

@ -55,10 +55,11 @@
#define OPT_MCU_NRF5X 100 ///< Nordic nRF5x series
// SAM
#define OPT_MCU_SAMD11 204 ///< MicroChip SAMD11
#define OPT_MCU_SAMD21 200 ///< MicroChip SAMD21
#define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51
#define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series
#define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x
#define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series
// STM32
#define OPT_MCU_STM32F0 300 ///< ST STM32F0