diff options
author | Omair Mohammed Abdullah <omair.m.abdullah@intel.com> | 2011-12-23 00:06:36 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-12-23 04:07:46 -0500 |
commit | 3eafc959b32f71d3fe6b27c9eae7495a23acfc3a (patch) | |
tree | e2795eaae508fdb0dc69d95cb265005c4dcb94c4 /include/sound | |
parent | 57bd9b8ddd434111918d3f7cb0b4297cd77f1b5b (diff) |
ALSA: core: add support for compressed devices
Use the minor numbers 2 and 3 for audio compressed offload devices.
Also add support for these devices in core
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/core.h | 1 | ||||
-rw-r--r-- | include/sound/minors.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 3be5ab782b99..5ab255f196cc 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -62,6 +62,7 @@ typedef int __bitwise snd_device_type_t; | |||
62 | #define SNDRV_DEV_BUS ((__force snd_device_type_t) 0x1007) | 62 | #define SNDRV_DEV_BUS ((__force snd_device_type_t) 0x1007) |
63 | #define SNDRV_DEV_CODEC ((__force snd_device_type_t) 0x1008) | 63 | #define SNDRV_DEV_CODEC ((__force snd_device_type_t) 0x1008) |
64 | #define SNDRV_DEV_JACK ((__force snd_device_type_t) 0x1009) | 64 | #define SNDRV_DEV_JACK ((__force snd_device_type_t) 0x1009) |
65 | #define SNDRV_DEV_COMPRESS ((__force snd_device_type_t) 0x100A) | ||
65 | #define SNDRV_DEV_LOWLEVEL ((__force snd_device_type_t) 0x2000) | 66 | #define SNDRV_DEV_LOWLEVEL ((__force snd_device_type_t) 0x2000) |
66 | 67 | ||
67 | typedef int __bitwise snd_device_state_t; | 68 | typedef int __bitwise snd_device_state_t; |
diff --git a/include/sound/minors.h b/include/sound/minors.h index 8f764204a856..5978f9a8c8b2 100644 --- a/include/sound/minors.h +++ b/include/sound/minors.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #define SNDRV_MINOR_TIMER 33 /* SNDRV_MINOR_GLOBAL + 1 * 32 */ | 35 | #define SNDRV_MINOR_TIMER 33 /* SNDRV_MINOR_GLOBAL + 1 * 32 */ |
36 | 36 | ||
37 | #ifndef CONFIG_SND_DYNAMIC_MINORS | 37 | #ifndef CONFIG_SND_DYNAMIC_MINORS |
38 | /* 2 - 3 (reserved) */ | 38 | #define SNDRV_MINOR_COMPRESS 2 /* 2 - 3 */ |
39 | #define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */ | 39 | #define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */ |
40 | #define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */ | 40 | #define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */ |
41 | #define SNDRV_MINOR_PCM_PLAYBACK 16 /* 16 - 23 */ | 41 | #define SNDRV_MINOR_PCM_PLAYBACK 16 /* 16 - 23 */ |
@@ -49,6 +49,7 @@ | |||
49 | #define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE | 49 | #define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE |
50 | #define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER | 50 | #define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER |
51 | #define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER | 51 | #define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER |
52 | #define SNDRV_DEVICE_TYPE_COMPRESS SNDRV_MINOR_COMPRESS | ||
52 | 53 | ||
53 | #else /* CONFIG_SND_DYNAMIC_MINORS */ | 54 | #else /* CONFIG_SND_DYNAMIC_MINORS */ |
54 | 55 | ||
@@ -60,6 +61,7 @@ enum { | |||
60 | SNDRV_DEVICE_TYPE_RAWMIDI, | 61 | SNDRV_DEVICE_TYPE_RAWMIDI, |
61 | SNDRV_DEVICE_TYPE_PCM_PLAYBACK, | 62 | SNDRV_DEVICE_TYPE_PCM_PLAYBACK, |
62 | SNDRV_DEVICE_TYPE_PCM_CAPTURE, | 63 | SNDRV_DEVICE_TYPE_PCM_CAPTURE, |
64 | SNDRV_DEVICE_TYPE_COMPRESS, | ||
63 | }; | 65 | }; |
64 | 66 | ||
65 | #endif /* CONFIG_SND_DYNAMIC_MINORS */ | 67 | #endif /* CONFIG_SND_DYNAMIC_MINORS */ |