From: Antti Palosaari <crope@iki.fi>
To: linux-media@vger.kernel.org
Cc: Hans Verkuil <hverkuil@xs4all.nl>, Antti Palosaari <crope@iki.fi>
Subject: [PATCH 06/13] v4l: add type field to v4l2_modulator struct
Date: Wed, 2 Sep 2015 00:59:22 +0300 [thread overview]
Message-ID: <1441144769-29211-7-git-send-email-crope@iki.fi> (raw)
In-Reply-To: <1441144769-29211-1-git-send-email-crope@iki.fi>
Add type field to that struct like it counterpart v4l2_tuner
already has. We need type field to distinguish different tuner
types from each others for transmitter too.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/v4l2-core/v4l2-ioctl.c | 18 +++++++++++++++++-
include/uapi/linux/videodev2.h | 3 ++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index a8582d3..6985edd 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1646,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)
{
@@ -2441,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)),
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 70f06c9..3a8eb8e 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1584,7 +1584,8 @@ struct v4l2_modulator {
__u32 rangelow;
__u32 rangehigh;
__u32 txsubchans;
- __u32 reserved[4];
+ __u32 type; /* enum v4l2_tuner_type */
+ __u32 reserved[3];
};
/* Flags for the 'capability' field */
--
http://palosaari.fi/
next prev parent reply other threads:[~2015-09-01 21:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 21:59 [PATCHv4 00/13] SDR transmitter API Antti Palosaari
2015-09-01 21:59 ` [PATCH 01/13] v4l2: rename V4L2_TUNER_ADC to V4L2_TUNER_SDR Antti Palosaari
2015-09-01 21:59 ` [PATCH 02/13] v4l2: add RF gain control Antti Palosaari
2015-09-01 21:59 ` [PATCH 03/13] DocBook: document tuner " Antti Palosaari
2015-09-01 21:59 ` [PATCH 04/13] v4l2: add support for SDR transmitter Antti Palosaari
2015-09-17 9:47 ` Hans Verkuil
2015-09-01 21:59 ` [PATCH 05/13] DocBook: document " Antti Palosaari
2015-09-01 21:59 ` Antti Palosaari [this message]
2015-09-01 21:59 ` [PATCH 07/13] DocBook: add modulator type field Antti Palosaari
2015-09-04 10:40 ` Hans Verkuil
2015-09-01 21:59 ` [PATCH 08/13] hackrf: add control for RF amplifier Antti Palosaari
2015-09-01 21:59 ` [PATCH 09/13] hackrf: switch to single function which configures everything Antti Palosaari
2015-09-01 21:59 ` [PATCH 10/13] hackrf: add support for transmitter Antti Palosaari
2015-09-04 10:06 ` Hans Verkuil
2015-10-16 8:53 ` Hans Verkuil
2015-10-16 8:59 ` Antti Palosaari
2015-10-16 9:14 ` Hans Verkuil
2015-09-01 21:59 ` [PATCH 11/13] hackrf: do not set human readable name for formats Antti Palosaari
2015-09-01 21:59 ` [PATCH 12/13] DocBook: add SDR specific info to G_TUNER / S_TUNER Antti Palosaari
2015-09-01 21:59 ` [PATCH 13/13] DocBook: add SDR specific info to G_MODULATOR / S_MODULATOR Antti Palosaari
2015-09-04 10:26 ` Hans Verkuil
2015-09-04 19:24 ` Antti Palosaari
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=1441144769-29211-7-git-send-email-crope@iki.fi \
--to=crope@iki.fi \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).