[PATCH v7 13/44] [media] uapi/media.h: Declare interface types
Subsystems:
media controller framework , media input infrastructure (v4l/dvb) , the rest
4028d
Revision v7 of 2 in this series.
4 messages,
3 authors,
2015-08-26 · open the first message on its own page
Declare the interface types that will be used by the new
G_TOPOLOGY ioctl that will be defined latter on.
For now, we need those types, as they'll be used on the
internal structs associated with the new media_interface
graph object defined on the next patch.
Signed-off-by: Mauro Carvalho Chehab <redacted>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 4e816be3de39..21c96cd7a6ae 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h @@ -167,6 +167,35 @@ struct media_links_enum {
__u32 reserved [ 4 ];
};
+ /* Interface type ranges */ + + #define MEDIA_INTF_T_DVB_BASE 0x00000000 + #define MEDIA_INTF_T_V4L_BASE 0x00000100 + #define MEDIA_INTF_T_ALSA_BASE 0x00000200 + + /* Interface types */ + + #define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE) + #define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1) + #define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2) + #define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3) + #define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4) + + #define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE) + #define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1) + #define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2) + #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)
#define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)
#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) --
2.4.3
On 08/23/2015 10:17 PM, Mauro Carvalho Chehab wrote: quoted hunk Declare the interface types that will be used by the new
G_TOPOLOGY ioctl that will be defined latter on.
For now, we need those types, as they'll be used on the
internal structs associated with the new media_interface
graph object defined on the next patch.
Signed-off-by: Mauro Carvalho Chehab <redacted>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 4e816be3de39..21c96cd7a6ae 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h @@ -167,6 +167,35 @@ struct media_links_enum {
__u32 reserved [ 4 ];
};
+ /* Interface type ranges */ + + #define MEDIA_INTF_T_DVB_BASE 0x00000000 + #define MEDIA_INTF_T_V4L_BASE 0x00000100 + #define MEDIA_INTF_T_ALSA_BASE 0x00000200
I would avoid BASE 0 and start with 0x100 for DVB (so ALSA gets 0x300).
This ensures that type is never 0 which is often useful since it catches
cases where userspace just memsets to 0 and never fills in the type. Or
it can be used in the future as an ERROR or UNKNOWN type or something.
Since there is nothing that requires type to be 0 I would avoid it
altogether.
After making this small change:
Acked-by: Hans Verkuil <redacted>
Regards,
Hans
+
+/* Interface types */
+
+#define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE)
+#define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1)
+#define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2)
+#define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3)
+#define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4)
+
+#define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE)
+#define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1)
+#define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2)
+#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)
#define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)
#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum)
On Sun, Aug 23, 2015 at 2:17 PM, Mauro Carvalho Chehab
[off-list ref] wrote: quoted hunk Declare the interface types that will be used by the new
G_TOPOLOGY ioctl that will be defined latter on.
For now, we need those types, as they'll be used on the
internal structs associated with the new media_interface
graph object defined on the next patch.
Signed-off-by: Mauro Carvalho Chehab <redacted>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 4e816be3de39..21c96cd7a6ae 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h @@ -167,6 +167,35 @@ struct media_links_enum {
__u32 reserved [ 4 ];
};
+ /* Interface type ranges */ + + #define MEDIA_INTF_T_DVB_BASE 0x00000000 + #define MEDIA_INTF_T_V4L_BASE 0x00000100 + #define MEDIA_INTF_T_ALSA_BASE 0x00000200 + + /* Interface types */ + + #define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE) + #define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1) + #define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2) + #define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3) + #define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4) + + #define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE) + #define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1) + #define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2) + #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)
Is it necessary to add ALSA types at this time without ALSA media
controller work?
Can these be added later when ALSA work is done.
thanks,
-- Shuah
Em Tue, 25 Aug 2015 14:34:46 -0600
Shuah Khan [off-list ref] escreveu:
On Sun, Aug 23, 2015 at 2:17 PM, Mauro Carvalho Chehab
[off-list ref] wrote: quoted Declare the interface types that will be used by the new
G_TOPOLOGY ioctl that will be defined latter on.
For now, we need those types, as they'll be used on the
internal structs associated with the new media_interface
graph object defined on the next patch.
Signed-off-by: Mauro Carvalho Chehab <redacted>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 4e816be3de39..21c96cd7a6ae 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h @@ -167,6 +167,35 @@ struct media_links_enum {
__u32 reserved [ 4 ];
};
+ /* Interface type ranges */ + + #define MEDIA_INTF_T_DVB_BASE 0x00000000 + #define MEDIA_INTF_T_V4L_BASE 0x00000100 + #define MEDIA_INTF_T_ALSA_BASE 0x00000200 + + /* Interface types */ + + #define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE) + #define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1) + #define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2) + #define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3) + #define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4) + + #define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE) + #define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1) + #define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2) + #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)
Is it necessary to add ALSA types at this time without ALSA media
controller work?
Can these be added later when ALSA work is done.
Sure. I'll remove those on the next spin.
thanks,
-- Shuah