Merge branch 'master' into fork/HiFiPhile/dcd_notif

1 files changed, 25 insertions, 16 deletions

diff --git a/examples/host/device_info/src/main.c b/examples/host/device_info/src/main.c
index 775968c16..7189972d6 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,
@@ -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");
 
@@ -259,7 +268,7 @@ void led_blinking_task(void* param) {
 
 #define BLINKY_STACK_SIZE   configMINIMAL_STACK_SIZE
 
-#if TUSB_MCU_VENDOR_ESPRESSIF
+#ifdef ESP_PLATFORM
   #define USB_STACK_SIZE     4096
 #else
   // Increase stack size when debug log is enabled
@@ -276,7 +285,7 @@ StackType_t  usb_stack[USB_STACK_SIZE];
 StaticTask_t usb_taskdef;
 #endif
 
-#if TUSB_MCU_VENDOR_ESPRESSIF
+#ifdef ESP_PLATFORM
 void app_main(void) {
   main();
 }
@@ -299,8 +308,8 @@ void init_freertos_task(void) {
   xTaskCreate(usb_host_task, "usbh", USB_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL);
 #endif
 
-  // skip starting scheduler (and return) for ESP32-S2 or ESP32-S3
-#if !TUSB_MCU_VENDOR_ESPRESSIF
+  // only start scheduler for non-espressif mcu
+#ifndef ESP_PLATFORM
   vTaskStartScheduler();
 #endif
 }