leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: Use a define for the number of jack switch types

Browse Source 
This is intended to facilitate the merge of the two jack detection
mechanisms.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mark Brown 2012-02-07 19:48:47 +00:00 committed by Takashi Iwai
parent 62aa2b537c
commit 53803aead0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/jack.h
View File

@ -53,6 +53,9 @@ enum snd_jack_types {
SND_JACK_BTN_5 = 0x0200, SND_JACK_BTN_5 = 0x0200,
}; };
/* Keep in sync with definitions above */
#define SND_JACK_SWITCH_TYPES 6
struct snd_jack { struct snd_jack {
struct input_dev *input_dev; struct input_dev *input_dev;
int registered; int registered;

4
sound/core/jack.c
View File

@ -25,7 +25,7 @@
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/core.h> #include <sound/core.h>
static int jack_switch_types[] = { static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {
SW_HEADPHONE_INSERT, SW_HEADPHONE_INSERT,
SW_MICROPHONE_INSERT, SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT, SW_LINEOUT_INSERT,
@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
jack->type = type; jack->type = type;
for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)
if (type & (1 << i)) if (type & (1 << i))
input_set_capability(jack->input_dev, EV_SW, input_set_capability(jack->input_dev, EV_SW,
jack_switch_types[i]); jack_switch_types[i]);