diff options
| author | hathach <[email protected]> | 2019-12-09 18:37:20 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-12-09 18:37:54 +0700 |
| commit | 208a77678cabd3dbd270a9f93f4ec110b25908ff (patch) | |
| tree | d725934abece9629ba4e02006676d1312377b7b3 | |
| parent | 9a8e6ed93b0713506c729c12243561ef23a2c619 (diff) | |
clean up, switch and update submodule samd to circuitpython branch
| -rw-r--r-- | hw/bsp/circuitplayground_express/circuitplayground_express.c | 2 | ||||
| -rw-r--r-- | hw/bsp/feather_m0_express/feather_m0_express.c | 2 | ||||
| -rw-r--r-- | hw/bsp/feather_m4_express/feather_m4_express.c | 2 | ||||
| -rw-r--r-- | hw/bsp/metro_m0_express/metro_m0_express.c | 2 | ||||
| -rw-r--r-- | hw/bsp/metro_m4_express/metro_m4_express.c | 2 | ||||
| m--------- | hw/mcu/microchip | 0 | ||||
| -rw-r--r-- | src/portable/microchip/samd21/dcd_samd21.c | 2 | ||||
| -rw-r--r-- | src/portable/microchip/samd51/dcd_samd51.c | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/hw/bsp/circuitplayground_express/circuitplayground_express.c b/hw/bsp/circuitplayground_express/circuitplayground_express.c index 6ca584eb3..c48d14463 100644 --- a/hw/bsp/circuitplayground_express/circuitplayground_express.c +++ b/hw/bsp/circuitplayground_express/circuitplayground_express.c @@ -24,9 +24,9 @@ * This file is part of the TinyUSB stack. */ +#include "sam.h" #include "bsp/board.h" -#include "sam.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_init.h" #include "hri/hri_nvmctrl_d21.h" diff --git a/hw/bsp/feather_m0_express/feather_m0_express.c b/hw/bsp/feather_m0_express/feather_m0_express.c index 35505add9..6fb14b5a2 100644 --- a/hw/bsp/feather_m0_express/feather_m0_express.c +++ b/hw/bsp/feather_m0_express/feather_m0_express.c @@ -24,9 +24,9 @@ * This file is part of the TinyUSB stack. */ +#include "sam.h" #include "bsp/board.h" -#include "sam.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_init.h" #include "hri/hri_nvmctrl_d21.h" diff --git a/hw/bsp/feather_m4_express/feather_m4_express.c b/hw/bsp/feather_m4_express/feather_m4_express.c index fccd0d3af..1e20c846f 100644 --- a/hw/bsp/feather_m4_express/feather_m4_express.c +++ b/hw/bsp/feather_m4_express/feather_m4_express.c @@ -24,9 +24,9 @@ * This file is part of the TinyUSB stack. */ +#include "sam.h" #include "bsp/board.h" -#include "sam.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_init.h" #include "hpl/gclk/hpl_gclk_base.h" diff --git a/hw/bsp/metro_m0_express/metro_m0_express.c b/hw/bsp/metro_m0_express/metro_m0_express.c index 35505add9..6fb14b5a2 100644 --- a/hw/bsp/metro_m0_express/metro_m0_express.c +++ b/hw/bsp/metro_m0_express/metro_m0_express.c @@ -24,9 +24,9 @@ * This file is part of the TinyUSB stack. */ +#include "sam.h" #include "bsp/board.h" -#include "sam.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_init.h" #include "hri/hri_nvmctrl_d21.h" diff --git a/hw/bsp/metro_m4_express/metro_m4_express.c b/hw/bsp/metro_m4_express/metro_m4_express.c index 08559e57c..c3c0468a4 100644 --- a/hw/bsp/metro_m4_express/metro_m4_express.c +++ b/hw/bsp/metro_m4_express/metro_m4_express.c @@ -24,9 +24,9 @@ * This file is part of the TinyUSB stack. */ +#include "sam.h" #include "bsp/board.h" -#include "sam.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_init.h" #include "hpl/gclk/hpl_gclk_base.h" diff --git a/hw/mcu/microchip b/hw/mcu/microchip -Subproject 005624a65dc6598b10eb1287edc92316d8ae3c1 +Subproject 66b5a11995025426224e0ba6f377322e6e8893b diff --git a/src/portable/microchip/samd21/dcd_samd21.c b/src/portable/microchip/samd21/dcd_samd21.c index 828b47018..9f04ac062 100644 --- a/src/portable/microchip/samd21/dcd_samd21.c +++ b/src/portable/microchip/samd21/dcd_samd21.c @@ -28,8 +28,8 @@ #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD21 -#include "device/dcd.h" #include "sam.h" +#include "device/dcd.h" /*------------------------------------------------------------------*/ /* MACRO TYPEDEF CONSTANT ENUM diff --git a/src/portable/microchip/samd51/dcd_samd51.c b/src/portable/microchip/samd51/dcd_samd51.c index abf89c32e..6ece35ac0 100644 --- a/src/portable/microchip/samd51/dcd_samd51.c +++ b/src/portable/microchip/samd51/dcd_samd51.c @@ -28,8 +28,8 @@ #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD51 -#include "device/dcd.h" #include "sam.h" +#include "device/dcd.h" /*------------------------------------------------------------------*/ /* MACRO TYPEDEF CONSTANT ENUM |