hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Add jack pointer and unsolicited event bits to callback 

For allowing the callee to evaluate the associated jack information
and the unsolicited event data, add the new fields to
hda_jack_callback.  They can be used, for example, to retrieve the
headset button state in the callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-11-28 14:17:58 +01:00
parent 2bff7e97eb
commit e6ce180fa6
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/hda/hda_jack.c
View File

@ -508,19 +508,25 @@ int snd_hda_jack_add_kctls(struct hda_codec *codec,
} }
EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctls); EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctls);
static void call_jack_callback(struct hda_codec *codec, static void call_jack_callback(struct hda_codec *codec, unsigned int res,
struct hda_jack_tbl *jack) struct hda_jack_tbl *jack)
{ {
struct hda_jack_callback *cb; struct hda_jack_callback *cb;
for (cb = jack->callback; cb; cb = cb->next) for (cb = jack->callback; cb; cb = cb->next) {
cb->jack = jack;
cb->unsol_res = res;
cb->func(codec, cb); cb->func(codec, cb);
}
if (jack->gated_jack) { if (jack->gated_jack) {
struct hda_jack_tbl *gated = struct hda_jack_tbl *gated =
snd_hda_jack_tbl_get(codec, jack->gated_jack); snd_hda_jack_tbl_get(codec, jack->gated_jack);
if (gated) { if (gated) {
for (cb = gated->callback; cb; cb = cb->next) for (cb = gated->callback; cb; cb = cb->next) {
cb->jack = gated;
cb->unsol_res = res;
cb->func(codec, cb); cb->func(codec, cb);
}
} }
} }
} }
@ -540,7 +546,7 @@ void snd_hda_jack_unsol_event(struct hda_codec *codec, unsigned int res)
return; return;
event->jack_dirty = 1; event->jack_dirty = 1;
call_jack_callback(codec, event); call_jack_callback(codec, res, event);
snd_hda_jack_report_sync(codec); snd_hda_jack_report_sync(codec);
} }
EXPORT_SYMBOL_GPL(snd_hda_jack_unsol_event); EXPORT_SYMBOL_GPL(snd_hda_jack_unsol_event);
@ -566,7 +572,7 @@ void snd_hda_jack_poll_all(struct hda_codec *codec)
if (old_sense == get_jack_plug_state(jack->pin_sense)) if (old_sense == get_jack_plug_state(jack->pin_sense))
continue; continue;
changes = 1; changes = 1;
call_jack_callback(codec, jack); call_jack_callback(codec, 0, jack);
} }
if (changes) if (changes)
snd_hda_jack_report_sync(codec); snd_hda_jack_report_sync(codec);

2
sound/pci/hda/hda_jack.h
View File

@ -24,6 +24,8 @@ struct hda_jack_callback {
hda_nid_t nid; hda_nid_t nid;
hda_jack_callback_fn func; hda_jack_callback_fn func;
unsigned int private_data; /* arbitrary data */ unsigned int private_data; /* arbitrary data */
unsigned int unsol_res; /* unsolicited event bits */
struct hda_jack_tbl *jack; /* associated jack entry */
struct hda_jack_callback *next; struct hda_jack_callback *next;
}; };