Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[sfrench/cifs-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 0b3da29245fb2deb7709032e21dbc5738cd87303..3281a6ca3685d46ea19ec12d9e88133ca228c6f8 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -47,6 +47,8 @@
 #define DST_TYPE_HAS_FW_2      16
 #define DST_TYPE_HAS_FW_3      32
 #define DST_TYPE_HAS_FW_BUILD  64
+#define DST_TYPE_HAS_OBS_REGS  128
+#define DST_TYPE_HAS_INC_COUNT 256
 
 /*     Card capability list    */
 
@@ -59,7 +61,6 @@
 #define        DST_TYPE_HAS_ANALOG     64      /*      Analog inputs   */
 #define DST_TYPE_HAS_SESSION   128
 
-
 #define RDC_8820_PIO_0_DISABLE 0
 #define RDC_8820_PIO_0_ENABLE  1
 #define RDC_8820_INT           2
@@ -110,7 +111,12 @@ struct dst_state {
        u32 dst_hw_cap;
        u8 dst_fw_version;
        fe_sec_mini_cmd_t minicmd;
+       fe_modulation_t modulation;
        u8 messages[256];
+       u8 mac_address[8];
+       u8 fw_version[8];
+       u8 card_info[8];
+       u8 vendor[8];
 };
 
 struct dst_types {
@@ -121,15 +127,12 @@ struct dst_types {
        u32 dst_feature;
 };
 
-
-
 struct dst_config
 {
        /* the ASIC i2c address */
        u8 demod_address;
 };
 
-
 int rdc_reset_state(struct dst_state *state);
 int rdc_8820_reset(struct dst_state *state);