From: Christian Ruppert <arc@gmx.li>
To: Will Porter <mrwillporter@gmail.com>
Cc: Takashi Iwai <tiwai@suse.com>, Jaroslav Kysela <perex@perex.cz>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
Neil Andrews <neil@androos.io>, Christian Ruppert <arc@gmx.li>
Subject: [RFC PATCH 01/11] ALSA: rename mixer_evo to mixer_audient
Date: Sun, 1 Nov 2026 01:00:03 +0100 [thread overview]
Message-ID: <20261101000013.11880-2-arc@gmx.li> (raw)
In-Reply-To: <20261101000013.11880-1-arc@gmx.li>
Rename mixer_evo files and functions to *_audient in preparation of a more
generic driver for audient devices.
Signed-off-by: Christian Ruppert <arc@gmx.li>
---
MAINTAINERS | 7 +-
sound/usb/Makefile | 2 +-
sound/usb/{mixer_evo.c => mixer_audient.c} | 247 +++++++++++----------
sound/usb/mixer_audient.h | 12 +
sound/usb/mixer_evo.h | 12 -
sound/usb/mixer_quirks.c | 4 +-
6 files changed, 147 insertions(+), 137 deletions(-)
rename sound/usb/{mixer_evo.c => mixer_audient.c} (54%)
create mode 100644 sound/usb/mixer_audient.h
delete mode 100644 sound/usb/mixer_evo.h
diff --git a/MAINTAINERS b/MAINTAINERS
index fee9d090b280..a1139ae3404d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4354,12 +4354,13 @@ F: drivers/net/ieee802154/at86rf230.h
F: drivers/net/ieee802154/atusb.c
F: drivers/net/ieee802154/atusb.h
-AUDIENT EVO MIXER DRIVER
+AUDIENT MIXER DRIVER
M: Christian Ruppert <arc@gmx.li>
+M: Will Porter <mrwillporter@gmail.com>
L: linux-sound@vger.kernel.org
S: Maintained
-F: sound/usb/mixer_evo.c
-F: sound/usb/mixer_evo.h
+F: sound/usb/mixer_audient.c
+F: sound/usb/mixer_audient.h
AUDIT SUBSYSTEM
M: Paul Moore <paul@paul-moore.com>
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 2e842dcc73de..44f4e4c820fb 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -11,7 +11,7 @@ snd-usb-audio-y := card.o \
helper.o \
implicit.o \
mixer.o \
- mixer_evo.o \
+ mixer_audient.o \
mixer_quirks.o \
mixer_scarlett.o \
mixer_scarlett2.o \
diff --git a/sound/usb/mixer_evo.c b/sound/usb/mixer_audient.c
similarity index 54%
rename from sound/usb/mixer_evo.c
rename to sound/usb/mixer_audient.c
index c1e0332232f2..8c1524c9b165 100644
--- a/sound/usb/mixer_evo.c
+++ b/sound/usb/mixer_audient.c
@@ -3,7 +3,7 @@
* Audient EVO driver for ALSA
* Copyright (C) 2026 Christian Ruppert <arc@gmx.li>
*
- * Based on the work of Ivan Hazucha for audient-evo-py.
+ * EVO4 support is based on the work of Ivan Hazucha for audient-evo-py.
* https://github.com/vanzaho/audient-evo-py/
*/
@@ -20,22 +20,22 @@
#include "mixer.h"
#include "mixer_quirks.h"
#include "helper.h"
-#include "mixer_evo.h"
+#include "mixer_audient.h"
-enum snd_evo_type {
- SND_EVO_TYPE_MONITOR = 0,
- SND_EVO_TYPE_PHANTOM,
- SND_EVO_TYPE_MUTE,
- SND_EVO_TYPE_MUTE_OUT,
- SND_EVO_TYPE_MIXER,
- SND_EVO_TYPE_NCTYPES
+enum snd_audient_type {
+ SND_AUDIENT_TYPE_MONITOR = 0,
+ SND_AUDIENT_TYPE_PHANTOM,
+ SND_AUDIENT_TYPE_MUTE,
+ SND_AUDIENT_TYPE_MUTE_OUT,
+ SND_AUDIENT_TYPE_MIXER,
+ SND_AUDIENT_TYPE_NCTYPES
};
/* Mixer matrix: -128dB (mute) to +6dB */
-static const DECLARE_TLV_DB_MINMAX_MUTE(snd_evo_tlv_mixer, -12800, 600);
+static const DECLARE_TLV_DB_MINMAX_MUTE(snd_audient_tlv_mixer, -12800, 600);
-static const struct snd_evo_ctrl_type {
+static const struct snd_audient_ctrl_type {
snd_ctl_elem_type_t type;
bool invert;
union {
@@ -47,8 +47,8 @@ static const struct snd_evo_ctrl_type {
const unsigned int *tlv;
u16 wValue;
u16 wIndex;
-} snd_evo_ctypes[SND_EVO_TYPE_NCTYPES] = {
- [SND_EVO_TYPE_MONITOR] = {
+} snd_audient_ctypes[SND_AUDIENT_TYPE_NCTYPES] = {
+ [SND_AUDIENT_TYPE_MONITOR] = {
.type = SNDRV_CTL_ELEM_TYPE_INTEGER,
.min.integer = 0,
.max.integer = 127,
@@ -56,7 +56,7 @@ static const struct snd_evo_ctrl_type {
.wIndex = 0x3800,
/* no TLV here because we can't describe the cross-fader */
},
- [SND_EVO_TYPE_PHANTOM] = {
+ [SND_AUDIENT_TYPE_PHANTOM] = {
.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,
.invert = false,
.min.integer = 0,
@@ -64,7 +64,7 @@ static const struct snd_evo_ctrl_type {
.wValue = 0x0000,
.wIndex = 0x3A00,
},
- [SND_EVO_TYPE_MUTE] = {
+ [SND_AUDIENT_TYPE_MUTE] = {
.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,
.invert = true,
.min.integer = 0,
@@ -72,7 +72,7 @@ static const struct snd_evo_ctrl_type {
.wValue = 0x0200,
.wIndex = 0x3A00,
},
- [SND_EVO_TYPE_MUTE_OUT] = {
+ [SND_AUDIENT_TYPE_MUTE_OUT] = {
.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,
.invert = true,
.min.integer = 0,
@@ -80,135 +80,135 @@ static const struct snd_evo_ctrl_type {
.wValue = 0x0100,
.wIndex = 0x3B00,
},
- [SND_EVO_TYPE_MIXER] = {
+ [SND_AUDIENT_TYPE_MIXER] = {
.type = SNDRV_CTL_ELEM_TYPE_INTEGER,
.min.integer = -128 * 256,
.max.integer = 6 * 256,
.wValue = 0x0100,
.wIndex = 0x3C00,
- .tlv = snd_evo_tlv_mixer,
+ .tlv = snd_audient_tlv_mixer,
},
};
-#define SND_EVO_FLAGS_DIRECTION (1L<<0)
-#define SND_EVO_FLAGS_CAPTURE (1L<<0)
-#define SND_EVO_FLAGS_PLAYBACK (0L<<0)
+#define SND_AUDIENT_FLAGS_DIRECTION (1L<<0)
+#define SND_AUDIENT_FLAGS_CAPTURE (1L<<0)
+#define SND_AUDIENT_FLAGS_PLAYBACK (0L<<0)
-struct snd_evo_ctrl {
+struct snd_audient_ctrl {
char *basename;
- enum snd_evo_type type;
+ enum snd_audient_type type;
unsigned int channels;
unsigned int hwchannels;
unsigned int val_offs;
unsigned long flags;
};
-static const struct snd_evo_ctrl evo4_controls[] = {
+static const struct snd_audient_ctrl snd_audient_evo4_controls[] = {
{
.basename = "Master",
- .type = SND_EVO_TYPE_MUTE_OUT,
+ .type = SND_AUDIENT_TYPE_MUTE_OUT,
.channels = 1,
.hwchannels = 1,
.val_offs = 0,
- .flags = SND_EVO_FLAGS_PLAYBACK,
+ .flags = SND_AUDIENT_FLAGS_PLAYBACK,
},
{
.basename = "Mic",
- .type = SND_EVO_TYPE_MUTE,
+ .type = SND_AUDIENT_TYPE_MUTE,
.channels = 4,
.hwchannels = 2,
.val_offs = 0,
- .flags = SND_EVO_FLAGS_PLAYBACK,
+ .flags = SND_AUDIENT_FLAGS_PLAYBACK,
},
{
.basename = "Monitor",
- .type = SND_EVO_TYPE_MONITOR,
+ .type = SND_AUDIENT_TYPE_MONITOR,
.channels = 1,
.hwchannels = 1,
.val_offs = 0,
- .flags = SND_EVO_FLAGS_PLAYBACK,
+ .flags = SND_AUDIENT_FLAGS_PLAYBACK,
},
{
.basename = "Mic 1",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 0,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Mic 2",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 2,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Master Left",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 4,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Master Right",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 6,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Loopback Left",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 8,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Loopback Right",
- .type = SND_EVO_TYPE_MIXER,
+ .type = SND_AUDIENT_TYPE_MIXER,
.channels = 2,
.hwchannels = 2,
.val_offs = 10,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Mic 1 Phantom",
- .type = SND_EVO_TYPE_PHANTOM,
+ .type = SND_AUDIENT_TYPE_PHANTOM,
.channels = 1,
.hwchannels = 1,
.val_offs = 0,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{
.basename = "Mic 2 Phantom",
- .type = SND_EVO_TYPE_PHANTOM,
+ .type = SND_AUDIENT_TYPE_PHANTOM,
.channels = 1,
.hwchannels = 1,
.val_offs = 1,
- .flags = SND_EVO_FLAGS_CAPTURE,
+ .flags = SND_AUDIENT_FLAGS_CAPTURE,
},
{ 0 }, /* sentinel */
};
-static const struct evo_devinfo {
+static const struct audient_devinfo {
u32 usb_id;
- const struct snd_evo_ctrl *controls;
-} evo_devinfo[] = {
+ const struct snd_audient_ctrl *controls;
+} audient_devinfo[] = {
{
.usb_id = USB_ID(USB_AUDIENT_VID, USB_EVO4_PID),
- .controls = evo4_controls,
+ .controls = snd_audient_evo4_controls,
},
{ 0 } /* sentinel */
};
-static inline unsigned long snd_evo_kctl_priv(enum snd_evo_type type,
- u8 valoffs, u8 hwchannels)
+static inline unsigned long snd_audient_kctl_priv(enum snd_audient_type type,
+ u8 valoffs, u8 hwchannels)
{
unsigned long type_l = type & 0xFF;
unsigned long valoffs_l = valoffs & 0xFF;
@@ -218,22 +218,24 @@ static inline unsigned long snd_evo_kctl_priv(enum snd_evo_type type,
}
static __always_inline
-const struct snd_evo_ctrl_type *snd_evo_kctl_type(struct snd_kcontrol *kctl)
+const struct snd_audient_ctrl_type *snd_audient_kctl_type(struct snd_kcontrol
+ *kctl)
{
- return &snd_evo_ctypes[kctl->private_value & 0xFF];
+ return &snd_audient_ctypes[kctl->private_value & 0xFF];
}
-static __always_inline u16 snd_evo_kctl_valoffs(struct snd_kcontrol *kctl)
+static __always_inline u16 snd_audient_kctl_valoffs(struct snd_kcontrol *kctl)
{
return (kctl->private_value >> 8) & 0xFF;
}
-static __always_inline u16 snd_evo_kctl_hwchannels(struct snd_kcontrol *kctl)
+static __always_inline
+u16 snd_audient_kctl_hwchannels(struct snd_kcontrol *kctl)
{
return (kctl->private_value >> 16) & 0xFF;
}
-static inline u16 snd_evo_kctl_channels(struct snd_kcontrol *kctl)
+static inline u16 snd_audient_kctl_channels(struct snd_kcontrol *kctl)
{
struct usb_mixer_elem_info *info = kctl->private_data;
@@ -241,43 +243,45 @@ static inline u16 snd_evo_kctl_channels(struct snd_kcontrol *kctl)
}
-#define EVO_REQ_CUR (0x01)
-#define EVO_REQTYPE_SET (USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE)
-#define EVO_REQTYPE_GET (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE)
+#define AUDIENT_REQTYPE_SET (USB_DIR_OUT | USB_TYPE_CLASS \
+ | USB_RECIP_INTERFACE)
+#define AUDIENT_REQTYPE_GET (USB_DIR_IN | USB_TYPE_CLASS \
+ | USB_RECIP_INTERFACE)
-static inline int snd_evo_get_cur(struct usb_mixer_interface *mixer,
- u16 value, u16 index,
- void *buf, size_t len)
+static inline int snd_audient_get_cur(struct usb_mixer_interface *mixer,
+ u16 value, u16 index,
+ void *buf, size_t len)
{
struct usb_device *const dev = mixer->chip->dev;
return snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0),
- EVO_REQ_CUR, EVO_REQTYPE_GET,
+ UAC2_CS_CUR, AUDIENT_REQTYPE_GET,
value, index, buf, len);
}
-static inline int snd_evo_set_cur(struct usb_mixer_interface *mixer,
- u16 value, u16 index,
- void *buf, size_t len)
+static inline int snd_audient_set_cur(struct usb_mixer_interface *mixer,
+ u16 value, u16 index,
+ void *buf, size_t len)
{
struct usb_device *const dev = mixer->chip->dev;
return snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
- EVO_REQ_CUR, EVO_REQTYPE_SET,
+ UAC2_CS_CUR, AUDIENT_REQTYPE_SET,
value, index, buf, len);
}
-static int snd_ctl_evo_boolean_get(struct snd_kcontrol *kctl,
- struct snd_ctl_elem_value *ctl_val)
+static int snd_ctl_audient_boolean_get(struct snd_kcontrol *kctl,
+ struct snd_ctl_elem_value *ctl_val)
{
struct usb_mixer_elem_list *const list = snd_kcontrol_chip(kctl);
struct usb_mixer_interface *const mixer = list->mixer;
- const unsigned int nchan = snd_evo_kctl_channels(kctl);
- const unsigned int hwchan = snd_evo_kctl_hwchannels(kctl);
- const struct snd_evo_ctrl_type *const ctype = snd_evo_kctl_type(kctl);
- const u16 value = ctype->wValue + snd_evo_kctl_valoffs(kctl);
+ const unsigned int nchan = snd_audient_kctl_channels(kctl);
+ const unsigned int hwchan = snd_audient_kctl_hwchannels(kctl);
+ const struct snd_audient_ctrl_type *const ctype
+ = snd_audient_kctl_type(kctl);
+ const u16 value = ctype->wValue + snd_audient_kctl_valoffs(kctl);
const u16 index = ctype->wIndex;
int i;
@@ -290,8 +294,8 @@ static int snd_ctl_evo_boolean_get(struct snd_kcontrol *kctl,
u32 buf;
int ret;
- ret = snd_evo_get_cur(mixer, value + i, index,
- &buf, sizeof(buf));
+ ret = snd_audient_get_cur(mixer, value + i, index,
+ &buf, sizeof(buf));
if (ret < 0)
return ret;
@@ -309,15 +313,16 @@ static int snd_ctl_evo_boolean_get(struct snd_kcontrol *kctl,
return 0;
}
-static int snd_ctl_evo_boolean_set(struct snd_kcontrol *kctl,
- struct snd_ctl_elem_value *ctl_val)
+static int snd_ctl_audient_boolean_set(struct snd_kcontrol *kctl,
+ struct snd_ctl_elem_value *ctl_val)
{
struct usb_mixer_elem_list *list = snd_kcontrol_chip(kctl);
struct usb_mixer_interface *mixer = list->mixer;
- const unsigned int hwchan = snd_evo_kctl_hwchannels(kctl);
- const struct snd_evo_ctrl_type *const ctype = snd_evo_kctl_type(kctl);
- const u16 value = ctype->wValue + snd_evo_kctl_valoffs(kctl);
+ const unsigned int hwchan = snd_audient_kctl_hwchannels(kctl);
+ const struct snd_audient_ctrl_type *const ctype
+ = snd_audient_kctl_type(kctl);
+ const u16 value = ctype->wValue + snd_audient_kctl_valoffs(kctl);
const u16 index = ctype->wIndex;
int changed = 0;
@@ -335,7 +340,7 @@ static int snd_ctl_evo_boolean_set(struct snd_kcontrol *kctl,
if (ctype->invert)
buf ^= cpu_to_le32(0x1);
- ret = snd_evo_get_cur(mixer, value + i, index,
+ ret = snd_audient_get_cur(mixer, value + i, index,
&rbuf, sizeof(rbuf));
if (ret < 0)
return ret;
@@ -343,8 +348,8 @@ static int snd_ctl_evo_boolean_set(struct snd_kcontrol *kctl,
if (rbuf != buf) {
changed = 1;
- ret = snd_evo_set_cur(mixer, value + i, index,
- &buf, sizeof(buf));
+ ret = snd_audient_set_cur(mixer, value + i, index,
+ &buf, sizeof(buf));
if (ret < 0)
return ret;
}
@@ -353,16 +358,17 @@ static int snd_ctl_evo_boolean_set(struct snd_kcontrol *kctl,
return changed;
}
-static int snd_ctl_evo_integer_get(struct snd_kcontrol *kctl,
+static int snd_ctl_audient_integer_get(struct snd_kcontrol *kctl,
struct snd_ctl_elem_value *ctl_val)
{
struct usb_mixer_elem_list *const list = snd_kcontrol_chip(kctl);
struct usb_mixer_interface *const mixer = list->mixer;
- const unsigned int nchan = snd_evo_kctl_channels(kctl);
- const unsigned int hwchan = snd_evo_kctl_hwchannels(kctl);
- const struct snd_evo_ctrl_type *const ctype = snd_evo_kctl_type(kctl);
- const u16 value = ctype->wValue + snd_evo_kctl_valoffs(kctl);
+ const unsigned int nchan = snd_audient_kctl_channels(kctl);
+ const unsigned int hwchan = snd_audient_kctl_hwchannels(kctl);
+ const struct snd_audient_ctrl_type *const ctype
+ = snd_audient_kctl_type(kctl);
+ const u16 value = ctype->wValue + snd_audient_kctl_valoffs(kctl);
const u16 index = ctype->wIndex;
int i;
@@ -376,8 +382,8 @@ static int snd_ctl_evo_integer_get(struct snd_kcontrol *kctl,
s16 val;
int ret;
- ret = snd_evo_get_cur(mixer, value + i, index,
- &buf, sizeof(buf));
+ ret = snd_audient_get_cur(mixer, value + i, index,
+ &buf, sizeof(buf));
if (ret < 0)
return ret;
@@ -391,15 +397,16 @@ static int snd_ctl_evo_integer_get(struct snd_kcontrol *kctl,
return 0;
}
-static int snd_ctl_evo_integer_set(struct snd_kcontrol *kctl,
+static int snd_ctl_audient_integer_set(struct snd_kcontrol *kctl,
struct snd_ctl_elem_value *ctl_val)
{
struct usb_mixer_elem_list *list = snd_kcontrol_chip(kctl);
struct usb_mixer_interface *mixer = list->mixer;
- const unsigned int hwchan = snd_evo_kctl_hwchannels(kctl);
- const struct snd_evo_ctrl_type *const ctype = snd_evo_kctl_type(kctl);
- const u16 value = ctype->wValue + snd_evo_kctl_valoffs(kctl);
+ const unsigned int hwchan = snd_audient_kctl_hwchannels(kctl);
+ const struct snd_audient_ctrl_type *const ctype
+ = snd_audient_kctl_type(kctl);
+ const u16 value = ctype->wValue + snd_audient_kctl_valoffs(kctl);
const u16 index = ctype->wIndex;
int changed = 0;
@@ -414,16 +421,16 @@ static int snd_ctl_evo_integer_set(struct snd_kcontrol *kctl,
s16 buf = cpu_to_le16(ctl_val->value.integer.value[i]);
int ret;
- ret = snd_evo_get_cur(mixer, value + i, index,
- &rbuf, sizeof(rbuf));
+ ret = snd_audient_get_cur(mixer, value + i, index,
+ &rbuf, sizeof(rbuf));
if (ret < 0)
return ret;
if (rbuf != buf) {
changed = 1;
- ret = snd_evo_set_cur(mixer, value + i, index,
- &buf, sizeof(buf));
+ ret = snd_audient_set_cur(mixer, value + i, index,
+ &buf, sizeof(buf));
if (ret < 0)
return ret;
}
@@ -432,23 +439,25 @@ static int snd_ctl_evo_integer_set(struct snd_kcontrol *kctl,
return changed;
}
-static int snd_ctl_evo_info(struct snd_kcontrol *kctl,
+static int snd_ctl_audient_info(struct snd_kcontrol *kctl,
struct snd_ctl_elem_info *uinfo)
{
- const struct snd_evo_ctrl_type *const ctype = snd_evo_kctl_type(kctl);
+ const struct snd_audient_ctrl_type *const ctype
+ = snd_audient_kctl_type(kctl);
uinfo->type = ctype->type;
- uinfo->count = snd_evo_kctl_channels(kctl);
+ uinfo->count = snd_audient_kctl_channels(kctl);
uinfo->value.integer.min = ctype->min.integer;
uinfo->value.integer.max = ctype->max.integer;
return 0;
}
-static int snd_evo_add_ctrl(struct usb_mixer_interface *mixer,
- const struct snd_evo_ctrl *ctrl)
+static int snd_audient_add_ctrl(struct usb_mixer_interface *mixer,
+ const struct snd_audient_ctrl *ctrl)
{
- const struct snd_evo_ctrl_type *ctype = &snd_evo_ctypes[ctrl->type];
+ const struct snd_audient_ctrl_type *ctype
+ = &snd_audient_ctypes[ctrl->type];
char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
struct snd_kcontrol_new knew = { 0 };
struct snd_kcontrol *kctl;
@@ -456,9 +465,9 @@ static int snd_evo_add_ctrl(struct usb_mixer_interface *mixer,
knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
knew.name = name;
- knew.info = snd_ctl_evo_info;
- knew.private_value = snd_evo_kctl_priv(ctrl->type, ctrl->val_offs,
- ctrl->hwchannels);
+ knew.info = snd_ctl_audient_info;
+ knew.private_value = snd_audient_kctl_priv(ctrl->type, ctrl->val_offs,
+ ctrl->hwchannels);
knew.tlv.p = ctype->tlv;
knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE
| SNDRV_CTL_ELEM_ACCESS_VOLATILE
@@ -466,20 +475,20 @@ static int snd_evo_add_ctrl(struct usb_mixer_interface *mixer,
switch (ctype->type) {
case SNDRV_CTL_ELEM_TYPE_INTEGER:
- knew.get = snd_ctl_evo_integer_get;
- knew.put = snd_ctl_evo_integer_set;
+ knew.get = snd_ctl_audient_integer_get;
+ knew.put = snd_ctl_audient_integer_set;
break;
case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
- knew.get = snd_ctl_evo_boolean_get;
- knew.put = snd_ctl_evo_boolean_set;
+ knew.get = snd_ctl_audient_boolean_get;
+ knew.put = snd_ctl_audient_boolean_set;
break;
default:
return -EINVAL;
}
snprintf(name, sizeof(name), "%s %s %s", ctrl->basename,
- ((ctrl->flags & SND_EVO_FLAGS_DIRECTION)
- == SND_EVO_FLAGS_CAPTURE) ? "Capture" : "Playback",
+ ((ctrl->flags & SND_AUDIENT_FLAGS_DIRECTION)
+ == SND_AUDIENT_FLAGS_CAPTURE) ? "Capture" : "Playback",
(ctype->type == SNDRV_CTL_ELEM_TYPE_BOOLEAN)
? "Switch" : "Volume");
@@ -503,12 +512,12 @@ static int snd_evo_add_ctrl(struct usb_mixer_interface *mixer,
/* called from mixer_quirks.c */
-int snd_evo_controls_create(struct usb_mixer_interface *mixer)
+int snd_audient_controls_create(struct usb_mixer_interface *mixer)
{
- const struct evo_devinfo *info;
- const struct snd_evo_ctrl *ctrl;
+ const struct audient_devinfo *info;
+ const struct snd_audient_ctrl *ctrl;
- for (info = evo_devinfo; info->controls; info++)
+ for (info = audient_devinfo; info->controls; info++)
if (info->usb_id == mixer->chip->usb_id)
break;
@@ -516,7 +525,7 @@ int snd_evo_controls_create(struct usb_mixer_interface *mixer)
return -ENODEV;
for (ctrl = info->controls; ctrl->basename; ctrl++) {
- const int ret = snd_evo_add_ctrl(mixer, ctrl);
+ const int ret = snd_audient_add_ctrl(mixer, ctrl);
if (ret < 0)
return ret;
diff --git a/sound/usb/mixer_audient.h b/sound/usb/mixer_audient.h
new file mode 100644
index 000000000000..db4f31e02b5e
--- /dev/null
+++ b/sound/usb/mixer_audient.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __USB_MIXER_AUDIENT_H
+#define __USB_MIXER_AUDIENT_H
+
+#include "mixer.h"
+
+#define USB_AUDIENT_VID (0x2708)
+#define USB_EVO4_PID (0x0006)
+
+int snd_audient_controls_create(struct usb_mixer_interface *mixer);
+
+#endif /* __USB_MIXER_AUDIENT_H */
diff --git a/sound/usb/mixer_evo.h b/sound/usb/mixer_evo.h
deleted file mode 100644
index 7fe7e197185c..000000000000
--- a/sound/usb/mixer_evo.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __USB_MIXER_EVO_H
-#define __USB_MIXER_EVO_H
-
-#include "mixer.h"
-
-#define USB_AUDIENT_VID (0x2708)
-#define USB_EVO4_PID (0x0006)
-
-int snd_evo_controls_create(struct usb_mixer_interface *mixer);
-
-#endif /* __USB_MIXER_EVO_H */
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 01210cc3fae7..af53c5c20e65 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -38,7 +38,7 @@
#include "mixer_scarlett2.h"
#include "mixer_us16x08.h"
#include "mixer_s1810c.h"
-#include "mixer_evo.h"
+#include "mixer_audient.h"
#include "helper.h"
#include "fcp.h"
@@ -4541,7 +4541,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
break;
case USB_ID(USB_AUDIENT_VID, USB_EVO4_PID): /* Audient EVO 4 */
- err = snd_evo_controls_create(mixer);
+ err = snd_audient_controls_create(mixer);
break;
case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */
--
2.56.0
next prev parent reply other threads:[~2026-11-01 0:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 23:01 [PATCH 0/5] ALSA: usb-audio: Audient iD14 MkI vendor controls Will Porter
2026-10-19 23:01 ` [PATCH 1/5] ALSA: usb-audio: Give the Audient iD14 MkI its own mixer map Will Porter
2026-10-19 23:01 ` [PATCH 2/5] ALSA: usb-audio: Add Audient iD14 MkI monitor and routing controls Will Porter
2026-10-19 23:01 ` [PATCH 3/5] ALSA: usb-audio: Add Audient iD14 MkI mixer matrix Will Porter
2026-10-19 23:01 ` [PATCH 4/5] ALSA: usb-audio: Add Audient iD14 MkI write-only controls Will Porter
2026-10-19 23:01 ` [PATCH 5/5] ALSA: usb-audio: Replace the Audient iD14 MkI FU 12 control Will Porter
2026-10-20 13:10 ` [PATCH 0/5] ALSA: usb-audio: Audient iD14 MkI vendor controls Takashi Iwai
2026-10-26 18:36 ` Christian Ruppert
2026-10-26 21:44 ` Will Porter
2026-10-27 6:35 ` Takashi Iwai
2026-10-27 23:21 ` Christian Ruppert
2026-10-28 2:36 ` Will Porter
2026-11-01 0:00 ` [RFC PATCH 00/11] " Christian Ruppert
2026-11-01 0:00 ` Christian Ruppert [this message]
2026-11-01 0:00 ` [RFC PATCH 02/11] ALSA: mixer_audient: explicitly define full control names Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 03/11] ALSA: mixer_audient: clarify USB control message definition Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 04/11] ALSA: mixer_audient: Add length check to USB transfer Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 05/11] ALSA: mixer_audient: make USB control transfer size configurable Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 06/11] ALSA: mixer_audient: Allow arbitrary boolean control values Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 07/11] ALSA: mixer_audient: Add integer range checks Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 08/11] ALSA: mixer_audient: Add control initialization at probe Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 09/11] ALSA: mixer_audient: Add readback-free parameter set Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 10/11] ALSA: mixer_audient: add control value caching Christian Ruppert
2026-11-01 0:00 ` [RFC PATCH 11/11] ALSA: mixer_audient: Create matrix programmatically Christian Ruppert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261101000013.11880-2-arc@gmx.li \
--to=arc@gmx.li \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=mrwillporter@gmail.com \
--cc=neil@androos.io \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®