diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-15 07:24:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-15 07:24:22 -0300 |
| commit | e1a86ef2de8867d886c75ae5308d17aa0f9a78df (patch) | |
| tree | 5ad063b7efe38e3d766762e65a4a7f498cc8047e /linux/drivers/media/radio/radio-si470x.c | |
| parent | 5d42bf58c3798d11494482f0c4ce11e4264e5fab (diff) | |
| parent | 7e35d0c788f864edd753b7d9b3e2289dde2dbce3 (diff) | |
| download | mediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.gz mediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/pinnacle_hybrid_2881
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio/radio-si470x.c')
| -rw-r--r-- | linux/drivers/media/radio/radio-si470x.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/radio/radio-si470x.c b/linux/drivers/media/radio/radio-si470x.c index 20aa447cc..3efd397d1 100644 --- a/linux/drivers/media/radio/radio-si470x.c +++ b/linux/drivers/media/radio/radio-si470x.c @@ -1254,7 +1254,7 @@ static int si470x_vidioc_querycap(struct file *file, void *priv, usb_make_path(radio->usbdev, capability->bus_info, sizeof(capability->bus_info)); capability->version = DRIVER_KERNEL_VERSION; capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | - V4L2_CAP_TUNER | V4L2_CAP_RADIO; + V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE; return 0; } @@ -1413,7 +1413,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, /* driver constants */ strcpy(tuner->name, "FM"); tuner->type = V4L2_TUNER_RADIO; - tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; + tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | + V4L2_TUNER_CAP_RDS; /* range limits */ switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) { @@ -1439,6 +1440,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, tuner->rxsubchans = V4L2_TUNER_SUB_MONO; else tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; + /* If there is a reliable method of detecting an RDS channel, + then this code should check for that before setting this + RDS subchannel. */ + tuner->rxsubchans |= V4L2_TUNER_SUB_RDS; /* mono/stereo selector */ if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0) |