summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2008-02-06 00:59:48 -0600
committerMike Isely <isely@pobox.com>2008-02-06 00:59:48 -0600
commit10e10ee41aa6117110610fe07f55711b6576a9cd (patch)
tree9913f216e74ed4eeac6874c8f5eb7cab14fbba0a /linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h
parent9c861211b25ec3dd761908391b28ec6e19dbcd2d (diff)
downloadmediapointer-dvb-s2-10e10ee41aa6117110610fe07f55711b6576a9cd.tar.gz
mediapointer-dvb-s2-10e10ee41aa6117110610fe07f55711b6576a9cd.tar.bz2
pvrusb2: Clean up dvb streaming start/stop
From: Mike Isely <isely@pobox.com> Eliminate the need for a separate pvr2_dvb_fh; since in the DVB context there can only ever be a single instance then there is no need for a separate instance to handle streaming state. This simplifies the module. Also move streaming start/stop out of the feed thread and into the driver's main context - which makes it possible for streaming start up failures to be detected by the DVB core. Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h
index b16584934..4787a2e5e 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h
@@ -7,8 +7,11 @@
#include "dmxdev.h"
#include "pvrusb2-context.h"
+#define PVR2_DVB_BUFFER_COUNT 32
+#define PVR2_DVB_BUFFER_SIZE PAGE_ALIGN(0x4000)
+
struct pvr2_dvb_adapter {
- struct pvr2_context *pvr;
+ struct pvr2_channel channel;
struct dvb_adapter dvb_adap;
struct dmxdev dmxdev;
@@ -27,6 +30,11 @@ struct pvr2_dvb_adapter {
#endif
unsigned int digital_up:1;
+ unsigned int stream_run:1;
+ unsigned int init:1;
+
+ wait_queue_head_t buffer_wait_data;
+ char *buffer_storage[PVR2_DVB_BUFFER_COUNT];
};
struct pvr2_dvb_props {