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

[media] uapi/media.h: Declare interface types for ALSA

Browse Source 
Declare the interface types to be used on alsa for
the new G_TOPOLOGY ioctl.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Shuah Khan 2016-02-11 21:41:18 -02:00 committed by Mauro Carvalho Chehab
parent ecd353a3b2
commit 5af557a6d2
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/media-entity.c
View File

@ -65,6 +65,22 @@ static inline const char *intf_type(struct media_interface *intf)
return "v4l2-subdev"; return "v4l2-subdev";
case MEDIA_INTF_T_V4L_SWRADIO: case MEDIA_INTF_T_V4L_SWRADIO:
return "swradio"; return "swradio";
case MEDIA_INTF_T_ALSA_PCM_CAPTURE:
return "pcm-capture";
case MEDIA_INTF_T_ALSA_PCM_PLAYBACK:
return "pcm-playback";
case MEDIA_INTF_T_ALSA_CONTROL:
return "alsa-control";
case MEDIA_INTF_T_ALSA_COMPRESS:
return "compress";
case MEDIA_INTF_T_ALSA_RAWMIDI:
return "rawmidi";
case MEDIA_INTF_T_ALSA_HWDEP:
return "hwdep";
case MEDIA_INTF_T_ALSA_SEQUENCER:
return "sequencer";
case MEDIA_INTF_T_ALSA_TIMER:
return "timer";
default: default:
return "unknown-intf"; return "unknown-intf";
} }

10
include/uapi/linux/media.h
View File

@ -263,6 +263,7 @@ struct media_links_enum {
#define MEDIA_INTF_T_DVB_BASE 0x00000100 #define MEDIA_INTF_T_DVB_BASE 0x00000100
#define MEDIA_INTF_T_V4L_BASE 0x00000200 #define MEDIA_INTF_T_V4L_BASE 0x00000200
#define MEDIA_INTF_T_ALSA_BASE 0x00000300
/* Interface types */ /* Interface types */
@ -278,6 +279,15 @@ struct media_links_enum {
#define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3) #define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3)
#define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4) #define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)
#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)
#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6)
#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7)
/* /*
* MC next gen API definitions * MC next gen API definitions
* *