diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 05:53:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:48 -0400 |
commit | 0d5a19f15837de69f864b2a43a93f119224d778c (patch) | |
tree | 952be3a127bdf863a7163f552e243020a44f64b1 /drivers/media/video/cx23885/cx23885.h | |
parent | d35ed62704bc1d44dd4746a242e8c09f2a48fc40 (diff) |
V4L/DVB (11297): cx23885: convert to v4l2_subdev.
Convert this driver to v4l2_subdev. Note that currently the only card with
analog support in this driver is the HVR-1800. The analog tuner support in
this driver is limited to what is needed for this board. When analog support
is added for other cards, then the tuner load code will probably have to be
expanded to take care of those boards. For example, there is currently no
support for either radio tuners or tda9887 demods.
I'd like to thank Steven Toth for testing this on his HVR-1800.
Tested-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
-rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index ba57643f1198..02d980a29962 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
@@ -323,6 +323,7 @@ struct cx23885_dev { | |||
323 | unsigned int radio_type; | 323 | unsigned int radio_type; |
324 | unsigned char radio_addr; | 324 | unsigned char radio_addr; |
325 | unsigned int has_radio; | 325 | unsigned int has_radio; |
326 | struct v4l2_subdev *sd_cx25840; | ||
326 | 327 | ||
327 | /* V4l */ | 328 | /* V4l */ |
328 | u32 freq; | 329 | u32 freq; |
@@ -348,6 +349,9 @@ static inline struct cx23885_dev *to_cx23885(struct v4l2_device *v4l2_dev) | |||
348 | return container_of(v4l2_dev, struct cx23885_dev, v4l2_dev); | 349 | return container_of(v4l2_dev, struct cx23885_dev, v4l2_dev); |
349 | } | 350 | } |
350 | 351 | ||
352 | #define call_all(dev, o, f, args...) \ | ||
353 | v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args) | ||
354 | |||
351 | extern struct list_head cx23885_devlist; | 355 | extern struct list_head cx23885_devlist; |
352 | 356 | ||
353 | #define SRAM_CH01 0 /* Video A */ | 357 | #define SRAM_CH01 0 /* Video A */ |
@@ -464,8 +468,6 @@ extern struct videobuf_queue_ops cx23885_vbi_qops; | |||
464 | /* cx23885-i2c.c */ | 468 | /* cx23885-i2c.c */ |
465 | extern int cx23885_i2c_register(struct cx23885_i2c *bus); | 469 | extern int cx23885_i2c_register(struct cx23885_i2c *bus); |
466 | extern int cx23885_i2c_unregister(struct cx23885_i2c *bus); | 470 | extern int cx23885_i2c_unregister(struct cx23885_i2c *bus); |
467 | extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, | ||
468 | void *arg); | ||
469 | extern void cx23885_av_clk(struct cx23885_dev *dev, int enable); | 471 | extern void cx23885_av_clk(struct cx23885_dev *dev, int enable); |
470 | 472 | ||
471 | /* ----------------------------------------------------------- */ | 473 | /* ----------------------------------------------------------- */ |