Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 phone: 301-407-9583 email: m-karicheri2@xxxxxx >-----Original Message----- >From: linux-media-owner@xxxxxxxxxxxxxxx [mailto:linux-media- >owner@xxxxxxxxxxxxxxx] On Behalf Of Hiremath, Vaibhav >Sent: Tuesday, October 13, 2009 11:28 AM >To: Hiremath, Vaibhav; linux-media@xxxxxxxxxxxxxxx >Subject: RE: [PATCH 5/6] Davinci VPFE Capture: Add support for Control >ioctls > >> -----Original Message----- >> From: Hiremath, Vaibhav >> Sent: Tuesday, October 13, 2009 8:40 PM >> To: linux-media@xxxxxxxxxxxxxxx >> Cc: Hiremath, Vaibhav >> Subject: [PATCH 5/6] Davinci VPFE Capture: Add support for Control >> ioctls >> >> From: Vaibhav Hiremath <hvaibhav@xxxxxx> >> >> Added support for Control IOCTL, >> - s_ctrl >> - g_ctrl >> - queryctrl >> >[Hiremath, Vaibhav] I am in the process of cleaning up of support for >AM3517 Capture driver, which is almost same as DM6446 CCDC. Then I would >want to finish up with OMAP3 Display driver part before moving to Media >Controller support for MEM-to-MEM (like, Resizer). > >Just FYI, I will be going for vacation for 1 & 1/2 week starting from >coming Friday. But I will make sure that I will submit patches for Display >(OMAP3 & AM3517) and AM3517 Capture driver before that. > >Thanks, >Vaibhav >> Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> >> --- >> drivers/media/video/davinci/vpfe_capture.c | 43 >> ++++++++++++++++++++++++++++ >> 1 files changed, 43 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/media/video/davinci/vpfe_capture.c >> b/drivers/media/video/davinci/vpfe_capture.c >> index abe21e4..f77d99b 100644 >> --- a/drivers/media/video/davinci/vpfe_capture.c >> +++ b/drivers/media/video/davinci/vpfe_capture.c >> @@ -1368,6 +1368,46 @@ static int vpfe_g_std(struct file *file, void >> *priv, v4l2_std_id *std_id) >> return 0; >> } >> >> +static int vpfe_queryctrl(struct file *file, void *priv, >> + struct v4l2_queryctrl *qctrl) >> +{ >> + struct vpfe_device *vpfe_dev = video_drvdata(file); >> + struct vpfe_subdev_info *sdinfo; >> + int ret = 0; >> + >> + sdinfo = vpfe_dev->current_subdev; >> + >> + ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo- >> >grp_id, >> + core, queryctrl, qctrl); >> + >> + if (ret) >> + qctrl->flags |= V4L2_CTRL_FLAG_DISABLED; What is this for ? Why don't we return error to user instead. I see there is a function v4l2_ctrl_check() in the v4l2 core which translates this to -EINVAL. So better to return an -EINVAL to user instead IMO. I am ok with rest of the changes. >> + >> + return 0; >> +} >> + >> +static int vpfe_g_ctrl(struct file *file, void *priv, struct >> v4l2_control *ctrl) >> +{ >> + struct vpfe_device *vpfe_dev = video_drvdata(file); >> + struct vpfe_subdev_info *sdinfo; >> + >> + sdinfo = vpfe_dev->current_subdev; >> + >> + return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo- >> >grp_id, >> + core, g_ctrl, ctrl); >> +} >> + >> +static int vpfe_s_ctrl(struct file *file, void *priv, struct >> v4l2_control *ctrl) >> +{ >> + struct vpfe_device *vpfe_dev = video_drvdata(file); >> + struct vpfe_subdev_info *sdinfo; >> + >> + sdinfo = vpfe_dev->current_subdev; >> + >> + return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo- >> >grp_id, >> + core, s_ctrl, ctrl); >> +} >> + >> /* >> * Videobuf operations >> */ >> @@ -1939,6 +1979,9 @@ static const struct v4l2_ioctl_ops >> vpfe_ioctl_ops = { >> .vidioc_querystd = vpfe_querystd, >> .vidioc_s_std = vpfe_s_std, >> .vidioc_g_std = vpfe_g_std, >> + .vidioc_queryctrl = vpfe_queryctrl, >> + .vidioc_g_ctrl = vpfe_g_ctrl, >> + .vidioc_s_ctrl = vpfe_s_ctrl, >> .vidioc_reqbufs = vpfe_reqbufs, >> .vidioc_querybuf = vpfe_querybuf, >> .vidioc_qbuf = vpfe_qbuf, >> -- >> 1.6.2.4 > >-- >To unsubscribe from this list: send the line "unsubscribe linux-media" in >the body of a message to majordomo@xxxxxxxxxxxxxxx >More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
