From nobody Tue Mar 31 09:55:12 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 4flNlN4DLcz6WcLk for ; Tue, 31 Mar 2026 09:55:12 +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 4flNlN1BsXz3kZT for ; Tue, 31 Mar 2026 09:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950912; 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=PYTb9X+6pYHcd5eXIhZOlYPuAnTI7w/Jiex77GikNPY=; b=bx5UZUcRpf6aExdgJ1NY0cWr/EulbVEjbZfMAAKxJmmsUeSbZr0dYuSW3alwMHMImkdhhH M9HUjI3gmZxzmI6czLSIoJlgjNb7NZkqB+VD6E0/6qloIApQYsEwstHBHKohEvN11iq9kp v6qhNMKfHQRaCtM8ZUAA66mif5eYerUWZsWFrSnCy9MtTVwl3926tpbwYyGRRohFTfYZ3o mnG8htMUuqo+O8PEV18ZO3/W7ZlUfxtWVwba7jlBRP8dRiKk5CKgM0vGKZ2j8eyL9Q9Oj1 JS+d3n50hlwMDcdgrDqJ0VDEHE/4aoZ4vXMqD7ZfxGMktAZbrqfisAZXd/yszw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950912; a=rsa-sha256; cv=none; b=YKOQmRwwT+sthWDiUyAsQFJJ1BSszM4PUHqiYcGOVk+ZqvjZTFP+qBA2gccJBwo8fqfxrD 3jzI6VNd7yK8ET3LUVWGMgOAWCP2W/Imx2h/HMnC3qA34w//BjR4IELS63fbfAiq56mtO3 fkh+CH3ukN36QxLaEkpEcacPzRjRiLpEsLWNae5hjMV8CN8Gmfm1/lXjP8J82gyaTtUFf9 Cua+S651Apji6NWuMZKFkDsw1PdqTABhm+quBsI068Sze1XNrfV9QzEm707zXk/S01e76d Q1XUNlPM/3kJm24a+SbkBxMlsEQs3N/hkqhfUTFW5lov2AMrftSUHBHBShb9fw== 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=1774950912; 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=PYTb9X+6pYHcd5eXIhZOlYPuAnTI7w/Jiex77GikNPY=; b=hO4I0qzsKEhfRtSr5PmTz6Fw+EGt+xIvELafTUk+TsTV2ouXrgqJRDN+4XxivJMFyoSPjl qpCXjNyHHKLOb7l51h6q5oYGFTrrwX2doKMb929yFfZs4hgiQ8m2rT3cWDq4cJIk7DEBpL bucXBR0nwwJe8gJrmw2Lj/YWTZQSZKF8ujsh6QeKhYM2PVgQIvwLmaTa+USMjX0hrjBXi8 9qGGC90OtxGlBnHAZcItjZU45gU0UsXUNv64+V5Ox+JdFXsBnCc4CkQyKSu410K+INtU9H aJPx5GiJeNSq2G7vO/N839ogpnCJlPPhv0o+jSc2iQUdtcM2qukmSIHGyId1FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNlN0f7Tz8K5 for ; Tue, 31 Mar 2026 09:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bdaa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:55:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 901d6fd8787d - stable/15 - sound: Retire CHN_GETMUTE() and use chn_getmute_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: 901d6fd8787de5dda492519238f2ce8f01d4919a Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:55:12 +0000 Message-Id: <69cb9a00.3bdaa.494e8951@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=901d6fd8787de5dda492519238f2ce8f01d4919a commit 901d6fd8787de5dda492519238f2ce8f01d4919a Author: Christos Margiolis AuthorDate: 2026-03-24 10:32:08 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:53:17 +0000 sound: Retire CHN_GETMUTE() and use chn_getmute_matrix() chn_getmute_matrix() does what CHN_GETMUTE() does, but with a few additional checks. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55993 (cherry picked from commit d171d5b8b5acb145efb41a57a2a8f3cded59a484) --- sys/dev/sound/pcm/channel.h | 2 -- sys/dev/sound/pcm/dsp.c | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0375bbfb006d..dbacbdd894f9 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_GETMUTE(x, y, z) ((x)->muted[y][z]) - #ifdef OSSV4_EXPERIMENT int chn_getpeaks(struct pcm_channel *c, int *lpeak, int *rpeak); #endif diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 4af0430feca9..797bfba81023 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -607,8 +607,9 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *ch, case MIXER_READ(0): switch (j) { case SOUND_MIXER_MUTE: - mute = CHN_GETMUTE(ch, SND_VOL_C_PCM, SND_CHN_T_FL) || - CHN_GETMUTE(ch, SND_VOL_C_PCM, SND_CHN_T_FR); + mute = chn_getmute_matrix(ch, + SND_VOL_C_PCM, SND_CHN_T_FL) || + chn_getmute_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FR); if (ch->direction == PCMDIR_REC) { *(int *)arg = mute << SOUND_MIXER_RECLEV; } else {