On 01/28/2016 07:59 AM, Mauro Carvalho Chehab wrote: > Em Wed, 6 Jan 2016 13:26:50 -0700 > Shuah Khan <[email protected]> escreveu: > >> From: Mauro Carvalho Chehab <[email protected]> >> >> Declare the interface types to be used on alsa for the new >> G_TOPOLOGY ioctl. >> >> Signed-off-by: Mauro Carvalho Chehab <[email protected]> >> --- >> drivers/media/media-entity.c | 12 ++++++++++++ >> include/uapi/linux/media.h | 8 ++++++++ >> 2 files changed, 20 insertions(+) >> >> diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c >> index eb38bc3..6e02d19 100644 >> --- a/drivers/media/media-entity.c >> +++ b/drivers/media/media-entity.c >> @@ -65,6 +65,18 @@ static inline const char *intf_type(struct >> media_interface *intf) >> return "v4l2-subdev"; >> case MEDIA_INTF_T_V4L_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"; >> default: >> return "unknown-intf"; >> } >> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h >> index cacfceb..75cbe92 100644 >> --- a/include/uapi/linux/media.h >> +++ b/include/uapi/linux/media.h >> @@ -252,6 +252,7 @@ struct media_links_enum { >> >> #define MEDIA_INTF_T_DVB_BASE 0x00000100 >> #define MEDIA_INTF_T_V4L_BASE 0x00000200 >> +#define MEDIA_INTF_T_ALSA_BASE 0x00000300 >> >> /* Interface types */ >> >> @@ -267,6 +268,13 @@ struct media_links_enum { >> #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_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) > > Patch looks ok, but please document the new media interfaces at KernelDoc > documentation. >
Hi Takashi, If you are okay with these changes, could you please Ack this patch. I am addressing documentation comment from Mauro. thanks, -- Shuah >> + >> /* >> * MC next gen API definitions >> * -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
