From nobody Thu Apr 30 15:18:45 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g5yVt3vf4z6c6Vl for ; Thu, 30 Apr 2026 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5yVs6SpCz463T for ; Thu, 30 Apr 2026 15:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777562325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkVP2ECEI3NRfSvfxHpRxaNlnLyc3X28nW7Y0C9sduM=; b=AYae1eE5lLzL1KqviHg2LUbPYbFydhPbNV9c2w5w4XZ+mAM9OfewLeVGw3Moi38ofjUjrn tSkaLu5C9mrgwQ6XwrnRahun1G6QmROdrnn435vf8AdVaxtw75fCvbYjDStlTVakHFOv/v iTurpw18FnQvRlkzkNfe4df+Kv2q/JJ3NMzKYK4kZpNxyRoEA8MJ2vnmqIjxHlJAu8Deya Y5PNCVXVtxmL8ddPXSA5UVAesZk0LE6StaPcQq7SRZdEugn9BEiY1afrZ0O7lEsk7Ib50C 03rjC1nYcHVR9JIci2TkkZaEhuw8V5d9c++WAZW95JslQJXqp+/oL3hunFmX7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777562325; a=rsa-sha256; cv=none; b=CsqaVLJrb0OcBG1u1MIU8JciDpyOokC1OcH2Qk6EelDYnecocIjATt0NAqFvuzv6ifLseT Nb/K8t0IhISCSskgYW8z7aU9zQnvJhQFPoHosja5me9fk+l/RpDVNHCBkSoMdkhh0icVoC n3r/sIq1cHXtD7xyWQ2DZLEh2gv/qJkPBIYx6cSQ85OHSm+BI5ToB5p8f2BvP6s+Uzv/Zz i+PXPNHwg/X82rKCBY954G5dhPtI1KKi76UgiAmAy1FVWRYGv+K7Dp2ib8ze9zcPLELytq nRXWa6B2RSIRFbHiarCEgcFi/J2PMPHO+MD8V/TTNAl2Lfzbpg5V1wQwdnVFLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777562325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkVP2ECEI3NRfSvfxHpRxaNlnLyc3X28nW7Y0C9sduM=; b=jWJCD+Jj57uiDXDcKMkZzcAZX3ZdhVefE9taHTWOwgZvJYBwBp1HZdjeaOJmGsE+rIMySg V1ubU1n0NgLXb2JadgShst4bPPmmPe6mvT8ERMons7YCmwI3zBoo527mEr7mSNs5PLVVoH NBzGJBN8HTJSeG31ll2A9WjzffBxOXYhGhf73pcqODIDi6Uvcm03hxfVs5tAYM+TTR0ZJT uQLqiO8cpsBdQQ69oNjSX1Tdkg1tPWQuv5XH8zjpxMo+3L4VKNmOCX9oOkPTQpNEAVYxXe eXAD1ii0ELbOMFb8wNztbf20ghTW6ru0GnpASFo/TTKtwVDGn2B/fyGkOsrkyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5yVs3WHGz2GG for ; Thu, 30 Apr 2026 15:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1869d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 15:18:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 549e74061987 - main - snd_uaudio: Support Roland UA-33 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 549e740619873716b796a841a10f56fae3c3ad49 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 15:18:45 +0000 Message-Id: <69f372d5.1869d.464b27ad@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=549e740619873716b796a841a10f56fae3c3ad49 commit 549e740619873716b796a841a10f56fae3c3ad49 Author: Christos Margiolis AuthorDate: 2026-04-28 16:39:45 +0000 Commit: Christos Margiolis CommitDate: 2026-04-30 15:18:30 +0000 snd_uaudio: Support Roland UA-33 Apply the appropriate quirk. Also, introduce a new uaudio_vendor_audio table, similar to uaudio_vendor_midi, which includes non-standard USB audio devices. The Roland UA-33 needs this, bceause it comes with bInterfaceClass = 0xff (vendor-specific), so snd_uaudio(4) doesn't detect it. PR: 294814 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/24 --- sys/dev/sound/usb/uaudio.c | 10 ++++++++++ sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 3 files changed, 12 insertions(+) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 65976ced8a75..f477eb768fde 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -713,6 +713,10 @@ static driver_t uaudio_driver = { .size = sizeof(struct uaudio_softc), }; +static const STRUCT_USB_HOST_ID uaudio_vendor_audio[] = { + { USB_VPI(USB_VENDOR_ROLAND, 0x0132, 0) }, /* UA-33 */ +}; + /* The following table is derived from Linux's quirks-table.h */ static const STRUCT_USB_HOST_ID uaudio_vendor_midi[] = { { USB_VPI(USB_VENDOR_YAMAHA, 0x1000, 0) }, /* UX256 */ @@ -868,6 +872,11 @@ uaudio_probe(device_t dev) /* lookup non-standard device(s) */ + if (usbd_lookup_id_by_uaa(uaudio_vendor_audio, + sizeof(uaudio_vendor_audio), uaa) == 0) { + return (BUS_PROBE_SPECIFIC); + } + if (usbd_lookup_id_by_uaa(uaudio_vendor_midi, sizeof(uaudio_vendor_midi), uaa) == 0) { return (BUS_PROBE_SPECIFIC); @@ -6258,4 +6267,5 @@ MODULE_DEPEND(snd_uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_DEPEND(snd_uaudio, hid, 1, 1, 1); MODULE_VERSION(snd_uaudio, 1); USB_PNP_HOST_INFO(uaudio_devs); +USB_PNP_HOST_INFO(uaudio_vendor_audio); USB_PNP_HOST_INFO(uaudio_vendor_midi); diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 303f76f37fb0..c1976a59acbe 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -565,6 +565,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(CMEDIA, CM6206, UQ_AU_SET_SPDIF_CM6206), USB_QUIRK(PLOYTEC, SPL_CRIMSON_1, UQ_CFG_INDEX_1), USB_QUIRK(ROLAND, UA25EX_AD, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UA33, UQ_AU_VENDOR_CLASS), /* DYMO LabelManager Pnp */ USB_QUIRK(DYMO, LABELMANAGERPNP, UQ_MSC_DYMO_EJECT), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index e1394e903cb3..594afafbb07f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4208,6 +4208,7 @@ product ROLAND UA700 0x002b UA-700 Audio I/F product ROLAND PCR300 0x0033 EDIROL PCR-300 MIDI I/F product ROLAND UA25EX_AD 0x00e6 EDIROL UA-25EX (Advanced Driver) product ROLAND UA25EX_CC 0x00e7 EDIROL UA-25EX (Class Compliant) +product ROLAND UA33 0x0132 UA-33 Audio I/F /* Rockfire products */ product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB