]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (9321): v4l2-int-if: Define new power state changes
authorSakari Ailus <sakari.ailus@nokia.com>
Sat, 18 Oct 2008 15:27:50 +0000 (12:27 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 21 Oct 2008 16:31:17 +0000 (14:31 -0200)
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>
include/media/v4l2-int-device.h

index cee941c39aa2b2c64cf1d97c8e868206564298dc..3351dcffb465447666b3525ecbfc550be141a1f4 100644 (file)
@@ -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, *);