Hi Mauro,
On Mon, Oct 12, 2015 at 01:43:04PM -0300, Mauro Carvalho Chehab wrote:
Declare the interface types to be used on alsa for the new G_TOPOLOGY ioctl.
Change-Id: I0e8f893a64cdcc058523eea340b9edabc6b5ef33 Signed-off-by: Mauro Carvalho Chehab mchehab@osg.samsung.com
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 dc679dfe8ade..27fce6224972 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -74,6 +74,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";diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 3ad3d6be293f..aca828709bad 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -171,6 +171,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 */
@@ -186,6 +187,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)
/* TBD: declare the structs needed for the new G_TOPOLOGY ioctl */
#define MEDIA_IOC_DEVICE_INFO _IOWR('|', 0x00, struct media_device_info)
Perhaps an entirely silly question, but do we have an ack for these from the ALSA folks?
I remember the last time we didn't. :-) Albeit these look more plausible this time, but back then I didn't know much ALSA either.