diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:52:51 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:52:51 -0500 |
| commit | 93125094c07d8c9ec25dff5869f191b33eb9dd6e (patch) | |
| tree | ddb760a612ee0633681543d0ccf38a03e361c95a | |
| parent | 58402b6e98f9059420e64b296db6c4cb6f6c1117 (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.h | 8 |
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 { | |||
| 82 | * Connectors | 82 | * Connectors |
| 83 | */ | 83 | */ |
| 84 | /* It is a responsibility of the entity drivers to add connectors and links */ | 84 | /* It is a responsibility of the entity drivers to add connectors and links */ |
| 85 | #ifdef __KERNEL__ | ||
| 86 | /* | ||
| 87 | * For now, it should not be used in userspace, as some | ||
| 88 | * definitions may change | ||
| 89 | */ | ||
| 90 | |||
| 85 | #define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001) | 91 | #define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001) |
| 86 | #define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002) | 92 | #define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002) |
| 87 | #define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003) | 93 | #define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003) |
| 88 | 94 | ||
| 95 | #endif | ||
| 96 | |||
| 89 | /* | 97 | /* |
| 90 | * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and | 98 | * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and |
| 91 | * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility | 99 | * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility |
