From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
The is_media_entity_v4l2_io() function should be renamed to
is_media_entity_v4l2_video_device.
Add a is_media_entity_v4l2_io to v4l2-common.h (since this is V4L2 specific)
that checks if the entity is a video_device AND if it does I/O.
Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---
include/media/media-entity.h | 4 ++--
include/media/v4l2-common.h | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index cbd3753..e5108f0 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -356,14 +356,14 @@ static inline u32 media_gobj_gen_id(enum media_gobj_type type, u64 local_id)
}
/**
- * is_media_entity_v4l2_io() - Check if the entity is a video_device
+ * is_media_entity_v4l2_video_device() - Check if the entity is a video_device
* @entity: pointer to entity
*
* Return: true if the entity is an instance of a video_device object and can
* safely be cast to a struct video_device using the container_of() macro, or
* false otherwise.
*/
-static inline bool is_media_entity_v4l2_io(struct media_entity *entity)
+static inline bool is_media_entity_v4l2_video_device(struct media_entity *entity)
{
return entity && entity->type == MEDIA_ENTITY_TYPE_VIDEO_DEVICE;
}
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 1cc0c5b..858b165 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -189,4 +189,32 @@ const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
void v4l2_get_timestamp(struct timeval *tv);
+#ifdef CONFIG_MEDIA_CONTROLLER
+/**
+ * is_media_entity_v4l2_io() - Check if the entity is a video_device and can do I/O
+ * @entity: pointer to entity
+ *
+ * Return: true if the entity is an instance of a video_device object and can
+ * safely be cast to a struct video_device using the container_of() macro and
+ * can do I/O, or false otherwise.
+ */
+static inline bool is_media_entity_v4l2_io(struct media_entity *entity)
+{
+ struct video_device *vdev;
+
+ if (!is_media_entity_v4l2_video_device(entity))
+ return false;
+ vdev = container_of(entity, struct video_device, entity);
+ /*
+ * For now assume that is device_caps == 0, then I/O is available
+ * unless it is a radio device.
+ * Eventually all drivers should set vdev->device_caps and then
+ * this assumption should be removed.
+ */
+ if (vdev->device_caps == 0)
+ return vdev->vfl_type != VFL_TYPE_RADIO;
+ return vdev->device_caps & (V4L2_CAP_READWRITE | V4L2_CAP_STREAMING);
+}
+#endif
+
#endif /* V4L2_COMMON_H_ */
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
