Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eafc959 authored by Omair Mohammed Abdullah's avatar Omair Mohammed Abdullah Committed by Takashi Iwai
Browse files

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: default avatarOmair Mohammed Abdullah <omair.m.abdullah@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Reviewed-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 57bd9b8d

include/sound/core.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ typedef int __bitwise snd_device_type_t; 
#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_COMPRESS	((__force snd_device_type_t) 0x100A)

#define	SNDRV_DEV_LOWLEVEL	((__force snd_device_type_t) 0x2000)



typedef int __bitwise snd_device_state_t;

include/sound/minors.h

+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define SNDRV_MINOR_TIMER		33	/* SNDRV_MINOR_GLOBAL + 1 * 32 */



#ifndef CONFIG_SND_DYNAMIC_MINORS

						/* 2 - 3 (reserved) */

#define SNDRV_MINOR_COMPRESS		2	/* 2 - 3 */

#define SNDRV_MINOR_HWDEP		4	/* 4 - 7 */

#define SNDRV_MINOR_RAWMIDI		8	/* 8 - 15 */

#define SNDRV_MINOR_PCM_PLAYBACK	16	/* 16 - 23 */
@@ -49,6 +49,7 @@ 
#define SNDRV_DEVICE_TYPE_PCM_CAPTURE	SNDRV_MINOR_PCM_CAPTURE

#define SNDRV_DEVICE_TYPE_SEQUENCER	SNDRV_MINOR_SEQUENCER

#define SNDRV_DEVICE_TYPE_TIMER		SNDRV_MINOR_TIMER

#define SNDRV_DEVICE_TYPE_COMPRESS	SNDRV_MINOR_COMPRESS



#else /* CONFIG_SND_DYNAMIC_MINORS */
@@ -60,6 +61,7 @@ enum { 
	SNDRV_DEVICE_TYPE_RAWMIDI,

	SNDRV_DEVICE_TYPE_PCM_PLAYBACK,

	SNDRV_DEVICE_TYPE_PCM_CAPTURE,

	SNDRV_DEVICE_TYPE_COMPRESS,

};



#endif /* CONFIG_SND_DYNAMIC_MINORS */

sound/core/sound.c

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev) 
	case SNDRV_DEVICE_TYPE_RAWMIDI:

	case SNDRV_DEVICE_TYPE_PCM_PLAYBACK:

	case SNDRV_DEVICE_TYPE_PCM_CAPTURE:

	case SNDRV_DEVICE_TYPE_COMPRESS:

		if (snd_BUG_ON(!card))

			return -EINVAL;

		minor = SNDRV_MINOR(card->number, type + dev);