From nobody Wed May 27 15:30:09 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 4gQYTY5YSyz6fC9n for ; Wed, 27 May 2026 15:30:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQYTY26Ktz3Sjb for ; Wed, 27 May 2026 15:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779895809; 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=N5h0Oh8/f3vgP7Zjh/Gj2a3MNJOrLbRlZfa3ZWtc0sM=; b=Eo1HiNTFwIQjazTVvOXB9nrWVPvoubZ7XdBiag7mv5EzWy/mtCh6RrW16rEgjskCiD5Qce IjQo5UiHMIQ2T3tMFmGKK51eTJ8OIEIt2N2pkf6EYnACJO5JWh9cCI/YuQeBlFcsBEP7ou +HvKTCECCrteMPmvy/VQuNtClpeXUCI0BTcXm9oEUOFLr9U/ejVMMtL8HiY7ChbQp0SHEM PGKaagGhrNxDd4ZkhTcPOxf25vnXYt/UQJNCgs1Kf/jazghs0u/Mmca2b74b3iQmLXFHq5 BB3ZWS9orCr5lpnP3DMfDj9H1uR+mdDPruFs00hDK2s01aVgMLPTXYyPtxUitw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779895809; a=rsa-sha256; cv=none; b=Qs+R1LJIARSjNmhW4/17QAwoVc66MsimDqVVpbyqv8v9ohWNm/5c3lbHXm4M3aBPFL/3w8 EJ7bQizYGQxiQ1BAUIvJTUvj9J8vcnTGaGGrVxmmLtC//XcOh73UIZMLntLT7y+KuwnIV5 3SkJ3faBLhTEiBZFnJVW08SmTdJ68apEWgkKAKPaL/WoLBcijGMB3JBUdTQhi2kmpLAd3J qBBvPm9GMfnk8dVK8APaVqXDkUsvGCiTBMqzTqFI5ISqLIsmLA4uU828KQVZOCRlbQHU3P q8RSjsQE8eOLEoS44ME9+j/+nj5N1EuuEqlalpzd6pB41qFvokOZtsp/b7HlOQ== 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=1779895809; 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=N5h0Oh8/f3vgP7Zjh/Gj2a3MNJOrLbRlZfa3ZWtc0sM=; b=uxEOu0osEoiXQY8YlIpOCekaAeGPGSNunGNRLjx1IuOdXOXmEV00N9jVTLN5TCe7dDT3f3 +h9OBPn1xbv2IoGNo3NtSXR4le4u4Q75QdqPL82OusYyVyl6r8dtFK2LVvHoeyB4h3r1Me Ma4K+PPcaEn+A8B4E/ncmjjXAAiMfPXEMx2TvIWP3ISWmlUKOk6pywTl+GsN9nmGDYM0Aq oNp4u17hIXYUYnyBOUcKcX3n8+waSagKbrdnwl8+MpQMFCYeQb1z1IzU0KImUTTbYE2Qej uxKtiI3PaCxG9nfFQGokM29bb1Tu4882LrqD64Xgch4/9Yzy3+LWlSCqziAUvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQYTY1PnGz14nw for ; Wed, 27 May 2026 15:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 15:30:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f5d6e5cb5c3e - main - sound: Retire FEEDEQ_DISABLE 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: f5d6e5cb5c3e0593d24c90671d72654aa59cdd1a Auto-Submitted: auto-generated Date: Wed, 27 May 2026 15:30:09 +0000 Message-Id: <6a170e01.27f94.274215ca@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d6e5cb5c3e0593d24c90671d72654aa59cdd1a commit f5d6e5cb5c3e0593d24c90671d72654aa59cdd1a Author: Christos Margiolis AuthorDate: 2026-04-17 15:14:46 +0000 Commit: Christos Margiolis CommitDate: 2026-05-27 15:27:11 +0000 sound: Retire FEEDEQ_DISABLE We can do this more efficiently by just using the SD_F_EQ* flags. In fact, the dev.pcm.%d.eq handler will (un)set SD_F_EQ_ENABLED and this is what we actually test with when choosing to creating the EQ feeder or not, so setting the state to FEEDEQ_DISABLE does not really an effect in the first place. Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/15 --- sys/dev/sound/pcm/channel.c | 12 ++++-------- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_eq.c | 5 ++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index be6d7f82f502..c97a3158dbd9 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2177,7 +2177,7 @@ chn_syncstate(struct pcm_channel *c) if (c->feederflags & (1 << FEEDER_EQ)) { struct pcm_feeder *f; - int treble, bass, state; + int treble, bass; /* CHN_UNLOCK(c); */ treble = mix_get(m, SOUND_MIXER_TREBLE); @@ -2209,13 +2209,9 @@ chn_syncstate(struct pcm_channel *c) device_printf(c->dev, "EQ: Failed to set preamp -- %d\n", d->eqpreamp); - if (d->flags & SD_F_EQ_ENABLED) - state = FEEDEQ_ENABLE; - else - state = FEEDEQ_DISABLE; - if (FEEDER_SET(f, FEEDEQ_STATE, state) != 0) - device_printf(c->dev, - "EQ: Failed to set state -- %d\n", state); + if (d->flags & SD_F_EQ_ENABLED && + FEEDER_SET(f, FEEDEQ_STATE, FEEDEQ_ENABLE) != 0) + device_printf(c->dev, "EQ: Failed to enable\n"); } } } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 7d14022c6849..10bfe9dca8f3 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -120,7 +120,6 @@ enum { FEEDEQ_BASS, FEEDEQ_PREAMP, FEEDEQ_STATE, - FEEDEQ_DISABLE, FEEDEQ_ENABLE, FEEDEQ_UNKNOWN }; diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index fe47a9d7e434..6fd7d7f2bfff 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -321,7 +321,7 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) info->preamp = FEEDEQ_PREAMP2IDX(value); break; case FEEDEQ_STATE: - if (!(value == FEEDEQ_ENABLE || value == FEEDEQ_DISABLE)) + if (value != FEEDEQ_ENABLE) return (EINVAL); info->state = value; feed_eq_reset(info); @@ -477,12 +477,11 @@ sysctl_dev_pcm_eq(SYSCTL_HANDLER_ARGS) PCM_LOCK(d); - d->flags &= ~(SD_F_EQ_ENABLED); if (val == 1) { val = FEEDEQ_ENABLE; d->flags |= SD_F_EQ_ENABLED; } else - val = FEEDEQ_DISABLE; + d->flags &= ~SD_F_EQ_ENABLED; CHN_FOREACH(c, d, channels.pcm.busy) { CHN_LOCK(c);