From 86d371fb79ca8b1ee6794c33b6a74d4319d9c1a6 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 12 Feb 2025 13:58:01 +0700
Subject: more ci fix

---
 examples/host/device_info/src/tusb_config.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'examples/host/device_info/src')

diff --git a/examples/host/device_info/src/tusb_config.h b/examples/host/device_info/src/tusb_config.h
index 5190b5b1f..27dd07e25 100644
--- a/examples/host/device_info/src/tusb_config.h
+++ b/examples/host/device_info/src/tusb_config.h
@@ -109,8 +109,7 @@
 // only hub class is enabled
 #define CFG_TUH_HUB                 1
 
-// max device support (excluding hub device)
-// 1 hub typically has 4 ports
+// max device support (excluding hub device): 1 hub typically has 4 ports
 #define CFG_TUH_DEVICE_MAX          (3*CFG_TUH_HUB + 1)
 
 #ifdef __cplusplus
-- 
cgit v1.3.1


From 65e44e0a51272f9d75719d90955f19209dbf1ea2 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 6 Mar 2025 22:46:21 +0700
Subject: fix(dwc2) host driver conflict with max3421e

---
 examples/host/bare_api/src/tusb_config.h             | 3 ++-
 examples/host/cdc_msc_hid/src/tusb_config.h          | 3 ++-
 examples/host/cdc_msc_hid_freertos/src/tusb_config.h | 3 ++-
 examples/host/device_info/src/tusb_config.h          | 3 ++-
 examples/host/hid_controller/src/tusb_config.h       | 3 ++-
 examples/host/msc_file_explorer/src/tusb_config.h    | 3 ++-
 src/portable/synopsys/dwc2/hcd_dwc2.c                | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'examples/host/device_info/src')

diff --git a/examples/host/bare_api/src/tusb_config.h b/examples/host/bare_api/src/tusb_config.h
index fab233be0..a03675c5f 100644
--- a/examples/host/bare_api/src/tusb_config.h
+++ b/examples/host/bare_api/src/tusb_config.h
@@ -69,9 +69,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index a59a0ffb9..cc8d6e5c4 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -69,9 +69,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/examples/host/cdc_msc_hid_freertos/src/tusb_config.h b/examples/host/cdc_msc_hid_freertos/src/tusb_config.h
index 02de4197b..682265f59 100644
--- a/examples/host/cdc_msc_hid_freertos/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid_freertos/src/tusb_config.h
@@ -74,9 +74,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/examples/host/device_info/src/tusb_config.h b/examples/host/device_info/src/tusb_config.h
index 5190b5b1f..db02a97db 100644
--- a/examples/host/device_info/src/tusb_config.h
+++ b/examples/host/device_info/src/tusb_config.h
@@ -74,9 +74,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/examples/host/hid_controller/src/tusb_config.h b/examples/host/hid_controller/src/tusb_config.h
index 3ac591d8f..351fe0178 100644
--- a/examples/host/hid_controller/src/tusb_config.h
+++ b/examples/host/hid_controller/src/tusb_config.h
@@ -69,9 +69,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/examples/host/msc_file_explorer/src/tusb_config.h b/examples/host/msc_file_explorer/src/tusb_config.h
index c798b4383..c1829c300 100644
--- a/examples/host/msc_file_explorer/src/tusb_config.h
+++ b/examples/host/msc_file_explorer/src/tusb_config.h
@@ -69,9 +69,10 @@
 // Enable Host stack
 #define CFG_TUH_ENABLED       1
 
+// #define CFG_TUH_MAX3421       1 // use max3421 as host controller
+
 #if CFG_TUSB_MCU == OPT_MCU_RP2040
   // #define CFG_TUH_RPI_PIO_USB   1 // use pio-usb as host controller
-  // #define CFG_TUH_MAX3421       1 // use max3421 as host controller
 
   // host roothub port is 1 if using either pio-usb or max3421
   #if (defined(CFG_TUH_RPI_PIO_USB) && CFG_TUH_RPI_PIO_USB) || (defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421)
diff --git a/src/portable/synopsys/dwc2/hcd_dwc2.c b/src/portable/synopsys/dwc2/hcd_dwc2.c
index ebbb6200a..b13479b02 100644
--- a/src/portable/synopsys/dwc2/hcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/hcd_dwc2.c
@@ -26,7 +26,7 @@
 
 #include "tusb_option.h"
 
