@dhalbert -

Flashed and tested USB-host drive detection (MAX3421E FeatherWing, hot-plug SanDisk/PNY/USB-storage) on real hardware with this bump:

espressif and atmel-samd build clean in CI as-is.

The RP2350 and nRF52 images above are local builds with CIRCUITPY_USB_AUDIO=0 disabled.

shared-module/usb_audio/usb_audio_descriptors.h still uses under the old names. These seem to be in the process of being migrated those to the TUD_AUDIO20_DESC_* family is the (cc @FoamyGuy). #11058 and #11062

nRF52 needed one more one-liner to build: tinyusb's dcd_nrf5x.c calls nrf_clock_is_running(), but CircuitPython pins nrfx v2.0.0 which only has nrf_clock_hf_is_running(NRF_CLOCK, …). Patched that one call locally to verify the hardware; the proper fix is bumping ports/nordic/nrfx (or upstream tinyusb supporting nrfx v2.0.0).

Neither the audio-disable nor the clock patch is included in this PR.

proof of life

hw-verify-repl-log.txt

@hathach We could use hathach/tinyusb#3748, but we are well behind in circuitpython as you can see above. @mikeysklar has made good progress. Do you have any recommendations or review comments? Thanks.

all changes look good, except the audio since we don't want to haardcode it with FS. Audio HS/FS has different way of calculating timing/samples. It is updated to not hardcored since even with highspeed capable device e.g imxrt, when plugging to FS host, still need to functio as FS audio. However, since cpy mostly work with PC, we can just use the TUD_OPT_HIGH_SPEED.

Thanks @hathach!

Updated: both TUD_AUDIO_EP_SIZE(...) calls in supervisor/shared/usb/tusb_config.h to now pass TUD_OPT_HIGH_SPEED instead of a hardcoded false

The audio path can't be fully CI-compiled here yet.

• the bump also reorganized the UAC descriptor macros (TUD_AUDIO_DESC_* → TUD_AUDIO20_DESC_*) and shared-module/usb_audio/usb_audio_descriptors.h

• still uses the old names, so CIRCUITPY_USB_AUDIO boards (nordic, rp2) need that descriptor migration before this compiles clean.

