From nobody Tue Mar 24 10:39:03 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 4fg63D1y33z6WV32 for ; Tue, 24 Mar 2026 10:39:04 +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 4fg63C5BQCz3tnl for ; Tue, 24 Mar 2026 10:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348743; 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=qDdGiwsPofik/3QUu6qbO6MiGQ5CFvzyw/rrWNmFBZc=; b=MNuI4qHbXTnk6omKdVFwVNKMNDQqXgPvN24nlyzms4BF1fqCO0ljSKnk8MHlH9iR2ZeLrn O4wR3WlPRucZGCkwiblKeO2zUPQD1SmM99qV8RCQcMvVdfegdm9UAfJ/KUxVuL38CGVe98 EM5cjx311DzAQSBWegtYOIvcyIS/KrNP175ysSkhhLrVTqJ+29VuB5T1JP6H3/662plA3q g/DF7pcKsoi48b2sWUR6dotGJgjhk1j5DKM0NQJfMnYE8PIKtpCTa1DvypdwFzTYnQEtXG Iedc65HQnNmIZUAxtti3AU9WR/e94VZrqS3no0+DlM39E2HAfCRyYnAkCKsktg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348743; a=rsa-sha256; cv=none; b=ee92cWQbIa3rtxRCijzGlxUjLL7p3HfhLXTj1EEftrEulEn/F3dHY79JI25UU/zVrNliFg iXVWivKkWzxmAPgmoCNBmnrWJatNPlziFmOgBXWok0f3zWNjQ1kFemH5g4rxxO/lAid1wj 4GHlrV6VPZWnIetqbZVlWo7jGZy3LGSbNjZKJOmgoAhsq7GKgiIOr2UWoiLL+XCAu5B8qe VcV/zchkaPkjIXoOqwYTsSyGb1k/ktUWJqfznB3LdMe5RNsgd+/SCY5+gFisMMcrdi3uSx NSq260v4cBZ7IPiL3HMSpOOoywSOghRdUxiJYk2tuluOIPO4pVl2gSX7Ie54sA== 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=1774348743; 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=qDdGiwsPofik/3QUu6qbO6MiGQ5CFvzyw/rrWNmFBZc=; b=WAwGzOcgkZPSCgHp34ckTEYyVKSKrBuIHdUZv4q6gsiAxvhWTgd7A8iOiiJdo2dXMD6Qv5 7lix/luAcj7c2hyc1oPTP7961zFY8N99roGPxIuwsYYuG+m1OhxC9qzUPF8cIvOZ2CPt1V 0683VuuGlH88yLO9frwJvFqRzbObsidQo4nwiFWECG3PhlSkNYCkcOxaoBigBtNELX7HHp tOiK9G0vEjHxoOwM5FWeTdoYb7TkN/axDc/Uv+KR3xn41bu2aDbvtVyE/BiQBAa4HtH7VO G8SksR+Gi3iKtsIhu+m4idiS7CkxPVyckGfffOesvNTOhTDyeJNCrishrdEWKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg63C4lJ3zq6 for ; Tue, 24 Mar 2026 10:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3398d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:39:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f190fad18c38 - main - sound: Retire CHN_GETVOLUME() and use chn_getvolume_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: f190fad18c385c184cb3600b7e24a362858a1911 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:39:03 +0000 Message-Id: <69c269c7.3398d.7b3a5cd0@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f190fad18c385c184cb3600b7e24a362858a1911 commit f190fad18c385c184cb3600b7e24a362858a1911 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:59 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:41 +0000 sound: Retire CHN_GETVOLUME() and use chn_getvolume_matrix() CHN_GETVOLUME() is just a wrapped around chn_getvolume_matrix() anyway, so use it directly. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55991 --- sys/dev/sound/pcm/channel.h | 1 - sys/dev/sound/pcm/dsp.c | 8 ++++---- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/sndstat.c | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0ccce2971c3a..22c2bf5a4d3e 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -307,7 +307,6 @@ 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_GETVOLUME(...) chn_getvolume_matrix(__VA_ARGS__) #define CHN_GETMUTE(x, y, z) ((x)->muted[y][z]) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c1e836691ac7..4af0430feca9 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -618,17 +618,17 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *ch, case SOUND_MIXER_PCM: if (ch->direction != PCMDIR_PLAY) break; - *(int *)arg = CHN_GETVOLUME(ch, + *(int *)arg = chn_getvolume_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FL); - *(int *)arg |= CHN_GETVOLUME(ch, + *(int *)arg |= chn_getvolume_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FR) << 8; break; case SOUND_MIXER_RECLEV: if (ch->direction != PCMDIR_REC) break; - *(int *)arg = CHN_GETVOLUME(ch, + *(int *)arg = chn_getvolume_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FL); - *(int *)arg |= CHN_GETVOLUME(ch, + *(int *)arg |= chn_getvolume_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FR) << 8; break; case SOUND_MIXER_DEVMASK: diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 55b61ccb4911..6ed2d0c3ce5c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1142,9 +1142,9 @@ mixer_ioctl_channel_proc: center = (left + right) >> 1; chn_setvolume_multi(c, SND_VOL_C_PCM, left, right, center); } else if ((cmd & ~0xff) == MIXER_READ(0)) { - *(int *)arg = CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FL); + *(int *)arg = chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FL); *(int *)arg |= - CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FR) << 8; + chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FR) << 8; } CHN_UNLOCK(c); diff --git a/sys/dev/sound/sndstat.c b/sys/dev/sound/sndstat.c index b0ac7f7d0824..c28a932c784e 100644 --- a/sys/dev/sound/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -487,9 +487,9 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) c->feedcount); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_XRUNS, c->xruns); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_LEFTVOL, - CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FL)); + chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FL)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_RIGHTVOL, - CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FR)); + chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FR)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_FORMAT, c->bufhard->fmt); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_RATE,