From: Hans Verkuil <hverkuil@xs4all.nl>
To: Antti Palosaari <crope@iki.fi>
Cc: linux-media@vger.kernel.org,
Mauro Carvalho Chehab <m.chehab@samsung.com>
Subject: Re: [PATCH RFC v2 7/7] v4l: define own IOCTL ops for SDR FMT
Date: Mon, 16 Dec 2013 09:54:23 +0100 [thread overview]
Message-ID: <52AEBFBF.7070502@xs4all.nl> (raw)
In-Reply-To: <1387037729-1977-8-git-send-email-crope@iki.fi>
On 12/14/2013 05:15 PM, Antti Palosaari wrote:
> Use own format ops for SDR data:
> vidioc_enum_fmt_sdr_cap
> vidioc_g_fmt_sdr_cap
> vidioc_s_fmt_sdr_cap
> vidioc_try_fmt_sdr_cap
The patch order is a bit weird. I would expect this patch to come before patch 6.
Regards,
Hans
>
> Cc: Hans Verkuil <hverkuil@xs4all.nl>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/v4l2-core/v4l2-dev.c | 8 ++++----
> drivers/media/v4l2-core/v4l2-ioctl.c | 18 +++++++++---------
> include/media/v4l2-ioctl.h | 8 ++++++++
> 3 files changed, 21 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
> index 9f15e25..a84f4ea 100644
> --- a/drivers/media/v4l2-core/v4l2-dev.c
> +++ b/drivers/media/v4l2-core/v4l2-dev.c
> @@ -673,13 +673,13 @@ static void determine_valid_ioctls(struct video_device *vdev)
> SET_VALID_IOCTL(ops, VIDIOC_G_SLICED_VBI_CAP, vidioc_g_sliced_vbi_cap);
> } else if (is_sdr) {
> /* SDR specific ioctls */
> - if (ops->vidioc_enum_fmt_vid_cap)
> + if (ops->vidioc_enum_fmt_sdr_cap)
> set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
> - if (ops->vidioc_g_fmt_vid_cap)
> + if (ops->vidioc_g_fmt_sdr_cap)
> set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
> - if (ops->vidioc_s_fmt_vid_cap)
> + if (ops->vidioc_s_fmt_sdr_cap)
> set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
> - if (ops->vidioc_try_fmt_vid_cap)
> + if (ops->vidioc_try_fmt_sdr_cap)
> set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
>
> if (is_rx) {
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index a7e6b52..18aa36a 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -939,7 +939,7 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
> return 0;
> break;
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> - if (is_sdr && is_rx && ops->vidioc_g_fmt_vid_cap)
> + if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap)
> return 0;
> break;
> default:
> @@ -1062,9 +1062,9 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> break;
> return ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg);
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> - if (unlikely(!is_rx || !ops->vidioc_enum_fmt_vid_cap))
> + if (unlikely(!is_rx || !ops->vidioc_enum_fmt_sdr_cap))
> break;
> - return ops->vidioc_enum_fmt_vid_cap(file, fh, arg);
> + return ops->vidioc_enum_fmt_sdr_cap(file, fh, arg);
> }
> return -EINVAL;
> }
> @@ -1121,9 +1121,9 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> break;
> return ops->vidioc_g_fmt_sliced_vbi_out(file, fh, arg);
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> - if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_vid_cap))
> + if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap))
> break;
> - return ops->vidioc_g_fmt_vid_cap(file, fh, arg);
> + return ops->vidioc_g_fmt_sdr_cap(file, fh, arg);
> }
> return -EINVAL;
> }
> @@ -1190,10 +1190,10 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> CLEAR_AFTER_FIELD(p, fmt.sliced);
> return ops->vidioc_s_fmt_sliced_vbi_out(file, fh, arg);
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> - if (unlikely(!is_rx || !is_sdr || !ops->vidioc_s_fmt_vid_cap))
> + if (unlikely(!is_rx || !is_sdr || !ops->vidioc_s_fmt_sdr_cap))
> break;
> CLEAR_AFTER_FIELD(p, fmt.sdr);
> - return ops->vidioc_s_fmt_vid_cap(file, fh, arg);
> + return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);
> }
> return -EINVAL;
> }
> @@ -1260,10 +1260,10 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> CLEAR_AFTER_FIELD(p, fmt.sliced);
> return ops->vidioc_try_fmt_sliced_vbi_out(file, fh, arg);
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> - if (unlikely(!is_rx || !is_sdr || !ops->vidioc_try_fmt_vid_cap))
> + if (unlikely(!is_rx || !is_sdr || !ops->vidioc_try_fmt_sdr_cap))
> break;
> CLEAR_AFTER_FIELD(p, fmt.sdr);
> - return ops->vidioc_try_fmt_vid_cap(file, fh, arg);
> + return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);
> }
> return -EINVAL;
> }
> diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
> index e0b74a4..8be32f5 100644
> --- a/include/media/v4l2-ioctl.h
> +++ b/include/media/v4l2-ioctl.h
> @@ -40,6 +40,8 @@ struct v4l2_ioctl_ops {
> struct v4l2_fmtdesc *f);
> int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
> struct v4l2_fmtdesc *f);
> + int (*vidioc_enum_fmt_sdr_cap) (struct file *file, void *fh,
> + struct v4l2_fmtdesc *f);
>
> /* VIDIOC_G_FMT handlers */
> int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh,
> @@ -62,6 +64,8 @@ struct v4l2_ioctl_ops {
> struct v4l2_format *f);
> int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_g_fmt_sdr_cap) (struct file *file, void *fh,
> + struct v4l2_format *f);
>
> /* VIDIOC_S_FMT handlers */
> int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh,
> @@ -84,6 +88,8 @@ struct v4l2_ioctl_ops {
> struct v4l2_format *f);
> int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_s_fmt_sdr_cap) (struct file *file, void *fh,
> + struct v4l2_format *f);
>
> /* VIDIOC_TRY_FMT handlers */
> int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh,
> @@ -106,6 +112,8 @@ struct v4l2_ioctl_ops {
> struct v4l2_format *f);
> int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_try_fmt_sdr_cap) (struct file *file, void *fh,
> + struct v4l2_format *f);
>
> /* Buffer handlers */
> int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
>
next prev parent reply other threads:[~2013-12-16 8:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 16:15 [PATCH RFC v2 0/7] V4L2 SDR API Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 1/7] v4l: don't clear VIDIOC_G_FREQUENCY tuner type Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 2/7] v4l: add device type for Software Defined Radio Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 3/7] v4l: add new tuner types for SDR Antti Palosaari
2013-12-16 8:53 ` Hans Verkuil
2013-12-16 12:36 ` Antti Palosaari
2013-12-16 12:50 ` Hans Verkuil
2013-12-16 14:19 ` Antti Palosaari
2013-12-16 14:25 ` Hans Verkuil
2013-12-16 14:41 ` Antti Palosaari
2013-12-16 14:57 ` Hans Verkuil
2013-12-14 16:15 ` [PATCH RFC v2 4/7] v4l: 1 Hz resolution flag for tuners Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 5/7] v4l: add stream format for SDR receiver Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 6/7] v4l: enable some IOCTLs " Antti Palosaari
2013-12-14 16:15 ` [PATCH RFC v2 7/7] v4l: define own IOCTL ops for SDR FMT Antti Palosaari
2013-12-14 16:24 ` Antti Palosaari
2013-12-15 11:23 ` Mauro Carvalho Chehab
2013-12-15 11:31 ` Hans Verkuil
2013-12-16 8:54 ` Hans Verkuil [this message]
2013-12-14 16:45 ` [PATCH RFC v2 0/7] V4L2 SDR API Antti Palosaari
2013-12-14 17:05 ` Hans Verkuil
2013-12-14 17:47 ` Antti Palosaari
2013-12-15 11:30 ` Mauro Carvalho Chehab
2013-12-16 16:50 ` Antti Palosaari
2013-12-16 17:09 ` Hans Verkuil
2013-12-16 8:55 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52AEBFBF.7070502@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox