From nobody Mon Feb 26 23:22:54 2024 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 4TkGqy3jGWz5BtTL; Mon, 26 Feb 2024 23:22:54 +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 4TkGqy20brz4V9l; Mon, 26 Feb 2024 23:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989774; 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=atQ5la8GoWN0kLnVCE7jqQB+Ld+pHBEhwubfcS4U6vE=; b=WJ/we74OUEAF9icTRU3j9e9BaCLC1QjCysSYDmL/xYpQm00R9zhFXk+eudZ6CnQIWC7GTd 2Sk3ceRzP+s5p9O+hnz70MjS7+olaJqcRAbPZG75QWMeax6gjAEDghmJkiPtRZ1xsOGk+/ 9PdGdgkcgfLE/Wgolf3Pbwy8RE/EVQQ73CJlcQWEeW0c0kOl3OUIUPzNe1RXXixjH3XUpV vgDLaCCjILxlkwb/TRy2XMMtdfSTKTuKZS0CvzXs4sxAYc7KGETYaQao/zjP6vLkNje4Pq uvk+Lx587MfADsLoDHpRMY5cJsr3GTT2p1mcemuh4UHpWqYl6KmyndvsMMLS1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989774; a=rsa-sha256; cv=none; b=nIo8YrmKQDVWvLx702AEJbH9c/nNYzLd7MBswTqnevYWwbZcDiIhyMSKTF8EZEqtQt3g5i VLDQy9WKH2PuDwNelNaLXNfDIaG4Z8ZDtayMd86gT9JVnR2WmgfVf+iKAgvxwTGZ6dwDj/ dW63tcNBWVqMRYY1woMcmAsSihf2Is5r0p+kCfrR0UAVqMgvQp0wU1EsUkDSpyYLEOWDi1 QYHC52I0U3o6E+3MLvJ/QNLVr8JdPkjVheYTKfTs3LAjFCIqbvJjBLtw1Wxk2DI0hOz6T6 uscg0K573lYrhOeIipBNMW/tDEjWVrwBv+imW0wxv095bKs4CmWijqkNEJCHLQ== 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=1708989774; 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=atQ5la8GoWN0kLnVCE7jqQB+Ld+pHBEhwubfcS4U6vE=; b=QjUWMUQigT03jfFaxwDWJtOaPPcq4hVBu3Z4M5xHPJxxWQiAm5KiB+T8JxBJIGynNfISCv pWkij4B2o5msVb0wm3SwAZrOoboCNwF/upWQYoWDe/AJQ4bn6LQBZ6QJs1BMH37f5Srhyf Y4wscTaGi4iybTlAdurotS3XAczGtftxcbRkiHfafffCR1Qxt6j6350pKNWM7ixza/Wagb 66JC4Fim9HTmCWuB2nLGfkKfMaJNY11yahyFHSFlTeeAARaRCYC4u/rpxht8U2eqUpNhv3 FH/CsCqatS3g6B8N0z/F6xroqF1Zts8Vew88ukY/VBPhOYzKFV7ZSasK1neMEg== 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 4TkGqy15hgzpLx; Mon, 26 Feb 2024 23:22:54 +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 41QNMslf028747; Mon, 26 Feb 2024 23:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMsRQ028744; Mon, 26 Feb 2024 23:22:54 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:54 GMT Message-Id: <202402262322.41QNMsRQ028744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 80da975b55dc - stable/14 - snd_uaudio: mark selected configurations 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 80da975b55dc2a2074a0ae49bb464cbe103d000d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=80da975b55dc2a2074a0ae49bb464cbe103d000d commit 80da975b55dc2a2074a0ae49bb464cbe103d000d Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:47 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +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 (cherry picked from commit f60e99f45e8197de2bc0970c7dd7f87148fdaf30) --- 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)