Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 110852
b: refs/heads/master
c: 815ecf8
h: refs/heads/master
v: v3
  • Loading branch information
Jon Smirl authored and Jaroslav Kysela committed Jul 29, 2008
1 parent b4a22e7 commit b1c2b07
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c94161580eee8137b868301434ea392083258b5
refs/heads/master: 815ecf8dec95d07e260a16ebe8409f4b7c0fdc0f
2 changes: 1 addition & 1 deletion trunk/include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ struct snd_soc_pcm_runtime {
/* mixer control */
struct soc_mixer_control {
int min, max;
uint reg, rreg, shift, rshift, invert;
unsigned int reg, rreg, shift, rshift, invert;
};

/* enumerated kcontrol */
Expand Down
48 changes: 24 additions & 24 deletions trunk/sound/soc/soc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1457,8 +1457,8 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
int max = mc->max;
uint shift = mc->min;
uint rshift = mc->rshift;
unsigned int shift = mc->min;
unsigned int rshift = mc->rshift;

if (max == 1)
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
Expand Down Expand Up @@ -1487,12 +1487,12 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
uint shift = mc->shift;
uint rshift = mc->rshift;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;

ucontrol->value.integer.value[0] =
(snd_soc_read(codec, reg) >> shift) & mask;
Expand Down Expand Up @@ -1526,12 +1526,12 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
uint shift = mc->shift;
uint rshift = mc->rshift;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;
unsigned short val, val2, val_mask;

val = (ucontrol->value.integer.value[0] & mask);
Expand Down Expand Up @@ -1594,12 +1594,12 @@ int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
uint reg2 = mc->rreg;
uint shift = mc->shift;
unsigned int reg = mc->reg;
unsigned int reg2 = mc->rreg;
unsigned int shift = mc->shift;
int max = mc->max;
uint mask = (1<<fls(max))-1;
uint invert = mc->invert;
unsigned int mask = (1<<fls(max))-1;
unsigned int invert = mc->invert;

ucontrol->value.integer.value[0] =
(snd_soc_read(codec, reg) >> shift) & mask;
Expand Down Expand Up @@ -1631,12 +1631,12 @@ int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
uint reg2 = mc->rreg;
uint shift = mc->shift;
unsigned int reg = mc->reg;
unsigned int reg2 = mc->rreg;
unsigned int shift = mc->shift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;
int err;
unsigned short val, val2, val_mask;

Expand Down Expand Up @@ -1701,7 +1701,7 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
unsigned int reg = mc->reg;
int min = mc->min;
int val = snd_soc_read(codec, reg);

Expand All @@ -1728,7 +1728,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
uint reg = mc->reg;
unsigned int reg = mc->reg;
int min = mc->min;
unsigned short val;

Expand Down
36 changes: 18 additions & 18 deletions trunk/sound/soc/soc-dapm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
int val;
struct soc_mixer_control *mc = (struct soc_mixer_control *)
w->kcontrols[i].private_value;
uint reg = mc->reg;
uint shift = mc->shift;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;

val = snd_soc_read(w->codec, reg);
val = (val >> shift) & mask;
Expand Down Expand Up @@ -252,11 +252,11 @@ static int dapm_set_pga(struct snd_soc_dapm_widget *widget, int power)
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;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;

if (power) {
int i;
Expand Down Expand Up @@ -1141,12 +1141,12 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
uint reg = mc->reg;
uint shift = mc->shift;
uint rshift = mc->rshift;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
int max = mc->max;
uint invert = mc->invert;
uint mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;

/* return the saved value if we are powered down */
if (widget->id == snd_soc_dapm_pga && !widget->power) {
Expand Down Expand Up @@ -1186,12 +1186,12 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
uint reg = mc->reg;
uint shift = mc->shift;
uint rshift = mc->rshift;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
int max = mc->max;
uint mask = (1 << fls(max)) - 1;
uint invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;
unsigned short val, val2, val_mask;
int ret;

Expand Down

0 comments on commit b1c2b07

Please sign in to comment.