-#if CFG_TUH_ENABLED && defined(TUP_USBIP_DWC2)
+#if CFG_TUH_ENABLED && defined(TUP_USBIP_DWC2) && !CFG_TUH_MAX3421
 
 #if !(CFG_TUH_DWC2_SLAVE_ENABLE || CFG_TUH_DWC2_DMA_ENABLE)
 #error DWC2 require either CFG_TUH_DWC2_SLAVE_ENABLE or CFG_TUH_DWC2_DMA_ENABLE to be enabled
-- 
cgit v1.3.1


From e54753814befa26742fa8a9805f5b7beac32a963 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 21 Mar 2025 00:11:18 +0700
Subject: enable hil dual for metro m4 with max3421

---
 examples/host/device_info/src/main.c | 2 +-
 src/host/usbh.h                      | 9 +++------
 test/hil/tinyusb.json                | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'examples/host/device_info/src')

diff --git a/examples/host/device_info/src/main.c b/examples/host/device_info/src/main.c
index 775968c16..ac4c46a11 100644
--- a/examples/host/device_info/src/main.c
+++ b/examples/host/device_info/src/main.c
@@ -81,7 +81,7 @@ void init_freertos_task(void);
 //--------------------------------------------------------------------
 // Main
 //--------------------------------------------------------------------
