git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dmxdev.h
diff --git
a/drivers/media/dvb/dvb-core/dmxdev.h
b/drivers/media/dvb/dvb-core/dmxdev.h
index
fd72920
..
d2bee9f
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dmxdev.h
+++ b/
drivers/media/dvb/dvb-core/dmxdev.h
@@
-30,14
+30,15
@@
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/string.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
#include <linux/dvb/dmx.h>
#include "dvbdev.h"
#include "demux.h"
#include <linux/dvb/dmx.h>
#include "dvbdev.h"
#include "demux.h"
+#include "dvb_ringbuffer.h"
-enum dmxdevype {
+enum dmxdev
_t
ype {
DMXDEV_TYPE_NONE,
DMXDEV_TYPE_SEC,
DMXDEV_TYPE_PES,
DMXDEV_TYPE_NONE,
DMXDEV_TYPE_SEC,
DMXDEV_TYPE_PES,
@@
-52,18
+53,7
@@
enum dmxdev_state {
DMXDEV_STATE_TIMEDOUT
};
DMXDEV_STATE_TIMEDOUT
};
-struct dmxdev_buffer {
- u8 *data;
- int size;
- int pread;
- int pwrite;
- wait_queue_head_t queue;
- int error;
-};
-
struct dmxdev_filter {
struct dmxdev_filter {
- struct dvb_device *dvbdev;
-
union {
struct dmx_section_filter *sec;
} filter;
union {
struct dmx_section_filter *sec;
} filter;
@@
-78,26
+68,17
@@
struct dmxdev_filter {
struct dmx_pes_filter_params pes;
} params;
struct dmx_pes_filter_params pes;
} params;
-
int
type;
+
enum dmxdev_type
type;
enum dmxdev_state state;
struct dmxdev *dev;
enum dmxdev_state state;
struct dmxdev *dev;
- struct d
mxdev_
buffer buffer;
+ struct d
vb_ring
buffer buffer;
- struct
semaphore
mutex;
+ struct
mutex
mutex;
/* only for sections */
struct timer_list timer;
int todo;
u8 secheader[3];
/* only for sections */
struct timer_list timer;
int todo;
u8 secheader[3];
-
- u16 pid;
-};
-
-
-struct dmxdev_dvr {
- int state;
- struct dmxdev *dev;
- struct dmxdev_buffer buffer;
};
};
@@
-106,7
+87,6
@@
struct dmxdev {
struct dvb_device *dvr_dvbdev;
struct dmxdev_filter *filter;
struct dvb_device *dvr_dvbdev;
struct dmxdev_filter *filter;
- struct dmxdev_dvr *dvr;
struct dmx_demux *demux;
int filternum;
struct dmx_demux *demux;
int filternum;
@@
-114,10
+94,10
@@
struct dmxdev {
#define DMXDEV_CAP_DUPLEX 1
struct dmx_frontend *dvr_orig_fe;
#define DMXDEV_CAP_DUPLEX 1
struct dmx_frontend *dvr_orig_fe;
- struct d
mxdev_
buffer dvr_buffer;
+ struct d
vb_ring
buffer dvr_buffer;
#define DVR_BUFFER_SIZE (10*188*1024)
#define DVR_BUFFER_SIZE (10*188*1024)
- struct
semaphore
mutex;
+ struct
mutex
mutex;
spinlock_t lock;
};
spinlock_t lock;
};