git: a3d65cde7775 - main - sound: Rename SD_F_EQ_ENABLED to SD_F_EQ
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Jun 2026 13:55:42 UTC
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=a3d65cde7775818fb78afe935a4616a31f137c3d
commit a3d65cde7775818fb78afe935a4616a31f137c3d
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-06-24 13:54:41 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-06-24 13:54:41 +0000
sound: Rename SD_F_EQ_ENABLED to SD_F_EQ
No functional change intended.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
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 1d74af76b757..be0125023f19 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 bfb0e259d510..9e616707b518 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -106,7 +106,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 */
@@ -122,7 +122,7 @@ struct snd_mixer;
"\007BITPERFECT" \
/* "\010 */ \
/* "\011 */ \
- "\012EQ_ENABLED" \
+ "\012EQ" \
/* "\013 */ \
/* "\014 */ \
"\015PVCHANS" \