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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
47d3177
..
d2bee9f
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dmxdev.h
+++ b/
drivers/media/dvb/dvb-core/dmxdev.h
@@
-1,4
+1,4
@@
-/*
+/*
* dmxdev.h
*
* Copyright (C) 2000 Ralph Metzler & Marcus Metzler
* dmxdev.h
*
* Copyright (C) 2000 Ralph Metzler & Marcus Metzler
@@
-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,52
+53,32
@@
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;
+ union {
+ struct dmx_section_filter *sec;
} filter;
} filter;
-
union {
-
struct dmx_ts_feed *ts;
-
struct dmx_section_feed *sec;
+ union {
+ struct dmx_ts_feed *ts;
+ struct dmx_section_feed *sec;
} feed;
} feed;
-
union {
- struct dmx_sct_filter_params sec;
- struct dmx_pes_filter_params pes;
+ union {
+ struct dmx_sct_filter_params sec;
+ struct dmx_pes_filter_params pes;
} params;
} params;
- int type;
- enum dmxdev_state state;
- struct dmxdev *dev;
- struct dmxdev_buffer buffer;
-
- struct semaphore mutex;
-
- /* only for sections */
- struct timer_list timer;
- int todo;
- u8 secheader[3];
-
- u16 pid;
-};
+ enum dmxdev_type type;
+ enum dmxdev_state state;
+ struct dmxdev *dev;
+ struct dvb_ringbuffer buffer;
+ struct mutex mutex;
-struct dmxdev_dvr {
-
int state
;
-
struct dmxdev *dev
;
-
struct dmxdev_buffer buffer
;
+ /* only for sections */
+
struct timer_list timer
;
+
int todo
;
+
u8 secheader[3]
;
};
};
@@
-105,19
+86,18
@@
struct dmxdev {
struct dvb_device *dvbdev;
struct dvb_device *dvr_dvbdev;
struct dvb_device *dvbdev;
struct dvb_device *dvr_dvbdev;
- struct dmxdev_filter *filter;
- struct dmxdev_dvr *dvr;
- struct dmx_demux *demux;
+ struct dmxdev_filter *filter;
+ struct dmx_demux *demux;
-
int filternum;
-
int capabilities;
+ int filternum;
+ int capabilities;
#define DMXDEV_CAP_DUPLEX 1
#define DMXDEV_CAP_DUPLEX 1
-
struct dmx_frontend *dvr_orig_fe;
+ struct dmx_frontend *dvr_orig_fe;
-
struct dmxdev_
buffer dvr_buffer;
+
struct dvb_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;
};