From nobody Fri May 2 10:46:13 2025 X-Original-To: dev-commits-src-branches@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 4Zpndy2fzyz5vWmw; Fri, 02 May 2025 10:46:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zpndy25Fgz4NQh; Fri, 02 May 2025 10:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182774; 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=OLRBp8dXJ86KEnXrYU8DDSdZIugx2ldJ0qME/ClZ9Dc=; b=gDWzYYNikdMwbaIvZr3cTiX6GNKdn+TmH8gbyDMPrszELKpWOn0Xxhrlc6J63Yr/GdNMO3 qHB78AJ+g5g7mM9wHAKYuUmFurHTUR00sGs6CUqq39jIQE7PH+KKg7MQ/OZYNs9F5D3DTC 8qcPBV45h8UReU0nt46ILOl3cH9N0lnBUJaeo2/4E1AspJKeM9mngZOJGaP7oq048O/usZ MuGaBOZnz23KqEenIl35uNVuPos0bPBaCB4qqCV0FpPBypMn8E5KfkI9eOT1z4yVNMC8My A+G9nwCIQI7GwdtqyhqEu8KIsRPqVk+h2xDaC1Zla8xwFyMHCJbqx+y/Mck41Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182774; 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=OLRBp8dXJ86KEnXrYU8DDSdZIugx2ldJ0qME/ClZ9Dc=; b=XXsgwzbSARR+sYPxXRGjIhzuolZPogKUgwxFQOZVvPQWaWpJAXoty4oH9m7RTO/SSQiD9s hZXFmlVrLWr2xWIiYq1OJ2paTzimx4kmsBN6s+lzTTb8JdhTjce7XhbDucvykWSzXyVSpR H+dLIB1cCumzrdyeI5H2VI8KbFG5HXij4zVnZw1I/tNjPZUks/6aYs5Yrey4r71vIANS71 TvC5RFcCYdhHWy/rs60Kwj9zDcjaugnkc8jGpqnXnkEEw9yrhLkoRp9fRtGptIFhHKILyR KqDMMSzoAXPuCCfR9iDbJnEaS5FB9NSK01kPjpAOq3u18/BhlN04IhZZMWM81w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746182774; a=rsa-sha256; cv=none; b=OQ+DvMs6zo1NWVdJrT9gR80/l5LH+/jpf26pDNHXzAUFdPw4zLVFWIqYV+Pt4GewPbir6u 0ry3j5gVRiqhKK1Z5XS9evSp2i7LRvUoCEeNGIc408afXSibshyf6e42C+h8Ed/DNDIsdf AMbSMninNtU9TDIINj5zw/aU2hqRwRfbYb6qHLcyjV+jFJMey0jMmPWqwgv9y/z385vXqr P7ZiZBN2AQosYyHdQO6sYcnGpve6L5F0ECyDzHUg++hUBe1zqvEYBT6vFF1jDOdbYEceSq kOj/AXcU9oiwjJRMEQyIcYPLDlbzfs7Vd6Roku6h2IEEHnl7fHeWsv7eRcV/Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zpndy1KLLz18b2; Fri, 02 May 2025 10:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 542AkDJD035946; Fri, 2 May 2025 10:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542AkDaC035943; Fri, 2 May 2025 10:46:13 GMT (envelope-from git) Date: Fri, 2 May 2025 10:46:13 GMT Message-Id: <202505021046.542AkDaC035943@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: 3b0ff20f8d69 - stable/14 - sound: Make sndstat PVCHAN and RVCHAN nvlist parameters bool List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 3b0ff20f8d69447bbea205187f759edc1f3d8e2d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0ff20f8d69447bbea205187f759edc1f3d8e2d commit 3b0ff20f8d69447bbea205187f759edc1f3d8e2d Author: Christos Margiolis AuthorDate: 2025-04-25 16:55:16 +0000 Commit: Christos Margiolis CommitDate: 2025-05-02 10:42:58 +0000 sound: Make sndstat PVCHAN and RVCHAN nvlist parameters bool Prior to 02d4eeabfd73 ("sound: Allocate vchans on-demand"), the play.vchans and rec.vchans sysctls corresponded to the value of d->pvchancount and d->rvchancount respectively, which is also what we are exporting through SNDST_DSPS_SOUND4_PVCHAN and SNDST_DSPS_SOUND4_RVCHAN respectively. Since that commit, the sysctls mentioned have been modified to show whether play/rec vchans are enabled or not. Modify the sndstat nvlist parameters accordingly. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49980 (cherry picked from commit 0c0bb4c1401c9696fbb8d0b1fe88990db0e706c8) sound tests: Fix PVCHAN and RVCHAN fetching in sndstat_nv Fixes: 0c0bb4c1401c ("sound: Make sndstat PVCHAN and RVCHAN nvlist parameters bool") Reported by: CI Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 6286b714f5e398cc2a87883d81aa087ee11ee310) --- share/man/man4/sndstat.4 | 8 ++++---- sys/dev/sound/pcm/sndstat.c | 6 ++++-- tests/sys/sound/sndstat.c | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/share/man/man4/sndstat.4 b/share/man/man4/sndstat.4 index 266bfcf304fe..1d51882b98a5 100644 --- a/share/man/man4/sndstat.4 +++ b/share/man/man4/sndstat.4 @@ -76,10 +76,10 @@ dsps (NVLIST ARRAY): 1 unit (NUMBER): 0 status (STRING): on hdaa0 bitperfect (BOOL): FALSE - pvchan (NUMBER): 1 + pvchan (BOOL): TRUE pvchanrate (NUMBER): 48000 pvchanformat (NUMBER): 0x00000010 - rvchan (NUMBER): 0 + rvchan (BOOL): TRUE rvchanrate (NUMBER): 48000 rvchanformat (NUMBER): 0x00000010 channel_info (NVLIST_ARRAY): 1 @@ -181,13 +181,13 @@ Usually reports the driver the device is attached on. .It Dv bitperfect Whether the sound card has bit-perfect mode enabled. .It Dv pvchan -Number of playback virtual channels. +Playback virtual channels enabled. .It Dv pvchanrate Playback virtual channel sample rate. .It Dv pvchanformat Playback virtual channel format. .It Dv rvchan -Number of recording virtual channels. +Recording virtual channels enabled. .It Dv rvchanrate Recording virtual channel sample rate. .It Dv rvchanformat diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 33cde235e070..cafd9aff4bdc 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -440,12 +440,14 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) nvlist_add_string(sound4di, SNDST_DSPS_SOUND4_STATUS, d->status); nvlist_add_bool( sound4di, SNDST_DSPS_SOUND4_BITPERFECT, d->flags & SD_F_BITPERFECT); - nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_PVCHAN, d->pvchancount); + nvlist_add_bool(sound4di, SNDST_DSPS_SOUND4_PVCHAN, + d->flags & SD_F_PVCHANS); nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_PVCHANRATE, d->pvchanrate); nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_PVCHANFORMAT, d->pvchanformat); - nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_RVCHAN, d->rvchancount); + nvlist_add_bool(sound4di, SNDST_DSPS_SOUND4_RVCHAN, + d->flags & SD_F_RVCHANS); nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_RVCHANRATE, d->rvchanrate); nvlist_add_number(sound4di, SNDST_DSPS_SOUND4_RVCHANFORMAT, diff --git a/tests/sys/sound/sndstat.c b/tests/sys/sound/sndstat.c index 553c745ec950..637e640d3cff 100644 --- a/tests/sys/sound/sndstat.c +++ b/tests/sys/sound/sndstat.c @@ -148,10 +148,10 @@ ATF_TC_BODY(sndstat_nv, tc) NV(number, UNIT); NV(string, STATUS); NV(bool, BITPERFECT); - NV(number, PVCHAN); + NV(bool, PVCHAN); NV(number, PVCHANRATE); NV(number, PVCHANFORMAT); - NV(number, RVCHAN); + NV(bool, RVCHAN); NV(number, PVCHANRATE); NV(number, PVCHANFORMAT); #undef NV