diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 09fa4d18a..b5fbf4a71 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.17 2004/11/05 09:40:59 kraxel Exp $ + * $Id: cx88-dvb.c,v 1.18 2004/11/07 13:17:15 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -49,9 +49,10 @@ MODULE_PARM_DESC(debug,"enable debug messages [dvb]"); /* ------------------------------------------------------------------ */ -static int dvb_buf_setup(void *priv, unsigned int *count, unsigned int *size) +static int dvb_buf_setup(struct videobuf_queue *q, + unsigned int *count, unsigned int *size) { - struct cx8802_dev *dev = priv; + struct cx8802_dev *dev = q->priv_data; dev->ts_packet_size = 188 * 4; dev->ts_packet_count = 32; @@ -61,22 +62,22 @@ static int dvb_buf_setup(void *priv, unsigned int *count, unsigned int *size) return 0; } -static int dvb_buf_prepare(void *priv, struct videobuf_buffer *vb, +static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, enum v4l2_field field) { - struct cx8802_dev *dev = priv; + struct cx8802_dev *dev = q->priv_data; return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb); } -static void dvb_buf_queue(void *priv, struct videobuf_buffer *vb) +static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) { - struct cx8802_dev *dev = priv; + struct cx8802_dev *dev = q->priv_data; cx8802_buf_queue(dev, (struct cx88_buffer*)vb); } -static void dvb_buf_release(void *priv, struct videobuf_buffer *vb) +static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb) { - struct cx8802_dev *dev = priv; + struct cx8802_dev *dev = q->priv_data; cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb); } @@ -98,14 +99,14 @@ static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe) static u8 gpp_ctl_cfg [] = { GPP_CTL, 0x33 }; static u8 capt_range_cfg[] = { CAPT_RANGE, 0x32 }; - mt352_write(fe, clock_config, sizeof(mt352_clock_config)); + mt352_write(fe, clock_config, sizeof(clock_config)); udelay(200); - mt352_write(fe, reset, sizeof(mt352_reset)); - mt352_write(fe, adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg)); + mt352_write(fe, reset, sizeof(reset)); + mt352_write(fe, adc_ctl_1_cfg, sizeof(adc_ctl_1_cfg)); - mt352_write(fe, agc_cfg, sizeof(mt352_agc_cfg)); - mt352_write(fe, gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg)); - mt352_write(fe, capt_range_cfg, sizeof(mt352_capt_range_cfg)); + mt352_write(fe, agc_cfg, sizeof(agc_cfg)); + mt352_write(fe, gpp_ctl_cfg, sizeof(gpp_ctl_cfg)); + mt352_write(fe, capt_range_cfg, sizeof(capt_range_cfg)); return 0; } @@ -180,7 +181,6 @@ struct mt352_config dvico_fusionhdtv_dvbt_plus = { static int dvb_register(struct cx8802_dev *dev) { /* init struct videobuf_dvb */ - dev->dvb.priv = dev; dev->dvb.name = dev->core->name; /* init frontend */ @@ -261,9 +261,8 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev, dev->pci, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, - sizeof(struct cx88_buffer)); - init_MUTEX(&dev->dvb.dvbq.lock); - + sizeof(struct cx88_buffer), + dev); err = dvb_register(dev); if (0 != err) goto fail_free; |