aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorAlexey Klimov <klimov.linux@gmail.com>2008-11-07 22:31:50 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:30 -0500
commit54b7b0deb4c602d0751627d14510dc50b5bba372 (patch)
treed19d06bcb9752a8868c55d0a38b994b402a520fe /drivers/media/radio
parent04e0ffbbdd297fac1d8a5696b5d27887d6ff3dc2 (diff)
V4L/DVB (9540): dsbr100: add disabled controls and fix version
Patch adds disabled controls in v4l2_queryctrl struct. Also version of driver corrected. -- Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/dsbr100.c26
1 files changed, 23 insertions, 3 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index e6485cfe1218..eafa547ca96b 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -93,8 +93,8 @@
93 */ 93 */
94#include <linux/version.h> /* for KERNEL_VERSION MACRO */ 94#include <linux/version.h> /* for KERNEL_VERSION MACRO */
95 95
96#define DRIVER_VERSION "v0.41" 96#define DRIVER_VERSION "v0.43"
97#define RADIO_VERSION KERNEL_VERSION(0,4,1) 97#define RADIO_VERSION KERNEL_VERSION(0, 4, 3)
98 98
99static struct v4l2_queryctrl radio_qctrl[] = { 99static struct v4l2_queryctrl radio_qctrl[] = {
100 { 100 {
@@ -104,7 +104,27 @@ static struct v4l2_queryctrl radio_qctrl[] = {
104 .maximum = 1, 104 .maximum = 1,
105 .default_value = 1, 105 .default_value = 1,
106 .type = V4L2_CTRL_TYPE_BOOLEAN, 106 .type = V4L2_CTRL_TYPE_BOOLEAN,
107 } 107 },
108/* HINT: the disabled controls are only here to satify kradio and such apps */
109 { .id = V4L2_CID_AUDIO_VOLUME,
110 .flags = V4L2_CTRL_FLAG_DISABLED,
111 },
112 {
113 .id = V4L2_CID_AUDIO_BALANCE,
114 .flags = V4L2_CTRL_FLAG_DISABLED,
115 },
116 {
117 .id = V4L2_CID_AUDIO_BASS,
118 .flags = V4L2_CTRL_FLAG_DISABLED,
119 },
120 {
121 .id = V4L2_CID_AUDIO_TREBLE,
122 .flags = V4L2_CTRL_FLAG_DISABLED,
123 },
124 {
125 .id = V4L2_CID_AUDIO_LOUDNESS,
126 .flags = V4L2_CTRL_FLAG_DISABLED,
127 },
108}; 128};
109 129
110#define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>" 130#define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"