summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-10-18 17:27:50 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-10-18 17:27:50 +0200
commitd3d1216cbe72328a396ecc76f9edc7dda77601df (patch)
treeaf832f208af19f729d197664b635ab2a43ba96a9
parentac78d9b2a6ad59c839beee937580024a04b1f77e (diff)
downloadmediapointer-dvb-s2-d3d1216cbe72328a396ecc76f9edc7dda77601df.tar.gz
mediapointer-dvb-s2-d3d1216cbe72328a396ecc76f9edc7dda77601df.tar.bz2
v4l2-int-if: Define new power state changes
From: Sakari Ailus <sakari.ailus@nokia.com> Use enum v4l2_power instead of int as second argument to vidioc_int_s_power. The new functionality is that standby state is also recognised. Priority: normal Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/include/media/v4l2-int-device.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h
index cee941c39..3351dcffb 100644
--- a/linux/include/media/v4l2-int-device.h
+++ b/linux/include/media/v4l2-int-device.h
@@ -96,6 +96,12 @@ int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg);
*
*/
+enum v4l2_power {
+ V4L2_POWER_OFF = 0,
+ V4L2_POWER_ON,
+ V4L2_POWER_STANDBY,
+};
+
/* Slave interface type. */
enum v4l2_if_type {
/*
@@ -185,7 +191,7 @@ enum v4l2_int_ioctl_num {
vidioc_int_dev_init_num = 1000,
/* Delinitialise the device at slave detach. */
vidioc_int_dev_exit_num,
- /* Set device power state: 0 is off, non-zero is on. */
+ /* Set device power state. */
vidioc_int_s_power_num,
/*
* Get slave private data, e.g. platform-specific slave
@@ -277,7 +283,7 @@ V4L2_INT_WRAPPER_1(s_parm, struct v4l2_streamparm, *);
V4L2_INT_WRAPPER_0(dev_init);
V4L2_INT_WRAPPER_0(dev_exit);
-V4L2_INT_WRAPPER_1(s_power, int, );
+V4L2_INT_WRAPPER_1(s_power, enum v4l2_power, );
V4L2_INT_WRAPPER_1(g_priv, void, *);
V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);
V4L2_INT_WRAPPER_1(g_needs_reset, void, *);