From nobody Tue Apr 14 10:31:52 2026 X-Original-To: dev-commits-src-all@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 4fw0vF2F4Xz6ZZ0p for ; Tue, 14 Apr 2026 10:31:53 +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 4fw0vD6jvHz3SFG for ; Tue, 14 Apr 2026 10:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162712; 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=XJegRrC1kSDIkF0MhgmON/NpV7II7ymu3Yu3b6HbGxo=; b=CzGNPxQSxSNC0+VzEpeQ6W1zFftB0PvFJ3WWH/exvSIO5tT6Vml7qOCd5QlNRy1WLpC3ty OICLVp0xCk4Jwr/xvw4gVtOIU98KJgzuRnsg9tAr37/KpWihyr7+PvYcesFNkNjuve5DUz mImtkGqlQAwApOCkm9Vu8gLDHARTwvCFwlxloQCUQmR2e/ylzSSLm78QBqJmjD9RAa9sb5 cVA4zUS7rVJoTBphum9U6C1Sknn9W4evS2DQqqoDiwLAjK+NB9VHASoBT10HcjxfSppKij fMqv9WkkW423AQixx5grh6fa4LvYjf3OJTHQL0zEL5LY76nf8GfBU9LhgifrDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162712; a=rsa-sha256; cv=none; b=i06/PNITUQIK6SUjGnqjL6lee5Zc+kviTSyZtJ1cxaIfHcOTpg1QQOQl03Qaj1bYnXVsdf zRegOxwB3MIbVJs4kq2aoLTtxZhH8fUDrSDReShJw6gYzxc2ecbQTHQ5EnYZ8AKP+Q1ihI EEOnGukwH7O3lppw4/AFlxharYwQ/l92SfsRgYEq/7X1b8z9ZGft+lxEGcPUW9EkEBF5kr vj037PvZEEkXBoe1498GcqnrbIOVe0Gv9Df0nLbQHAzHnyNwQnmgn2lozZi5AYC1dQeVRT JN9x0/ajSO9Qnt/0MZRwHh9W6Q24qP/TRrJd/TjVTztu7cbRz9Ur9guxzrLcmQ== 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=1776162712; 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=XJegRrC1kSDIkF0MhgmON/NpV7II7ymu3Yu3b6HbGxo=; b=VopDJ3x0Pvc+SAZFfRGqP3ORXBHgFlTriYx6baiIYUtaD875xJUZPf7In7zyFTs7xKxbZj GmIXH1DwRKD+1NNFLSnQAU+9FtFLChMghPQkzemrfzoSQOEL2L+DevM2cQGP+tRN3awpPa 34jDCjQoUHRi/9KLVtSqOKQ6Vq/sjxCNkP7RntR0L2Pqe0M/jQeXjJq+nVVwOKdAJ9QkvN yKhL8cr+g8UqcDCRtPylApTgdiHN0K45d8ZebGzoibFlI+DXNBCVtUf24oBWFNS0LTrmw2 YXr9qW9N2pD4FkTl9MEpPXN/lRYwWEAJ0j2voNaIrVG9X2utSCzFDaDXW9ip+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vD5QcHznCY for ; Tue, 14 Apr 2026 10:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ff8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 573fd4252cc0 - stable/15 - sound: Retire unused CHN_N_* defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 573fd4252cc0cadb188eee07bec66d22e641c070 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:52 +0000 Message-Id: <69de1798.30ff8.6902990f@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=573fd4252cc0cadb188eee07bec66d22e641c070 commit 573fd4252cc0cadb188eee07bec66d22e641c070 Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:21 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:42 +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 (cherry picked from commit 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8) --- 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