aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@nokia.com>2008-10-18 11:27:50 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:31:17 -0400
commit84389910d0f760cea22a5e58ee16b3b9713d456d (patch)
tree950c760bad38d153161d1c093f136e3e2076cd24 /include/media
parent733d710b09748a79f70cbb58547d036d28ec566e (diff)
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);
96 * 96 *
97 */ 97 */
98 98
99enum v4l2_power {
100 V4L2_POWER_OFF = 0,
101 V4L2_POWER_ON,
102 V4L2_POWER_STANDBY,
103};
104
99/* Slave interface type. */ 105/* Slave interface type. */
100enum v4l2_if_type { 106enum v4l2_if_type {
101 /* 107 /*
@@ -185,7 +191,7 @@ enum v4l2_int_ioctl_num {
185 vidioc_int_dev_init_num = 1000, 191 vidioc_int_dev_init_num = 1000,
186 /* Delinitialise the device at slave detach. */ 192 /* Delinitialise the device at slave detach. */
187 vidioc_int_dev_exit_num, 193 vidioc_int_dev_exit_num,
188 /* Set device power state: 0 is off, non-zero is on. */ 194 /* Set device power state. */
189 vidioc_int_s_power_num, 195 vidioc_int_s_power_num,
190 /* 196 /*
191 * Get slave private data, e.g. platform-specific slave 197 * Get slave private data, e.g. platform-specific slave
@@ -277,7 +283,7 @@ V4L2_INT_WRAPPER_1(s_parm, struct v4l2_streamparm, *);
277 283
278V4L2_INT_WRAPPER_0(dev_init); 284V4L2_INT_WRAPPER_0(dev_init);
279V4L2_INT_WRAPPER_0(dev_exit); 285V4L2_INT_WRAPPER_0(dev_exit);
280V4L2_INT_WRAPPER_1(s_power, int, ); 286V4L2_INT_WRAPPER_1(s_power, enum v4l2_power, );
281V4L2_INT_WRAPPER_1(g_priv, void, *); 287V4L2_INT_WRAPPER_1(g_priv, void, *);
282V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *); 288V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);
283V4L2_INT_WRAPPER_1(g_needs_reset, void, *); 289V4L2_INT_WRAPPER_1(g_needs_reset, void, *);