Merge remote-tracking branch 'tinyusb/master' into fix-stm32-usbc

3 files changed, 57 insertions, 3 deletions

diff --git a/examples/device/audio_test_multi_rate/src/main.c b/examples/device/audio_test_multi_rate/src/main.c
index 952176997..a86beb415 100644
--- a/examples/device/audio_test_multi_rate/src/main.c
+++ b/examples/device/audio_test_multi_rate/src/main.c
@@ -532,7 +532,7 @@ static bool audio20_get_req_entity(uint8_t rhport, tusb_control_request_t const
 bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
   (void) rhport;
   //uint8_t const itf = tu_u16_low(tu_le16toh(p_request->wIndex));
-  uint8_t const alt = tu_u16_low(tu_le16toh(p_request->wValue));
+  uint8_t const alt = tu_u16_low(p_request->wValue);
 
   // Clear buffer when streaming format is changed
   if (alt != 0) {
diff --git a/examples/device/audio_test_multi_rate/src/plot_audio_samples.py b/examples/device/audio_test_multi_rate/src/plot_audio_samples.py
index 1f33a003e..f35cfa311 100755
--- a/examples/device/audio_test_multi_rate/src/plot_audio_samples.py
+++ b/examples/device/audio_test_multi_rate/src/plot_audio_samples.py
@@ -5,6 +5,52 @@ import numpy as np
 import platform
 import csv
 
+
+def find_windows_input_device(name_hint, channels, preferred_apis=None):
+    """Pick a Windows input device index from query_devices() output."""
+    preferred_apis = preferred_apis or []
+    name_hint = name_hint.lower()
+    candidates = []
+
+    for index in range(len(sd.query_devices())):
+        device_info = sd.query_devices(index)
+        max_input_channels = int(device_info.get('max_input_channels', 0))
+
+        if max_input_channels < channels:
+            continue
+
+        device_name = str(device_info.get('name', '')).lower()
+        if name_hint not in device_name:
+            continue
+
+        score = 0
+
+        # Prefer exact channel matches (for example 1ch source over a 4ch source).
+        if max_input_channels == channels:
+            score += 100
+        else:
+            score += 10
+
+        hostapi_index = int(device_info.get('hostapi', -1))
+        api_name = ''
+        if hostapi_index >= 0:
+            hostapi_info = sd.query_hostapis(hostapi_index)
+            api_name = str(hostapi_info.get('name', '')).lower()
+
+        for priority, api_hint in enumerate(preferred_apis):
+            if api_hint in api_name:
+                score += 50 - priority
+                break
+
+        candidates.append((score, index))
+
+    if not candidates:
+        raise ValueError(
+            'No input device matching hint="{}" with at least {} channels'.format(name_hint, channels)
+        )
+
+    return max(candidates, key=lambda item: item[0])[1]
+
 if __name__ == '__main__':
 
     # If you got "ValueError: No input device matching", that is because your PC name example device
@@ -15,8 +61,8 @@ if __name__ == '__main__':
     duration = 100e-3    # Duration of recording
 
     if platform.system() == 'Windows':
-        # MME is needed since there are more than one MicNode device APIs (at least in Windows)
-        device = 'Microphone (MicNode) MME'
+        # Match by substring to support names like "Microphone (2- MicNode)".
+        device = find_windows_input_device('micnode', channels=1, preferred_apis=['mme', 'wasapi', 'wdm-ks'])
     elif platform.system() == 'Darwin':
         device = 'MicNode'
     else:
diff --git a/examples/device/audio_test_multi_rate/src/usb_descriptors.c b/examples/device/audio_test_multi_rate/src/usb_descriptors.c
index 505936fdb..b1f60dd10 100644
--- a/examples/device/audio_test_multi_rate/src/usb_descriptors.c
+++ b/examples/device/audio_test_multi_rate/src/usb_descriptors.c
@@ -88,6 +88,14 @@ enum {
   // nRF5x ISO can only be endpoint 8
   #define EPNUM_AUDIO   0x08
 
+#elif TU_CHECK_MCU(OPT_MCU_MAX32650, OPT_MCU_MAX32666, OPT_MCU_MAX32690, OPT_MCU_MAX78002)
+  // Put audio iso on EP>=8 so the 2048/4096-byte FIFOs can back double packet buffering
+  #define EPNUM_AUDIO   0x0A
+
+#elif TU_CHECK_MCU(OPT_MCU_CH32V20X, OPT_MCU_CH32V307)
+  // Only EP3 is available for ISO
+  #define EPNUM_AUDIO   0x03
+
 #else
   #define EPNUM_AUDIO   0x01
 #endif