Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / drivers / media / v4l2-core / v4l2-ioctl.c

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 4a384fc765b84b5768e5cc06d7c98d4264292905..7486af2c8ae49241d3aafd3c30f1a90094a63a0f 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -26,7 +26,7 @@
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-device.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 
 #include <trace/events/v4l2.h>
 
@@ -153,6 +153,7 @@ const char *v4l2_type_names[] = {
        [V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE] = "vid-cap-mplane",
        [V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE] = "vid-out-mplane",
        [V4L2_BUF_TYPE_SDR_CAPTURE]        = "sdr-cap",
+       [V4L2_BUF_TYPE_SDR_OUTPUT]         = "sdr-out",
 };
 EXPORT_SYMBOL(v4l2_type_names);
 
@@ -326,6 +327,7 @@ static void v4l_print_format(const void *arg, bool write_only)
                                sliced->service_lines[1][i]);
                break;
        case V4L2_BUF_TYPE_SDR_CAPTURE:
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
                sdr = &p->fmt.sdr;
                pr_cont(", pixelformat=%c%c%c%c\n",
                        (sdr->pixelformat >>  0) & 0xff,
@@ -974,6 +976,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
                if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap)
                        return 0;
                break;
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
+               if (is_sdr && is_tx && ops->vidioc_g_fmt_sdr_out)
+                       return 0;
+               break;
        default:
                break;
        }
@@ -1324,6 +1330,11 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
                        break;
                ret = ops->vidioc_enum_fmt_sdr_cap(file, fh, arg);
                break;
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
+               if (unlikely(!is_tx || !is_sdr || !ops->vidioc_enum_fmt_sdr_out))
+                       break;
+               ret = ops->vidioc_enum_fmt_sdr_out(file, fh, arg);
+               break;
        }
        if (ret == 0)
                v4l_fill_fmtdesc(p);
@@ -1418,6 +1429,10 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
                if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap))
                        break;
                return ops->vidioc_g_fmt_sdr_cap(file, fh, arg);
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
+               if (unlikely(!is_tx || !is_sdr || !ops->vidioc_g_fmt_sdr_out))
+                       break;
+               return ops->vidioc_g_fmt_sdr_out(file, fh, arg);
        }
        return -EINVAL;
 }
@@ -1497,6 +1512,11 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
                        break;
                CLEAR_AFTER_FIELD(p, fmt.sdr);
                return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
+               if (unlikely(!is_tx || !is_sdr || !ops->vidioc_s_fmt_sdr_out))
+                       break;
+               CLEAR_AFTER_FIELD(p, fmt.sdr);
+               return ops->vidioc_s_fmt_sdr_out(file, fh, arg);
        }
        return -EINVAL;
 }
@@ -1576,6 +1596,11 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
                        break;
                CLEAR_AFTER_FIELD(p, fmt.sdr);
                return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);
+       case V4L2_BUF_TYPE_SDR_OUTPUT:
+               if (unlikely(!is_tx || !is_sdr || !ops->vidioc_try_fmt_sdr_out))
+                       break;
+               CLEAR_AFTER_FIELD(p, fmt.sdr);
+               return ops->vidioc_try_fmt_sdr_out(file, fh, arg);
        }
        return -EINVAL;
 }
@@ -1621,15 +1646,31 @@ static int v4l_s_tuner(const struct v4l2_ioctl_ops *ops,
 static int v4l_g_modulator(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
+       struct video_device *vfd = video_devdata(file);
        struct v4l2_modulator *p = arg;
        int err;
 
+       if (vfd->vfl_type == VFL_TYPE_RADIO)
+               p->type = V4L2_TUNER_RADIO;
+
        err = ops->vidioc_g_modulator(file, fh, p);
        if (!err)
                p->capability |= V4L2_TUNER_CAP_FREQ_BANDS;
        return err;
 }
 
+static int v4l_s_modulator(const struct v4l2_ioctl_ops *ops,
+                               struct file *file, void *fh, void *arg)
+{
+       struct video_device *vfd = video_devdata(file);
+       struct v4l2_modulator *p = arg;
+
+       if (vfd->vfl_type == VFL_TYPE_RADIO)
+               p->type = V4L2_TUNER_RADIO;
+
+       return ops->vidioc_s_modulator(file, fh, p);
+}
+
 static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
@@ -1637,7 +1678,7 @@ static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops,
        struct v4l2_frequency *p = arg;
 
        if (vfd->vfl_type == VFL_TYPE_SDR)
-               p->type = V4L2_TUNER_ADC;
+               p->type = V4L2_TUNER_SDR;
        else
                p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
                                V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
@@ -1652,7 +1693,7 @@ static int v4l_s_frequency(const struct v4l2_ioctl_ops *ops,
        enum v4l2_tuner_type type;
 
        if (vfd->vfl_type == VFL_TYPE_SDR) {
-               if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)
+               if (p->type != V4L2_TUNER_SDR && p->type != V4L2_TUNER_RF)
                        return -EINVAL;
        } else {
                type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
@@ -2277,7 +2318,7 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
        int err;
 
        if (vfd->vfl_type == VFL_TYPE_SDR) {
-               if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)
+               if (p->type != V4L2_TUNER_SDR && p->type != V4L2_TUNER_RF)
                        return -EINVAL;
                type = p->type;
        } else {
@@ -2416,7 +2457,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
        IOCTL_INFO_STD(VIDIOC_G_AUDOUT, vidioc_g_audout, v4l_print_audioout, 0),
        IOCTL_INFO_STD(VIDIOC_S_AUDOUT, vidioc_s_audout, v4l_print_audioout, INFO_FL_PRIO),
        IOCTL_INFO_FNC(VIDIOC_G_MODULATOR, v4l_g_modulator, v4l_print_modulator, INFO_FL_CLEAR(v4l2_modulator, index)),
-       IOCTL_INFO_STD(VIDIOC_S_MODULATOR, vidioc_s_modulator, v4l_print_modulator, INFO_FL_PRIO),
+       IOCTL_INFO_FNC(VIDIOC_S_MODULATOR, v4l_s_modulator, v4l_print_modulator, INFO_FL_PRIO),
        IOCTL_INFO_FNC(VIDIOC_G_FREQUENCY, v4l_g_frequency, v4l_print_frequency, INFO_FL_CLEAR(v4l2_frequency, tuner)),
        IOCTL_INFO_FNC(VIDIOC_S_FREQUENCY, v4l_s_frequency, v4l_print_frequency, INFO_FL_PRIO),
        IOCTL_INFO_FNC(VIDIOC_CROPCAP, v4l_cropcap, v4l_print_cropcap, INFO_FL_CLEAR(v4l2_cropcap, type)),