Skip to contentSkip to conversation

ALSA: Add jack reporting API

PATCH New Mark Brown 1 participant 2 messages Jul 28, 2008 Sound

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 ALSA: Add jack reporting API

Currently very few systems provide information about jack status to user space, even though many have hardware facilities to do detection. Those systems that do use an input device with the existing SW_HEADPHONE_INSERT switch type to do so, often independently of ALSA.

This patch introduces a standard method for representing jacks to user space into ALSA. It allows drivers to register jacks for a sound card with the input subsystem, binding the input device to the card to help user space associate the input devices with their sound cards. The created input devices are named in the form "card longname jack" where jack is provided by the driver when allocating a jack. By default the parent for the input device is the sound card but this can be overridden by the card driver.

The existing user space API with SW_HEADPHONE_INSERT is preserved.

---
 include/sound/core.h |    1 +
 include/sound/jack.h |   75 +++++++++++++++++++++++
 sound/core/jack.c    |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 239 insertions(+), 0 deletions(-)
 create mode 100644 include/sound/jack.h
 create mode 100644 sound/core/jack.c
include/sound/core.h +1 -0
index 558b962..1a4ff0b 100644
@@ -63,6 +63,7 @@ typedef int __bitwise snd_device_type_t;
 #define	SNDRV_DEV_INFO		((__force snd_device_type_t) 0x1006)
 #define	SNDRV_DEV_BUS		((__force snd_device_type_t) 0x1007)
 #define	SNDRV_DEV_CODEC		((__force snd_device_type_t) 0x1008)
+#define	SNDRV_DEV_JACK          ((__force snd_device_type_t) 0x1009)
 #define	SNDRV_DEV_LOWLEVEL	((__force snd_device_type_t) 0x2000)
 
 typedef int __bitwise snd_device_state_t;
include/sound/jack.h new file +75 -0

75 lines not on this page · raw message

sound/core/jack.c new file +163 -0

163 lines not on this page · raw message

Signature · 1 line
1.5.4.3
author
#1 lore raw

PATCH 2/2 ALSA: Build jack detection

Since jack detection requires the input subsystem which may not be desired on small systems it is not built unless required by a driver that is being built. Drivers using jack detection should use a pattern like this:

config SND_FOO

        tristate "..."
        ...
        select SND_JACK if INPUT=y || INPUT=SND

to ensure that the jack detection API is enabled if the input subsystem is. If the input subsystem is not enabled then a stub version of the API is provided.

---
 sound/core/Kconfig  |    6 ++++++
 sound/core/Makefile |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
sound/core/Kconfig +6 -0
index 335d45e..9c4da1c 100644
@@ -12,6 +12,12 @@ config SND_HWDEP
 config SND_RAWMIDI
 	tristate
 
+# To be effective this also requires INPUT - users should say:
+#    select SND_JACK if INPUT=y || INPUT=SND
+# to avoid having to force INPUT on.
+config SND_JACK
+	bool
+
 config SND_SEQUENCER
 	tristate "Sequencer support"
 	select SND_TIMER
sound/core/Makefile +1 -0
index da8e685..d57125a 100644
@@ -7,6 +7,7 @@ snd-y     := sound.o init.o memory.o info.o control.o misc.o device.o
 snd-$(CONFIG_ISA_DMA_API) += isadma.o
 snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
 snd-$(CONFIG_SND_VMASTER) += vmaster.o
+snd-$(CONFIG_SND_JACK)	  += jack.o
 
 snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
 		pcm_memory.o
Signature · 1 line
1.5.4.3