summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <ext-jani.1.nikula@nokia.com>2009-01-07 11:54:25 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-07 10:55:18 +0000
commitd506fc322ec2af04fc47be83d796a1c9e1a16022 (patch)
tree5cff203f7a30d76df16a27c10bf43990586925c4
parentbd8a71a7b0f50da9350d202d325c3926ffd6b189 (diff)
ALSA: Add support for video out to the jack reporting API
Add support for reporting new jack types SND_JACK_VIDEOOUT and SND_JACK_AVOUT (a combination of LINEOUT and VIDEOOUT) to the jack reporting API. Also add the corresponding SW_VIDEOOUT_INSERT switch to the input system header. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/linux/input.h1
-rw-r--r--include/sound/jack.h2
-rw-r--r--sound/core/jack.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 9a6355f74db2..adc13322d1d2 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -661,6 +661,7 @@ struct input_absinfo {
#define SW_DOCK 0x05 /* set = plugged into dock */
#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */
+#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 85266a2f5c6f..6b013c6f6a04 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -40,6 +40,8 @@ enum snd_jack_types {
SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
SND_JACK_LINEOUT = 0x0004,
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
+ SND_JACK_VIDEOOUT = 0x0010,
+ SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
};
struct snd_jack {
diff --git a/sound/core/jack.c b/sound/core/jack.c
index b2da10c9916a..43b10d6e522b 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -28,6 +28,7 @@ static int jack_types[] = {
SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT,
SW_JACK_PHYSICAL_INSERT,
+ SW_VIDEOOUT_INSERT,
};
static int snd_jack_dev_free(struct snd_device *device)