From nobody Tue Mar 24 10:38:55 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 4fg6341xc4z6WTps for ; Tue, 24 Mar 2026 10:38:56 +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 4fg63400slz3tTF for ; Tue, 24 Mar 2026 10:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348736; 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=fiBZrQNdDZVBQeSFo0JrswJT9Tr0htQtujzMyRkRs0Y=; b=h3NJyy9Rp+E1BXN/xlkZ9OELTEVA+PaTIRUcIocS4bTaAIcXOUDNc9g4US/t3txnL3MhBa gZhgLjzR75k26YW9KAtWdkAwHZ1FiPpofuTJe+CCRd402Iv+X9q03XYAuC95Ns0ZigVuau a30FLc/4LInzgp74xn8+oKCkYewfXgJyWTNMV58ennAu/ElywSwRB9lq2LloIltqqILm83 5AU0LPmFfyrXyaYbQcm1n0CsMT9E8n5dotuHbxKzSJWcwGsAK96lam3cqXWbVp9IiusCP8 Op+6A5a8vHqjqlgVA4fLK8jaZtGEBthBkVI8uCPbj72xl7MAWk+Ow2XjL9b5Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348736; a=rsa-sha256; cv=none; b=VpBJ0u4mukUgW7b4Okr8eK4ZR/SK+2l6knMQL2cPEBWA56k8W+Yku4SFnExBnMfe2Lhu3T aSe+llDvFcPmmAUAwnQvGj0vti3WPkz1SKaN2xcNl9EfQBOBLwwIptSO9rz5cXOWFgzXF8 K19F9iOnMUDZKJHcXSvfbDDgzP7SZ/sB1pk0DtNNz/0a5ci/zIJhUsLHIcGP0PaWlKcxd1 XAgv4rhUmnurqsPEnNhiErBIluhaAUt6sZ/CIVP3R4/zkU2BpKYh2jcCB4pjoqzT/tNnBk bp5RCRFy9JoMKAtKJ4EkhT891nfU/HdCTRN2yrrqRq6iCBbOpU+6fhZrV1D3jA== 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=1774348736; 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=fiBZrQNdDZVBQeSFo0JrswJT9Tr0htQtujzMyRkRs0Y=; b=YlDoGs89bt/LtgU+MIBhJwBLmMFRcgiZyyxuoLMZ/S3BDLmTFZGZ0RWnk2nfDR2XzDFyo0 DFnGJ51cQ7SQ6rlwwNjwk8gMwtUAcuqbBctDdeXroKMUJqQ0DkyC7c6J2hUFAMln8eOEji rpzKzcNKQKfamIW6bOhzHFWoceLsX+jr3qR9OkUUa2S7u8YCbTGUIhNBUdM0uFkAkbtYYI ASJwtcTg6PQfIREYplp1+znXij5vnh0r8C2A6QhSPsYO7eSoxp+qgau80C2OQpzdoKv047 RMHYyACX8swJHYOXUMrMjc4vCZDOOSd7x/tL0kdsY7tJjf+teF8sxE9DP9dBRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg6336S4XzQV for ; Tue, 24 Mar 2026 10:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 326b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:38:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 712bd9b2750a - main - sound: Retire SND_MULTICHANNEL 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: 712bd9b2750a71ad7f8b6bebc5177c47d33a6364 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:38:55 +0000 Message-Id: <69c269bf.326b4.6ca666a0@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=712bd9b2750a71ad7f8b6bebc5177c47d33a6364 commit 712bd9b2750a71ad7f8b6bebc5177c47d33a6364 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:26 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:40 +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 --- 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