From nobody Wed Jun 3 08:23:17 2026 X-Original-To: dev-commits-src-branches@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 4gVggn3kXvz6gJwx for ; Wed, 03 Jun 2026 08:23:17 +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 4gVggn2WC9z3gN3 for ; Wed, 03 Jun 2026 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780474997; 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=6KOobMWnLX4C/bv2sUMjt0QnFPqDEWREDaxUcNhW/Mo=; b=Prot2d6g2mqEDZpHkjEmftvmoyaNTAI3NimyFwncKGKOZZdq2CiC1NAwLmANsZNhdas0pZ FUnLLTbDnFc5+Gs9U//Xx4AiNO+D8S03eCttNexA6OPn0i6rqmLmpiem2V/bjiHgXME8bl kNr7XcsqJvcSpW5dkG3hg+j6L+0hIbN61zre0cKo0PCD6ExXw3wEmmKYmERlQnaG/7pByv MGXu8O4abdzeDu4Lbj9gBttlx487Q5HA7f0tJqZXguxtcQ9moPLSe7Dd6vMH6+4R2Ixqfp kWKVJ7dxMam2+gWx9HVLJpgs8nPDPXfOCIQ2WmcGWVC9d9Y+qLuysXTerD5sNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780474997; a=rsa-sha256; cv=none; b=pv1ygTc2s4MU08IvoJvCDm9j8k96XJfM3IZ2w+uF4qMbSBFjqdZCsZkgvARSTmBqd54m5G 8ue6SO1dCikZ6EnSKCXcA2UZnYmBIb/dXvdZanu4GSn+joO0sQn4nB2PuEWKKOvM6lYR1S KnUVHJVFVSjEYgaWMfvcQUAtvp15zM53uhWgs2ZUeB/JNfjq7523bcj3qZdvmueFvWkPQR KfzE+h1Rt+oZP+JL9ghhdtti3cRXhFQUWP9aD6ddSPsqXlsq7tiosfg/5S6I3+QytKWYr/ l736aSvl1JoJnM638HQlcopq83su5zyBBlB327bJHo2t3LXgNwA3BY00M5VJvA== 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=1780474997; 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=6KOobMWnLX4C/bv2sUMjt0QnFPqDEWREDaxUcNhW/Mo=; b=oGMW4C/Td9qwSO+RgkNalUWUJSae4c8Q2JcBFqw6mScy5P+1xpcbojl6vtnj+9RxMSgY6T kGyZcm0cVylJv7riZ795seLoaUHm/buEHZSm/Q6bh35iBNYOPCJjmGXr6sKbW0WVG00xVj E/G0pS/lnMzBP9t2WITDbwCzm6xRFG3obSVelJP/i+/pQtbON4BNhdyVCCVorjhikMt8Tq qP0OvRqIqwtIN8bghE4taRepub4W3BzG5mHbX/EQdKpSBANlsT9AmXBFOVKppyrUTY4vnC 8AVqthVE3qwpAJVUtdphpioFsZypxbyxP6fqjUTNGbIJT/28oz0ZPGhNmQM7vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVggn26p6z13Hx for ; Wed, 03 Jun 2026 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39168 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 08:23:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 333af32c928d - stable/15 - sound: Retire EQ states List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 333af32c928d0064c1fdec9006e6bdc4538dcf6c Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 08:23:17 +0000 Message-Id: <6a1fe475.39168.308612c5@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=333af32c928d0064c1fdec9006e6bdc4538dcf6c commit 333af32c928d0064c1fdec9006e6bdc4538dcf6c Author: Christos Margiolis AuthorDate: 2026-04-17 15:23:38 +0000 Commit: Christos Margiolis CommitDate: 2026-06-03 08:22:23 +0000 sound: Retire EQ states The SD_F_EQ_ENABLED does the same thing, and is actually what we test against in order to create the EQ feeder. Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/15 (cherry picked from commit 88bc1d7325aa97520f7a308d70a5fcb39acdc5d2) --- sys/dev/sound/pcm/channel.c | 3 --- sys/dev/sound/pcm/feeder.h | 3 --- sys/dev/sound/pcm/feeder_eq.c | 25 ++----------------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index c97a3158dbd9..a0ee16a14386 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2209,9 +2209,6 @@ 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 && - 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 10bfe9dca8f3..127b479cd7c9 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -119,9 +119,6 @@ enum { FEEDEQ_TREBLE, FEEDEQ_BASS, FEEDEQ_PREAMP, - FEEDEQ_STATE, - FEEDEQ_ENABLE, - FEEDEQ_UNKNOWN }; int feeder_eq_validrate(uint32_t); diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 6fd7d7f2bfff..fdb786171d5a 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -122,7 +122,6 @@ struct feed_eq_info { uint32_t rate; uint32_t align; int32_t preamp; - int state; }; #if !defined(_KERNEL) && defined(FEEDEQ_ERR_CLIP) @@ -277,7 +276,6 @@ feed_eq_init(struct pcm_feeder *f) info->treble.gain = FEEDEQ_L2GAIN(50); info->bass.gain = FEEDEQ_L2GAIN(50); info->preamp = FEEDEQ_PREAMP2IDX(FEEDEQ_PREAMP_DEFAULT); - info->state = FEEDEQ_UNKNOWN; f->data = info; @@ -303,8 +301,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) if (feeder_eq_validrate(value) == 0) return (EINVAL); info->rate = (uint32_t)value; - if (info->state == FEEDEQ_UNKNOWN) - info->state = FEEDEQ_ENABLE; return (feed_eq_setup(info)); case FEEDEQ_TREBLE: case FEEDEQ_BASS: @@ -320,12 +316,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) return (EINVAL); info->preamp = FEEDEQ_PREAMP2IDX(value); break; - case FEEDEQ_STATE: - if (value != FEEDEQ_ENABLE) - return (EINVAL); - info->state = value; - feed_eq_reset(info); - break; default: return (EINVAL); } @@ -449,8 +439,6 @@ static int sysctl_dev_pcm_eq(SYSCTL_HANDLER_ARGS) { struct snddev_info *d; - struct pcm_channel *c; - struct pcm_feeder *f; int err, val, oval; d = oidp->oid_arg1; @@ -477,20 +465,11 @@ sysctl_dev_pcm_eq(SYSCTL_HANDLER_ARGS) PCM_LOCK(d); - if (val == 1) { - val = FEEDEQ_ENABLE; + if (val == 1) d->flags |= SD_F_EQ_ENABLED; - } else + else d->flags &= ~SD_F_EQ_ENABLED; - CHN_FOREACH(c, d, channels.pcm.busy) { - CHN_LOCK(c); - f = feeder_find(c, FEEDER_EQ); - if (f != NULL) - (void)FEEDER_SET(f, FEEDEQ_STATE, val); - CHN_UNLOCK(c); - } - PCM_RELEASE(d); PCM_UNLOCK(d); } else