From nobody Thu Jul 2 12:57:07 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 4grcNN2jznz5q352 for ; Thu, 02 Jul 2026 12:57:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4grcNN0Wkcz3mZ8 for ; Thu, 02 Jul 2026 12:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782997028; 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=onGGTrJLl2I7VOxUQYDe86ZM+7KJP5UyzsNcmSIbmAA=; b=f3F51aMtU32MSCdZbcq1WEKYK9PCB4tF6TEsB/ozgHz82XpL64eBa0ivLn+qZzOI8DouQV 8XFUTQu3MCXFJgoZc3APAp2+N2rLhYI419evZaY0A7Pm8gsuKt9e59MJkRJXjb61P3whO7 0h+PJWRXUwnjmvLhrtZ+tvLSUiPqeP4zswKaMDFjK+23BbKmHpDQhoblsfti+bulGFSqMD Mg289vqao66Xs86StesxTqgyuB+E0RB78CFKCDAqjthTBi56Jzh4mUflP1I9uc3Gi+7u1O Q5U3VXodz9Kp0FIUBwmwXDQ9k30iCpQ4ENvvLS6YoEtvG5IDBRGau+2T4QG+Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782997028; a=rsa-sha256; cv=none; b=bynzyQg3dVOB2nGkcBdG04Khmt8c0GF2sHQBODHp27o5lHTbXu7fRTgj1jp0a71SJrZ+DO Dzk7QBtqYk3lpjPn5++ENarZdjbexsKXmJDCK+5QnH8u3/KWtqfDhHArS42jBD1pJJ9/zO dDxj2UFb1Gn0Kl/x+J7eywXRLcztkO95PRXS1QxNf+ncuIMZ1enQYNzt50rgE9MecXPyuM jeHISM7qETq9PmCCkP1V7Trrug/U9UDb0BhcuIHV4tqRT0bl+PHIjMYCfkCQpLcO4SJPWq ShrNGG4yKC3QK2KrqWc3tGekmRT4XUnDWXmPPOK5ACwA3bdF8vcCC6pmb+np3A== 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=1782997028; 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=onGGTrJLl2I7VOxUQYDe86ZM+7KJP5UyzsNcmSIbmAA=; b=q17Jio7Kq7uwxmLGwHHiBpB3VXrL7tD1XEyEkYUOv6ygyBa18tXkdAo2M2ZgLxjg8olQBC zYbdO0gzNjyOLI/Vwbp0AA9RKAV+p0YsO7N7WPwZenOIb9Xx4tZT+fR/Z1apM59DgKncm8 PMj+My2cWjzYkf7urnTEp445tjGFefj7MtTsVsLrcZrBdRhtk7l5n8xxbxEDHmImZEehA8 Hw8uOhc3hf0enBQEQXAd0DuNx6F/GDFNj6yDuVNxyT9AyGnGZy0Md87Zn7vPEytpro9/Q3 RBdwugXbgl0qlr6uy7DPkf6XXiOQzFXrtIRFN1S+x5ubyTxPg5EdbF/sg7hOrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grcNM63HFz12SD for ; Thu, 02 Jul 2026 12:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 12:57:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5cac86f12e0c - stable/15 - sound: Rename SD_F_EQ_ENABLED to SD_F_EQ 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: 5cac86f12e0ca1377530012e1c253b588ca08705 Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 12:57:07 +0000 Message-Id: <6a466023.33a2b.1d9a0133@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5cac86f12e0ca1377530012e1c253b588ca08705 commit 5cac86f12e0ca1377530012e1c253b588ca08705 Author: Christos Margiolis AuthorDate: 2026-06-24 13:54:41 +0000 Commit: Christos Margiolis CommitDate: 2026-07-02 12:56:58 +0000 sound: Rename SD_F_EQ_ENABLED to SD_F_EQ No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit a3d65cde7775818fb78afe935a4616a31f137c3d) --- sys/dev/sound/pcm/feeder_chain.c | 2 +- sys/dev/sound/pcm/feeder_eq.c | 6 +++--- sys/dev/sound/pcm/mixer.c | 2 +- sys/dev/sound/pcm/sound.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index dc0788ffb53c..f8ec7ab9eb86 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -726,7 +726,7 @@ feeder_chain(struct pcm_channel *c) /* Soft EQ only applicable for PLAY. */ if (cdesc.dummy == 0 && c->direction == PCMDIR_PLAY && - (d->flags & SD_F_EQ_ENABLED) && !(c->flags & CHN_F_VIRTUAL)) + (d->flags & SD_F_EQ) && !(c->flags & CHN_F_VIRTUAL)) cdesc.use_eq = 1; if (FEEDFORMAT_NE_REQUIRED(&cdesc)) { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 0a28dfa1ba17..52e96fa91768 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -447,7 +447,7 @@ sysctl_dev_pcm_eq(SYSCTL_HANDLER_ARGS) PCM_LOCK(d); PCM_WAIT(d); - if (d->flags & SD_F_EQ_ENABLED) + if (d->flags & SD_F_EQ) val = 1; else val = 0; @@ -466,9 +466,9 @@ sysctl_dev_pcm_eq(SYSCTL_HANDLER_ARGS) PCM_LOCK(d); if (val == 1) - d->flags |= SD_F_EQ_ENABLED; + d->flags |= SD_F_EQ; else - d->flags &= ~SD_F_EQ_ENABLED; + d->flags &= ~SD_F_EQ; PCM_RELEASE(d); PCM_UNLOCK(d); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 3ddee24417cc..0c214b475822 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -278,7 +278,7 @@ mixer_set(struct snd_mixer *m, u_int dev, u_int32_t muted, u_int lev) if (dev == SOUND_MIXER_PCM && (d->flags & SD_F_SOFTPCMVOL)) (void)mixer_set_softpcmvol(m, d, l, r); else if ((dev == SOUND_MIXER_TREBLE || - dev == SOUND_MIXER_BASS) && (d->flags & SD_F_EQ_ENABLED)) + dev == SOUND_MIXER_BASS) && (d->flags & SD_F_EQ)) (void)mixer_set_eq(m, d, dev, (l + r) >> 1); else if (realdev != SOUND_MIXER_NONE && MIXER_SET(m, realdev, l, r) < 0) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index fea27921e7db..2985909f986a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -103,7 +103,7 @@ struct snd_mixer; #define SD_F_BITPERFECT 0x00000040 /* unused 0x00000080 */ /* unused 0x00000100 */ -#define SD_F_EQ_ENABLED 0x00000200 /* EQ enabled */ +#define SD_F_EQ 0x00000200 /* EQ enabled */ /* unused 0x00000400 */ /* unused 0x00000800 */ #define SD_F_PVCHANS 0x00001000 /* Playback vchans enabled */ @@ -119,7 +119,7 @@ struct snd_mixer; "\007BITPERFECT" \ /* "\010 */ \ /* "\011 */ \ - "\012EQ_ENABLED" \ + "\012EQ" \ /* "\013 */ \ /* "\014 */ \ "\015PVCHANS" \