git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pcmcia
/
vx
/
vxp_mixer.c
diff --git
a/sound/pcmcia/vx/vxp_mixer.c
b/sound/pcmcia/vx/vxp_mixer.c
index
aeaef3d
..
e237f6c
100644
(file)
--- a/
sound/pcmcia/vx/vxp_mixer.c
+++ b/
sound/pcmcia/vx/vxp_mixer.c
@@
-31,7
+31,7
@@
/*
* mic level control (for VXPocket)
*/
/*
* mic level control (for VXPocket)
*/
-static int vx_mic_level_info(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
*uinfo)
+static int vx_mic_level_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info
*uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
@@
-40,30
+40,30
@@
static int vx_mic_level_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinf
return 0;
}
return 0;
}
-static int vx_mic_level_get(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*ucontrol)
+static int vx_mic_level_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
*ucontrol)
{
{
-
vx_core_t
*_chip = snd_kcontrol_chip(kcontrol);
+
struct vx_core
*_chip = snd_kcontrol_chip(kcontrol);
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
ucontrol->value.integer.value[0] = chip->mic_level;
return 0;
}
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
ucontrol->value.integer.value[0] = chip->mic_level;
return 0;
}
-static int vx_mic_level_put(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*ucontrol)
+static int vx_mic_level_put(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
*ucontrol)
{
{
-
vx_core_t
*_chip = snd_kcontrol_chip(kcontrol);
+
struct vx_core
*_chip = snd_kcontrol_chip(kcontrol);
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
-
down
(&_chip->mixer_mutex);
+
mutex_lock
(&_chip->mixer_mutex);
if (chip->mic_level != ucontrol->value.integer.value[0]) {
vx_set_mic_level(_chip, ucontrol->value.integer.value[0]);
chip->mic_level = ucontrol->value.integer.value[0];
if (chip->mic_level != ucontrol->value.integer.value[0]) {
vx_set_mic_level(_chip, ucontrol->value.integer.value[0]);
chip->mic_level = ucontrol->value.integer.value[0];
-
up
(&_chip->mixer_mutex);
+
mutex_unlock
(&_chip->mixer_mutex);
return 1;
}
return 1;
}
-
up
(&_chip->mixer_mutex);
+
mutex_unlock
(&_chip->mixer_mutex);
return 0;
}
return 0;
}
-static s
nd_kcontrol_new_t
vx_control_mic_level = {
+static s
truct snd_kcontrol_new
vx_control_mic_level = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Capture Volume",
.info = vx_mic_level_info,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Capture Volume",
.info = vx_mic_level_info,
@@
-74,7
+74,7
@@
static snd_kcontrol_new_t vx_control_mic_level = {
/*
* mic boost level control (for VXP440)
*/
/*
* mic boost level control (for VXP440)
*/
-static int vx_mic_boost_info(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
*uinfo)
+static int vx_mic_boost_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info
*uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
@@
-83,30
+83,30
@@
static int vx_mic_boost_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinf
return 0;
}
return 0;
}
-static int vx_mic_boost_get(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*ucontrol)
+static int vx_mic_boost_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
*ucontrol)
{
{
-
vx_core_t
*_chip = snd_kcontrol_chip(kcontrol);
+
struct vx_core
*_chip = snd_kcontrol_chip(kcontrol);
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
ucontrol->value.integer.value[0] = chip->mic_level;
return 0;
}
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
ucontrol->value.integer.value[0] = chip->mic_level;
return 0;
}
-static int vx_mic_boost_put(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*ucontrol)
+static int vx_mic_boost_put(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
*ucontrol)
{
{
-
vx_core_t
*_chip = snd_kcontrol_chip(kcontrol);
+
struct vx_core
*_chip = snd_kcontrol_chip(kcontrol);
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
-
down
(&_chip->mixer_mutex);
+
mutex_lock
(&_chip->mixer_mutex);
if (chip->mic_level != ucontrol->value.integer.value[0]) {
vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]);
chip->mic_level = ucontrol->value.integer.value[0];
if (chip->mic_level != ucontrol->value.integer.value[0]) {
vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]);
chip->mic_level = ucontrol->value.integer.value[0];
-
up
(&_chip->mixer_mutex);
+
mutex_unlock
(&_chip->mixer_mutex);
return 1;
}
return 1;
}
-
up
(&_chip->mixer_mutex);
+
mutex_unlock
(&_chip->mixer_mutex);
return 0;
}
return 0;
}
-static s
nd_kcontrol_new_t
vx_control_mic_boost = {
+static s
truct snd_kcontrol_new
vx_control_mic_boost = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Boost",
.info = vx_mic_boost_info,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Boost",
.info = vx_mic_boost_info,
@@
-115,7
+115,7
@@
static snd_kcontrol_new_t vx_control_mic_boost = {
};
};
-int vxp_add_mic_controls(
vx_core_t
*_chip)
+int vxp_add_mic_controls(
struct vx_core
*_chip)
{
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
int err;
{
struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
int err;