From nobody Tue Mar 31 09:54:59 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 4flNl82HVZz6WcLH for ; Tue, 31 Mar 2026 09:55:00 +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 4flNl80ZHkz3kKD for ; Tue, 31 Mar 2026 09:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950900; 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=W9w3lvRdciZyfgey4T5tASKSAWqGg80Iq0zuTSW9Wj8=; b=OG2zym0UFoxTAs6Gka5sLhf601oBGhtt/Edhw9B5eIaM5INqESt26S1Uxh8XxNOW4VPsZU V3vEAlqpiMvNG/moBu9uTJYuvZRXpaixKRZiCS8f7cZK6yeeD/i40tguQhYCTEZX4vxp4C SCHTllPVscEduF4rRpQVvqSYW+uF6GppYgaI/F08ra1y4XSG1I6l/b8KBSwfG7A6VE63c4 1bRkAAS1/vVkgKpv7SoDsKfMwJDVYNC4DwRY0qYRdvEB8Uel1oBmn/3Ma8L1QsR/lEGuv5 HfB18OmAe+TWRCFnFt51uS2c/p1n9dSvIEkSXlWsJJXiCetGCpOadWB8iREuaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950900; a=rsa-sha256; cv=none; b=NgYajepoSNhBdKBN18wuiVbAolavFetxr/M690TGAVqxlJKtgZWHclvhoeb9mNtA5xlzvI m/7Cw0jhnkxgs4Dee36wTWxHwQ4Q95mJfeouoW6xr0M1llvb0NctACH/vZs5jlEdbK6umU 8YWNKmKeZahpNmB6if12D8/j7EWAUUlUpyduibWyYwm7VjrG6GqrTAGK9f+WaYYdGWODcS gnS1atSQTPdNSThRAEYfzNzGhjSAIhOzslnIL0ozWoK5Y5J0TUBN9ySRTymQrfP6qOSZfy F2Mnx2FL/OtvE/sttKunbsMDHJ3JytlB2Xuk12mJBVJZ6cPC8gUSP98UFbEnIA== 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=1774950900; 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=W9w3lvRdciZyfgey4T5tASKSAWqGg80Iq0zuTSW9Wj8=; b=JWQDxfquvgtCyw6nItUOK23HSr8LAaDDtBEGteQHQf4dx2S1BsdovzclOQmTXG/xvORHau ihEOe0EnCVeqlwJT10IB8o4g8MnMbjMUaB7EubCMxkDF23fZZEonLsb/vUl3olU2xf96RB QM0w26UwxkJ9D54Bd56Uo6esBg9j5feJZLnlPgdhq749M/TsS8rzzo+0JfXY8oWKZH+/r8 CJqSRKsYGX0JqlZ/Os1D+XzRQ/WcrSUibF/XuMGmfZwHjHCWzjg+eRcQ0Z6KQrD3zb436k ovlKNxIEZdzdiMelhk34a13FAkDknT0Oqe63tXpcIK9B9YwDJv7bI6v/1rHbow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNl76d8rz7h0 for ; Tue, 31 Mar 2026 09:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c00f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:54:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e6da66073052 - stable/15 - sound: Retire SND_DEBUG 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: e6da6607305265f842a4bb211d24d481495ca311 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:54:59 +0000 Message-Id: <69cb99f3.3c00f.2e484aba@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e6da6607305265f842a4bb211d24d481495ca311 commit e6da6607305265f842a4bb211d24d481495ca311 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:17 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:53:16 +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 (cherry picked from commit 5d311c75324a205f3cd8a8a404a25ebdadb18b54) --- 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 714f88ff2b80..c66abd138b10 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2156,10 +2156,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. # @@ -2181,7 +2177,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 9e9cb6aeb6b3..744da1e394de 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -919,7 +919,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));