modified the bsp files of at32 to make them work better

7 files changed, 117 insertions, 141 deletions

diff --git a/hw/bsp/at32f435_437/boards/at_start_f435/board.cmake b/hw/bsp/at32f435_437/boards/at_start_f435/board.cmake
new file mode 100644
index 000000000..6d9024f4f
--- /dev/null
+++ b/hw/bsp/at32f435_437/boards/at_start_f435/board.cmake
@@ -0,0 +1,8 @@
+set(MCU_VARIANT AT32F435ZMT7)
+set(MCU_LINKER_NAME AT32F435xM)
+
+set(JLINK_DEVICE ${MCU_VARIANT})
+
+function(update_board TARGET)
+  target_compile_definitions(${TARGET} PUBLIC ${MCU_VARIANT})
+endfunction()
diff --git a/hw/bsp/at32f435_437/boards/at_start_f435/board.h b/hw/bsp/at32f435_437/boards/at_start_f435/board.h
new file mode 100644
index 000000000..3522e759a
--- /dev/null
+++ b/hw/bsp/at32f435_437/boards/at_start_f435/board.h
@@ -0,0 +1,74 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+/* metadata:
+   name: AT-START-F437
+   url: https://www.arterychip.com/en/product/AT32F437.jsp
+*/
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+//#define USB_VBUS_IGNORE
+//#define USB_SOF_OUTPUT_ENABLE
+
+// LED
+#define LED_PORT              GPIOD
+#define LED_PIN               GPIO_PINS_13
+#define LED_STATE_ON          0 // Active Low
+#define LED_GPIO_CLK_EN()     crm_periph_clock_enable(CRM_GPIOD_PERIPH_CLOCK, TRUE)
+
+// Button
+#define BUTTON_PORT           GPIOA
+#define BUTTON_PIN            GPIO_PINS_0
+#define BUTTON_STATE_ACTIVE   1
+#define BUTTON_GPIO_CLK_EN()  crm_periph_clock_enable(CRM_GPIOA_PERIPH_CLOCK, TRUE)
+
+// USART
+#define PRINT_UART                       USART1
+#define PRINT_UART_CRM_CLK               CRM_USART1_PERIPH_CLOCK
+#define PRINT_UART_TX_PIN                GPIO_PINS_9
+#define PRINT_UART_TX_GPIO               GPIOA
+#define PRINT_UART_TX_GPIO_CRM_CLK       CRM_GPIOA_PERIPH_CLOCK
+#define PRINT_UART_TX_PIN_SOURCE         GPIO_PINS_SOURCE9
+#define PRINT_UART_TX_PIN_MUX_NUM        GPIO_MUX_7
+
+// VBUS
+static inline void board_vbus_sense_init(void)
+{
+    *(int*)(0x50000038) |= (1<<21);
+    *(int*)(0x40040038) |= (1<<21);
+}
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* BOARD_H_ */
diff --git a/hw/bsp/at32f435_437/boards/at_start_f435/board.mk b/hw/bsp/at32f435_437/boards/at_start_f435/board.mk
new file mode 100644
index 000000000..5fe56ce77
--- /dev/null
+++ b/hw/bsp/at32f435_437/boards/at_start_f435/board.mk
@@ -0,0 +1,7 @@
+MCU_VARIANT = AT32F435ZMT7
+MCU_LINKER_NAME = AT32F435xM
+
+JLINK_DEVICE = ${MCU_VARIANT}
+
+CFLAGS += \
+  -D${MCU_VARIANT}
diff --git a/hw/bsp/at32f435_437/boards/at_start_f437/board.h b/hw/bsp/at32f435_437/boards/at_start_f437/board.h
index b6de119bc..3522e759a 100644
--- a/hw/bsp/at32f435_437/boards/at_start_f437/board.h
+++ b/hw/bsp/at32f435_437/boards/at_start_f437/board.h
@@ -60,124 +60,11 @@
 #define PRINT_UART_TX_PIN_SOURCE         GPIO_PINS_SOURCE9
 #define PRINT_UART_TX_PIN_MUX_NUM        GPIO_MUX_7
 
