leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: oxygen: add digital input validity check switch

Browse Source 
Add a mixer control to prevent capturing S/PDIF samples that are not
marked as valid (non-audio or corrupted samples).

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2011-01-10 16:34:15 +01:00 committed by Takashi Iwai
parent af39917d5a
commit 860cffd57a
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/oxygen/oxygen_mixer.c
View File

@ -434,30 +434,31 @@ static int spdif_input_default_get(struct snd_kcontrol *ctl,
return 0; return 0;
} }
static int spdif_loopback_get(struct snd_kcontrol *ctl, static int spdif_bit_switch_get(struct snd_kcontrol *ctl,
struct snd_ctl_elem_value *value) struct snd_ctl_elem_value *value)
{ {
struct oxygen *chip = ctl->private_data; struct oxygen *chip = ctl->private_data;
u32 bit = ctl->private_value;
value->value.integer.value[0] = value->value.integer.value[0] =
!!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL) !!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL) & bit);
& OXYGEN_SPDIF_LOOPBACK);
return 0; return 0;
} }
static int spdif_loopback_put(struct snd_kcontrol *ctl, static int spdif_bit_switch_put(struct snd_kcontrol *ctl,
struct snd_ctl_elem_value *value) struct snd_ctl_elem_value *value)
{ {
struct oxygen *chip = ctl->private_data; struct oxygen *chip = ctl->private_data;
u32 bit = ctl->private_value;
u32 oldreg, newreg; u32 oldreg, newreg;
int changed; int changed;
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
oldreg = oxygen_read32(chip, OXYGEN_SPDIF_CONTROL); oldreg = oxygen_read32(chip, OXYGEN_SPDIF_CONTROL);
if (value->value.integer.value[0]) if (value->value.integer.value[0])
newreg = oldreg | OXYGEN_SPDIF_LOOPBACK; newreg = oldreg | bit;
else else
newreg = oldreg & ~OXYGEN_SPDIF_LOOPBACK; newreg = oldreg & ~bit;
changed = newreg != oldreg; changed = newreg != oldreg;
if (changed) if (changed)
oxygen_write32(chip, OXYGEN_SPDIF_CONTROL, newreg); oxygen_write32(chip, OXYGEN_SPDIF_CONTROL, newreg);
@ -835,8 +836,17 @@ static const struct snd_kcontrol_new spdif_input_controls[] = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("Loopback ", NONE, SWITCH), .name = SNDRV_CTL_NAME_IEC958("Loopback ", NONE, SWITCH),
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = spdif_loopback_get, .get = spdif_bit_switch_get,
.put = spdif_loopback_put, .put = spdif_bit_switch_put,
.private_value = OXYGEN_SPDIF_LOOPBACK,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("Validity Check ",CAPTURE,SWITCH),
.info = snd_ctl_boolean_mono_info,
.get = spdif_bit_switch_get,
.put = spdif_bit_switch_put,
.private_value = OXYGEN_SPDIF_SPDVALID,
}, },
}; };