From nobody Tue Mar 31 09:55:02 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 4flNlB6034z6WcLQ for ; Tue, 31 Mar 2026 09:55:02 +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 4flNlB2RkWz3jpX for ; Tue, 31 Mar 2026 09:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950902; 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=47ZLgEs3fZ31TXnZLnH/EIz3WubPxLpkkpQ0YqD9gmg=; b=cLM5dK5B8HUhZgMz1sZmuH6iklEnzrVUfy7i3/0bBivf1mLEJWM4O20cxCCwLH4YyIiML+ cgG1LOCkDQlONCbgHGEP2+Mo4o2l0JbA+ROjXoeaOtAbS19/zH4iN5727ebf3jrUZXKd6v RgaeRoLApgEcm3yMhrBOGakONFmbleSKAaDcBeGkKD+zk4WWYgK+H5b+uOWE1cq/SMUUDA IKLjHXpDPQ7KrPCzw1cXOiDalR6vjkjh7RySaaLuMdhaozOrReuY5FJ0JplZ1qHPlAogrl 0oAhiZ4EHmM3h+56Ptk+/lN9beVU8i9nhoB7OcF2+58Ybjv1OZ/OZJL8XKKKsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950902; a=rsa-sha256; cv=none; b=gd4Q7rLtcFMNf/o9/Ji4qlxqMvscdUWOU0kL+f9lm1vmoKmAysKJ8VkkEdTJ9l+FVXo/CM 8bf1LJQPmtPXqRzyC4cJ1TkL85BYUi2yJBhj4zMMRF3ZqKzlS7mj+AvYk0SLrB5xZPA5OO nmUg4PCKMA5Wu/YuZbzUSzs6VAQH0f/tsjBZJbfD/TsJa3frwjZHQ3v/sbr7c7z1r5sh3W +NFo/MXqTJvkcSajGHqxlhPyoU9EapfnmYePND4X2fnWlPBrq8QZOvwT4RnuUROt7Dmts9 CPLHOuejTQrw2W4fSZP/p7zbsV3Geri/tahmP3LrhEeEcLRh9IDcH7xzeCng6g== 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=1774950902; 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=47ZLgEs3fZ31TXnZLnH/EIz3WubPxLpkkpQ0YqD9gmg=; b=uS+xT95grTgUOcc7ccPTAH/4PRwYpPXh0R7hWG5HoxFp+NaJtXnjwaM8ImP1zrBb/Qi9Ff 3ifxQJNW7qHHWCAO1SG7G74oCYR71XU43YjZIlORk8FYkSacrmQxwmiUWud7vlIOSco224 W/8RcLitIPCvNgQTJ7XI1yYgDV72YiKcpXV6xaE856r5BPe36/GCMOZmItgngRaEw3FIUA a9AuIf3s4f6NYrXBQfRRxouI3AXeFbw8MSmol3cfnf0mVcq0iMD0Aq4x+WTHXppPSaPjwG gRfh6QmwZ7xYMLrjGl6YhW25wmgNiuDcNN70k/rwAP1G699xAFfFLhEOqJJUyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNlB12xXz8HT for ; Tue, 31 Mar 2026 09:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c826 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:55:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d6b36b860770 - stable/15 - sound: Retire SND_MULTICHANNEL 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: d6b36b860770cc9ca4b4cb9669a8639248fd3c93 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:55:02 +0000 Message-Id: <69cb99f6.3c826.45c541c@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d6b36b860770cc9ca4b4cb9669a8639248fd3c93 commit d6b36b860770cc9ca4b4cb9669a8639248fd3c93 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:26 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:53:16 +0000 sound: Retire SND_MULTICHANNEL SND_MULTICHANNEL is always defined, so SND_CHN_MAX will also always be 8. Apart from the fact that there is no other place in the code that touches SND_MULTICHANNEL, there is also no good reason nowadays to set SND_CHN_MAX to 2. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55934 (cherry picked from commit 712bd9b2750a71ad7f8b6bebc5177c47d33a6364) --- sys/dev/sound/pcm/matrix.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h index ff5f05e477e4..f4a79fdc3b30 100644 --- a/sys/dev/sound/pcm/matrix.h +++ b/sys/dev/sound/pcm/matrix.h @@ -29,8 +29,6 @@ #ifndef _SND_MATRIX_H_ #define _SND_MATRIX_H_ -#define SND_MULTICHANNEL 1 - /* * XXX = unused, but part of the definition (will be used someday, maybe). */ @@ -173,12 +171,7 @@ #define SND_CHN_T_END SND_CHN_T_TBR #define SND_CHN_T_STEP 1 #define SND_CHN_MIN 1 - -#ifdef SND_MULTICHANNEL #define SND_CHN_MAX 8 -#else -#define SND_CHN_MAX 2 -#endif /* * Multichannel interleaved volume matrix. Each calculated value relative