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>

diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index c499727920e61c1ac28fb8981000c4963e151745..87498235787a238de0d18db019603e0a3207a7e1 100644 (file)
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -508,19 +508,25 @@ int snd_hda_jack_add_kctls(struct hda_codec *codec,
 }
 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_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);
+       }
        if (jack->gated_jack) {
                struct hda_jack_tbl *gated =
                        snd_hda_jack_tbl_get(codec, jack->gated_jack);
                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);
+                       }
                }
        }
 }
@@ -540,7 +546,7 @@ void snd_hda_jack_unsol_event(struct hda_codec *codec, unsigned int res)
                return;
        event->jack_dirty = 1;
 
-       call_jack_callback(codec, event);
+       call_jack_callback(codec, res, event);
        snd_hda_jack_report_sync(codec);
 }
 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))
                        continue;
                changes = 1;
-               call_jack_callback(codec, jack);
+               call_jack_callback(codec, 0, jack);
        }
        if (changes)
                snd_hda_jack_report_sync(codec);

diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
index e9814c0168ea5d77da2922454ed4256d7ad2a30a..695a652cc6b36229bb51c51cbf002374ba5bb215 100644 (file)
--- a/sound/pci/hda/hda_jack.h
+++ b/sound/pci/hda/hda_jack.h
@@ -24,6 +24,8 @@ struct hda_jack_callback {
        hda_nid_t nid;
        hda_jack_callback_fn func;
        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;
 };