V4L/DVB (9540): dsbr100: add disabled controls and fix version
authorAlexey Klimov <klimov.linux@gmail.com>
Sat, 8 Nov 2008 03:31:50 +0000 (00:31 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 29 Dec 2008 19:53:30 +0000 (17:53 -0200)
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>
drivers/media/radio/dsbr100.c

index e6485cfe121899ef0ae891606c4a6ad41d5d1072..eafa547ca96beeefc74e1fd70de2258fe4b76736 100644 (file)
@@ -93,8 +93,8 @@
  */
 #include <linux/version.h>     /* for KERNEL_VERSION MACRO     */
 
-#define DRIVER_VERSION "v0.41"
-#define RADIO_VERSION KERNEL_VERSION(0,4,1)
+#define DRIVER_VERSION "v0.43"
+#define RADIO_VERSION KERNEL_VERSION(0, 4, 3)
 
 static struct v4l2_queryctrl radio_qctrl[] = {
        {
@@ -104,7 +104,27 @@ static struct v4l2_queryctrl radio_qctrl[] = {
                .maximum       = 1,
                .default_value = 1,
                .type          = V4L2_CTRL_TYPE_BOOLEAN,
-       }
+       },
+/* HINT: the disabled controls are only here to satify kradio and such apps */
+       {       .id             = V4L2_CID_AUDIO_VOLUME,
+               .flags          = V4L2_CTRL_FLAG_DISABLED,
+       },
+       {
+               .id             = V4L2_CID_AUDIO_BALANCE,
+               .flags          = V4L2_CTRL_FLAG_DISABLED,
+       },
+       {
+               .id             = V4L2_CID_AUDIO_BASS,
+               .flags          = V4L2_CTRL_FLAG_DISABLED,
+       },
+       {
+               .id             = V4L2_CID_AUDIO_TREBLE,
+               .flags          = V4L2_CTRL_FLAG_DISABLED,
+       },
+       {
+               .id             = V4L2_CID_AUDIO_LOUDNESS,
+               .flags          = V4L2_CTRL_FLAG_DISABLED,
+       },
 };
 
 #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"