diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-31 11:58:53 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-31 11:58:53 +0000 |
| commit | 440c5b5d420d3f8984d724521e1c2527055d669c (patch) | |
| tree | d9a3fd023658d1d815d0a4ddcd8e9286d5c8d15a /linux/drivers/media/video/cx88/cx88.h | |
| parent | 44798bf57a6018adac20290fb0e6985b8a9efc33 (diff) | |
| download | mediapointer-dvb-s2-440c5b5d420d3f8984d724521e1c2527055d669c.tar.gz mediapointer-dvb-s2-440c5b5d420d3f8984d724521e1c2527055d669c.tar.bz2 | |
- cx88: merge dvb patches (by Christopher Pascoe), step one.
- cx88: added some code lines for error stats.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 4abb91649..9db2c04df 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.26 2004/08/26 10:59:39 kraxel Exp $ + * $Id: cx88.h,v 1.27 2004/08/31 11:58:53 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -266,6 +266,9 @@ struct cx88_core { u32 tvaudio; u32 input; u32 astat; + + /* used by cx88-dvb -- i2c code needs access to this for FE register */ + struct dvb_adapter *dvb_adapter; }; struct cx8800_dev; @@ -365,6 +368,10 @@ struct cx8802_dev { u32 ts_packet_size; u32 ts_packet_count; + /* error stats */ + u32 stopper_count; + u32 error_count; + /* for blackbird only */ struct list_head devlist; struct video_device *mpeg_dev; @@ -373,12 +380,12 @@ struct cx8802_dev { /* for dvb only */ struct videobuf_queue dvbq; struct task_struct *dvb_thread; - struct dvb_adapter *dvb_adapter; struct dvb_demux demux; struct dmxdev dmxdev; struct dmx_frontend fe_hw; struct dmx_frontend fe_mem; struct dvb_net dvbnet; + int nfeeds; }; /* ----------------------------------------------------------- */ @@ -409,6 +416,7 @@ struct cx8802_dev { extern char *cx88_pci_irqs[32]; extern char *cx88_vid_irqs[32]; +extern char *cx88_mpeg_irqs[32]; extern void cx88_print_irqbits(char *name, char *tag, char **strings, u32 bits, u32 mask); extern void cx88_print_ioctl(char *name, unsigned int cmd); @@ -425,6 +433,10 @@ cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc, unsigned int top_offset, unsigned int bottom_offset, unsigned int bpl, unsigned int padding, unsigned int lines); extern int +cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc, + struct scatterlist *sglist, unsigned int bpl, + unsigned int lines); +extern int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc, u32 reg, u32 mask, u32 value); extern void |