diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-17 07:22:09 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-05 14:25:59 -0300 |
| commit | d2370f8eee263a0a0260b9df9798f242d4cb13bf (patch) | |
| tree | 054820e4d0f881bf4d25a8dc7716f7b4fb802d40 /drivers/media/usb/cx231xx/cx231xx.h | |
| parent | [media] cx231xx: fix vbi compliance issues (diff) | |
| download | linux-dev-d2370f8eee263a0a0260b9df9798f242d4cb13bf.tar.xz linux-dev-d2370f8eee263a0a0260b9df9798f242d4cb13bf.zip | |
[media] cx231xx: convert to the control framework
This is needed to resolve the v4l2-compliance complaints about the control
ioctls.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx.h')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index 3e11462be0d0..53408ce598d1 100644 --- a/drivers/media/usb/cx231xx/cx231xx.h +++ b/drivers/media/usb/cx231xx/cx231xx.h @@ -33,6 +33,7 @@ #include <media/videobuf-vmalloc.h> #include <media/v4l2-device.h> +#include <media/v4l2-ctrls.h> #include <media/rc-core.h> #include <media/ir-kbd-i2c.h> #include <media/videobuf-dvb.h> @@ -516,14 +517,6 @@ struct cx231xx_tvnorm { u32 cxoformat; }; -struct cx231xx_ctrl { - struct v4l2_queryctrl v; - u32 off; - u32 reg; - u32 mask; - u32 shift; -}; - enum TRANSFER_TYPE { Raw_Video = 0, Audio, @@ -631,6 +624,8 @@ struct cx231xx { struct v4l2_device v4l2_dev; struct v4l2_subdev *sd_cx25840; struct v4l2_subdev *sd_tuner; + struct v4l2_ctrl_handler ctrl_handler; + struct v4l2_ctrl_handler radio_ctrl_handler; struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ atomic_t stream_started; /* stream should be running if true */ @@ -653,8 +648,6 @@ struct cx231xx { v4l2_std_id norm; /* selected tv norm */ int ctl_freq; /* selected frequency */ unsigned int ctl_ainput; /* selected audio input */ - int mute; - int volume; /* frame properties */ int width; /* current frame width */ |