cc @FoamyGuy (#11058 / #11062)

3 commits pushed. CI green except nordic.

80d6cae usb_audio → TUD_AUDIO20_* / AUDIO20_* (@FoamyGuy OK'd on Discord)

• bigger than a macro rename — 3 layers moved: macros, 23 enums, 7 C types
• AUDIO_TERM_TYPE_* is shared across UAC 1.0/2.0, keeps its name
• FEATURE_UNIT ONE/TWO_CHANNEL → varargs TUD_AUDIO20_DESC_FEATURE_UNIT(unitid, srcid, stridx, ...)
• descriptor bytes diffed before/after: identical (132/230/132). No HW test yet.

d4d5ad3 stm: build fsdev_common.c for STM32L433xx

• bump split the fsdev driver; 3 symbols moved to a new file
• mirrors the existing dwc2_common.c pattern. blues_cygnet links.

6c8a542 pimoroni_pico_dv_base_w: disable usb_audio

• bigger tinyusb → 232 bytes over flash; board was already at 100.0% on main
• usb_audio = USB Audio device class, not the board's I2S line-out/HDMI audio — audiobusio.I2SOut, audiocore, synthio untouched
• board never opted in; inherited the rp2 port default. Frees ~9kB. Non-W sibling keeps it.

Remaining: 51 nordic + the windows job (same nordic build). Not caused by this PR.

• tinyusb autodetect puts MDK 8.29.0 in the v2 bucket, but nrf_clock_is_running() didn't land until nrfx v2.1.0
• no CFG_TUD_NRF_NRFX_VERSION value bridges it
• fix filed upstream: nrf5x: fix hfclk_running() for nrfx v2.0.0 hathach/tinyusb#3766
• @dhalbert — wait for that to merge and re-bump the submodule, or land this with nordic red?

@relic-se — #11102 will need a rebase after this. FEATURE_UNIT_TWO_CHANNEL becomes the same varargs macro with one extra control arg; the AUDIO_* enums and audio_*_t types need the 20 too.

@FoamyGuy — the bump deletes CFG_TUD_AUDIO_FUNC_1_DESC_LEN and _N_AS_INT (the driver walks the descriptor itself now). Both are still defined in tusb_config.h, now dead, and the comment atop usb_audio_descriptors.h is stale. usb_audio_descriptor_length() is still needed by usb_desc.c. Left as-is — clean up here, or fold into the stereo work?

Remaining: 51 nordic + the windows job (same nordic build). Not caused by this PR.

• tinyusb autodetect puts MDK 8.29.0 in the v2 bucket, but nrf_clock_is_running() didn't land until nrfx v2.1.0

• no CFG_TUD_NRF_NRFX_VERSION value bridges it

• fix filed upstream: nrf5x: fix hfclk_running() for nrfx v2.0.0 hathach/tinyusb#3766

• @dhalbert — wait for that to merge and re-bump the submodule, or land this with nordic red?

Please wait for that to merge (I see it is not yet building successfully). We don't merge PR's with broken builds, in general.

Will wait.

The test failures were on hathach/tinyusb#3766 - hil-tinyusb.

All 33 hil-build compile jobs pass.

@dhalbert -

• nrf5x: fix hfclk_running() for nrfx v2.0.0 hathach/tinyusb#3766 merged
• this PR builds clean

Since this bump introduces nRF52 and usb_audio changes I tested in hardware on a Feather Sense nRF52840 against (hathach/tinyusb#3766). Used this minimal code to confirm usb_audio is visible to macOS.

Adafruit CircuitPython 10.3.0-alpha.3-14-g6c8a542dd0-dirty on 2026-07-10; Adafruit Feather Bluefruit Sense with nRF52840
>>>

macOS enumerates

system_profiler SPAudioDataType
...
        CircuitPython Headset:

          Input Channels: 1
          Manufacturer: Adafruit Industries LLC
          Output Channels: 1
          Current SampleRate: 48000
          Transport: USB
          Input Source: Default
          Output Source: Default
...

boot.py

import usb_audio
import usb_hid
import usb_midi

usb_hid.disable()
usb_midi.disable()

usb_audio.enable(
    sample_rate=48000,
    channel_count=1,
    microphone=True,
    speaker=True,
)

code.py

import time
import usb_audio

print("usb_microphone:", usb_audio.usb_microphone)
print("usb_speaker:   ", usb_audio.usb_speaker)

while True:
    mic = usb_audio.usb_microphone
    spk = usb_audio.usb_speaker
    print(
        "mic connected:", getattr(mic, "connected", None),
        "| speaker connected:", getattr(spk, "connected", None),
    )
    time.sleep(2)

I tested this successfully on a CircuitPlayground Bluefruit with morse code project code: https://github.com/adafruit/Adafruit_Learning_System_Guides/blob/main/CPB_Morse_Code_Paddle/code.py

@FoamyGuy - Thanks for testing!

the bump deletes CFG_TUD_AUDIO_FUNC_1_DESC_LEN and _N_AS_INT (the driver walks the descriptor itself now). Both are still defined in tusb_config.h, now dead, and the comment atop usb_audio_descriptors.h is stale.

@mikeysklar Is this still true? Don't leave dead or stale stuff in.

usb_audio_descriptor_length() is still needed by usb_desc.c. Left as-is — clean up here, or fold into the stereo work?

I'm not sure I understand, is that a regression, or a reminder?

@dhalbert -

Cleaned up the stale stuff.

• DESC_LEN and N_AS_INT
• UAC2 driver no longer reads
  • N_BYTES_PER_SAMPLE_TX/RX
  • N_CHANNELS_TX/RX
• CFG_TUD_AUDIO_FUNC_1_CTRL_BUF_SZ
• Rewrote the stale usb_audio_descriptors.h comment

usb_audio_descriptor_length() stays. My note was a reminder to not delete it.

Verified builds clean locally on CIRCUITPY_USB_AUDIO=1 builds of adafruit_feather_rp2350 and feather_bluefruit_sense.