ENGR00238201-1 V4L2:ADV7180:Support ioctrl_enum_framesizes

Add ioctl_enum_framesizes function to align the requirement
of Camera HAL in Android

Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
(cherry picked from commit fd0a1be3e55c3ca5b16f5bf89a24c62b1f3f3abe)

diff --git a/drivers/media/video/mxc/capture/adv7180.c b/drivers/media/video/mxc/capture/adv7180.c
index 2656afbb21e4e7b4e199d4a8e62873d594d5da60..70c65129c942d996cbe4f810fade82158bcf1fb6 100644 (file)
--- a/drivers/media/video/mxc/capture/adv7180.c
+++ b/drivers/media/video/mxc/capture/adv7180.c
@@ -679,6 +679,26 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *vc)
        return retval;
 }
 
+/*!
+ * ioctl_enum_framesizes - V4L2 sensor interface handler for
+ *                        VIDIOC_ENUM_FRAMESIZES ioctl
+ * @s: pointer to standard V4L2 device structure
+ * @fsize: standard V4L2 VIDIOC_ENUM_FRAMESIZES ioctl structure
+ *
+ * Return 0 if successful, otherwise -EINVAL.
+ */
+static int ioctl_enum_framesizes(struct v4l2_int_device *s,
+                                struct v4l2_frmsizeenum *fsize)
+{
+       if (fsize->index >= 1)
+               return -EINVAL;
+
+       fsize->discrete.width = video_fmts[video_idx].active_width;
+       fsize->discrete.height  = video_fmts[video_idx].active_height;
+
+       return 0;
+}
+
 /*!
  * ioctl_g_chip_ident - V4L2 sensor interface handler for
  *                     VIDIOC_DBG_G_CHIP_IDENT ioctl
@@ -768,6 +788,8 @@ static struct v4l2_int_ioctl_desc adv7180_ioctl_desc[] = {
        {vidioc_int_queryctrl_num, (v4l2_int_ioctl_func*)ioctl_queryctrl},
        {vidioc_int_g_ctrl_num, (v4l2_int_ioctl_func*)ioctl_g_ctrl},
        {vidioc_int_s_ctrl_num, (v4l2_int_ioctl_func*)ioctl_s_ctrl},
+       {vidioc_int_enum_framesizes_num,
+                               (v4l2_int_ioctl_func *) ioctl_enum_framesizes},
        {vidioc_int_g_chip_ident_num,
                                (v4l2_int_ioctl_func *)ioctl_g_chip_ident},
 };