From nobody Thu May 07 09:18:37 2026 X-Original-To: dev-commits-src-all@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 4gB6BC2thPz6RlS0 for ; Thu, 07 May 2026 09:18:43 +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 4gB6BC0bSbz3bhm for ; Thu, 07 May 2026 09:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778145523; 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=n96cjoud6b7gGcGCxgilXJOyt0BXkInXAAjxeklbEt4=; b=tKlFPOs78u6VcxUZjsktsy0VG7hf0EoFhCKhZ0YiOS+PmnSdhMMO/kIpVXDXi3kmh6ppRx 6fnGOqqOT9ypxrE6flM0L/NfGjFwSPr/tiYVYzrT3ztTN/GiHfd9Mahvi8tkHOtl0wKom8 oO1/PjlhSmgqAwTaAP4OlTuhMUj4SDe9V422TfNQ+JWGUgtjqD7Ht7EypoXyVLK35q/Pxc dMUZ9pkIdaXHfsaj8cKccssqRluJLG1gDlNB9tdthkTG1r3/WXXMTKFZmZ6LJwo98S+Ule 4soqpDejzVpezku4F6s6ct7VOVGBoXcF/yYMZqqhkZvvrRgW2n/M5g3pQzYOvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778145523; a=rsa-sha256; cv=none; b=qAyG7B31Ve2w1dnN90IC0Y7/uixutqSiNDjMGDEQa5Gp+j78siYcdoQ1n6lzz1Vj2Jli8q xi6FjcO2bHgRigwNnw0zZCCXALMy1Scs4SpOIfepzrgcf2Wex8ZkmiKNIH4DnRKu7eUHL8 ++S0e74guDncvgBMF9VWNPnDG6GvEgPWfGAiRaGS/ZHnbBPrveZkrmJEksEPkE5vJcbdne Xu174pD41vAaU2gnA4dE/0VkLFd/6R6siuA6CdYaR5TjTbiWyExHgCZdcw6t44Vsk1O5pP HwJOWYZcOKUbMkGC22NtN4Qd3zxIkFDn0tMWvfvf6mYruAyQXxkSefl1RZamjw== 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=1778145523; 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=n96cjoud6b7gGcGCxgilXJOyt0BXkInXAAjxeklbEt4=; b=TEG9sefivtRqO+g7VJSrzy6bBP+BN7UMeHU6u17oA6F2+Ko7m+G+6Yc/Edcpmf8/xs3xHJ 06oJbIbMUk33wMIGSSFS3pmJ5VQz8xGGtj/Gd7RYXwcfuYRmQYdYUOfQIioxpjvk+g7+K7 DMIpmzNg+gvwdFLMFdBHsMm+dWP96aEDCtqYEg6RIMtfzNI60mwyFUfHQBSumzx8GSoSaL a7Qk8MJlWWz+828LVbtX4P0zvbRvZx9xuP23vq1eHxdDWqJaLbj930Ml3YEzw5dTCBgi/x EnrdZNRpsAxhISVh9Z2mJj+BJW1uCCo2Uro2STuAHrFyl7ESEDl8cESjjJuNQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB6BC09k1z4V2 for ; Thu, 07 May 2026 09:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2070b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 09:18:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ed919bf54acf - stable/15 - snd_uaudio: Support Roland UA-33 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ed919bf54acfde48a36ab07b83186e3639223137 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 09:18:37 +0000 Message-Id: <69fc58ed.2070b.5ec9a053@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ed919bf54acfde48a36ab07b83186e3639223137 commit ed919bf54acfde48a36ab07b83186e3639223137 Author: Christos Margiolis AuthorDate: 2026-04-28 16:39:45 +0000 Commit: Christos Margiolis CommitDate: 2026-05-07 09:18:31 +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 (cherry picked from commit 549e740619873716b796a841a10f56fae3c3ad49) --- 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 69e16c91604f..6237df4b4fe0 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 bb039f59ce19..e8eee7f330c5 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4196,6 +4196,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