Преглед изворни кода

clean up, switch and update submodule samd to circuitpython branch

hathach пре 6 година
родитељ
комит
208a77678c

+ 1 - 1
hw/bsp/circuitplayground_express/circuitplayground_express.c

@@ -24,9 +24,9 @@
  * This file is part of the TinyUSB stack.
  * This file is part of the TinyUSB stack.
  */
  */
 
 
+#include "sam.h"
 #include "bsp/board.h"
 #include "bsp/board.h"
 
 
-#include "sam.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hal_init.h"
 #include "hri/hri_nvmctrl_d21.h"
 #include "hri/hri_nvmctrl_d21.h"

+ 1 - 1
hw/bsp/feather_m0_express/feather_m0_express.c

@@ -24,9 +24,9 @@
  * This file is part of the TinyUSB stack.
  * This file is part of the TinyUSB stack.
  */
  */
 
 
+#include "sam.h"
 #include "bsp/board.h"
 #include "bsp/board.h"
 
 
-#include "sam.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hal_init.h"
 #include "hri/hri_nvmctrl_d21.h"
 #include "hri/hri_nvmctrl_d21.h"

+ 1 - 1
hw/bsp/feather_m4_express/feather_m4_express.c

@@ -24,9 +24,9 @@
  * This file is part of the TinyUSB stack.
  * This file is part of the TinyUSB stack.
  */
  */
 
 
+#include "sam.h"
 #include "bsp/board.h"
 #include "bsp/board.h"
 
 
-#include "sam.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hal_init.h"
 #include "hpl/gclk/hpl_gclk_base.h"
 #include "hpl/gclk/hpl_gclk_base.h"

+ 1 - 1
hw/bsp/metro_m0_express/metro_m0_express.c

@@ -24,9 +24,9 @@
  * This file is part of the TinyUSB stack.
  * This file is part of the TinyUSB stack.
  */
  */
 
 
+#include "sam.h"
 #include "bsp/board.h"
 #include "bsp/board.h"
 
 
-#include "sam.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hal_init.h"
 #include "hri/hri_nvmctrl_d21.h"
 #include "hri/hri_nvmctrl_d21.h"

+ 1 - 1
hw/bsp/metro_m4_express/metro_m4_express.c

@@ -24,9 +24,9 @@
  * This file is part of the TinyUSB stack.
  * This file is part of the TinyUSB stack.
  */
  */
 
 
+#include "sam.h"
 #include "bsp/board.h"
 #include "bsp/board.h"
 
 
-#include "sam.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_gpio.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hal_init.h"
 #include "hpl/gclk/hpl_gclk_base.h"
 #include "hpl/gclk/hpl_gclk_base.h"

+ 1 - 1
hw/mcu/microchip

@@ -1 +1 @@
-Subproject commit 005624a65dc6598b10eb1287edc92316d8ae3c1d
+Subproject commit 66b5a11995025426224e0ba6f377322e6e8893b6

+ 1 - 1
src/portable/microchip/samd21/dcd_samd21.c

@@ -28,8 +28,8 @@
 
 
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD21
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD21
 
 
-#include "device/dcd.h"
 #include "sam.h"
 #include "sam.h"
+#include "device/dcd.h"
 
 
 /*------------------------------------------------------------------*/
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
 /* MACRO TYPEDEF CONSTANT ENUM

+ 1 - 1
src/portable/microchip/samd51/dcd_samd51.c

@@ -28,8 +28,8 @@
 
 
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD51
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMD51
 
 
-#include "device/dcd.h"
 #include "sam.h"
 #include "sam.h"
+#include "device/dcd.h"
 
 
 /*------------------------------------------------------------------*/
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
 /* MACRO TYPEDEF CONSTANT ENUM