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

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

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

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

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_JACK_H
 #define __SOUND_JACK_H
@@ -6 +7 @@
  *
  *  Copyright 2008 Wolfson Microelectronics plc
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
@@ -29 +14 @@
 
 /**
- * Jack types which can be reported.  These values are used as a
- * bitmask.
+ * enum snd_jack_types - Jack types which can be reported
+ * @SND_JACK_HEADPHONE: Headphone
+ * @SND_JACK_MICROPHONE: Microphone
+ * @SND_JACK_HEADSET: Headset
+ * @SND_JACK_LINEOUT: Line out
+ * @SND_JACK_MECHANICAL: Mechanical switch
+ * @SND_JACK_VIDEOOUT: Video out
+ * @SND_JACK_AVOUT: AV (Audio Video) out
+ * @SND_JACK_LINEIN:  Line in
+ * @SND_JACK_BTN_0: Button 0
+ * @SND_JACK_BTN_1: Button 1
+ * @SND_JACK_BTN_2: Button 2
+ * @SND_JACK_BTN_3: Button 3
+ * @SND_JACK_BTN_4: Button 4
+ * @SND_JACK_BTN_5: Button 5
+ *
+ * These values are used as a bitmask.
  *
  * Note that this must be kept in sync with the lookup table in
@@ -43 +43 @@
         SND_JACK_VIDEOOUT       = 0x0010,
         SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+        SND_JACK_LINEIN         = 0x0020,
 
         /* Kept separate from switches to facilitate implementation */
@@ -53 +54 @@
 };
 
+/* Keep in sync with definitions above */
+#define SND_JACK_SWITCH_TYPES 6
+
 struct snd_jack {
+        struct list_head kctl_list;
+        struct snd_card *card;
+        const char *id;
+#ifdef CONFIG_SND_JACK_INPUT_DEV
         struct input_dev *input_dev;
         int registered;
         int type;
-        const char *id;
         char name[100];
         unsigned int key[6];   /* Keep in sync with definitions above */
+#endif /* CONFIG_SND_JACK_INPUT_DEV */
         void *private_data;
         void (*private_free)(struct snd_jack *);
@@ -67 +75 @@
 
 int snd_jack_new(struct snd_card *card, const char *id, int type,
-                 struct snd_jack **jack);
+                 struct snd_jack **jack, bool initial_kctl, bool phantom_jack);
+int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);
+#ifdef CONFIG_SND_JACK_INPUT_DEV
 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);
-
+#endif
 void snd_jack_report(struct snd_jack *jack, int status);
 
 #else
-
 static inline int snd_jack_new(struct snd_card *card, const char *id, int type,
-                               struct snd_jack **jack)
+                               struct snd_jack **jack, bool initial_kctl, bool phantom_jack)
 {
         return 0;
 }
 
-static inline void snd_jack_set_parent(struct snd_jack *jack,
-                                       struct device *parent)
+static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask)
 {
+        return 0;
 }
 
@@ -93 +102 @@
 #endif
 
+#if !defined(CONFIG_SND_JACK) || !defined(CONFIG_SND_JACK_INPUT_DEV)
+static inline void snd_jack_set_parent(struct snd_jack *jack,
+                                       struct device *parent)
+{
+}
+
+static inline int snd_jack_set_key(struct snd_jack *jack,
+                                   enum snd_jack_types type,
+                                   int keytype)
+{
+        return 0;
+}
+#endif /* !CONFIG_SND_JACK || !CONFIG_SND_JACK_INPUT_DEV */
+
 #endif