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 / ttpci / budget.h

diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index c6ef496..ecea3a1 100644 (file)
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -10,6 +10,8 @@
 #include "dvb_net.h"
 
 #include <linux/module.h>
+#include <linux/mutex.h>
+
 #include <media/saa7146.h>
 
 extern int budget_debug;
@@ -19,7 +21,7 @@ extern int budget_debug;
 #endif
 
 #define dprintk(level,args...) \
-            do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
+           do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)
 
 struct budget_info {
        char *name;
@@ -51,12 +53,18 @@ struct budget {
        struct dmx_frontend mem_frontend;
 
        int fe_synced;
-       struct semaphore pid_mutex;
+       struct mutex pid_mutex;
 
        int ci_present;
        int video_port;
 
-       u8 tsf;
+       u32 buffer_width;
+       u32 buffer_height;
+       u32 buffer_size;
+       u32 buffer_warning_threshold;
+       u32 buffer_warnings;
+       unsigned long buffer_warning_time;
+
        u32 ttbp;
        int feeding;
 
@@ -77,11 +85,6 @@ 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
@@ -95,6 +98,7 @@ static struct saa7146_pci_extension_data x_var = { \
 #define BUDGET_KNC1SP             11
 #define BUDGET_KNC1CP             12
 #define BUDGET_KNC1TP             13
+#define BUDGET_TVSTAR             14
 
 #define BUDGET_VIDEO_PORTA         0
 #define BUDGET_VIDEO_PORTB         1