niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ALSA: control - introduce snd_ctl_notify_one() helper

Browse source 
This helper is required for the following generic LED mute
patch. The helper also simplifies some other functions.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20210317172945.842280-2-perex@perex.cz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jaroslav Kysela 2021-03-17 18:29:40 +01:00 • committed by Takashi Iwai
parent a5e13c6df0
commit 1fa4445f9a
2 changed files with 47 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sound/control.h
View file

@ -115,6 +115,7 @@ typedef int (*snd_kctl_ioctl_func_t) (struct snd_card * card,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
void snd_ctl_notify(struct snd_card * card, unsigned int mask, struct snd_ctl_elem_id * id); void snd_ctl_notify(struct snd_card * card, unsigned int mask, struct snd_ctl_elem_id * id);
void snd_ctl_notify_one(struct snd_card * card, unsigned int mask, struct snd_kcontrol * kctl, unsigned int ioff);
struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, void * private_data); struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, void * private_data);
void snd_ctl_free_one(struct snd_kcontrol * kcontrol); void snd_ctl_free_one(struct snd_kcontrol * kcontrol);
@ -123,8 +124,7 @@ int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, bool add_on_replace); int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, bool add_on_replace);
int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id); int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id); int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id);
int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, int active);
int active);
struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid); struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid);
struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id); struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id);

68
sound/core/control.c
View file

@ -181,6 +181,27 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask,
} }
EXPORT_SYMBOL(snd_ctl_notify); EXPORT_SYMBOL(snd_ctl_notify);
/**
* snd_ctl_notify_one - Send notification to user-space for a control change
* @card: the card to send notification
* @mask: the event mask, SNDRV_CTL_EVENT_*
* @kctl: the pointer with the control instance
* @ioff: the additional offset to the control index
*
* This function calls snd_ctl_notify() and does additional jobs
* like LED state changes.
*/
void snd_ctl_notify_one(struct snd_card *card, unsigned int mask,
struct snd_kcontrol *kctl, unsigned int ioff)
{
struct snd_ctl_elem_id id = kctl->id;
id.index += ioff;
id.numid += ioff;
snd_ctl_notify(card, mask, &id);
}
EXPORT_SYMBOL(snd_ctl_notify_one);
/** /**
* snd_ctl_new - create a new control instance with some elements * snd_ctl_new - create a new control instance with some elements
* @kctl: the pointer to store new control instance * @kctl: the pointer to store new control instance
@ -342,7 +363,6 @@ static int __snd_ctl_add_replace(struct snd_card *card,
{ {
struct snd_ctl_elem_id id; struct snd_ctl_elem_id id;
unsigned int idx; unsigned int idx;
unsigned int count;
struct snd_kcontrol *old; struct snd_kcontrol *old;
int err; int err;
@ -376,10 +396,8 @@ static int __snd_ctl_add_replace(struct snd_card *card,
kcontrol->id.numid = card->last_numid + 1; kcontrol->id.numid = card->last_numid + 1;
card->last_numid += kcontrol->count; card->last_numid += kcontrol->count;
id = kcontrol->id; for (idx = 0; idx < kcontrol->count; idx++)
count = kcontrol->count; snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_ADD, kcontrol, idx);
for (idx = 0; idx < count; idx++, id.index++, id.numid++)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
return 0; return 0;
} }
@ -462,16 +480,14 @@ EXPORT_SYMBOL(snd_ctl_replace);
*/ */
int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol) int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)
{ {
struct snd_ctl_elem_id id;
unsigned int idx; unsigned int idx;
if (snd_BUG_ON(!card || !kcontrol)) if (snd_BUG_ON(!card || !kcontrol))
return -EINVAL; return -EINVAL;
list_del(&kcontrol->list); list_del(&kcontrol->list);
card->controls_count -= kcontrol->count; card->controls_count -= kcontrol->count;
id = kcontrol->id; for (idx = 0; idx < kcontrol->count; idx++)
for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++) snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_REMOVE, kcontrol, idx);
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_REMOVE, &id);
snd_ctl_free_one(kcontrol); snd_ctl_free_one(kcontrol);
return 0; return 0;
} }
@ -584,11 +600,13 @@ int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
vd->access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE; vd->access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
} }
snd_ctl_build_ioff(id, kctl, index_offset); snd_ctl_build_ioff(id, kctl, index_offset);
ret = 1; downgrade_write(&card->controls_rwsem);
snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_INFO, kctl, index_offset);
up_read(&card->controls_rwsem);
return 1;
unlock: unlock:
up_write(&card->controls_rwsem); up_write(&card->controls_rwsem);
if (ret > 0)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_INFO, id);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(snd_ctl_activate_id); EXPORT_SYMBOL_GPL(snd_ctl_activate_id);
@ -1110,25 +1128,34 @@ static int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,
unsigned int index_offset; unsigned int index_offset;
int result; int result;
down_write(&card->controls_rwsem);
kctl = snd_ctl_find_id(card, &control->id); kctl = snd_ctl_find_id(card, &control->id);
if (kctl == NULL) if (kctl == NULL) {
up_write(&card->controls_rwsem);
return -ENOENT; return -ENOENT;
}
index_offset = snd_ctl_get_ioff(kctl, &control->id); index_offset = snd_ctl_get_ioff(kctl, &control->id);
vd = &kctl->vd[index_offset]; vd = &kctl->vd[index_offset];
if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_WRITE) || kctl->put == NULL || if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_WRITE) || kctl->put == NULL ||
(file && vd->owner && vd->owner != file)) { (file && vd->owner && vd->owner != file)) {
up_write(&card->controls_rwsem);
return -EPERM; return -EPERM;
} }
snd_ctl_build_ioff(&control->id, kctl, index_offset); snd_ctl_build_ioff(&control->id, kctl, index_offset);
result = kctl->put(kctl, control); result = kctl->put(kctl, control);
if (result < 0) if (result < 0) {
up_write(&card->controls_rwsem);
return result; return result;
}
if (result > 0) { if (result > 0) {
struct snd_ctl_elem_id id = control->id; downgrade_write(&card->controls_rwsem);
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &id); snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_VALUE, kctl, index_offset);
up_read(&card->controls_rwsem);
} else {
up_write(&card->controls_rwsem);
} }
return 0; return 0;
@ -1150,9 +1177,7 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
if (result < 0) if (result < 0)
goto error; goto error;
down_write(&card->controls_rwsem);
result = snd_ctl_elem_write(card, file, control); result = snd_ctl_elem_write(card, file, control);
up_write(&card->controls_rwsem);
if (result < 0) if (result < 0)
goto error; goto error;
@ -1301,7 +1326,6 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
{ {
struct user_element *ue = kctl->private_data; struct user_element *ue = kctl->private_data;
unsigned int *container; unsigned int *container;
struct snd_ctl_elem_id id;
unsigned int mask = 0; unsigned int mask = 0;
int i; int i;
int change; int change;
@ -1333,10 +1357,8 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
ue->tlv_data_size = size; ue->tlv_data_size = size;
mask |= SNDRV_CTL_EVENT_MASK_TLV; mask |= SNDRV_CTL_EVENT_MASK_TLV;
for (i = 0; i < kctl->count; ++i) { for (i = 0; i < kctl->count; ++i)
snd_ctl_build_ioff(&id, kctl, i); snd_ctl_notify_one(ue->card, mask, kctl, i);
snd_ctl_notify(ue->card, mask, &id);
}
return change; return change;
} }