aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 14:52:51 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 14:52:51 -0300
commit93125094c07d8c9ec25dff5869f191b33eb9dd6e (patch)
treeddb760a612ee0633681543d0ccf38a03e361c95a
parent58402b6e98f9059420e64b296db6c4cb6f6c1117 (diff)
[media] media.h: postpone connectors entities
The representation of external connections got some heated discussions recently. As we're too close to the merge window, let's not set those entities into a stone. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--include/uapi/linux/media.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 13e19a18f97f..323f1af35062 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -82,10 +82,18 @@ struct media_device_info {
* Connectors
*/
/* It is a responsibility of the entity drivers to add connectors and links */
+#ifdef __KERNEL__
+ /*
+ * For now, it should not be used in userspace, as some
+ * definitions may change
+ */
+
#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001)
#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002)
#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003)
+#endif
+
/*
* Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
* MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility

Privacy Policy