Convert bitfields in ASOC into full int width
PATCH 1/1 Convert bitfields in ASOC into full int width
Convert bitfields in ASOC into full int width. This needs testing, I don't have sample controls for all of the different configurations. This is a simple mechanical conversion, behavior should not be changed. I did find two places in the DAPM code where max was being used as a mask. I fixed them to convert max to a mask, was this right?
---
include/sound/soc.h | 46 ++++++++++++++++++------------ sound/soc/soc-core.c | 77 ++++++++++++++++++++++++++++---------------------- sound/soc/soc-dapm.c | 46 +++++++++++++++++------------- 3 files changed, 96 insertions(+), 73 deletions(-)
include/sound/soc.h +27 -19
@@ -26,10 +26,12 @@/* * Convenience kcontrol builders */ -#define SOC_SINGLE_VALUE (reg, shift, max, invert) ((reg) | ((shift) << 8) |\ - ((shift) << 12) | ((max) << 16) | ((invert) << 24)) -#define SOC_SINGLE_VALUE_EXT (reg, max, invert) ((reg) | ((max) << 16) |\ - ((invert) << 31)) +#define SOC_SINGLE_VALUE (xreg, xshift, xmax, xinvert) \ + (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_SINGLE_VALUE_EXT (xreg, xmax, xinvert) \ + (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .max=xmax, .invert=xinvert}#define SOC_SINGLE (xname, reg, shift, max, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
@@ -43,45 +45,45 @@ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ .put = snd_soc_put_volsw, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } -#define SOC_DOUBLE (xname, reg, shift_left, shift_right, max, invert) \ +#define SOC_DOUBLE (xname, xreg, shift_left, shift_right, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ .put = snd_soc_put_volsw, \ - .private_value = (reg) | ((shift_left) << 8) | \ - ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) } -#define SOC_DOUBLE_R (xname, reg_left, reg_right, shift, max, invert) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=shift_left, .rshift=shift_right, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_R (xname, reg_left, reg_right, xshift, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ .info = snd_soc_info_volsw_2r, \ .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ - .private_value = (reg_left) | ((shift) << 8) | \ - ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } -#define SOC_DOUBLE_TLV (xname, reg, shift_left, shift_right, max, invert, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=reg_left, .rreg=reg_right, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_TLV (xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ .put = snd_soc_put_volsw, \ - .private_value = (reg) | ((shift_left) << 8) | \ - ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) } -#define SOC_DOUBLE_R_TLV (xname, reg_left, reg_right, shift, max, invert, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=shift_left, .rshift=right_shift, .max=xmax, .invert=xinvert} +#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 |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_2r, \ .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ - .private_value = (reg_left) | ((shift) << 8) | \ - ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } -#define SOC_DOUBLE_S8_TLV (xname, reg, min, max, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=reg_left, .rreg=reg_right, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_S8_TLV (xname, xreg, xmin, xmax, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \ .put = snd_soc_put_volsw_s8, \ - .private_value = (reg) | (((signed char)max) << 16) | \ - (((signed char)min) << 24) } + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .min=xmin, .max=xmax}#define SOC_ENUM_DOUBLE (xreg, xshift_l, xshift_r, xmask, xtexts) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .texts = xtexts }
@@ -516,6 +518,12 @@ struct snd_soc_pcm_runtime {struct snd_soc_device *socdev; }; +/* mixer control */ +struct mixer_control { +int min, max; +uint reg, rreg, shift, rshift, invert; +}; +/* enumerated kcontrol */ struct soc_enum {unsigned short reg;
sound/soc/soc-core.c +43 -34
137 lines not on this page · raw message
sound/soc/soc-dapm.c +26 -20
69 lines not on this page · raw message
Quoted 1 line · Jon Smirl
Convert bitfields in ASOC into full int width. This needs testing, I don't have sample controls for all of the different configurations. This is a simple mechanical conversion, behavior should not be changed. I did find two places in the DAPM code where max was being used as a mask. I fixed them to convert max to a mask, was this right?
Might want to look at your line wrapping here :) .
The patch looks like a good approach and should work - the issues below a look fixable.
When I tried testing this patch I found that SOC_ENUM no longer builds - the first error is 'error: extra brace group at end of initializer'. Looks like that needs adjusting as well. There's also rather a lot of checkpatch warnings, mostly lines over 80 columns and whitespace errors.
include/sound/soc.h struct snd_soc_pcm_runtime { · line 525
Quoted 5 lines
include/sound/soc.h +5
-0+/* mixer control */ +struct mixer_control { +int min, max; +uint reg, rreg, shift, rshift, invert; +};
This should be namespaced - soc_mixer_control, snd_soc_mixer_control or simlar.
Quoted 4 lines
sound/soc/soc-dapm.c +0
-0@@ -104,10 +104,12 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,case snd_soc_dapm_switch:case snd_soc_dapm_mixer: {int val;
sound/soc/soc-dapm.c static void dapm_set_path_status(struct snd_soc_dapm_widget *w, · line 112
Quoted 10 lines
sound/soc/soc-dapm.c +6
-4-int reg = w->kcontrols[i].private_value &0xff ; -int shift = (w->kcontrols[i].private_value >>8 ) &0x0f ; -int mask = (w->kcontrols[i].private_value >>16 ) &0xff ; -int invert = (w->kcontrols[i].private_value >>24 ) &0x01 ; +struct mixer_control *mc = (struct mixer_control *)w->kcontrols[i].private_value; +uint reg = mc->reg; +uint shift = mc->shift; +int max = mc->max; +uint mask = (1 <<fls (max)) -1 ; +uint invert = mc->invert;
What the original code is doing here is checking to see if the control is on at all.
On 7/23/08, Mark Brown <[email protected]> wrote:
I found the brace problem.
Quoted 10 lines
Quoted 10 lines
sound/soc/soc-dapm.c +2
-4@@ -104,10 +104,12 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,case snd_soc_dapm_switch:case snd_soc_dapm_mixer: {int val; -int reg = w->kcontrols[i].private_value &0xff ; -int shift = (w->kcontrols[i].private_value >>8 ) &0x0f ; -int mask = (w->kcontrols[i].private_value >>16 ) &0xff ; -int invert = (w->kcontrols[i].private_value >>24 ) &0x01 ; +struct mixer_control *mc = (struct mixer_control *)w->kcontrols[i].private_value; +uint reg = mc->reg;
Quoted 9 lines
sound/soc/soc-core.c EXPORT_SYMBOL_GPL(snd_soc_info_volsw); · line 1473
Quoted 4 lines
sound/soc/soc-core.c +4
-0+uint shift = mc->shift; +int max = mc->max; +uint mask = (1 <<fls (max)) -1 ; +uint invert = mc->invert;What the original code is doing here is checking to see if the control
is on at all.
Mask is usually the same as mask, but hasn't this been written to allow a max smaller than the max? If so these two areas look wrong.
if (widget->num_kcontrols && k) {
struct soc_mixer_control *mc = (struct soc_mixer_control *)k->private_value;
uint reg = mc->reg;
uint shift = mc->shift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
if (power) {
int i;
/* power up has happended, increase volume to last level */
if (invert) {
// shouldn't this be
// for (i = max; i > widget->saved_value; i--)
for (i = mask; i > widget->saved_value; i--)
// and this mask is right
snd_soc_update_bits(widget->codec, reg, mask, i);
} else {
for (i = 0; i < widget->saved_value; i++)
snd_soc_update_bits(widget->codec, reg, mask, i);
}And this one should have used mask instead of max:
case snd_soc_dapm_mixer: {
int val;
struct soc_mixer_control *mc = (struct soc_mixer_control
*)w->kcontrols[i].private_value;
uint reg = mc->reg;
uint shift = mc->shift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
val = snd_soc_read(w->codec, reg);
val = (val >> shift) & mask;
if ((invert && !val) || (!invert && val))
p->connect = 1;
else
p->connect = 0;Signature · 2 lines
Jon Smirl [email protected]
Quoted 2 lines · Jon Smirl
Mask is usually the same as mask, but hasn't this been written to allow a max smaller than the max? If so these two areas look wrong.
Yes, that's the idea.
Quoted 8 lines
if (power) { int i; /* power up has happended, increase volume to last level */ if (invert) { // shouldn't this be // for (i = max; i > widget->saved_value; i--) for (i = mask; i > widget->saved_value; i--)// and this mask is right
I think so.
Quoted 1 line
And this one should have used mask instead of max:
Looks like it, yes.