From nobody Sat Jun 13 18:41:24 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 4gd4wT305sz6gtY9 for ; Sat, 13 Jun 2026 18:41:29 +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 4gd4wT2P81z3VpL for ; Sat, 13 Jun 2026 18:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781376089; 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=NpsxX75sIYDWNhDYfzVB7Qyuy49LeLgfGWtp8YNxBTA=; b=XdWUZRMAL+ov0p0x97w70exO7/InmS+jWwq3vrghB8uZV1KlV2qA2dYFOVzr5Cecznj/nk sUbKBP8qQQgStfqxkf4lzYqRNaLeQG/IJPLuZvWIMjrff6sheXLvgle8mNMaqyWjEzmcO2 ZUpOD8VLVv5wNE+/H6f+PANxQyK6X6ijCnepGgxt2HSw0vzjwbQzRNt4LnTfGYk0upbn5i UNyahNUc6H/6dixXFXIP3uQgVzB00fToIB4LhoWnAosyczffH5kkzLTCMff9wx7cvitDtg 1PfPh4IxU503U8ZYNbp6xuyHh9xNJDIlwdv7wIf+cnw7diudNBLwxNXcRVv5mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781376089; a=rsa-sha256; cv=none; b=QX44PVuKMGLw4SKAr31QBA6IoYIazawh0ICAkECqJBmeVctmixetA0xyjbEVeDvb03Xoh0 VoSaNq/tzMOgV2j2SIsgogJ1sUBTBU8eHHAtjsBFFtQVSO4tc214CD+LkMdkuOONzAfZtv jx6S2CZLauPvGi5bYoORQWNpQXEua3LFhLjL4T6WQtbSjBJfIUY1vzOxI+TNlO/g0hDXYE XUzUDR7TMiGxZwJ+lFAg+5PKWaZCyjs8L863eoHtzCXiu5C4/0jPP0vhyv+leK7jpIWx9m 4A+q5egTLWGmMTnFv1tjKoaS3CzbTRBjqXWhizG35Q/omKiZ61d7sjr54Pzc3w== 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=1781376089; 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=NpsxX75sIYDWNhDYfzVB7Qyuy49LeLgfGWtp8YNxBTA=; b=xzvrphxnThKbsQwFNajO5jvJvT+FJK4fW8VmiM3MoeMjKhEJmms53Nl7DHTeNXclHaEEG2 co0/Q20lKiWY+AmnTmHdO4++M/CT5FSgparPWqHr/Zg4zKa4PtsYpb4ed2gWs4H73pUQyU pDfcMTfHYuGlL3S320vUeQYb3T+qyDMkbpbhGABeaya9apgG1wLnVynr57ve3OozHNlBtD vcZR5noG/11ifu38K2nPZrNNULAVHj/nMrZLhTl1nsf+spA92Uq6To1XryJTMfyRDqDnY1 p5FeCQ0XWgE+hR2i6vnFybvqNoUansmsU+d6Pg+U/jBb2WaJA+fJ9OYqylUvWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gd4wT20RbzZgt for ; Sat, 13 Jun 2026 18:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22000 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 18:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 33c8e68d3237 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 33c8e68d3237af2f0540ff39eed8439a67b3f90a Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 18:41:24 +0000 Message-Id: <6a2da454.22000.24c9de7f@gitrepo.freebsd.org> The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=33c8e68d3237af2f0540ff39eed8439a67b3f90a commit 33c8e68d3237af2f0540ff39eed8439a67b3f90a Author: Christos Margiolis AuthorDate: 2026-06-13 18:40:35 +0000 Commit: Christos Margiolis CommitDate: 2026-06-13 18:40:35 +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 8238629a2a51..986cab8a7a62 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -715,6 +715,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 */ @@ -870,6 +874,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); @@ -6278,4 +6287,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 5920ffa934a0..dd319fde130d 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -619,6 +619,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(CMEDIA, CM6206, 0x0000, 0xffff, UQ_AU_SET_SPDIF_CM6206), USB_QUIRK(PLOYTEC, SPL_CRIMSON_1, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(ROLAND, UA25EX_AD, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UA33, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), /* * Quirks for manufacturers which USB devices does not respond diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index fa201f448fd6..97cd80795e3c 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4201,6 +4201,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