aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2012-01-04 19:08:35 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-05 03:52:02 -0500
commit350451375d6d8e9b124eacad67e221a0fdff0ac9 (patch)
tree321a0535ef3f78804be28aa3b07e183014dd0c12 /drivers/media/video/cx23885/cx23885.h
parentadddf86b4cf545b82e422a9897a377d7e55b50ee (diff)
[media] cx23885: Hauppauge HVR1850 Analog driver support
First in a series of patches that adds support to the cx23885 driver for CX23888 analog video handling. Raw and MPEG video support is being added for the HVR1850 driver in the patch, and the following series of patches. Some basic cx23885 driver cleanup. Partly to add HVR1850 support and partly to allow -417.c V4L2 calls to be routed through thr driver core and handled in a single place. Make a number of core driver functions available to the -417.c driver to streamline the driver. Add the analog tuner ops definition so we can reach/tune the hardware when we need to. Added the tff field so 888 based cards (which have a weird field ordering issue) can be accomodated and worked around in the driver. Signed-off-by: Steven Toth <stoth@kernellabs.com> 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.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 519f40d2af5d..78fdb841cc17 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -227,6 +227,8 @@ struct cx23885_board {
227 u32 clk_freq; 227 u32 clk_freq;
228 struct cx23885_input input[MAX_CX23885_INPUT]; 228 struct cx23885_input input[MAX_CX23885_INPUT];
229 int ci_type; /* for NetUP */ 229 int ci_type; /* for NetUP */
230 /* Force bottom field first during DMA (888 workaround) */
231 u32 force_bff;
230}; 232};
231 233
232struct cx23885_subid { 234struct cx23885_subid {
@@ -311,6 +313,9 @@ struct cx23885_tsport {
311 u32 num_frontends; 313 u32 num_frontends;
312 void (*gate_ctrl)(struct cx23885_tsport *port, int open); 314 void (*gate_ctrl)(struct cx23885_tsport *port, int open);
313 void *port_priv; 315 void *port_priv;
316
317 /* Workaround for a temp dvb_frontend that the tuner can attached to */
318 struct dvb_frontend analog_fe;
314}; 319};
315 320
316struct cx23885_kernel_ir { 321struct cx23885_kernel_ir {
@@ -575,6 +580,13 @@ extern void cx23885_video_unregister(struct cx23885_dev *dev);
575extern int cx23885_video_irq(struct cx23885_dev *dev, u32 status); 580extern int cx23885_video_irq(struct cx23885_dev *dev, u32 status);
576extern void cx23885_video_wakeup(struct cx23885_dev *dev, 581extern void cx23885_video_wakeup(struct cx23885_dev *dev,
577 struct cx23885_dmaqueue *q, u32 count); 582 struct cx23885_dmaqueue *q, u32 count);
583int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i);
584int cx23885_set_input(struct file *file, void *priv, unsigned int i);
585int cx23885_get_input(struct file *file, void *priv, unsigned int *i);
586int cx23885_set_frequency(struct file *file, void *priv, struct v4l2_frequency *f);
587int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl);
588int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl);
589int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm);
578 590
579/* ----------------------------------------------------------- */ 591/* ----------------------------------------------------------- */
580/* cx23885-vbi.c */ 592/* cx23885-vbi.c */