Commit e377d3e9 authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab
Browse files

media: media.h: Enable ALSA MEDIA_INTF_T* interface types 



Move PCM_CAPTURE, PCM_PLAYBACK, and CONTROL ALSA MEDIA_INTF_T* interface
types back into __KERNEL__ scope to get ready for adding ALSA support for
these to the media controller.

Signed-off-by: default avatarShuah Khan <shuah@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 812658d8

include/uapi/linux/media.h

+15 −10
Original line number Diff line number Diff line
@@ -262,6 +262,11 @@ struct media_links_enum { 
#define MEDIA_INTF_T_V4L_SWRADIO		(MEDIA_INTF_T_V4L_BASE + 4)

#define MEDIA_INTF_T_V4L_TOUCH			(MEDIA_INTF_T_V4L_BASE + 5)



#define MEDIA_INTF_T_ALSA_BASE			0x00000300

#define MEDIA_INTF_T_ALSA_PCM_CAPTURE		(MEDIA_INTF_T_ALSA_BASE)

#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK		(MEDIA_INTF_T_ALSA_BASE + 1)

#define MEDIA_INTF_T_ALSA_CONTROL		(MEDIA_INTF_T_ALSA_BASE + 2)



#if defined(__KERNEL__)



/*
@@ -413,14 +418,14 @@ struct media_v2_topology { 
#define MEDIA_ENT_F_DTV_DECODER			MEDIA_ENT_F_DV_DECODER



/*

 * There is still no ALSA support in the media controller. These

 * There is still no full ALSA support in the media controller. These

 * defines should not have been added and we leave them here only

 * in case some application tries to use these defines.

 *

 * The ALSA defines that are in use have been moved into __KERNEL__

 * scope. As support gets added to these interface types, they should

 * be moved into __KERNEL__ scope with the code that uses them.

 */

#define MEDIA_INTF_T_ALSA_BASE			0x00000300

#define MEDIA_INTF_T_ALSA_PCM_CAPTURE		(MEDIA_INTF_T_ALSA_BASE)

#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK		(MEDIA_INTF_T_ALSA_BASE + 1)

#define MEDIA_INTF_T_ALSA_CONTROL		(MEDIA_INTF_T_ALSA_BASE + 2)

#define MEDIA_INTF_T_ALSA_COMPRESS             (MEDIA_INTF_T_ALSA_BASE + 3)

#define MEDIA_INTF_T_ALSA_RAWMIDI              (MEDIA_INTF_T_ALSA_BASE + 4)

#define MEDIA_INTF_T_ALSA_HWDEP                (MEDIA_INTF_T_ALSA_BASE + 5)