From nobody Mon Feb 12 11:08:49 2024 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 4TYMCQ177yz59b59; Mon, 12 Feb 2024 11:08:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYMCP3gT6z4YCC; Mon, 12 Feb 2024 11:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736129; 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=NviqJ3qPGQ5NV6zCIMAKcwUpMYbEUB4+uB3/0hQrgKw=; b=GMahIPrH736tzFc4JLida77iIg3Aj8RTuRpmVQmIyoN4HcNZbDmY4oVnEiSNhhvLNBAmb7 ECoko5P5ok5GRhD7h5OYz2KexYLgpBff4jIP+ZP5/QH45v64DVoPteoYplp3hVj+eidHkB nKsyr1TB/Ea+XAD74O4+rYhR1GwntyVcAxzVrxebj4MLySSTG0MLbbjCUQBnBo9ieEPRLt 4i14Repo2W6O4nJuiVBvFPGXZBXxekc0muQJUyxaTBNM+WCQL+8ovRuZKZAGtpQajSH3NI mNFqWCiNTxr2zJiwHFOi72G/tg25eQzY6dyNtkQyYg+svlQxP6Pt3s+buFhTUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736129; a=rsa-sha256; cv=none; b=Vw56V7lKmbonw2eCrLmK+lRluQEqNJhDe2HRmH8UyWbKekTMAoAlkT2MVipZN0+QoZ18pQ EYWhSZAdGwUC0WZz0VNqgoM1ZyaZmGIcDX5nfobGVI3egz5XrRqqxSqbCuMWIkXkNTfA+u 3UXuYpOOS1sbs5TYBm1zhGaHo5/wOqPyhyYR4fPQGCC3MG6zXhGmJhzgUc6wT4Aa/Bm8pD 9Tk6v2JMAlPmU0AlL4eqqaQfoZiP4p1gdp2k6+fBuEqaPryeFS99Dws42dkidqySYJNORM DuHKzMTXUVu+XykhdjMZ4HJEaxovBxaCMYX71FTp/kBRvVSiAEMKlyi71quGJA== 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=1707736129; 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=NviqJ3qPGQ5NV6zCIMAKcwUpMYbEUB4+uB3/0hQrgKw=; b=UNdjhUPljT84Z/MHeVJi++MPs3o4semDPeF3lXs0kfJ6Dhn5yhh/HTU0xwbsyLjc8t8X05 XR+aDPtKmGvFamjjpXiewNumDKd1ot+sZi/q+Dt4EvWS8umC6rE6ldSvOCT7TMYu/DwCqY KwEOBOqiMbF8qqG4YVABnHlpVEb862DBokuROQNhR+EeBWGIFIOaCgtaURcLs12UErFywW Xuxh/xRNAFlbkz52kwdnbm4jSzd3NaeyGdTPmQtdERYyrnJ0X6FNzOGuwZwhg8ywyYBpe+ UFLLQzKeoSkQ6cm9ymj48W4fm/C8UpnnTgpvJpDutI+dkeABXXortbg914ZgHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCP2brJzPJJ; Mon, 12 Feb 2024 11:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CB8n8Z041357; Mon, 12 Feb 2024 11:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8nhK041354; Mon, 12 Feb 2024 11:08:49 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:49 GMT Message-Id: <202402121108.41CB8nhK041354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f60e99f45e81 - main - snd_uaudio: mark selected configurations 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f60e99f45e8197de2bc0970c7dd7f87148fdaf30 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f60e99f45e8197de2bc0970c7dd7f87148fdaf30 commit f60e99f45e8197de2bc0970c7dd7f87148fdaf30 Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:47 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:50 +0000 snd_uaudio: mark selected configurations snd_uaudio(4) selects the first maching rate/channel/bit/format/buffer configuration for use during attach, even though it will print the rest of the supported configurations detected. To make this clear, mark the selected playback and recording configurations with a "selected" string. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D43766 --- sys/dev/sound/usb/uaudio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index eb4b676d5e7d..26d95bf3ee9f 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1051,11 +1051,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_play_chan[i].num_alt; x++) { device_printf(dev, "Play[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_play_chan[i].usb_alt[x].sample_rate, sc->sc_play_chan[i].usb_alt[x].channels, sc->sc_play_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0) @@ -1081,11 +1082,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_rec_chan[i].num_alt; x++) { device_printf(dev, "Record[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_rec_chan[i].usb_alt[x].sample_rate, sc->sc_rec_chan[i].usb_alt[x].channels, sc->sc_rec_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0)