From nobody Tue Mar 24 10:38:53 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 4fg632257hz6WTwh for ; Tue, 24 Mar 2026 10:38:54 +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 4fg6315YcJz3tWR for ; Tue, 24 Mar 2026 10:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348733; 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=RGBbTVq8KQjX4H+OanXtiyrcnoL9qEtN087w9tsWS3k=; b=UNIXNMgyb8HPMVF1EQJY3IdlUYypOrMa8g7eWra5PtArjiFMWteoMG/qPCf/7h1gV10bT1 c+okqiMyzOHL2ZnYn0JNm9wS1K0eIJIj6Zib6b6TfVm8FSdl2jXfgNcuIypdypXFQJg5py yNK3DDieU7jFH7Srr3jSYQHY0QQPoaqcaQwsdrGSSm2yWSkJWb79VtHYVSb9hCXktkCQyU nZS3G2v6POwrpHda60XVvPD4Izl9morNim0STQ5OPAieaHGHAdyRsx6jQ8ZTCiOpSvbK9w MSbZBpgQU/sihsyNpInm/5iYGjxHtUu3jKDc/D4EEjDl9WMnkvkMTr01BGs1NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348733; a=rsa-sha256; cv=none; b=Veo83BPi50d3qblCF1BgdArWOFXjfNirWqOitGQBPiu+Iu6BbB+8/115h1LmIYD32EHol2 2Plzzas5NFANFY2xKGIPmTy0wdGf7Tb8yrj36PBWcE0DXsWATKFazSHAV9YrwLZBaift7h qPZbySB0siI7fprdrt9A4Kfbzp8R58UZYcUlhkSOyKT/hC5FSauwbHl4yoD4c1KhFLkd+g sNPU4b8qu7De9Z1QWscJc/LYtxnpZJO21N+Wxsn9AMDsW1SPi8RhlJRyd3qonXuvVSeC3K aD0AXIvIA4LgR2dDM/D283i7F4Q7ACnhAyOABPcfnTZQoZE4JYJ2Ou1aVPywmQ== 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=1774348733; 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=RGBbTVq8KQjX4H+OanXtiyrcnoL9qEtN087w9tsWS3k=; b=igtplNtrYrmljP1LdVPh9FliW7Si6tsVPFYRbVrqVa6alCDz97qO6w1rqhp8pMCZnG1IDU o3BknbJHZoBIpiyRfEsogVIuHNgCtMkZdp7TP/Vt8uuXeh8FGFMFelOZHQGqfbmC4ZziqF rZnSiS5bformlEmubo+DBna6LX08oz0khgVTY/NW3RJKqTCdWkY7ApG8DFcc9UdPiUciqE R2sLY1Dd9SzNzjvNCR7FXn1I6nyabTq5XxA5JdaRi2Tp+OXoKdwv3+B1HaBNJ/cTgcTyir IAZ7AB0CNdgaBKD/QenYHMkfHpwEXbalWvayA9oCvWVDFm/8cel/qQcrTm7row== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg6314sQrzdT for ; Tue, 24 Mar 2026 10:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ffe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:38:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 5d311c75324a - main - sound: Retire SND_DEBUG 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: 5d311c75324a205f3cd8a8a404a25ebdadb18b54 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:38:53 +0000 Message-Id: <69c269bd.33ffe.2db57696@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5d311c75324a205f3cd8a8a404a25ebdadb18b54 commit 5d311c75324a205f3cd8a8a404a25ebdadb18b54 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:17 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:40 +0000 sound: Retire SND_DEBUG Not useful anymore. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55932 --- sys/conf/NOTES | 5 ----- sys/conf/options | 1 - sys/dev/sound/pcm/feeder_chain.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 16 ---------------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 98c63d9bb7f7..adcaf4699c19 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2157,10 +2157,6 @@ envvar hint.gusc.0.flags="0x13" # # Following options are intended for debugging/testing purposes: # -# SND_DEBUG Enable extra debugging code that includes -# sanity checking and possible increase of -# verbosity. -# # SND_DIAGNOSTIC Similar in a spirit of INVARIANTS/DIAGNOSTIC, # zero tolerance against inconsistencies. # @@ -2182,7 +2178,6 @@ envvar hint.gusc.0.flags="0x13" # SND_OLDSTEREO Only 2 channels are allowed, effectively # disabling multichannel processing. # -options SND_DEBUG options SND_DIAGNOSTIC options SND_FEEDER_MULTIFORMAT options SND_FEEDER_FULL_MULTIFORMAT diff --git a/sys/conf/options b/sys/conf/options index 4aeb15a489ea..d3890d5b3a9e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -915,7 +915,6 @@ CFI_ARMEDANDDANGEROUS opt_cfi.h CFI_HARDWAREBYTESWAP opt_cfi.h # Sound options -SND_DEBUG opt_snd.h SND_DIAGNOSTIC opt_snd.h SND_FEEDER_MULTIFORMAT opt_snd.h SND_FEEDER_FULL_MULTIFORMAT opt_snd.h diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 4ec50d810253..8129d7e90bfd 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -126,7 +126,7 @@ static uint32_t *feeder_chain_formats[FEEDER_CHAIN_LAST] = { static int feeder_chain_mode = FEEDER_CHAIN_DEFAULT; -#if defined(_KERNEL) && defined(SND_DEBUG) && defined(SND_FEEDER_FULL_MULTIFORMAT) +#if defined(_KERNEL) && defined(SND_FEEDER_FULL_MULTIFORMAT) SYSCTL_INT(_hw_snd, OID_AUTO, feeder_chain_mode, CTLFLAG_RWTUN, &feeder_chain_mode, 0, "feeder chain mode " diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 8c58e1c8ef33..13342094966b 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -174,14 +174,6 @@ feed_mixer_rec(struct pcm_channel *c) CHN_UNLOCK(ch); continue; } -#ifdef SND_DEBUG - if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) { - if (vchan_sync(ch) != 0) { - CHN_UNLOCK(ch); - continue; - } - } -#endif bs = ch->bufsoft; if (ch->flags & CHN_F_MMAP) sndbuf_dispose(bs, NULL, sndbuf_getready(bs)); @@ -270,14 +262,6 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, CHN_UNLOCK(ch); continue; } -#ifdef SND_DEBUG - if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) { - if (vchan_sync(ch) != 0) { - CHN_UNLOCK(ch); - continue; - } - } -#endif if ((ch->flags & CHN_F_MMAP) && !(ch->flags & CHN_F_CLOSING)) sndbuf_acquire(ch->bufsoft, NULL, sndbuf_getfree(ch->bufsoft));