1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index cce00ef293e9..6ea30df2e823 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -98,7 +98,8 @@ struct av7110 {
         int adac_type;         /* audio DAC type */
 #define DVB_ADAC_TI       0
 #define DVB_ADAC_CRYSTAL  1
-#define DVB_ADAC_MSP      2
+#define DVB_ADAC_MSP34x0  2
+#define DVB_ADAC_MSP34x5  3
 #define DVB_ADAC_NONE    -1
 
 
@@ -228,6 +229,9 @@ struct av7110 {
         struct dvb_video_events  video_events;
         video_size_t             video_size;
 
+        u16                     wssMode;
+        u16                     wssData;
+
         u32                     ir_config;
         u32                     ir_command;
         void                    (*ir_handler)(struct av7110 *av7110, u32 ircom);
@@ -245,6 +249,15 @@ struct av7110 {
 
         struct dvb_frontend* fe;
         fe_status_t fe_status;
+
+        /* crash recovery */
+        void                            (*recover)(struct av7110* av7110);
+        struct dvb_frontend_parameters  saved_fe_params;
+        fe_sec_voltage_t                saved_voltage;
+        fe_sec_tone_mode_t              saved_tone;
+        struct dvb_diseqc_master_cmd    saved_master_cmd;
+        fe_sec_mini_cmd_t               saved_minicmd;
+
         int (*fe_init)(struct dvb_frontend* fe);
         int (*fe_read_status)(struct dvb_frontend* fe, fe_status_t* status);
         int (*fe_diseqc_reset_overload)(struct dvb_frontend* fe);
@@ -252,7 +265,7 @@ struct av7110 {
         int (*fe_diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);
         int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
         int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
-        int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd);
+        int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
         int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };