diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 768de629a..f9412befd 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.37 2004/10/12 07:33:22 kraxel Exp $ + * $Id: cx88.h,v 1.38 2004/10/19 16:02:05 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -26,22 +26,10 @@ #include <linux/videodev.h> #include <linux/kdev_t.h> -#include <dvbdev.h> -#include <dmxdev.h> -#include <dvb_demux.h> -#include <dvb_net.h> -#include <dvb_frontend.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64) -#include "video-buf.h" -#include "tuner.h" -#include "audiochip.h" -#include "i2c-compat.h" -#else -#include <media/video-buf.h> #include <media/tuner.h> #include <media/audiochip.h> -#endif +#include <media/video-buf.h> +#include <media/video-buf-dvb.h> #include "compat.h" #include "btcx-risc.h" @@ -378,11 +366,6 @@ struct cx8802_dev { u32 ts_packet_size; u32 ts_packet_count; - /* error stats */ - u32 stopper_count; - u32 error_count; - u32 timeout_count; - /* other global state info */ struct cx8802_suspend_state state; @@ -392,15 +375,7 @@ struct cx8802_dev { u32 mailbox; /* for dvb only */ - struct dvb_adapter *dvb_adapter; - struct videobuf_queue dvbq; - struct task_struct *dvb_thread; - struct dvb_demux demux; - struct dmxdev dmxdev; - struct dmx_frontend fe_hw; - struct dmx_frontend fe_mem; - struct dvb_net dvbnet; - int nfeeds; + struct videobuf_dvb dvb; void* fe_handle; int (*fe_release)(void *handle); }; |