Changeset 598 for GPL/trunk/alsa-kernel/include/sound/jack.h

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/jack.h (modified) (3 diffs)

GPL/trunk/alsa-kernel/include/sound/jack.h

@@ -43 +43 @@
         SND_JACK_VIDEOOUT       = 0x0010,
         SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+
+        /* Kept separate from switches to facilitate implementation */
+        SND_JACK_BTN_0          = 0x4000,
+        SND_JACK_BTN_1          = 0x2000,
+        SND_JACK_BTN_2          = 0x1000,
+        SND_JACK_BTN_3          = 0x0800,
+        SND_JACK_BTN_4          = 0x0400,
+        SND_JACK_BTN_5          = 0x0200,
 };
 
@@ -51 +59 @@
         const char *id;
         char name[100];
+        unsigned int key[6];   /* Keep in sync with definitions above */
         void *private_data;
         void (*private_free)(struct snd_jack *);
@@ -60 +69 @@
                  struct snd_jack **jack);
 void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
+int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
+                     int keytype);
 
 void snd_jack_report(struct snd_jack *jack, int status);