From nobody Fri Apr 25 16:56:37 2025 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 4ZkfBZ0J20z5tmnc; Fri, 25 Apr 2025 16:56:38 +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 4ZkfBY6QdFz3Srd; Fri, 25 Apr 2025 16:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745600197; 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=/nS1K1L5wKCrfRYiMKF9djXRZ8+MpOYEz6O/zVEWCU4=; b=s7gaS1R9j/L0u5tWEpmvfclGFixbVW6t0k4lIDUg9nfGQkHoOddUFaMwvgJuCCPo7TAy1p 9NqxtezDeLlaWwY/AQGAXRjzts5vjQUsXjBGNaZCloaW+uRKQrzlaMhSaQ58nA8q43tMjH BpGfYxT+5BQWcwQnfz+Q6BMC3P5Fv7nozEtkvzabsgMZcLoUbwycj3CCpDuiZwLxN9PtOX /M+KcJn/94qun+9y27Q35W9enPNRAb3YCMUOVhkyYvqAtb4kHeqKKegoJj15h0ESwmu9XQ l3km+bk4L4Xoi4Hv6p9GJxUI8sFisivRiAci02/1qJA1rivsBfvS/5JSHJMnJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745600197; a=rsa-sha256; cv=none; b=uwg2tLx6cYrBr3u/YnRGB+vkfTS96u8RKrybrPT84LOCT822UsGGqOqHfJXDk4pzCqjyXn qjXKgL7ClWPaIph2eKgY7b6G16b14BVgOP1gKbr6KPDaFvqwly+Si/ch1qx25FO3daVeAz Potb2P1CNsOkIUTSeUAwznfklghpY050+tWGkzC5w7xnK74qjCWU3OwtO2S7todO9HScZ2 wrFiEk2We9NeXqpnGHcvdEU4/F4563w4b2Ph/p6BliMk5jjowCSFXycXOVy+Gfho0xHlTz OOjUr961CKphr4VYJ5/6CUC7ZCJxjFVsweVs8NtttvyUme1lBTcorW3stUfbfg== 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=1745600197; 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=/nS1K1L5wKCrfRYiMKF9djXRZ8+MpOYEz6O/zVEWCU4=; b=aFRfeUPU05s2rq5v+XzwhbiDK4tt8iRlDMrj71bPovXmzgoFhLr/+oX1atI+PNdGyrgNdy ZDdeiM7yeusNUP5ZUIqkZusiv20cAEJe8jnKaQV+p4nMGRSZTs+9gqxgzGMl9cfZmUqAWY Js2iSYE9dXc+Cpq/XnzrRVVry6kkpn3thfmYFBnp6mOkMKPQM4WYZ7vsdaCR6AyeWpc7m6 xmyGvMHtXU3sMmL7mgO8TmGMscpCmASJ/gr4it+ryHpbyF+6yNAitg3mc+zDFS5AJhHLnR BzG8ClTIo4nG41dIgXtLnEqEKhLey9VkV12gefskuCSozHls1YeEtrCymvdlCw== 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 4ZkfBY5rkXzkNl; Fri, 25 Apr 2025 16:56:37 +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 53PGubM2034639; Fri, 25 Apr 2025 16:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PGubA4034636; Fri, 25 Apr 2025 16:56:37 GMT (envelope-from git) Date: Fri, 25 Apr 2025 16:56:37 GMT Message-Id: <202504251656.53PGubA4034636@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: 0c0bb4c1401c - main - sound: Make sndstat PVCHAN and RVCHAN nvlist parameters bool 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 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: 0c0bb4c1401c9696fbb8d0b1fe88990db0e706c8 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0c0bb4c1401c9696fbb8d0b1fe88990db0e706c8 commit 0c0bb4c1401c9696fbb8d0b1fe88990db0e706c8 Author: Christos Margiolis AuthorDate: 2025-04-25 16:55:16 +0000 Commit: Christos Margiolis CommitDate: 2025-04-25 16:55:16 +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 --- share/man/man4/sndstat.4 | 8 ++++---- sys/dev/sound/pcm/sndstat.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/man/man4/sndstat.4 b/share/man/man4/sndstat.4 index 44c3f3152610..8da705502920 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,