add support for native SAMD HCD

hathach · Apr 4, 2024 · a5a4251 · a5a4251
1 parent 5738757
commit a5a4251
Show file tree

Hide file tree

Showing 7 changed files with 806 additions and 14 deletions.
diff --git a/hw/bsp/samd21/family.c b/hw/bsp/samd21/family.c
@@ -60,7 +60,13 @@
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
 void USB_Handler(void) {
+#if CFG_TUD_ENABLED
  tud_int_handler(0);
+#endif
+
+#if CFG_TUH_ENABLED && !(defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
+ tuh_int_handler(0);
+#endif
 }
 
 //--------------------------------------------------------------------+
@@ -140,8 +146,14 @@ void board_init(void) {
  gpio_set_pin_function(PIN_PA19, PINMUX_PA19F_TCC0_WO3);
  _gclk_enable_channel(TCC0_GCLK_ID, GCLK_CLKCTRL_GEN_GCLK0_Val);
 
-#if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
- max3421_init();
+#if CFG_TUH_ENABLED
+ #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
+ max3421_init();
+ #else
+ // VBUS Power
+ gpio_set_pin_direction(PIN_PA28, GPIO_DIRECTION_OUT);
+ gpio_set_pin_level(PIN_PA28, true);
+ #endif
 #endif
 }
 

diff --git a/hw/bsp/samd21/family.cmake b/hw/bsp/samd21/family.cmake
@@ -94,6 +94,7 @@ function(family_configure_example TARGET RTOS)
  family_add_tinyusb(${TARGET} OPT_MCU_SAMD21 ${RTOS})
  target_sources(${TARGET}-tinyusb PUBLIC
  ${TOP}/src/portable/microchip/samd/dcd_samd.c
+ ${TOP}/src/portable/microchip/samd/hcd_samd.c
  )
  target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
 

diff --git a/hw/bsp/samd21/family.mk b/hw/bsp/samd21/family.mk
@@ -20,6 +20,7 @@ LDFLAGS_GCC += -specs=nosys.specs -specs=nano.specs
 
 SRC_C += \
  src/portable/microchip/samd/dcd_samd.c \
+ src/portable/microchip/samd/hcd_samd.c \
  ${SDK_DIR}/gcc/gcc/startup_samd21.c \
  ${SDK_DIR}/gcc/system_samd21.c \
  ${SDK_DIR}/hpl/gclk/hpl_gclk.c \

diff --git a/hw/bsp/samd51/family.c b/hw/bsp/samd51/family.c
@@ -56,21 +56,24 @@
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
-void USB_0_Handler(void) {
+TU_ATTR_ALWAYS_INLINE inline void USB_Any_Handler(void)
+{
+#if CFG_TUD_ENABLED
  tud_int_handler(0);
-}
+#endif
 
-void USB_1_Handler(void) {
- tud_int_handler(0);
+#if CFG_TUH_ENABLED && !CFG_TUH_MAX3421
+ tuh_int_handler(0);
+#endif
 }
 
-void USB_2_Handler(void) {
- tud_int_handler(0);
-}
+void USB_0_Handler(void) { USB_Any_Handler(); }
 
-void USB_3_Handler(void) {
- tud_int_handler(0);
-}
+void USB_1_Handler(void) { USB_Any_Handler(); }
+
+void USB_2_Handler(void) { USB_Any_Handler(); }
+
+void USB_3_Handler(void) { USB_Any_Handler(); }
 
 //--------------------------------------------------------------------+
 // Implementation
@@ -136,8 +139,14 @@ void board_init(void) {
  gpio_set_pin_function(PIN_PA24, PINMUX_PA24H_USB_DM);
  gpio_set_pin_function(PIN_PA25, PINMUX_PA25H_USB_DP);
 
-#if CFG_TUH_ENABLED && CFG_TUH_MAX3421
- max3421_init();
+#if CFG_TUH_ENABLED
+ #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
+ max3421_init();
+ #else
+ // VBUS Power
+ gpio_set_pin_direction(PIN_PA28, GPIO_DIRECTION_OUT);
+ gpio_set_pin_level(PIN_PA28, true);
+ #endif
 #endif
 }
 

diff --git a/hw/bsp/samd51/family.cmake b/hw/bsp/samd51/family.cmake
@@ -93,6 +93,7 @@ function(family_configure_example TARGET RTOS)
  family_add_tinyusb(${TARGET} OPT_MCU_SAMD51 ${RTOS})
  target_sources(${TARGET}-tinyusb PUBLIC
  ${TOP}/src/portable/microchip/samd/dcd_samd.c
+ ${TOP}/src/portable/microchip/samd/hcd_samd.c
  )
  target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
 

diff --git a/hw/bsp/samd51/family.mk b/hw/bsp/samd51/family.mk
@@ -16,6 +16,7 @@ LDFLAGS_GCC += -specs=nosys.specs -specs=nano.specs
 
 SRC_C += \
  src/portable/microchip/samd/dcd_samd.c \
+ src/portable/microchip/samd/hcd_samd.c \
  hw/mcu/microchip/samd51/gcc/gcc/startup_samd51.c \
  hw/mcu/microchip/samd51/gcc/system_samd51.c \
  hw/mcu/microchip/samd51/hpl/gclk/hpl_gclk.c \