From nobody Tue Mar 31 09:55:10 2026 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 4flNlM3JkJz6WcLj for ; Tue, 31 Mar 2026 09:55:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flNlM0Nhdz3kM1 for ; Tue, 31 Mar 2026 09:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950911; 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=p0F8YsEUgdWR2T+QZx6qCTpKgDOlGYssG7GcZV8WPD4=; b=c/p4MZsZJxqNk1pWJGqurd+2dfkrJ5We2DBbgzKv+hOABw10Gnq9BEVqrsL8UNxILSxbf2 dKjBWq9Mt24SCFZEZsyNSVeJOVWDU8WuAXUtWOiAL7PvR/5RQiHcjaJM9HiCKKAo0NJkEX NXWvKM5ZVDQuLnzNg7+//D+w4HCgmqGtV1sXxmpPUUty7XIkCt2jBwdoaDAYhKbiseFKt0 w7qowgfUGQS2NFh9xliYZf7uNVyKT5UFHWQCiQCWmZq0FrAqK2Hcn1jQWWE1geD1PnnMXP v74OZu01q8/1u0dvSThGHtMias25Td1/yZ3AD3YgoEimWrpbvhTkREhMOHCKvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950911; a=rsa-sha256; cv=none; b=KFbJGXhLgMSvQySYjhR3+4K7LI3vX7obYvDbt3fJpwdmNm6g7Ybky8HTydibgc75sN3e+g 9D1g4NQr0htELNm8szfGZVftTREw2Iih07SWNtc2iewU94uuuZwyxDpUTVL3OiYlhaIWMU 8FJpWcx3PxFQG0/mMeOPeJdEfLpJVagcXehNs0lz59SitQFzHJNfZ0POtElPaPp9Se6OH6 2ldSFed76Fg6XdeKPpI9yYGyofeRzat6MAicjwbChIOlFpYP8xE/o538tKJQN1QYu4PuqZ xdpxC+NaajQx2F57EHqHGZJPBQwxTGe1wLOrBtBnL8XVBEapCagJgTKDuyHSvg== 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=1774950911; 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=p0F8YsEUgdWR2T+QZx6qCTpKgDOlGYssG7GcZV8WPD4=; b=SPaA36IFyIRwf1XKN63NNgn0qHu1huo4voTtlGgglub6rm4LLvFE0yJq4u11MwDhVqwfzW mNwHIbekQy3LCrwC6GJdwCD5w3aSe5YVcyQJdygjHtrKwdLGPN8uILgeAB2d1BjlKSkdEG ERl3WutKy7B/TKSCcyl7noGO7qfqQB3X0Lv/ylaG7yZkEaJsuKpr9NHoyuQHiHfj+XswiY 4xWyTJoaDfk391+n2X6Stw9T+gXon3llE8lCB5uwyCYX0lfqlFyW6RJxBtpFaY71uqzUIU YOYBsLNrACp7/heV0hpL4aChTH2BecDmlHhg/7IDtEq8hdpKGdGAAX2w+XFQ9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNlL6wnwz8VJ for ; Tue, 31 Mar 2026 09:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:55:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 668167682a2e - stable/15 - sound: Retire CHN_SETVOLUME() and use chn_setvolume_matrix() 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/15 X-Git-Reftype: branch X-Git-Commit: 668167682a2e20e8b6de6d374683d2c19849d7fc Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:55:10 +0000 Message-Id: <69cb99fe.3be27.11b3c58a@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=668167682a2e20e8b6de6d374683d2c19849d7fc commit 668167682a2e20e8b6de6d374683d2c19849d7fc Author: Christos Margiolis AuthorDate: 2026-03-24 10:32:04 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:53:17 +0000 sound: Retire CHN_SETVOLUME() and use chn_setvolume_matrix() CHN_SETVOLUME() is just a wrapped around chn_setvolume_matrix() anyway, so use it directly. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55992 (cherry picked from commit 127aa056fea0714116952efb7664956e0f2b69cd) --- sys/dev/sound/pcm/channel.c | 4 ++-- sys/dev/sound/pcm/channel.h | 2 -- sys/dev/sound/pcm/matrix.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 5e7c5772af01..67bbfba28177 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -143,7 +143,7 @@ chn_vpc_proc(int reset, int db) PCM_ACQUIRE(d); CHN_FOREACH(c, d, channels.pcm) { CHN_LOCK(c); - CHN_SETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_VOL_0DB, db); + chn_setvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_VOL_0DB, db); if (reset != 0) chn_vpc_reset(c, SND_VOL_C_PCM, 1); CHN_UNLOCK(c); @@ -1635,7 +1635,7 @@ chn_vpc_reset(struct pcm_channel *c, int vc, int force) return; for (i = SND_CHN_T_BEGIN; i <= SND_CHN_T_END; i += SND_CHN_T_STEP) - CHN_SETVOLUME(c, vc, i, c->volume[vc][SND_CHN_T_VOL_0DB]); + chn_setvolume_matrix(c, vc, i, c->volume[vc][SND_CHN_T_VOL_0DB]); } static u_int32_t diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 22c2bf5a4d3e..0375bbfb006d 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -306,8 +306,6 @@ int chn_notify(struct pcm_channel *c, u_int32_t flags); int chn_getrates(struct pcm_channel *c, int **rates); int chn_syncdestroy(struct pcm_channel *c); -#define CHN_SETVOLUME(...) chn_setvolume_matrix(__VA_ARGS__) - #define CHN_GETMUTE(x, y, z) ((x)->muted[y][z]) #ifdef OSSV4_EXPERIMENT diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h index f4a79fdc3b30..ffac162f41a1 100644 --- a/sys/dev/sound/pcm/matrix.h +++ b/sys/dev/sound/pcm/matrix.h @@ -176,8 +176,7 @@ /* * Multichannel interleaved volume matrix. Each calculated value relative * to master and 0db will be stored in each CLASS + 1 as long as - * chn_setvolume_matrix() or the equivalent CHN_SETVOLUME() macros is - * used (see channel.c). + * chn_setvolume_matrix() is used (see channel.c). */ #define SND_VOL_C_MASTER 0 #define SND_VOL_C_PCM 1