V4L/DVB (8900): pvrusb2: Implement cropping pass through

This builds upon the previous pvrusb2 change to more formally
implement full cropping support.  This enables access from the
driver's V4L interface, and enables access to full capabilities from
sysfs as well.  Note that this is only effective when in analog mode.
It also will only work when the underlying digitizer's driver (saa7115
or cx25840 depending on the hardware) also implements the appropriate
functions.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 86 insertions, 0 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index c53037a25570..f048d80b77e5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -755,6 +755,92 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
+        case VIDIOC_CROPCAP:
+        {
+                struct v4l2_cropcap *cap = (struct v4l2_cropcap *)arg;
+                if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_hdw_get_cropcap(hdw, cap);
+                cap->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; /* paranoia */
+                break;
+        }
+        case VIDIOC_G_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                int val = 0;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.left = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.top = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.width = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.height = val;
+        }
+        case VIDIOC_S_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                struct v4l2_cropcap cap;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL),
+                        crop->c.left);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT),
+                        crop->c.top);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW),
+                        crop->c.width);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH),
+                        crop->c.height);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+        }
         case VIDIOC_LOG_STATUS:
         {
                 pvr2_hdw_trigger_module_log(hdw);