-// USB
-#ifdef BOARD_TUD_RHPORT
-    #if BOARD_TUD_RHPORT == 0
-        #define USB_ID                           0
-        #define OTG_CLOCK                        CRM_OTGFS1_PERIPH_CLOCK
-        #define OTG_IRQ                          OTGFS1_IRQn
-        #define OTG_IRQ_HANDLER                  OTGFS1_IRQHandler
-        #define OTG_WKUP_IRQ                     OTGFS1_WKUP_IRQn
-        #define OTG_WKUP_HANDLER                 OTGFS1_WKUP_IRQHandler
-        #define OTG_WKUP_EXINT_LINE              EXINT_LINE_18
-        #define OTG_PIN_GPIO                     GPIOA
-        #define OTG_PIN_GPIO_CLOCK               CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_DP                       GPIO_PINS_12
-        #define OTG_PIN_DP_SOURCE                GPIO_PINS_SOURCE12
-        #define OTG_PIN_DM                       GPIO_PINS_11
-        #define OTG_PIN_DM_SOURCE                GPIO_PINS_SOURCE11
-        #define OTG_PIN_VBUS                     GPIO_PINS_9
-        #define OTG_PIN_VBUS_SOURCE              GPIO_PINS_SOURCE9
-        #define OTG_PIN_ID                       GPIO_PINS_10
-        #define OTG_PIN_ID_SOURCE                GPIO_PINS_SOURCE12
-        #define OTG_PIN_SOF_GPIO                 GPIOA
-        #define OTG_PIN_SOF_GPIO_CLOCK           CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_SOF                      GPIO_PINS_8
-        #define OTG_PIN_SOF_SOURCE               GPIO_PINS_SOURCE8
-        #define OTG_PIN_MUX                      GPIO_MUX_10
-    #elif BOARD_TUD_RHPORT == 1
-        #define USB_ID                           1
-        #define OTG_CLOCK                        CRM_OTGFS2_PERIPH_CLOCK
-        #define OTG_IRQ                          OTGFS2_IRQn
-        #define OTG_IRQ_HANDLER                  OTGFS2_IRQHandler
-        #define OTG_WKUP_IRQ                     OTGFS2_WKUP_IRQn
-        #define OTG_WKUP_HANDLER                 OTGFS2_WKUP_IRQHandler
-        #define OTG_WKUP_EXINT_LINE              EXINT_LINE_20
-        #define OTG_PIN_GPIO                     GPIOB
-        #define OTG_PIN_GPIO_CLOCK               CRM_GPIOB_PERIPH_CLOCK
-        #define OTG_PIN_DP                       GPIO_PINS_15
-        #define OTG_PIN_DP_SOURCE                GPIO_PINS_SOURCE15
-        #define OTG_PIN_DM                       GPIO_PINS_14
-        #define OTG_PIN_DM_SOURCE                GPIO_PINS_SOURCE14
-        #define OTG_PIN_VBUS                     GPIO_PINS_13
-        #define OTG_PIN_VBUS_SOURCE              GPIO_PINS_SOURCE13
-        #define OTG_PIN_ID                       GPIO_PINS_12
-        #define OTG_PIN_ID_SOURCE                GPIO_PINS_SOURCE10
-        #define OTG_PIN_SOF_GPIO                 GPIOA
-        #define OTG_PIN_SOF_GPIO_CLOCK           CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_SOF                      GPIO_PINS_4
-        #define OTG_PIN_SOF_SOURCE               GPIO_PINS_SOURCE4
-        #define OTG_PIN_MUX                      GPIO_MUX_12
-    #endif
-#endif
-
-#ifdef BOARD_TUH_RHPORT
-    #if BOARD_TUH_RHPORT == 0
-        #define USB_ID                           0
-        #define OTG_CLOCK                        CRM_OTGFS1_PERIPH_CLOCK
-        #define OTG_IRQ                          OTGFS1_IRQn
-        #define OTG_IRQ_HANDLER                  OTGFS1_IRQHandler
-        #define OTG_WKUP_IRQ                     OTGFS1_WKUP_IRQn
-        #define OTG_WKUP_HANDLER                 OTGFS1_WKUP_IRQHandler
-        #define OTG_WKUP_EXINT_LINE              EXINT_LINE_18
-        #define OTG_PIN_GPIO                     GPIOA
-        #define OTG_PIN_GPIO_CLOCK               CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_DP                       GPIO_PINS_12
-        #define OTG_PIN_DP_SOURCE                GPIO_PINS_SOURCE12
-        #define OTG_PIN_DM                       GPIO_PINS_11
-        #define OTG_PIN_DM_SOURCE                GPIO_PINS_SOURCE11
-        #define OTG_PIN_VBUS                     GPIO_PINS_9
-        #define OTG_PIN_VBUS_SOURCE              GPIO_PINS_SOURCE9
-        #define OTG_PIN_ID                       GPIO_PINS_10
-        #define OTG_PIN_ID_SOURCE                GPIO_PINS_SOURCE12
-        #define OTG_PIN_SOF_GPIO                 GPIOA
-        #define OTG_PIN_SOF_GPIO_CLOCK           CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_SOF                      GPIO_PINS_8
-        #define OTG_PIN_SOF_SOURCE               GPIO_PINS_SOURCE8
-        #define OTG_PIN_MUX                      GPIO_MUX_10
-    #elif BOARD_TUH_RHPORT == 1
-        #define USB_ID                           1
-        #define OTG_CLOCK                        CRM_OTGFS2_PERIPH_CLOCK
-        #define OTG_IRQ                          OTGFS2_IRQn
-        #define OTG_IRQ_HANDLER                  OTGFS2_IRQHandler
-        #define OTG_WKUP_IRQ                     OTGFS2_WKUP_IRQn
-        #define OTG_WKUP_HANDLER                 OTGFS2_WKUP_IRQHandler
-        #define OTG_WKUP_EXINT_LINE              EXINT_LINE_20
-        #define OTG_PIN_GPIO                     GPIOB
-        #define OTG_PIN_GPIO_CLOCK               CRM_GPIOB_PERIPH_CLOCK
-        #define OTG_PIN_DP                       GPIO_PINS_15
-        #define OTG_PIN_DP_SOURCE                GPIO_PINS_SOURCE15
-        #define OTG_PIN_DM                       GPIO_PINS_14
-        #define OTG_PIN_DM_SOURCE                GPIO_PINS_SOURCE14
-        #define OTG_PIN_VBUS                     GPIO_PINS_13
-        #define OTG_PIN_VBUS_SOURCE              GPIO_PINS_SOURCE13
-        #define OTG_PIN_ID                       GPIO_PINS_12
-        #define OTG_PIN_ID_SOURCE                GPIO_PINS_SOURCE10
-        #define OTG_PIN_SOF_GPIO                 GPIOA
-        #define OTG_PIN_SOF_GPIO_CLOCK           CRM_GPIOA_PERIPH_CLOCK
-        #define OTG_PIN_SOF                      GPIO_PINS_4
-        #define OTG_PIN_SOF_SOURCE               GPIO_PINS_SOURCE4
-        #define OTG_PIN_MUX                      GPIO_MUX_12
-    #endif
-#endif
-
 // VBUS
 static inline void board_vbus_sense_init(void)
 {
-    #ifdef BOARD_TUD_RHPORT
-        #if BOARD_TUD_RHPORT == 0
-            *(int*)(0x50000038) |= (1<<21);
-        #elif BOARD_TUD_RHPORT == 1
-            *(int*)(0x40040038) |= (1<<21);
-        #endif
-    #endif
-    #ifdef BOARD_TUH_RHPORT
-        #if BOARD_TUH_RHPORT == 0
-            *(int*)(0x50000038) |= (1<<21);
-        #elif BOARD_TUH_RHPORT == 1
-            *(int*)(0x40040038) |= (1<<21);
-        #endif
-    #endif
+    *(int*)(0x50000038) |= (1<<21);
+    *(int*)(0x40040038) |= (1<<21);
 }
 
 #ifdef __cplusplus
