From nobody Tue Mar 24 10:39:05 2026 X-Original-To: dev-commits-src-main@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 4fg63G51Qhz6WV9m for ; Tue, 24 Mar 2026 10:39:06 +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 4fg63F74Ngz3tm0 for ; Tue, 24 Mar 2026 10:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348746; 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=rEQ969xxvzrffjO6kvOE+slt7sLx5ODCcW/DMMk2lrA=; b=y3QYR/QVldgsfDi/UnvAVPCMj/vZuQyHbIRbNH/lggcbHUK3q51W5yWAoCgfNhNZMgugd2 q7HnaEwAwYxIPJhmp+VioQf3jkmnugormo0meIOiaofUZd3en8zN6AVfXmrCNDDQHcGvBS eq60DmkCPoju9kGIulr2Xy4Q48S7EihhI6UGAWvG4SEShcwNsf8LWma7M4KoHPqkZha9yR fiI5qOvcvc28bNiwQB/I0JR1KhAT68417gjQl6yXXUbxeILecLBMfx3BOYL1IdEKZfZc8c She+wgasFJbUToIXSvzvzYX0YdVFSF9kfhMUcQohIkm/wr+TEwwPACPJ3IMgZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348746; a=rsa-sha256; cv=none; b=n1u6vU/OUXbDj6Fu2q02CFpkjy4lOyHvc3A4+EkVm1QQORD3sDkpIwipsj9CtZ9AfRPhGy Fj++nTUI3gra3osm4B4zwYwJU/tgqpErKt94FP5cH1ipNj74Ha6R+bnpXAC71xnC/7A0KW 8NogiLxNw4w40TWrsoIegoTwYQ4a0BOaMcDBIaybmQRrSaMPXp8VcYlCCjUWAiM0NFDDqV f9WhWZpamJuWZZLg09f7R4bUPYYbYCJjnHUgzjxEpzH+AqUjsGO/A/rkwESOj3f+DGLrUe 577Vaq+/zGQAodsnveOB6gpPV8mFQS24Qp7k2lJnf9mF3a6V3MI4Hzs+bATphQ== 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=1774348746; 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=rEQ969xxvzrffjO6kvOE+slt7sLx5ODCcW/DMMk2lrA=; b=S3kc+e1i6t39uLm5ngAmNxWE8F6iVoG2GYvmCvONTOx3yFu4LCKItzhP0D0E6SCnrV5EWP RkqrZK+PPl17EKmN4Yq+UMeeXShiBMNxf5LPA2hsQkXS9IhArvHpmaSq4Z32vaPRoylYI6 jBZulSGYqYroWvFCWpJpTVzV3+PWwNJaWTFFThBz9AivZoojbMCpCUGnfyL4wBgmCezwPF DoxtSIL6DnCkDxQTO3QZt+emiZ3zsJUHduEFuaYkcrR/ynR86WWL4Rz1IZsg+ILSpImsGg SLR2IFidiCNv+YqGbAGZny1ZLUYMrxMAl9327AUS8N10MzFrV+xQ+eY4E9h+LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg63F6PX9zbC for ; Tue, 24 Mar 2026 10:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32459 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:39:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d171d5b8b5ac - main - sound: Retire CHN_GETMUTE() and use chn_getmute_matrix() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d171d5b8b5acb145efb41a57a2a8f3cded59a484 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:39:05 +0000 Message-Id: <69c269c9.32459.828b324@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d171d5b8b5acb145efb41a57a2a8f3cded59a484 commit d171d5b8b5acb145efb41a57a2a8f3cded59a484 Author: Christos Margiolis AuthorDate: 2026-03-24 10:32:08 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:41 +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 --- 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 {