linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / bt8xx / dst_common.h

diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 0677b04..81557f3 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -25,7 +25,6 @@
 #include <linux/smp_lock.h>
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
-#include <linux/mutex.h>
 #include "bt878.h"
 
 #include "dst_ca.h"
@@ -42,7 +41,7 @@
 #define DST_TYPE_IS_CABLE      2
 #define DST_TYPE_IS_ATSC       3
 
-#define DST_TYPE_HAS_TS188     1
+#define DST_TYPE_HAS_NEWTUNE   1
 #define DST_TYPE_HAS_TS204     2
 #define DST_TYPE_HAS_SYMDIV    4
 #define DST_TYPE_HAS_FW_1      8
@@ -52,9 +51,6 @@
 #define DST_TYPE_HAS_OBS_REGS  128
 #define DST_TYPE_HAS_INC_COUNT 256
 #define DST_TYPE_HAS_MULTI_FE  512
-#define DST_TYPE_HAS_NEWTUNE_2 1024
-#define DST_TYPE_HAS_DBOARD    2048
-#define DST_TYPE_HAS_VLF       4096
 
 /*     Card capability list    */
 
@@ -67,20 +63,6 @@
 #define        DST_TYPE_HAS_ANALOG     64      /*      Analog inputs   */
 #define DST_TYPE_HAS_SESSION   128
 
-#define TUNER_TYPE_MULTI       1
-#define TUNER_TYPE_UNKNOWN     2
-/*     DVB-S           */
-#define TUNER_TYPE_L64724      4
-#define TUNER_TYPE_STV0299     8
-#define TUNER_TYPE_MB86A15     16
-
-/*     DVB-T           */
-#define TUNER_TYPE_TDA10046    32
-
-/*     ATSC            */
-#define TUNER_TYPE_NXT200x     64
-
-
 #define RDC_8820_PIO_0_DISABLE 0
 #define RDC_8820_PIO_0_ENABLE  1
 #define RDC_8820_INT           2
@@ -101,6 +83,8 @@ struct dst_state {
 
        struct bt878* bt;
 
+       struct dvb_frontend_ops ops;
+
        /* configuration settings */
        const struct dst_config* config;
 
@@ -136,17 +120,8 @@ struct dst_state {
        u8 card_info[8];
        u8 vendor[8];
        u8 board_info[8];
-       u32 tuner_type;
-       char *tuner_name;
-       struct mutex dst_mutex;
-       u8 fw_name[8];
-};
 
-struct tuner_types {
-       u32 tuner_type;
-       char *tuner_name;
-       char *board_name;
-       char *fw_name;
+       struct semaphore dst_mutex;
 };
 
 struct dst_types {
@@ -155,7 +130,6 @@ struct dst_types {
        u8 dst_type;
        u32 type_flags;
        u32 dst_feature;
-       u32 tuner_type;
 };
 
 struct dst_config