diff --git a/hw/bsp/at32f435_437/family.c b/hw/bsp/at32f435_437/family.c
index 702fdd2a8..a65116729 100644
--- a/hw/bsp/at32f435_437/family.c
+++ b/hw/bsp/at32f435_437/family.c
@@ -64,21 +64,23 @@ void board_init(void) {
   usb_gpio_config();
 
   /* enable usb clock */
-  crm_periph_clock_enable(OTG_CLOCK, TRUE);
+  crm_periph_clock_enable(CRM_OTGFS1_PERIPH_CLOCK, TRUE);
+  crm_periph_clock_enable(CRM_OTGFS2_PERIPH_CLOCK, TRUE);
 
   /* select usb 48m clcok source */
   usb_clock48m_select(USB_CLK_HEXT);
 
-  /* enable otgfs irq */
-  //nvic_irq_enable(OTG_IRQ, 0, 0);
-
   /* vbus ignore */
   board_vbus_sense_init();
 
   SysTick_Config(SystemCoreClock / 1000);
 #if CFG_TUSB_OS == OPT_OS_FREERTOS
   // If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher )
-  NVIC_SetPriority(OTG_IRQ, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY);
+  NVIC_SetPriority(OTGFS1_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY);
+  NVIC_SetPriority(OTGFS2_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY);
+#else
+  NVIC_SetPriority(OTGFS1_IRQn, 0);
+  NVIC_SetPriority(OTGFS2_IRQn, 0);
 #endif
 
   /* config led and key */
@@ -271,30 +273,22 @@ int inHandlerMode(void) {
 
 void usb_gpio_config(void) {
   gpio_init_type gpio_init_struct;
-  crm_periph_clock_enable(OTG_PIN_GPIO_CLOCK, TRUE);
+  crm_periph_clock_enable(CRM_GPIOA_PERIPH_CLOCK, TRUE);
+  crm_periph_clock_enable(CRM_GPIOB_PERIPH_CLOCK, TRUE);
   gpio_default_para_init(&gpio_init_struct);
   gpio_init_struct.gpio_drive_strength = GPIO_DRIVE_STRENGTH_STRONGER;
   gpio_init_struct.gpio_out_type = GPIO_OUTPUT_PUSH_PULL;
   gpio_init_struct.gpio_mode = GPIO_MODE_MUX;
   gpio_init_struct.gpio_pull = GPIO_PULL_NONE;
   /* dp and dm */
-  gpio_init_struct.gpio_pins = OTG_PIN_DP | OTG_PIN_DM;
-  gpio_init(OTG_PIN_GPIO, &gpio_init_struct);
-  gpio_pin_mux_config(OTG_PIN_GPIO, OTG_PIN_DP_SOURCE, OTG_PIN_MUX);
-  gpio_pin_mux_config(OTG_PIN_GPIO, OTG_PIN_DM_SOURCE, OTG_PIN_MUX);
-#ifdef USB_SOF_OUTPUT_ENABLE
-  crm_periph_clock_enable(OTG_PIN_SOF_GPIO_CLOCK, TRUE);
-  gpio_init_struct.gpio_pins = OTG_PIN_SOF;
-  gpio_init(OTG_PIN_SOF_GPIO, &gpio_init_struct);
-  gpio_pin_mux_config(OTG_PIN_SOF_GPIO, OTG_PIN_SOF_SOURCE, OTG_PIN_MUX);
-#endif
-  /* otgfs use vbus pin */
-#ifndef USB_VBUS_IGNORE
-  gpio_init_struct.gpio_pins = OTG_PIN_VBUS;
-  gpio_init_struct.gpio_pull = GPIO_PULL_DOWN;
-  gpio_pin_mux_config(OTG_PIN_GPIO, OTG_PIN_VBUS_SOURCE, OTG_PIN_MUX);
-  gpio_init(OTG_PIN_GPIO, &gpio_init_struct);
-#endif
+  gpio_init_struct.gpio_pins = GPIO_PINS_11 | GPIO_PINS_12;
+  gpio_init(GPIOA, &gpio_init_struct);
+  gpio_init_struct.gpio_pins = GPIO_PINS_14 | GPIO_PINS_15;
+  gpio_init(GPIOB, &gpio_init_struct);
+  gpio_pin_mux_config(GPIOA, GPIO_PINS_SOURCE11, GPIO_MUX_10);
+  gpio_pin_mux_config(GPIOA, GPIO_PINS_SOURCE12, GPIO_MUX_10);
+  gpio_pin_mux_config(GPIOB, GPIO_PINS_SOURCE14, GPIO_MUX_12);
+  gpio_pin_mux_config(GPIOB, GPIO_PINS_SOURCE15, GPIO_MUX_12);
 }
 
 void board_led_write(bool state) {
diff --git a/hw/bsp/at32f435_437/family.cmake b/hw/bsp/at32f435_437/family.cmake
index c85b58ae4..7bb38eb2f 100644
--- a/hw/bsp/at32f435_437/family.cmake
+++ b/hw/bsp/at32f435_437/family.cmake
@@ -51,9 +51,12 @@ function(add_board_target BOARD_TARGET)
     ${AT32_SDK_LIB}/drivers/inc
     )
   target_compile_definitions(${BOARD_TARGET} PUBLIC
-    BOARD_TUD_RHPORT=0
+    BOARD_TUD_RHPORT=1
+    BOARD_TUH_RHPORT=0
+    BOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
+    BOARD_TUH_MAX_SPEED=OPT_MODE_FULL_SPEED
     )
-
+    
   update_board(${BOARD_TARGET})
 
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
diff --git a/hw/bsp/at32f435_437/family.mk b/hw/bsp/at32f435_437/family.mk
index b33be1180..ba22f5420 100644
--- a/hw/bsp/at32f435_437/family.mk
+++ b/hw/bsp/at32f435_437/family.mk
@@ -10,7 +10,10 @@ CFLAGS_GCC += \
 
 CFLAGS += \
 	-DCFG_TUSB_MCU=OPT_MCU_AT32F435_437 \
-	-DBOARD_TUD_RHPORT=0
+	-DBOARD_TUD_RHPORT=1 \
+	-DBOARD_TUH_RHPORT=0 \
+	-DBOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED \
+	-DBOARD_TUH_MAX_SPEED=OPT_MODE_FULL_SPEED \
 
 LDFLAGS_GCC += \
 	-flto --specs=nosys.specs -nostdlib -nostartfiles