linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / ttpci / budget.h

diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index ecea3a1..c7bb63c 100644 (file)
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -10,8 +10,6 @@
 #include "dvb_net.h"
 
 #include <linux/module.h>
-#include <linux/mutex.h>
-
 #include <media/saa7146.h>
 
 extern int budget_debug;
@@ -53,18 +51,12 @@ struct budget {
        struct dmx_frontend mem_frontend;
 
        int fe_synced;
-       struct mutex pid_mutex;
+       struct semaphore pid_mutex;
 
        int ci_present;
        int video_port;
 
-       u32 buffer_width;
-       u32 buffer_height;
-       u32 buffer_size;
-       u32 buffer_warning_threshold;
-       u32 buffer_warnings;
-       unsigned long buffer_warning_time;
-
+       u8 tsf;
        u32 ttbp;
        int feeding;
 
@@ -85,6 +77,11 @@ static struct saa7146_pci_extension_data x_var = { \
        .ext_priv = &x_var ## _info, \
        .ext = &budget_extension };
 
+#define TS_WIDTH  (376)
+#define TS_HEIGHT (512)
+#define TS_BUFLEN (TS_WIDTH*TS_HEIGHT)
+#define TS_MAX_PACKETS (TS_BUFLEN/TS_SIZE)
+
 #define BUDGET_TT                 0
 #define BUDGET_TT_HW_DISEQC       1
 #define BUDGET_PATCH              3