diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-14 18:55:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-14 18:55:39 -0300 |
| commit | 49c7ae95a0e651f7e2186509d62e7eb21ff6154c (patch) | |
| tree | e3eb7ee9b5f9d8341a1c4b2c0dc5f135f59b6ef6 /linux/drivers/media/dvb/dvb-core/dmxdev.h | |
| parent | 088d748ee46301d439b389131fd3971e47a4555b (diff) | |
| parent | 93d4ff1bf42268c291a14a04c34d700189f42a27 (diff) | |
| download | mediapointer-dvb-s2-49c7ae95a0e651f7e2186509d62e7eb21ff6154c.tar.gz mediapointer-dvb-s2-49c7ae95a0e651f7e2186509d62e7eb21ff6154c.tar.bz2 | |
Merging mkrufky tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.h')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dmxdev.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h index 73da838f8..080abd9a9 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.h +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h @@ -39,6 +39,7 @@ #include "dvbdev.h" #include "demux.h" +#include "dvb_ringbuffer.h" enum dmxdev_type { DMXDEV_TYPE_NONE, @@ -55,15 +56,6 @@ enum dmxdev_state { DMXDEV_STATE_TIMEDOUT }; -struct dmxdev_buffer { - u8 *data; - int size; - int pread; - int pwrite; - wait_queue_head_t queue; - int error; -}; - struct dmxdev_filter { union { struct dmx_section_filter *sec; @@ -82,7 +74,7 @@ struct dmxdev_filter { enum dmxdev_type type; enum dmxdev_state state; struct dmxdev *dev; - struct dmxdev_buffer buffer; + struct dvb_ringbuffer buffer; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex mutex; @@ -109,7 +101,7 @@ struct dmxdev { #define DMXDEV_CAP_DUPLEX 1 struct dmx_frontend *dvr_orig_fe; - struct dmxdev_buffer dvr_buffer; + struct dvb_ringbuffer dvr_buffer; #define DVR_BUFFER_SIZE (10*188*1024) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) |