Skip to contentSkip to conversation

ALSA jack updates for 2.6.30

PATCH In review Mark Brown 2 participants 4 messages Jan 7, 2009

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

cover ALSA jack updates for 2.6.30

The following changes since commit 6a94cb73064c952255336cc57731904174b2c58f:
Linus Torvalds (1):
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git topic/jack-core

Jani Nikula (1):
ALSA: Add support for video out to the jack reporting API

Mark Brown (1):
ALSA: Reduce boilerplate for new jack types

 include/linux/input.h |    1 +
 include/sound/jack.h  |    5 +++++
 sound/core/jack.c     |   45 +++++++++++++++++++++------------------------
 3 files changed, 27 insertions(+), 24 deletions(-)
author
#1 lore raw

PATCH 1/2 ALSA: Reduce boilerplate for new jack types

Use a lookup table rather than explicit code to map input subsystem jack types into ASoC ones, implemented as suggested by Takashi Iwai.

---
 include/sound/jack.h |    3 +++
 sound/core/jack.c    |   44 ++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)
include/sound/jack.h +3 -0
index 2e0315c..85266a2 100644
@@ -30,6 +30,9 @@ struct input_dev;
 /**
  * Jack types which can be reported.  These values are used as a
  * bitmask.
+ *
+ * Note that this must be kept in sync with the lookup table in
+ * sound/core/jack.c.
  */
 enum snd_jack_types {
 	SND_JACK_HEADPHONE	= 0x0001,
sound/core/jack.c +20 -24

71 lines not on this page · raw message

Signature · 1 line
1.5.6.3
author
#2 lore raw

PATCH 2/2 ALSA: Add support for video out to the jack reporting API

From: Jani Nikula <[email protected]>

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.

---
 include/linux/input.h |    1 +
 include/sound/jack.h  |    2 ++
 sound/core/jack.c     |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)
include/linux/input.h +1 -0
index 9a6355f..adc1332 100644
@@ -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)
 
include/sound/jack.h +2 -0
index 85266a2..6b013c6 100644
@@ -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 {
sound/core/jack.c +1 -0
index b2da10c..43b10d6 100644
@@ -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)
Signature · 1 line
1.5.6.3
#3 lore raw
In reply to Mark Brown

At Wed, 7 Jan 2009 20:11:34 +0000,

Quoted 8 lines · Mark Brown

The following changes since commit 6a94cb73064c952255336cc57731904174b2c58f:
Linus Torvalds (1):
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git topic/jack-core

Thanks, pulled now onto next/jack branch and merged to master branch.

Takashi