-void init_tinyusb(void) {
+static void init_tinyusb(void) {
   // init host stack on configured roothub port
   tusb_rhport_init_t host_init = {
     .role = TUSB_ROLE_HOST,
diff --git a/src/host/usbh.h b/src/host/usbh.h
index 52b4f478c..36bb7c9b2 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -155,8 +155,7 @@ bool tuh_inited(void);
 void tuh_task_ext(uint32_t timeout_ms, bool in_isr);
 
 // Task function should be called in main/rtos loop
-TU_ATTR_ALWAYS_INLINE static inline
-void tuh_task(void) {
+TU_ATTR_ALWAYS_INLINE static inline void tuh_task(void) {
   tuh_task_ext(UINT32_MAX, false);
 }
 
@@ -197,16 +196,14 @@ bool tuh_mounted(uint8_t daddr);
 bool tuh_connected(uint8_t daddr);
 
 // Check if device is suspended
-TU_ATTR_ALWAYS_INLINE static inline
-bool tuh_suspended(uint8_t daddr) {
+TU_ATTR_ALWAYS_INLINE static inline bool tuh_suspended(uint8_t daddr) {
   // TODO implement suspend & resume on host
   (void) daddr;
   return false;
 }
 
 // Check if device is ready to communicate with
-TU_ATTR_ALWAYS_INLINE static inline
-bool tuh_ready(uint8_t daddr) {
+TU_ATTR_ALWAYS_INLINE static inline bool tuh_ready(uint8_t daddr) {
   return tuh_mounted(daddr) && !tuh_suspended(daddr);
 }
 
diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index 7393226eb..c2bbdf5a3 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -60,7 +60,7 @@
             "name": "metro_m4_express",
             "uid": "9995AD485337433231202020FF100A34",
             "tests": {
-                "device": true, "host": false, "dual": false,
+                "device": true, "host": false, "dual": true,
                 "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002130"}]
             },
             "flasher": {
-- 
cgit v1.3.1


From 4787cd5f546eabad630fc5c22f37f67a076ac37e Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 3 Apr 2025 18:11:33 +0700
Subject: fix(hcd) hcd_edpt_open() return true if endpoint is already opened.

---
 examples/host/device_info/src/main.c      | 31 ++++++++++++++++++++-----------
 src/host/hcd.h                            |  1 +
 src/portable/analog/max3421/hcd_max3421.c |  2 +-
 src/portable/ehci/ehci.c                  |  4 +++-
 4 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'examples/host/device_info/src')

diff --git a/examples/host/device_info/src/main.c b/examples/host/device_info/src/main.c
index ac4c46a11..e924a137b 100644
--- a/examples/host/device_info/src/main.c
+++ b/examples/host/device_info/src/main.c
@@ -124,13 +124,18 @@ void tuh_mount_cb(uint8_t daddr) {
   }
 
   printf("Device %u: ID %04x:%04x SN ", daddr, desc.device.idVendor, desc.device.idProduct);
-  xfer_result = tuh_descriptor_get_serial_string_sync(daddr, LANGUAGE_ID, desc.serial, sizeof(desc.serial));
+
+  xfer_result = XFER_RESULT_FAILED;
+  if (desc.device.iSerialNumber != 0) {
+    xfer_result = tuh_descriptor_get_serial_string_sync(daddr, LANGUAGE_ID, desc.serial, sizeof(desc.serial));
+  }
   if (XFER_RESULT_SUCCESS != xfer_result) {
     uint16_t* serial = (uint16_t*)(uintptr_t) desc.serial;
-    serial[0] = 'n';
-    serial[1] = '/';
-    serial[2] = 'a';
-    serial[3] = 0;
+    serial[0] = (uint16_t) ((TUSB_DESC_STRING << 8) | (2 * 3 + 2));
+    serial[1] = 'n';
+    serial[2] = '/';
+    serial[3] = 'a';
+    serial[4] = 0;
   }
   print_utf16((uint16_t*)(uintptr_t) desc.serial, sizeof(desc.serial)/2);
   printf("\r\n");
@@ -150,16 +155,20 @@ void tuh_mount_cb(uint8_t daddr) {
   // Get String descriptor using Sync API
 
   printf("  iManufacturer       %u     ", desc.device.iManufacturer);
-  xfer_result = tuh_descriptor_get_manufacturer_string_sync(daddr, LANGUAGE_ID, desc.buf, sizeof(desc.buf));
-  if (XFER_RESULT_SUCCESS == xfer_result) {
-    print_utf16((uint16_t*)(uintptr_t) desc.buf, sizeof(desc.buf)/2);
+  if (desc.device.iManufacturer != 0) {
+    xfer_result = tuh_descriptor_get_manufacturer_string_sync(daddr, LANGUAGE_ID, desc.buf, sizeof(desc.buf));
+    if (XFER_RESULT_SUCCESS == xfer_result) {
+      print_utf16((uint16_t*)(uintptr_t) desc.buf, sizeof(desc.buf)/2);
+    }
   }
   printf("\r\n");
 
   printf("  iProduct            %u     ", desc.device.iProduct);
-  xfer_result = tuh_descriptor_get_product_string_sync(daddr, LANGUAGE_ID, desc.buf, sizeof(desc.buf));
-  if (XFER_RESULT_SUCCESS == xfer_result) {
-    print_utf16((uint16_t*)(uintptr_t) desc.buf, sizeof(desc.buf)/2);
+  if (desc.device.iProduct != 0) {
+    xfer_result = tuh_descriptor_get_product_string_sync(daddr, LANGUAGE_ID, desc.buf, sizeof(desc.buf));
+    if (XFER_RESULT_SUCCESS == xfer_result) {
+      print_utf16((uint16_t*)(uintptr_t) desc.buf, sizeof(desc.buf)/2);
+    }
   }
   printf("\r\n");
 
diff --git a/src/host/hcd.h b/src/host/hcd.h
index aa9e9cf3b..b20d96d54 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -163,6 +163,7 @@ void hcd_device_close(uint8_t rhport, uint8_t dev_addr);
 //--------------------------------------------------------------------+
 
 // Open an endpoint
+// return true if successfully opened or endpoint is currently opened
 bool hcd_edpt_open(uint8_t rhport, uint8_t daddr, tusb_desc_endpoint_t const * ep_desc);
 
 // Close an endpoint
diff --git a/src/portable/analog/max3421/hcd_max3421.c b/src/portable/analog/max3421/hcd_max3421.c
index 3fbf950a4..bb33200f2 100644
--- a/src/portable/analog/max3421/hcd_max3421.c
+++ b/src/portable/analog/max3421/hcd_max3421.c
@@ -611,7 +611,7 @@ bool hcd_edpt_open(uint8_t rhport, uint8_t daddr, tusb_desc_endpoint_t const * e
     ep = &_hcd_data.ep[0];
   }else {
     if (NULL != find_ep_not_addr0(daddr, ep_num, ep_dir)) {
-      return false; // endpoint already opened
+      return true; // already opened
     }
     ep = allocate_ep();
     TU_ASSERT(ep);
diff --git a/src/portable/ehci/ehci.c b/src/portable/ehci/ehci.c
index 292a352fb..7451f69a3 100644
--- a/src/portable/ehci/ehci.c
+++ b/src/portable/ehci/ehci.c
@@ -381,7 +381,9 @@ bool hcd_edpt_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const
   if (ep_desc->bEndpointAddress == 0) {
     p_qhd = qhd_control(dev_addr);
   } else {
-    TU_VERIFY(NULL == qhd_get_from_addr(dev_addr, ep_desc->bEndpointAddress)); // ep not opened yet
+    if (NULL != qhd_get_from_addr(dev_addr, ep_desc->bEndpointAddress)) {
+      return true; // already opened
+    }
     p_qhd = qhd_find_free();
   }
   TU_ASSERT(p_qhd);
-- 
cgit v1.3.1