summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@nokia.com>2008-10-18 12:27:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 14:31:17 -0200
commit84389910d0f760cea22a5e58ee16b3b9713d456d (patch)
tree950c760bad38d153161d1c093f136e3e2076cd24 /include/media
parent733d710b09748a79f70cbb58547d036d28ec566e (diff)
downloadtalos-obmc-linux-84389910d0f760cea22a5e58ee16b3b9713d456d.tar.gz
talos-obmc-linux-84389910d0f760cea22a5e58ee16b3b9713d456d.zip
V4L/DVB (9321): v4l2-int-if: Define new power state changes
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. Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-int-device.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index cee941c39aa2..3351dcffb465 100644
--- a/include/media/v4l2-int-device.h
+++ b/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, *);
OpenPOWER on IntegriCloud