From: Hans de Goede <hdegoede@redhat.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Oder Chiou <oder_chiou@realtek.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.com>,
Bard Liao <bard.liao@intel.com>
Subject: [RFC 1/2] ASoC: Add new SOC_DOUBLE*_ACCESS() macros
Date: Mon, 15 Feb 2021 15:24:18 +0100 [thread overview]
Message-ID: <20210215142419.308651-2-hdegoede@redhat.com> (raw)
In-Reply-To: <20210215142419.308651-1-hdegoede@redhat.com>
Add 3 new SOC_DOUBLE*_ACCESS() macros:
SOC_DOUBLE_ACCESS()
SOC_DOUBLE_EXT_ACCESS()
SOC_DOUBLE_TLV_ACCESS()
These work the same as their non _ACCESS postfixed counter-parts,
with an extra argument that allows specifying extra access flags.
This is meant to be used with the new SNDRV_CTL_ELEM_ACCESS_*_LED flags.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
include/sound/soc.h | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3fa6c40a63b7..0136650466f3 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -100,12 +100,15 @@
{.reg = xreg, .rreg = xreg, .shift = xshift, \
.rshift = xshift, .min = xmin, .max = xmax, \
.platform_max = xmax, .invert = xinvert} }
-#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
+#define SOC_DOUBLE_ACCESS(xname, reg, shift_left, shift_right, max, invert, elem_access) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
+ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | (elem_access),\
.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
.put = snd_soc_put_volsw, \
.private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
max, invert, 0) }
+#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
+ SOC_DOUBLE_ACCESS(xname, reg, shift_left, shift_right, max, invert, 0)
#define SOC_DOUBLE_STS(xname, reg, shift_left, shift_right, max, invert) \
{ \
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -127,15 +130,19 @@
.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \
.private_value = SOC_DOUBLE_R_RANGE_VALUE(reg_left, reg_right, \
xshift, xmin, xmax, xinvert) }
-#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
+#define SOC_DOUBLE_TLV_ACCESS(xname, reg, shift_left, shift_right, max, invert, \
+ tlv_array, elem_access) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
- SNDRV_CTL_ELEM_ACCESS_READWRITE,\
+ SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+ (elem_access),\
.tlv.p = (tlv_array), \
.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
.put = snd_soc_put_volsw, \
.private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
max, invert, 0) }
+#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
+ SOC_DOUBLE_TLV_ACCESS(xname, reg, shift_left, shift_right, max, invert, tlv_array, 0)
#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -225,13 +232,18 @@
.info = snd_soc_info_volsw, \
.get = xhandler_get, .put = xhandler_put, \
.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, 0) }
-#define SOC_DOUBLE_EXT(xname, reg, shift_left, shift_right, max, invert,\
+#define SOC_DOUBLE_EXT_ACCESS(xname, reg, shift_left, shift_right, max, invert, elem_access,\
xhandler_get, xhandler_put) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
+ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | (elem_access),\
.info = snd_soc_info_volsw, \
.get = xhandler_get, .put = xhandler_put, \
.private_value = \
SOC_DOUBLE_VALUE(reg, shift_left, shift_right, max, invert, 0) }
+#define SOC_DOUBLE_EXT(xname, reg, shift_left, shift_right, max, invert,\
+ xhandler_get, xhandler_put) \
+ SOC_DOUBLE_EXT_ACCESS(xname, reg, shift_left, shift_right, max, invert, 0,\
+ xhandler_get, xhandler_put)
#define SOC_DOUBLE_R_EXT(xname, reg_left, reg_right, xshift, xmax, xinvert,\
xhandler_get, xhandler_put) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
--
2.30.1
next prev parent reply other threads:[~2021-02-15 14:26 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 14:24 [RFC 0/2] ASoC: rt5670: Add LED trigger support Hans de Goede
2021-02-15 14:24 ` Hans de Goede [this message]
2021-02-15 14:24 ` [RFC 2/2] " Hans de Goede
2021-02-23 13:45 ` Mark Brown
2021-02-23 13:59 ` Hans de Goede
2021-02-23 14:09 ` Mark Brown
2021-02-23 14:21 ` Takashi Iwai
2021-02-23 16:14 ` Jaroslav Kysela
2021-02-23 16:20 ` Takashi Iwai
2021-02-23 20:56 ` Jaroslav Kysela
2021-02-24 7:12 ` Takashi Iwai
2021-02-24 8:14 ` Jaroslav Kysela
2021-02-24 8:52 ` Takashi Iwai
2021-02-24 9:27 ` Jaroslav Kysela
2021-02-24 9:38 ` Takashi Iwai
2021-02-24 9:49 ` Jaroslav Kysela
2021-02-24 10:33 ` Takashi Iwai
2021-02-24 10:56 ` Jaroslav Kysela
2021-02-24 11:43 ` Takashi Iwai
2021-02-24 12:08 ` Jaroslav Kysela
2021-02-24 12:42 ` Takashi Iwai
2021-02-24 17:57 ` Jaroslav Kysela
2021-02-25 11:00 ` Takashi Iwai
2021-02-25 18:09 ` Jaroslav Kysela
2021-02-26 8:41 ` Takashi Iwai
2021-02-26 9:22 ` Jaroslav Kysela
2021-02-23 17:07 ` Hans de Goede
2021-02-23 17:20 ` Mark Brown
2021-02-23 19:03 ` Hans de Goede
2021-02-24 12:59 ` Mark Brown
2021-02-24 19:14 ` Hans de Goede
2021-02-24 19:36 ` Mark Brown
2021-02-24 20:09 ` Hans de Goede
2021-02-25 14:59 ` Mark Brown
2021-02-25 18:45 ` Hans de Goede
2021-03-01 13:23 ` Mark Brown
2021-03-01 13:39 ` Hans de Goede
2021-03-01 19:15 ` Mark Brown
2021-03-01 19:49 ` Hans de Goede
2021-03-01 20:43 ` Mark Brown
2021-03-01 21:26 ` Hans de Goede
2021-03-02 12:41 ` Mark Brown
2021-03-02 21:14 ` Jaroslav Kysela
2021-03-04 19:39 ` Hans de Goede
2021-03-05 13:02 ` Jaroslav Kysela
2021-03-07 13:51 ` Hans de Goede
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=20210215142419.308651-2-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=oder_chiou@realtek.com \
--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;
as well as URLs for NNTP newsgroup(s).