From nobody Tue Apr 7 15:44:51 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 4fqr9c0qGxz6YSS0 for ; Tue, 07 Apr 2026 15:44:52 +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 4fqr9b61VJz3qFk for ; Tue, 07 Apr 2026 15:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775576691; 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=M6PNfkO1xdiJAWRHw8NRg3SFlO/+dzJa/fQ+kMkUlOQ=; b=wZmDMn3I4k3T8h66jXqzTV7Ffdy5VFaF0Hq5XQmY7VbMKCgolYpETRivbJH5zezfUkshoM 2iXCFD4ruOnWbHvSGJ+H90wmDj5Zdgc4nBg9qiJp1WoTw/X1aXcLYpDhQyspdmL8Ge8vnT /meEQP1V3PLS8c4B+ZV8t/EHbNwgV82aG78/12auOnPtvfn/XlnTWDkqRFGrJYel5674OA u2sRHschttM3CFTHRsmau2w6eO2//2Paoc8UPWlw/eF+nn46yZn1/4KmK5gloDWsPCHKlc UYdFbNtLooj2uXK6Q19CyUOsyOwP2LwIjKCQNDhC33sK1H09xT1qdALOPhkEow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775576691; a=rsa-sha256; cv=none; b=sP8r8zvgAnLfpGEMCouZEGITdcXKqZpwDHkjUHowYzAy/8FOumOb6vTPFxrzGByc3fzVln GKsw1Ad7LOtRY0DxIDPfulo8/8wGt0mMbRcDqdPrwih7l2FQPQ4W4yRvDmYJgJadxSSaoR LhxFvn8VbwP05vkHEEFiC1QJr7NJ4cam34Nr4Z6OoxAF0e4SYiegY9g+k25mYkjk7bSy1G TMgw9ewVEP9jZmuLFb6v7PJx3QLjqLWXNgbFSuOGfBy1pPf1hXkoQAS/SzhGHrGr14IvIi xeL/PAXaPdzi6e7yHzVagMUtVCTVYLapTf1sYAHqONcx269N3c0OcB3RXDvTbw== 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=1775576691; 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=M6PNfkO1xdiJAWRHw8NRg3SFlO/+dzJa/fQ+kMkUlOQ=; b=lOYqC2LDLOleqGE9ljSVsessnNX9F5LJmN+6pPBlE84AzvQPMunp93s2Y2mayqwOV4nKpp MZVA0u7znWtaewyAgds7Vjh6LJ3VRkzGKvrqkmhYIheU3y6yxrqUlBo1EeRDbsoD/XWd2p cYvEmAaa7Xu3f6yuVfzxnFYrm/mcZiDrwLEoRhKL5oEA1oSTBDXrj+MbaIQ/7PT7SYAn70 X0x0w12X7p1y+E1dZOXqlCwxltksgoNA7GJoPOqTb+5rDiWhQCZM73Rfv73Sgt7hTm9rzD i52kW4oqMJWIxFcWO03LGRqcjx0hTqClBe5S3w7BUUvFRoLrbvfuJ2W7bJXWxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqr9b5WwQzmVT for ; Tue, 07 Apr 2026 15:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4464e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2d84c8a3d3d6 - main - sound: Retire unused CHN_N_* defines 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: 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:44:51 +0000 Message-Id: <69d52673.4464e.6b5c6e2e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2d84c8a3d3d673081c803f8aadc4eae8f6a221d8 commit 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8 Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:21 +0000 Commit: Christos Margiolis CommitDate: 2026-04-07 15:44:21 +0000 sound: Retire unused CHN_N_* defines These still haven't been implemented by the original author, and there doesn't seem to be much use for them anyway. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56239 --- sys/dev/sound/pcm/channel.c | 26 +------------------------- sys/dev/sound/pcm/channel.h | 7 ++----- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 67bbfba28177..c9edce27c8cd 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2351,31 +2351,7 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) */ run = (CHN_STARTED(c)) ? 1 : 0; if (run) - flags &= CHN_N_VOLUME | CHN_N_TRIGGER; - - if (flags & CHN_N_RATE) { - /* - * XXX I'll make good use of this someday. - * However this is currently being superseded by - * the availability of CHN_F_VCHAN_DYNAMIC. - */ - } - - if (flags & CHN_N_FORMAT) { - /* - * XXX I'll make good use of this someday. - * However this is currently being superseded by - * the availability of CHN_F_VCHAN_DYNAMIC. - */ - } - - if (flags & CHN_N_VOLUME) { - /* - * XXX I'll make good use of this someday, though - * soft volume control is currently pretty much - * integrated. - */ - } + flags &= CHN_N_TRIGGER; if (flags & CHN_N_BLOCKSIZE) { /* diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index f964480369a1..6fa4338dce4a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -405,11 +405,8 @@ enum { -#define CHN_N_RATE 0x00000001 -#define CHN_N_FORMAT 0x00000002 -#define CHN_N_VOLUME 0x00000004 -#define CHN_N_BLOCKSIZE 0x00000008 -#define CHN_N_TRIGGER 0x00000010 +#define CHN_N_BLOCKSIZE 0x00000001 +#define CHN_N_TRIGGER 0x00000002 #define CHN_LATENCY_MIN 0 #define CHN_LATENCY_MAX 10