X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Fttpci%2Fbudget.h;fp=drivers%2Fmedia%2Fdvb%2Fttpci%2Fbudget.h;h=c7bb63c4d98dc086253fc2f377408a0ec8c95fda;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=e8a5c79178e1e229a331a07225ba521aca9c4434;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index e8a5c7917..c7bb63c4d 100644
--- 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;
@@ -52,16 +50,13 @@ struct budget {
 	struct dmx_frontend hw_frontend;
 	struct dmx_frontend mem_frontend;
 
+	int fe_synced;
+	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;
 
@@ -71,9 +66,6 @@ struct budget {
 
 	struct dvb_adapter dvb_adapter;
 	struct dvb_frontend *dvb_frontend;
-	int (*read_fe_status)(struct dvb_frontend *fe, fe_status_t *status);
-	int fe_synced;
-
 	void *priv;
 };
 
@@ -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
@@ -106,7 +103,6 @@ static struct saa7146_pci_extension_data x_var = { \
 extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
 			     struct saa7146_pci_extension_data *info,
 			     struct module *owner);
-extern void ttpci_budget_init_hooks(struct budget *budget);
 extern int ttpci_budget_deinit(struct budget *budget);
 extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
 extern void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port);