V4L/DVB (13341): stv0900: big rework to support cut 3.0.
authorIgor M. Liplianin <liplianin@netup.ru>
Sat, 7 Nov 2009 02:46:32 +0000 (23:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 5 Dec 2009 20:41:26 +0000 (18:41 -0200)
Patch 4 of 4.
Also patch changes logic to prevent code repetitions and big indents.
It makes checkpatch silent :)

Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/stv0900_sw.c

index 8c83c8b..b8da87f 100644 (file)
 #include "stv0900_reg.h"
 #include "stv0900_priv.h"
 
-int stv0900_check_signal_presence(struct stv0900_internal *i_params,
+s32 shiftx(s32 x, int demod, s32 shift)
+{
+       if (demod == 1)
+               return x - shift;
+
+       return x;
+}
+
+int stv0900_check_signal_presence(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 carr_offset,
-       agc2_integr,
-       max_carrier;
+       s32     carr_offset,
+               agc2_integr,
+               max_carrier;
 
-       int no_signal;
+       int no_signal = FALSE;
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               carr_offset = (stv0900_read_reg(i_params, R0900_P1_CFR2) << 8)
-                                               | stv0900_read_reg(i_params,
-                                               R0900_P1_CFR1);
-               carr_offset = ge2comp(carr_offset, 16);
-               agc2_integr = (stv0900_read_reg(i_params, R0900_P1_AGC2I1) << 8)
-                                               | stv0900_read_reg(i_params,
-                                               R0900_P1_AGC2I0);
-               max_carrier = i_params->dmd1_srch_range / 1000;
-               break;
-       case STV0900_DEMOD_2:
-               carr_offset = (stv0900_read_reg(i_params, R0900_P2_CFR2) << 8)
-                                               | stv0900_read_reg(i_params,
-                                               R0900_P2_CFR1);
-               carr_offset = ge2comp(carr_offset, 16);
-               agc2_integr = (stv0900_read_reg(i_params, R0900_P2_AGC2I1) << 8)
-                                               | stv0900_read_reg(i_params,
-                                               R0900_P2_AGC2I0);
-               max_carrier = i_params->dmd2_srch_range / 1000;
-               break;
-       }
+       carr_offset = (stv0900_read_reg(intp, CFR2) << 8)
+                                       | stv0900_read_reg(intp, CFR1);
+       carr_offset = ge2comp(carr_offset, 16);
+       agc2_integr = (stv0900_read_reg(intp, AGC2I1) << 8)
+                                       | stv0900_read_reg(intp, AGC2I0);
+       max_carrier = intp->srch_range[demod] / 1000;
 
        max_carrier += (max_carrier / 10);
        max_carrier = 65536 * (max_carrier / 2);
-       max_carrier /= i_params->mclk / 1000;
+       max_carrier /= intp->mclk / 1000;
        if (max_carrier > 0x4000)
                max_carrier = 0x4000;
 
        if ((agc2_integr > 0x2000)
-                       || (carr_offset > + 2*max_carrier)
-                       || (carr_offset < -2*max_carrier))
+                       || (carr_offset > (2 * max_carrier))
+                       || (carr_offset < (-2 * max_carrier)))
                no_signal = TRUE;
-       else
-               no_signal = FALSE;
 
        return no_signal;
 }
 
-static void stv0900_get_sw_loop_params(struct stv0900_internal *i_params,
+static void stv0900_get_sw_loop_params(struct stv0900_internal *intp,
                                s32 *frequency_inc, s32 *sw_timeout,
                                s32 *steps,
                                enum fe_stv0900_demod_num demod)
@@ -85,30 +74,19 @@ static void stv0900_get_sw_loop_params(struct stv0900_internal *i_params,
 
        enum fe_stv0900_search_standard standard;
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               srate = i_params->dmd1_symbol_rate;
-               max_carrier = i_params->dmd1_srch_range / 1000;
-               max_carrier += max_carrier / 10;
-               standard = i_params->dmd1_srch_standard;
-               break;
-       case STV0900_DEMOD_2:
-               srate = i_params->dmd2_symbol_rate;
-               max_carrier = i_params->dmd2_srch_range / 1000;
-               max_carrier += max_carrier / 10;
-               standard = i_params->dmd2_srch_stndrd;
-               break;
-       }
+       srate = intp->symbol_rate[demod];
+       max_carrier = intp->srch_range[demod] / 1000;
+       max_carrier += max_carrier / 10;
+       standard = intp->srch_standard[demod];
 
        max_carrier = 65536 * (max_carrier / 2);
-       max_carrier /= i_params->mclk / 1000;
+       max_carrier /= intp->mclk / 1000;
 
        if (max_carrier > 0x4000)
                max_carrier = 0x4000;
 
        freq_inc = srate;
-       freq_inc /= i_params->mclk >> 10;
+       freq_inc /= intp->mclk >> 10;
        freq_inc = freq_inc << 6;
 
        switch (standard) {
@@ -154,7 +132,7 @@ static void stv0900_get_sw_loop_params(struct stv0900_internal *i_params,
 
 }
 
-static int stv0900_search_carr_sw_loop(struct stv0900_internal *i_params,
+static int stv0900_search_carr_sw_loop(struct stv0900_internal *intp,
                                s32 FreqIncr, s32 Timeout, int zigzag,
                                s32 MaxStep, enum fe_stv0900_demod_num demod)
 {
@@ -164,20 +142,11 @@ static int stv0900_search_carr_sw_loop(struct stv0900_internal *i_params,
                freqOffset,
                max_carrier;
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               max_carrier = i_params->dmd1_srch_range / 1000;
-               max_carrier += (max_carrier / 10);
-               break;
-       case STV0900_DEMOD_2:
-               max_carrier = i_params->dmd2_srch_range / 1000;
-               max_carrier += (max_carrier / 10);
-               break;
-       }
+       max_carrier = intp->srch_range[demod] / 1000;
+       max_carrier += (max_carrier / 10);
 
        max_carrier = 65536 * (max_carrier / 2);
-       max_carrier /= i_params->mclk / 1000;
+       max_carrier /= intp->mclk / 1000;
 
        if (max_carrier > 0x4000)
                max_carrier = 0x4000;
@@ -190,40 +159,15 @@ static int stv0900_search_carr_sw_loop(struct stv0900_internal *i_params,
        stepCpt = 0;
 
        do {
-               switch (demod) {
-               case STV0900_DEMOD_1:
-               default:
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1C);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1,
-                                       (freqOffset / 256) & 0xFF);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0,
-                                        freqOffset & 0xFF);
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-                       stv0900_write_bits(i_params, F0900_P1_ALGOSWRST, 1);
-
-                       if (i_params->chip_id == 0x12) {
-                               stv0900_write_bits(i_params,
-                                               F0900_P1_RST_HWARE, 1);
-                               stv0900_write_bits(i_params,
-                                               F0900_P1_RST_HWARE, 0);
-                       }
-                       break;
-               case STV0900_DEMOD_2:
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1C);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1,
-                                       (freqOffset / 256) & 0xFF);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0,
-                                       freqOffset & 0xFF);
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-                       stv0900_write_bits(i_params, F0900_P2_ALGOSWRST, 1);
-
-                       if (i_params->chip_id == 0x12) {
-                               stv0900_write_bits(i_params,
-                                               F0900_P2_RST_HWARE, 1);
-                               stv0900_write_bits(i_params,
-                                               F0900_P2_RST_HWARE, 0);
-                       }
-                       break;
+               stv0900_write_reg(intp, DMDISTATE, 0x1c);
+               stv0900_write_reg(intp, CFRINIT1, (freqOffset / 256) & 0xff);
+               stv0900_write_reg(intp, CFRINIT0, freqOffset & 0xff);
+               stv0900_write_reg(intp, DMDISTATE, 0x18);
+               stv0900_write_bits(intp, ALGOSWRST, 1);
+
+               if (intp->chip_id == 0x12) {
+                       stv0900_write_bits(intp, RST_HWARE, 1);
+                       stv0900_write_bits(intp, RST_HWARE, 0);
                }
 
                if (zigzag == TRUE) {
@@ -235,8 +179,8 @@ static int stv0900_search_carr_sw_loop(struct stv0900_internal *i_params,
                        freqOffset += + 2 * FreqIncr;
 
                stepCpt++;
-               lock = stv0900_get_demod_lock(i_params, demod, Timeout);
-               no_signal = stv0900_check_signal_presence(i_params, demod);
+               lock = stv0900_get_demod_lock(intp, demod, Timeout);
+               no_signal = stv0900_check_signal_presence(intp, demod);
 
        } while ((lock == FALSE)
                        && (no_signal == FALSE)
@@ -244,269 +188,138 @@ static int stv0900_search_carr_sw_loop(struct stv0900_internal *i_params,
                        && ((freqOffset + FreqIncr) > -max_carrier)
                        && (stepCpt < MaxStep));
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               stv0900_write_bits(i_params, F0900_P1_ALGOSWRST, 0);
-               break;
-       case STV0900_DEMOD_2:
-               stv0900_write_bits(i_params, F0900_P2_ALGOSWRST, 0);
-               break;
-       }
+       stv0900_write_bits(intp, ALGOSWRST, 0);
 
        return lock;
 }
 
-int stv0900_sw_algo(struct stv0900_internal *i_params,
+int stv0900_sw_algo(struct stv0900_internal *intp,
                                enum fe_stv0900_demod_num demod)
 {
-       int lock = FALSE;
-
-       int no_signal,
-       zigzag;
-       s32 dvbs2_fly_wheel;
-
-       s32 freqIncrement, softStepTimeout, trialCounter, max_steps;
-
-       stv0900_get_sw_loop_params(i_params, &freqIncrement, &softStepTimeout,
+       int     lock = FALSE,
+               no_signal,
+               zigzag;
+       s32     s2fw,
+               fqc_inc,
+               sft_stp_tout,
+               trial_cntr,
+               max_steps;
+
+       stv0900_get_sw_loop_params(intp, &fqc_inc, &sft_stp_tout,
                                        &max_steps, demod);
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               switch (i_params->dmd1_srch_standard) {
-               case STV0900_SEARCH_DVBS1:
-               case STV0900_SEARCH_DSS:
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ,
-                                               0x3B);
-                       else
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ,
-                                               0xef);
-
-                       stv0900_write_reg(i_params, R0900_P1_DMDCFGMD, 0x49);
-                       zigzag = FALSE;
-                       break;
-               case STV0900_SEARCH_DVBS2:
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P1_CORRELABS,
-                                               0x79);
-                       else
-                               stv0900_write_reg(i_params, R0900_P1_CORRELABS,
-                                               0x68);
+       switch (intp->srch_standard[demod]) {
+       case STV0900_SEARCH_DVBS1:
+       case STV0900_SEARCH_DSS:
+               if (intp->chip_id >= 0x20)
+                       stv0900_write_reg(intp, CARFREQ, 0x3b);
+               else
+                       stv0900_write_reg(intp, CARFREQ, 0xef);
 
-                       stv0900_write_reg(i_params, R0900_P1_DMDCFGMD,
-                                               0x89);
+               stv0900_write_reg(intp, DMDCFGMD, 0x49);
+               zigzag = FALSE;
+               break;
+       case STV0900_SEARCH_DVBS2:
+               if (intp->chip_id >= 0x20)
+                       stv0900_write_reg(intp, CORRELABS, 0x79);
+               else
+                       stv0900_write_reg(intp, CORRELABS, 0x68);
 
-                       zigzag = TRUE;
-                       break;
-               case STV0900_AUTO_SEARCH:
-               default:
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ,
-                                                       0x3B);
-                               stv0900_write_reg(i_params, R0900_P1_CORRELABS,
-                                                       0x79);
-                       } else {
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ,
-                                                       0xef);
-                               stv0900_write_reg(i_params, R0900_P1_CORRELABS,
-                                                       0x68);
-                       }
+               stv0900_write_reg(intp, DMDCFGMD, 0x89);
 
-                       stv0900_write_reg(i_params, R0900_P1_DMDCFGMD,
-                                                       0xc9);
-                       zigzag = FALSE;
-                       break;
+               zigzag = TRUE;
+               break;
+       case STV0900_AUTO_SEARCH:
+       default:
+               if (intp->chip_id >= 0x20) {
+                       stv0900_write_reg(intp, CARFREQ, 0x3b);
+                       stv0900_write_reg(intp, CORRELABS, 0x79);
+               } else {
+                       stv0900_write_reg(intp, CARFREQ, 0xef);
+                       stv0900_write_reg(intp, CORRELABS, 0x68);
                }
 
-               trialCounter = 0;
-               do {
-                       lock = stv0900_search_carr_sw_loop(i_params,
-                                                       freqIncrement,
-                                                       softStepTimeout,
-                                                       zigzag,
-                                                       max_steps,
-                                                       demod);
-                       no_signal = stv0900_check_signal_presence(i_params,
-                                                               demod);
-                       trialCounter++;
-                       if ((lock == TRUE)
-                                       || (no_signal == TRUE)
-                                       || (trialCounter == 2)) {
-
-                               if (i_params->chip_id >= 0x20) {
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P1_CARFREQ,
-                                                       0x49);
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P1_CORRELABS,
-                                                       0x9e);
-                               } else {
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P1_CARFREQ,
-                                                       0xed);
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P1_CORRELABS,
-                                                       0x88);
-                               }
-
-                               if ((lock == TRUE) && (stv0900_get_bits(i_params, F0900_P1_HEADER_MODE) == STV0900_DVBS2_FOUND)) {
-                                       msleep(softStepTimeout);
-                                       dvbs2_fly_wheel = stv0900_get_bits(i_params, F0900_P1_FLYWHEEL_CPT);
-
-                                       if (dvbs2_fly_wheel < 0xd) {
-                                               msleep(softStepTimeout);
-                                               dvbs2_fly_wheel = stv0900_get_bits(i_params, F0900_P1_FLYWHEEL_CPT);
-                                       }
-
-                                       if (dvbs2_fly_wheel < 0xd) {
-                                               lock = FALSE;
-
-                                               if (trialCounter < 2) {
-                                                       if (i_params->chip_id >= 0x20)
-                                                               stv0900_write_reg(i_params, R0900_P1_CORRELABS, 0x79);
-                                                       else
-                                                               stv0900_write_reg(i_params, R0900_P1_CORRELABS, 0x68);
-
-                                                       stv0900_write_reg(i_params, R0900_P1_DMDCFGMD, 0x89);
-                                               }
-                                       }
-                               }
-                       }
-
-               } while ((lock == FALSE)
-                       && (trialCounter < 2)
-                       && (no_signal == FALSE));
-
+               stv0900_write_reg(intp, DMDCFGMD, 0xc9);
+               zigzag = FALSE;
                break;
-       case STV0900_DEMOD_2:
-               switch (i_params->dmd2_srch_stndrd) {
-               case STV0900_SEARCH_DVBS1:
-               case STV0900_SEARCH_DSS:
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ,
-                                               0x3b);
-                       else
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ,
-                                               0xef);
-
-                       stv0900_write_reg(i_params, R0900_P2_DMDCFGMD,
-                                               0x49);
-                       zigzag = FALSE;
-                       break;
-               case STV0900_SEARCH_DVBS2:
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P2_CORRELABS,
-                                               0x79);
-                       else
-                               stv0900_write_reg(i_params, R0900_P2_CORRELABS,
-                                               0x68);
+       }
 
-                       stv0900_write_reg(i_params, R0900_P2_DMDCFGMD, 0x89);
-                       zigzag = TRUE;
-                       break;
-               case STV0900_AUTO_SEARCH:
-               default:
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ,
-                                               0x3b);
-                               stv0900_write_reg(i_params, R0900_P2_CORRELABS,
-                                               0x79);
+       trial_cntr = 0;
+       do {
+               lock = stv0900_search_carr_sw_loop(intp,
+                                               fqc_inc,
+                                               sft_stp_tout,
+                                               zigzag,
+                                               max_steps,
+                                               demod);
+               no_signal = stv0900_check_signal_presence(intp, demod);
+               trial_cntr++;
+               if ((lock == TRUE)
+                               || (no_signal == TRUE)
+                               || (trial_cntr == 2)) {
+
+                       if (intp->chip_id >= 0x20) {
+                               stv0900_write_reg(intp, CARFREQ, 0x49);
+                               stv0900_write_reg(intp, CORRELABS, 0x9e);
                        } else {
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ,
-                                               0xef);
-                               stv0900_write_reg(i_params, R0900_P2_CORRELABS,
-                                               0x68);
+                               stv0900_write_reg(intp, CARFREQ, 0xed);
+                               stv0900_write_reg(intp, CORRELABS, 0x88);
                        }
 
-                       stv0900_write_reg(i_params, R0900_P2_DMDCFGMD, 0xc9);
-
-                       zigzag = FALSE;
-                       break;
-               }
+                       if ((stv0900_get_bits(intp, HEADER_MODE) ==
+                                               STV0900_DVBS2_FOUND) &&
+                                                       (lock == TRUE)) {
+                               msleep(sft_stp_tout);
+                               s2fw = stv0900_get_bits(intp, FLYWHEEL_CPT);
 
-               trialCounter = 0;
-
-               do {
-                       lock = stv0900_search_carr_sw_loop(i_params,
-                                                       freqIncrement,
-                                                       softStepTimeout,
-                                                       zigzag,
-                                                       max_steps,
-                                                       demod);
-                       no_signal = stv0900_check_signal_presence(i_params,
-                                                               demod);
-                       trialCounter++;
-                       if ((lock == TRUE)
-                                       || (no_signal == TRUE)
-                                       || (trialCounter == 2)) {
-                               if (i_params->chip_id >= 0x20) {
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P2_CARFREQ,
-                                                       0x49);
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P2_CORRELABS,
-                                                       0x9e);
-                               } else {
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P2_CARFREQ,
-                                                       0xed);
-                                       stv0900_write_reg(i_params,
-                                                       R0900_P2_CORRELABS,
-                                                       0x88);
+                               if (s2fw < 0xd) {
+                                       msleep(sft_stp_tout);
+                                       s2fw = stv0900_get_bits(intp,
+                                                               FLYWHEEL_CPT);
                                }
 
-                               if ((lock == TRUE) && (stv0900_get_bits(i_params, F0900_P2_HEADER_MODE) == STV0900_DVBS2_FOUND)) {
-                                       msleep(softStepTimeout);
-                                       dvbs2_fly_wheel = stv0900_get_bits(i_params, F0900_P2_FLYWHEEL_CPT);
-                                       if (dvbs2_fly_wheel < 0xd) {
-                                               msleep(softStepTimeout);
-                                               dvbs2_fly_wheel = stv0900_get_bits(i_params, F0900_P2_FLYWHEEL_CPT);
-                                       }
+                               if (s2fw < 0xd) {
+                                       lock = FALSE;
 
-                                       if (dvbs2_fly_wheel < 0xd) {
-                                               lock = FALSE;
-                                               if (trialCounter < 2) {
-                                                       if (i_params->chip_id >= 0x20)
-                                                               stv0900_write_reg(i_params, R0900_P2_CORRELABS, 0x79);
-                                                       else
-                                                               stv0900_write_reg(i_params, R0900_P2_CORRELABS, 0x68);
+                                       if (trial_cntr < 2) {
+                                               if (intp->chip_id >= 0x20)
+                                                       stv0900_write_reg(intp,
+                                                               CORRELABS,
+                                                               0x79);
+                                               else
+                                                       stv0900_write_reg(intp,
+                                                               CORRELABS,
+                                                               0x68);
 
-                                                       stv0900_write_reg(i_params, R0900_P2_DMDCFGMD, 0x89);
-                                               }
+                                               stv0900_write_reg(intp,
+                                                               DMDCFGMD,
+                                                               0x89);
                                        }
                                }
                        }
+               }
 
-               } while ((lock == FALSE) && (trialCounter < 2) && (no_signal == FALSE));
-
-               break;
-       }
+       } while ((lock == FALSE)
+               && (trial_cntr < 2)
+               && (no_signal == FALSE));
 
        return lock;
 }
 
-static u32 stv0900_get_symbol_rate(struct stv0900_internal *i_params,
+static u32 stv0900_get_symbol_rate(struct stv0900_internal *intp,
                                        u32 mclk,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 sfr_field3, sfr_field2, sfr_field1, sfr_field0,
-       rem1, rem2, intval1, intval2, srate;
-
-       dmd_reg(sfr_field3, F0900_P1_SYMB_FREQ3, F0900_P2_SYMB_FREQ3);
-       dmd_reg(sfr_field2, F0900_P1_SYMB_FREQ2, F0900_P2_SYMB_FREQ2);
-       dmd_reg(sfr_field1, F0900_P1_SYMB_FREQ1, F0900_P2_SYMB_FREQ1);
-       dmd_reg(sfr_field0, F0900_P1_SYMB_FREQ0, F0900_P2_SYMB_FREQ0);
-
-       srate = (stv0900_get_bits(i_params, sfr_field3) << 24) +
-               (stv0900_get_bits(i_params, sfr_field2) << 16) +
-               (stv0900_get_bits(i_params, sfr_field1) << 8) +
-               (stv0900_get_bits(i_params, sfr_field0));
+       s32     rem1, rem2, intval1, intval2, srate;
+
+       srate = (stv0900_get_bits(intp, SYMB_FREQ3) << 24) +
+               (stv0900_get_bits(intp, SYMB_FREQ2) << 16) +
+               (stv0900_get_bits(intp, SYMB_FREQ1) << 8) +
+               (stv0900_get_bits(intp, SYMB_FREQ0));
        dprintk("lock: srate=%d r0=0x%x r1=0x%x r2=0x%x r3=0x%x \n",
-               srate, stv0900_get_bits(i_params, sfr_field0),
-               stv0900_get_bits(i_params, sfr_field1),
-               stv0900_get_bits(i_params, sfr_field2),
-               stv0900_get_bits(i_params, sfr_field3));
+               srate, stv0900_get_bits(intp, SYMB_FREQ0),
+               stv0900_get_bits(intp, SYMB_FREQ1),
+               stv0900_get_bits(intp, SYMB_FREQ2),
+               stv0900_get_bits(intp, SYMB_FREQ3));
 
        intval1 = (mclk) >> 16;
        intval2 = (srate) >> 16;
@@ -520,18 +333,15 @@ static u32 stv0900_get_symbol_rate(struct stv0900_internal *i_params,
        return srate;
 }
 
-static void stv0900_set_symbol_rate(struct stv0900_internal *i_params,
+static void stv0900_set_symbol_rate(struct stv0900_internal *intp,
                                        u32 mclk, u32 srate,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 sfr_init_reg;
        u32 symb;
 
        dprintk("%s: Mclk %d, SR %d, Dmd %d\n", __func__, mclk,
                                                        srate, demod);
 
-       dmd_reg(sfr_init_reg, R0900_P1_SFRINIT1, R0900_P2_SFRINIT1);
-
        if (srate > 60000000) {
                symb = srate << 4;
                symb /= (mclk >> 12);
@@ -543,19 +353,16 @@ static void stv0900_set_symbol_rate(struct stv0900_internal *i_params,
                symb /= (mclk >> 7);
        }
 
-       stv0900_write_reg(i_params, sfr_init_reg, (symb >> 8) & 0x7F);
-       stv0900_write_reg(i_params, sfr_init_reg + 1, (symb & 0xFF));
+       stv0900_write_reg(intp, SFRINIT1, (symb >> 8) & 0x7f);
+       stv0900_write_reg(intp, SFRINIT1 + 1, (symb & 0xff));
 }
 
-static void stv0900_set_max_symbol_rate(struct stv0900_internal *i_params,
+static void stv0900_set_max_symbol_rate(struct stv0900_internal *intp,
                                        u32 mclk, u32 srate,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 sfr_max_reg;
        u32 symb;
 
-       dmd_reg(sfr_max_reg, R0900_P1_SFRUP1, R0900_P2_SFRUP1);
-
        srate = 105 * (srate / 100);
 
        if (srate > 60000000) {
@@ -570,23 +377,20 @@ static void stv0900_set_max_symbol_rate(struct stv0900_internal *i_params,
        }
 
        if (symb < 0x7fff) {
-               stv0900_write_reg(i_params, sfr_max_reg, (symb >> 8) & 0x7F);
-               stv0900_write_reg(i_params, sfr_max_reg + 1, (symb & 0xFF));
+               stv0900_write_reg(intp, SFRUP1, (symb >> 8) & 0x7f);
+               stv0900_write_reg(intp, SFRUP1 + 1, (symb & 0xff));
        } else {
-               stv0900_write_reg(i_params, sfr_max_reg, 0x7F);
-               stv0900_write_reg(i_params, sfr_max_reg + 1, 0xFF);
+               stv0900_write_reg(intp, SFRUP1, 0x7f);
+               stv0900_write_reg(intp, SFRUP1 + 1, 0xff);
        }
 }
 
-static void stv0900_set_min_symbol_rate(struct stv0900_internal *i_params,
+static void stv0900_set_min_symbol_rate(struct stv0900_internal *intp,
                                        u32 mclk, u32 srate,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 sfr_min_reg;
        u32     symb;
 
-       dmd_reg(sfr_min_reg, R0900_P1_SFRLOW1, R0900_P2_SFRLOW1);
-
        srate = 95 * (srate / 100);
        if (srate > 60000000) {
                symb = srate << 4;
@@ -601,22 +405,20 @@ static void stv0900_set_min_symbol_rate(struct stv0900_internal *i_params,
                symb /= (mclk >> 7);
        }
 
-       stv0900_write_reg(i_params, sfr_min_reg, (symb >> 8) & 0xFF);
-       stv0900_write_reg(i_params, sfr_min_reg + 1, (symb & 0xFF));
+       stv0900_write_reg(intp, SFRLOW1, (symb >> 8) & 0xff);
+       stv0900_write_reg(intp, SFRLOW1 + 1, (symb & 0xff));
 }
 
-static s32 stv0900_get_timing_offst(struct stv0900_internal *i_params,
+static s32 stv0900_get_timing_offst(struct stv0900_internal *intp,
                                        u32 srate,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 tmgreg,
-       timingoffset;
+       s32 timingoffset;
 
-       dmd_reg(tmgreg, R0900_P1_TMGREG2, R0900_P2_TMGREG2);
 
-       timingoffset = (stv0900_read_reg(i_params, tmgreg) << 16) +
-                      (stv0900_read_reg(i_params, tmgreg + 1) << 8) +
-                      (stv0900_read_reg(i_params, tmgreg + 2));
+       timingoffset = (stv0900_read_reg(intp, TMGREG2) << 16) +
+                      (stv0900_read_reg(intp, TMGREG2 + 1) << 8) +
+                      (stv0900_read_reg(intp, TMGREG2 + 2));
 
        timingoffset = ge2comp(timingoffset, 24);
 
@@ -630,22 +432,19 @@ static s32 stv0900_get_timing_offst(struct stv0900_internal *i_params,
        return timingoffset;
 }
 
-static void stv0900_set_dvbs2_rolloff(struct stv0900_internal *i_params,
+static void stv0900_set_dvbs2_rolloff(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 rolloff, man_fld, matstr_reg, rolloff_ctl_fld;
-
-       dmd_reg(man_fld, F0900_P1_MANUAL_ROLLOFF, F0900_P2_MANUAL_ROLLOFF);
-       dmd_reg(matstr_reg, R0900_P1_MATSTR1, R0900_P2_MATSTR1);
-       dmd_reg(rolloff_ctl_fld, F0900_P1_ROLLOFF_CONTROL,
-                               F0900_P2_ROLLOFF_CONTROL);
-
-       if (i_params->chip_id == 0x10) {
-               stv0900_write_bits(i_params, man_fld, 1);
-               rolloff = stv0900_read_reg(i_params, matstr_reg) & 0x03;
-               stv0900_write_bits(i_params, rolloff_ctl_fld, rolloff);
-       } else
-               stv0900_write_bits(i_params, man_fld, 0);
+       s32 rolloff;
+
+       if (intp->chip_id == 0x10) {
+               stv0900_write_bits(intp, MANUALSX_ROLLOFF, 1);
+               rolloff = stv0900_read_reg(intp, MATSTR1) & 0x03;
+               stv0900_write_bits(intp, ROLLOFF_CONTROL, rolloff);
+       } else if (intp->chip_id <= 0x20)
+               stv0900_write_bits(intp, MANUALSX_ROLLOFF, 0);
+       else /* cut 3.0 */
+               stv0900_write_bits(intp, MANUALS2_ROLLOFF, 0);
 }
 
 static u32 stv0900_carrier_width(u32 srate, enum fe_stv0900_rolloff ro)
@@ -668,84 +467,47 @@ static u32 stv0900_carrier_width(u32 srate, enum fe_stv0900_rolloff ro)
        return srate  + (srate * rolloff) / 100;
 }
 
-static int stv0900_check_timing_lock(struct stv0900_internal *i_params,
+static int stv0900_check_timing_lock(struct stv0900_internal *intp,
                                enum fe_stv0900_demod_num demod)
 {
        int timingLock = FALSE;
-       s32 i,
-       timingcpt = 0;
-       u8 carFreq,
-       tmgTHhigh,
-       tmgTHLow;
-
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               carFreq = stv0900_read_reg(i_params, R0900_P1_CARFREQ);
-               tmgTHhigh = stv0900_read_reg(i_params, R0900_P1_TMGTHRISE);
-               tmgTHLow = stv0900_read_reg(i_params, R0900_P1_TMGTHFALL);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHRISE, 0x20);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHFALL, 0x0);
-               stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 0);
-               stv0900_write_reg(i_params, R0900_P1_RTC, 0x80);
-               stv0900_write_reg(i_params, R0900_P1_RTCS2, 0x40);
-               stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0x0);
-               stv0900_write_reg(i_params, R0900_P1_CFRINIT1, 0x0);
-               stv0900_write_reg(i_params, R0900_P1_CFRINIT0, 0x0);
-               stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x65);
-               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-               msleep(7);
-
-               for (i = 0; i < 10; i++) {
-                       if (stv0900_get_bits(i_params, F0900_P1_TMGLOCK_QUALITY) >= 2)
-                               timingcpt++;
-
-                       msleep(1);
-               }
-
-               if (timingcpt >= 3)
-                       timingLock = TRUE;
-
-               stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x38);
-               stv0900_write_reg(i_params, R0900_P1_RTC, 0x88);
-               stv0900_write_reg(i_params, R0900_P1_RTCS2, 0x68);
-               stv0900_write_reg(i_params, R0900_P1_CARFREQ, carFreq);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHRISE, tmgTHhigh);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHFALL, tmgTHLow);
-               break;
-       case STV0900_DEMOD_2:
-               carFreq = stv0900_read_reg(i_params, R0900_P2_CARFREQ);
-               tmgTHhigh = stv0900_read_reg(i_params, R0900_P2_TMGTHRISE);
-               tmgTHLow = stv0900_read_reg(i_params, R0900_P2_TMGTHFALL);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHRISE, 0x20);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHFALL, 0);
-               stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 0);
-               stv0900_write_reg(i_params, R0900_P2_RTC, 0x80);
-               stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x40);
-               stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0x0);
-               stv0900_write_reg(i_params, R0900_P2_CFRINIT1, 0x0);
-               stv0900_write_reg(i_params, R0900_P2_CFRINIT0, 0x0);
-               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x65);
-               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-               msleep(5);
-               for (i = 0; i < 10; i++) {
-                       if (stv0900_get_bits(i_params, F0900_P2_TMGLOCK_QUALITY) >= 2)
-                               timingcpt++;
-
-                       msleep(1);
-               }
+       s32     i,
+               timingcpt = 0;
+       u8      car_freq,
+               tmg_th_high,
+               tmg_th_low;
+
+       car_freq = stv0900_read_reg(intp, CARFREQ);
+       tmg_th_high = stv0900_read_reg(intp, TMGTHRISE);
+       tmg_th_low = stv0900_read_reg(intp, TMGTHFALL);
+       stv0900_write_reg(intp, TMGTHRISE, 0x20);
+       stv0900_write_reg(intp, TMGTHFALL, 0x0);
+       stv0900_write_bits(intp, CFR_AUTOSCAN, 0);
+       stv0900_write_reg(intp, RTC, 0x80);
+       stv0900_write_reg(intp, RTCS2, 0x40);
+       stv0900_write_reg(intp, CARFREQ, 0x0);
+       stv0900_write_reg(intp, CFRINIT1, 0x0);
+       stv0900_write_reg(intp, CFRINIT0, 0x0);
+       stv0900_write_reg(intp, AGC2REF, 0x65);
+       stv0900_write_reg(intp, DMDISTATE, 0x18);
+       msleep(7);
+
+       for (i = 0; i < 10; i++) {
+               if (stv0900_get_bits(intp, TMGLOCK_QUALITY) >= 2)
+                       timingcpt++;
+
+               msleep(1);
+       }
 
-               if (timingcpt >= 3)
-                       timingLock = TRUE;
+       if (timingcpt >= 3)
+               timingLock = TRUE;
 
-               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x38);
-               stv0900_write_reg(i_params, R0900_P2_RTC, 0x88);
-               stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x68);
-               stv0900_write_reg(i_params, R0900_P2_CARFREQ, carFreq);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHRISE, tmgTHhigh);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHFALL, tmgTHLow);
-               break;
-       }
+       stv0900_write_reg(intp, AGC2REF, 0x38);
+       stv0900_write_reg(intp, RTC, 0x88);
+       stv0900_write_reg(intp, RTCS2, 0x68);
+       stv0900_write_reg(intp, CARFREQ, car_freq);
+       stv0900_write_reg(intp, TMGTHRISE, tmg_th_high);
+       stv0900_write_reg(intp, TMGTHFALL, tmg_th_low);
 
        return  timingLock;
 }
@@ -754,142 +516,114 @@ static int stv0900_get_demod_cold_lock(struct dvb_frontend *fe,
                                        s32 demod_timeout)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
+       int     lock = FALSE,
+               d = demod;
+       s32     srate,
+               search_range,
+               locktimeout,
+               currier_step,
+               nb_steps,
+               current_step,
+               direction,
+               tuner_freq,
+               timeout,
+               freq;
 
-       int lock = FALSE;
-       s32 srate, search_range, locktimeout,
-               currier_step, nb_steps, current_step,
-               direction, tuner_freq, timeout;
-
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               srate = i_params->dmd1_symbol_rate;
-               search_range = i_params->dmd1_srch_range;
-               break;
-
-       case STV0900_DEMOD_2:
-               srate = i_params->dmd2_symbol_rate;
-               search_range = i_params->dmd2_srch_range;
-               break;
-       }
+       srate = intp->symbol_rate[d];
+       search_range = intp->srch_range[d];
 
        if (srate >= 10000000)
                locktimeout = demod_timeout / 3;
        else
                locktimeout = demod_timeout / 2;
 
-       lock = stv0900_get_demod_lock(i_params, demod, locktimeout);
-
-       if (lock == FALSE) {
-               if (srate >= 10000000) {
-                       if (stv0900_check_timing_lock(i_params, demod) == TRUE) {
-                               switch (demod) {
-                               case STV0900_DEMOD_1:
-                               default:
-                                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1f);
-                                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x15);
-                                       break;
-                               case STV0900_DEMOD_2:
-                                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1f);
-                                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x15);
-                                       break;
-                               }
+       lock = stv0900_get_demod_lock(intp, d, locktimeout);
 
-                               lock = stv0900_get_demod_lock(i_params, demod, demod_timeout);
-                       } else
-                               lock = FALSE;
-               } else {
-                       if (srate <= 4000000)
-                               currier_step = 1000;
-                       else if (srate <= 7000000)
-                               currier_step = 2000;
-                       else if (srate <= 10000000)
-                               currier_step = 3000;
-                       else
-                               currier_step = 5000;
-
-                       nb_steps = ((search_range / 1000) / currier_step);
-                       nb_steps /= 2;
-                       nb_steps = (2 * (nb_steps + 1));
-                       if (nb_steps < 0)
-                               nb_steps = 2;
-                       else if (nb_steps > 12)
-                               nb_steps = 12;
-
-                       current_step = 1;
-                       direction = 1;
+       if (lock != FALSE)
+               return lock;
+
+       if (srate >= 10000000) {
+               if (stv0900_check_timing_lock(intp, d) == TRUE) {
+                       stv0900_write_reg(intp, DMDISTATE, 0x1f);
+                       stv0900_write_reg(intp, DMDISTATE, 0x15);
+                       lock = stv0900_get_demod_lock(intp, d, demod_timeout);
+               } else
+                       lock = FALSE;
+
+               return lock;
+       }
+
+       if (intp->chip_id <= 0x20) {
+               if (srate <= 1000000)
+                       currier_step = 500;
+               else if (srate <= 4000000)
+                       currier_step = 1000;
+               else if (srate <= 7000000)
+                       currier_step = 2000;
+               else if (srate <= 10000000)
+                       currier_step = 3000;
+               else
+                       currier_step = 5000;
+
+               if (srate >= 2000000) {
                        timeout = (demod_timeout / 3);
                        if (timeout > 1000)
                                timeout = 1000;
+               } else
+                       timeout = (demod_timeout / 2);
+       } else {
+               /*cut 3.0 */
+               currier_step = srate / 4000;
+               timeout = (demod_timeout * 3) / 4;
+       }
 
-                       switch (demod) {
-                       case STV0900_DEMOD_1:
-                       default:
-                               if (lock == FALSE) {
-                                       tuner_freq = i_params->tuner1_freq;
-                                       i_params->tuner1_bw = stv0900_carrier_width(i_params->dmd1_symbol_rate, i_params->rolloff) + i_params->dmd1_symbol_rate;
+       nb_steps = ((search_range / 1000) / currier_step);
 
-                                       while ((current_step <= nb_steps) && (lock == FALSE)) {
+       if ((nb_steps % 2) != 0)
+               nb_steps += 1;
 
-                                               if (direction > 0)
-                                                       tuner_freq += (current_step * currier_step);
-                                               else
-                                                       tuner_freq -= (current_step * currier_step);
-
-                                               stv0900_set_tuner(fe, tuner_freq, i_params->tuner1_bw);
-                                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1C);
-                                               if (i_params->dmd1_srch_standard == STV0900_SEARCH_DVBS2) {
-                                                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 0);
-                                                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-                                                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                                                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 1);
-                                               }
-
-                                               stv0900_write_reg(i_params, R0900_P1_CFRINIT1, 0);
-                                               stv0900_write_reg(i_params, R0900_P1_CFRINIT0, 0);
-                                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1F);
-                                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x15);
-                                               lock = stv0900_get_demod_lock(i_params, demod, timeout);
-                                               direction *= -1;
-                                               current_step++;
-                                       }
-                               }
-                               break;
-                       case STV0900_DEMOD_2:
-                               if (lock == FALSE) {
-                                       tuner_freq = i_params->tuner2_freq;
-                                       i_params->tuner2_bw = stv0900_carrier_width(srate, i_params->rolloff) + srate;
+       if (nb_steps <= 0)
+               nb_steps = 2;
+       else if (nb_steps > 12)
+               nb_steps = 12;
 
-                                       while ((current_step <= nb_steps) && (lock == FALSE)) {
+       current_step = 1;
+       direction = 1;
 
-                                               if (direction > 0)
-                                                       tuner_freq += (current_step * currier_step);
-                                               else
-                                                       tuner_freq -= (current_step * currier_step);
-
-                                               stv0900_set_tuner(fe, tuner_freq, i_params->tuner2_bw);
-                                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1C);
-                                               if (i_params->dmd2_srch_stndrd == STV0900_SEARCH_DVBS2) {
-                                                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 0);
-                                                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
-                                                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                                                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 1);
-                                               }
-
-                                               stv0900_write_reg(i_params, R0900_P2_CFRINIT1, 0);
-                                               stv0900_write_reg(i_params, R0900_P2_CFRINIT0, 0);
-                                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1F);
-                                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x15);
-                                               lock = stv0900_get_demod_lock(i_params, demod, timeout);
-                                               direction *= -1;
-                                               current_step++;
-                                       }
-                               }
-                               break;
-                       }
+       if (intp->chip_id <= 0x20) {
+               tuner_freq = intp->freq[d];
+               intp->bw[d] = stv0900_carrier_width(intp->symbol_rate[d],
+                               intp->rolloff) + intp->symbol_rate[d];
+       } else
+               tuner_freq = 0;
+
+       while ((current_step <= nb_steps) && (lock == FALSE)) {
+               if (direction > 0)
+                       tuner_freq += (current_step * currier_step);
+               else
+                       tuner_freq -= (current_step * currier_step);
+
+               if (intp->chip_id <= 0x20) {
+                       stv0900_set_tuner(fe, tuner_freq, intp->bw[d]);
+                       stv0900_write_reg(intp, DMDISTATE, 0x1c);
+                       stv0900_write_reg(intp, CFRINIT1, 0);
+                       stv0900_write_reg(intp, CFRINIT0, 0);
+                       stv0900_write_reg(intp, DMDISTATE, 0x1f);
+                       stv0900_write_reg(intp, DMDISTATE, 0x15);
+               } else {
+                       stv0900_write_reg(intp, DMDISTATE, 0x1c);
+                       freq = (tuner_freq * 65536) / (intp->mclk / 1000);
+                       stv0900_write_bits(intp, CFR_INIT1, MSB(freq));
+                       stv0900_write_bits(intp, CFR_INIT0, LSB(freq));
+                       stv0900_write_reg(intp, DMDISTATE, 0x1f);
+                       stv0900_write_reg(intp, DMDISTATE, 0x05);
                }
+
+               lock = stv0900_get_demod_lock(intp, d, timeout);
+               direction *= -1;
+               current_step++;
        }
 
        return  lock;
@@ -931,9 +665,7 @@ static void stv0900_get_lock_timeout(s32 *demod_timeout, s32 *fec_timeout,
                } else if (srate <= 20000000) {
                        (*demod_timeout) = 400;
                        (*fec_timeout) = 130;
-               }
-
-               else {
+               } else {
                        (*demod_timeout) = 300;
                        (*fec_timeout) = 100;
                }
@@ -946,95 +678,77 @@ static void stv0900_get_lock_timeout(s32 *demod_timeout, s32 *fec_timeout,
                (*demod_timeout) /= 2;
 }
 
-static void stv0900_set_viterbi_tracq(struct stv0900_internal *i_params,
+static void stv0900_set_viterbi_tracq(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
 
-       s32 vth_reg;
+       s32 vth_reg = VTH12;
 
        dprintk("%s\n", __func__);
 
-       dmd_reg(vth_reg, R0900_P1_VTH12, R0900_P2_VTH12);
-
-       stv0900_write_reg(i_params, vth_reg++, 0xd0);
-       stv0900_write_reg(i_params, vth_reg++, 0x7d);
-       stv0900_write_reg(i_params, vth_reg++, 0x53);
-       stv0900_write_reg(i_params, vth_reg++, 0x2F);
-       stv0900_write_reg(i_params, vth_reg++, 0x24);
-       stv0900_write_reg(i_params, vth_reg++, 0x1F);
+       stv0900_write_reg(intp, vth_reg++, 0xd0);
+       stv0900_write_reg(intp, vth_reg++, 0x7d);
+       stv0900_write_reg(intp, vth_reg++, 0x53);
+       stv0900_write_reg(intp, vth_reg++, 0x2f);
+       stv0900_write_reg(intp, vth_reg++, 0x24);
+       stv0900_write_reg(intp, vth_reg++, 0x1f);
 }
 
-static void stv0900_set_viterbi_standard(struct stv0900_internal *i_params,
-                                  enum fe_stv0900_search_standard Standard,
-                                  enum fe_stv0900_fec PunctureRate,
+static void stv0900_set_viterbi_standard(struct stv0900_internal *intp,
+                                  enum fe_stv0900_search_standard standard,
+                                  enum fe_stv0900_fec fec,
                                   enum fe_stv0900_demod_num demod)
 {
-
-       s32 fecmReg,
-       prvitReg;
-
        dprintk("%s: ViterbiStandard = ", __func__);
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               fecmReg = R0900_P1_FECM;
-               prvitReg = R0900_P1_PRVIT;
-               break;
-       case STV0900_DEMOD_2:
-               fecmReg = R0900_P2_FECM;
-               prvitReg = R0900_P2_PRVIT;
-               break;
-       }
-
-       switch (Standard) {
+       switch (standard) {
        case STV0900_AUTO_SEARCH:
                dprintk("Auto\n");
-               stv0900_write_reg(i_params, fecmReg, 0x10);
-               stv0900_write_reg(i_params, prvitReg, 0x3F);
+               stv0900_write_reg(intp, FECM, 0x10);
+               stv0900_write_reg(intp, PRVIT, 0x3f);
                break;
        case STV0900_SEARCH_DVBS1:
                dprintk("DVBS1\n");
-               stv0900_write_reg(i_params, fecmReg, 0x00);
-               switch (PunctureRate) {
+               stv0900_write_reg(intp, FECM, 0x00);
+               switch (fec) {
                case STV0900_FEC_UNKNOWN:
                default:
-                       stv0900_write_reg(i_params, prvitReg, 0x2F);
+                       stv0900_write_reg(intp, PRVIT, 0x2f);
                        break;
                case STV0900_FEC_1_2:
-                       stv0900_write_reg(i_params, prvitReg, 0x01);
+                       stv0900_write_reg(intp, PRVIT, 0x01);
                        break;
                case STV0900_FEC_2_3:
-                       stv0900_write_reg(i_params, prvitReg, 0x02);
+                       stv0900_write_reg(intp, PRVIT, 0x02);
                        break;
                case STV0900_FEC_3_4:
-                       stv0900_write_reg(i_params, prvitReg, 0x04);
+                       stv0900_write_reg(intp, PRVIT, 0x04);
                        break;
                case STV0900_FEC_5_6:
-                       stv0900_write_reg(i_params, prvitReg, 0x08);
+                       stv0900_write_reg(intp, PRVIT, 0x08);
                        break;
                case STV0900_FEC_7_8:
-                       stv0900_write_reg(i_params, prvitReg, 0x20);
+                       stv0900_write_reg(intp, PRVIT, 0x20);
                        break;
                }
 
                break;
        case STV0900_SEARCH_DSS:
                dprintk("DSS\n");
-               stv0900_write_reg(i_params, fecmReg, 0x80);
-               switch (PunctureRate) {
+               stv0900_write_reg(intp, FECM, 0x80);
+               switch (fec) {
                case STV0900_FEC_UNKNOWN:
                default:
-                       stv0900_write_reg(i_params, prvitReg, 0x13);
+                       stv0900_write_reg(intp, PRVIT, 0x13);
                        break;
                case STV0900_FEC_1_2:
-                       stv0900_write_reg(i_params, prvitReg, 0x01);
+                       stv0900_write_reg(intp, PRVIT, 0x01);
                        break;
                case STV0900_FEC_2_3:
-                       stv0900_write_reg(i_params, prvitReg, 0x02);
+                       stv0900_write_reg(intp, PRVIT, 0x02);
                        break;
                case STV0900_FEC_6_7:
-                       stv0900_write_reg(i_params, prvitReg, 0x10);
+                       stv0900_write_reg(intp, PRVIT, 0x10);
                        break;
                }
                break;
@@ -1043,340 +757,277 @@ static void stv0900_set_viterbi_standard(struct stv0900_internal *i_params,
        }
 }
 
+static enum fe_stv0900_fec stv0900_get_vit_fec(struct stv0900_internal *intp,
+                                               enum fe_stv0900_demod_num demod)
+{
+       enum fe_stv0900_fec prate;
+       s32 rate_fld = stv0900_get_bits(intp, VIT_CURPUN);
+
+       switch (rate_fld) {
+       case 13:
+               prate = STV0900_FEC_1_2;
+               break;
+       case 18:
+               prate = STV0900_FEC_2_3;
+               break;
+       case 21:
+               prate = STV0900_FEC_3_4;
+               break;
+       case 24:
+               prate = STV0900_FEC_5_6;
+               break;
+       case 25:
+               prate = STV0900_FEC_6_7;
+               break;
+       case 26:
+               prate = STV0900_FEC_7_8;
+               break;
+       default:
+               prate = STV0900_FEC_UNKNOWN;
+               break;
+       }
+
+       return prate;
+}
+
+void stv0900_set_dvbs1_track_car_loop(struct stv0900_internal *intp,
+                                       enum fe_stv0900_demod_num demod,
+                                       u32 srate)
+{
+       if (intp->chip_id >= 0x30) {
+               if (srate >= 15000000) {
+                       stv0900_write_reg(intp, ACLC, 0x2b);
+                       stv0900_write_reg(intp, BCLC, 0x1a);
+               } else if ((srate >= 7000000) && (15000000 > srate)) {
+                       stv0900_write_reg(intp, ACLC, 0x0c);
+                       stv0900_write_reg(intp, BCLC, 0x1b);
+               } else if (srate < 7000000) {
+                       stv0900_write_reg(intp, ACLC, 0x2c);
+                       stv0900_write_reg(intp, BCLC, 0x1c);
+               }
+
+       } else { /*cut 2.0 and 1.x*/
+               stv0900_write_reg(intp, ACLC, 0x1a);
+               stv0900_write_reg(intp, BCLC, 0x09);
+       }
+
+}
+
 static void stv0900_track_optimization(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
 
-       s32 srate, pilots, aclc, freq1, freq0,
-               i = 0, timed, timef, blindTunSw = 0;
+       s32     srate,
+               pilots,
+               aclc,
+               freq1,
+               freq0,
+               i = 0,
+               timed,
+               timef,
+               blind_tun_sw = 0,
+               modulation;
 
        enum fe_stv0900_rolloff rolloff;
        enum fe_stv0900_modcode foundModcod;
 
        dprintk("%s\n", __func__);
 
-       srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-       srate += stv0900_get_timing_offst(i_params, srate, demod);
+       srate = stv0900_get_symbol_rate(intp, intp->mclk, demod);
+       srate += stv0900_get_timing_offst(intp, srate, demod);
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               switch (i_params->dmd1_rslts.standard) {
-               case STV0900_DVBS1_STANDARD:
-                       if (i_params->dmd1_srch_standard == STV0900_AUTO_SEARCH) {
-                               stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                               stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-                       }
+       switch (intp->result[demod].standard) {
+       case STV0900_DVBS1_STANDARD:
+       case STV0900_DSS_STANDARD:
+               dprintk("%s: found DVB-S or DSS\n", __func__);
+               if (intp->srch_standard[demod] == STV0900_AUTO_SEARCH) {
+                       stv0900_write_bits(intp, DVBS1_ENABLE, 1);
+                       stv0900_write_bits(intp, DVBS2_ENABLE, 0);
+               }
 
-                       stv0900_write_bits(i_params, F0900_P1_ROLLOFF_CONTROL, i_params->rolloff);
-                       stv0900_write_bits(i_params, F0900_P1_MANUAL_ROLLOFF, 1);
-                       stv0900_write_reg(i_params, R0900_P1_ERRCTRL1, 0x75);
-                       break;
-               case STV0900_DSS_STANDARD:
-                       if (i_params->dmd1_srch_standard == STV0900_AUTO_SEARCH) {
-                               stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                               stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-                       }
+               stv0900_write_bits(intp, ROLLOFF_CONTROL, intp->rolloff);
+               stv0900_write_bits(intp, MANUALSX_ROLLOFF, 1);
 
-                       stv0900_write_bits(i_params, F0900_P1_ROLLOFF_CONTROL, i_params->rolloff);
-                       stv0900_write_bits(i_params, F0900_P1_MANUAL_ROLLOFF, 1);
-                       stv0900_write_reg(i_params, R0900_P1_ERRCTRL1, 0x75);
+               if (intp->chip_id < 0x30) {
+                       stv0900_write_reg(intp, ERRCTRL1, 0x75);
                        break;
-               case STV0900_DVBS2_STANDARD:
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 1);
-                       stv0900_write_reg(i_params, R0900_P1_ACLC, 0);
-                       stv0900_write_reg(i_params, R0900_P1_BCLC, 0);
-                       if (i_params->dmd1_rslts.frame_length == STV0900_LONG_FRAME) {
-                               foundModcod = stv0900_get_bits(i_params, F0900_P1_DEMOD_MODCOD);
-                               pilots = stv0900_get_bits(i_params, F0900_P1_DEMOD_TYPE) & 0x01;
-                               aclc = stv0900_get_optim_carr_loop(srate, foundModcod, pilots, i_params->chip_id);
-                               if (foundModcod <= STV0900_QPSK_910)
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, aclc);
-                               else if (foundModcod <= STV0900_8PSK_910) {
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S28, aclc);
-                               }
-
-                               if ((i_params->demod_mode == STV0900_SINGLE) && (foundModcod > STV0900_8PSK_910)) {
-                                       if (foundModcod <= STV0900_16APSK_910) {
-                                               stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                               stv0900_write_reg(i_params, R0900_P1_ACLC2S216A, aclc);
-                                       } else if (foundModcod <= STV0900_32APSK_910) {
-                                               stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                               stv0900_write_reg(i_params, R0900_P1_ACLC2S232A, aclc);
-                                       }
-                               }
+               }
 
-                       } else {
-                               aclc = stv0900_get_optim_short_carr_loop(srate, i_params->dmd1_rslts.modulation, i_params->chip_id);
-                               if (i_params->dmd1_rslts.modulation == STV0900_QPSK)
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, aclc);
-
-                               else if (i_params->dmd1_rslts.modulation == STV0900_8PSK) {
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S28, aclc);
-                               } else if (i_params->dmd1_rslts.modulation == STV0900_16APSK) {
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S216A, aclc);
-                               } else if (i_params->dmd1_rslts.modulation == STV0900_32APSK) {
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P1_ACLC2S232A, aclc);
-                               }
+               if (stv0900_get_vit_fec(intp, demod) == STV0900_FEC_1_2) {
+                       stv0900_write_reg(intp, GAUSSR0, 0x98);
+                       stv0900_write_reg(intp, CCIR0, 0x18);
+               } else {
+                       stv0900_write_reg(intp, GAUSSR0, 0x18);
+                       stv0900_write_reg(intp, CCIR0, 0x18);
+               }
 
+               stv0900_write_reg(intp, ERRCTRL1, 0x75);
+               break;
+       case STV0900_DVBS2_STANDARD:
+               dprintk("%s: found DVB-S2\n", __func__);
+               stv0900_write_bits(intp, DVBS1_ENABLE, 0);
+               stv0900_write_bits(intp, DVBS2_ENABLE, 1);
+               stv0900_write_reg(intp, ACLC, 0);
+               stv0900_write_reg(intp, BCLC, 0);
+               if (intp->result[demod].frame_len == STV0900_LONG_FRAME) {
+                       foundModcod = stv0900_get_bits(intp, DEMOD_MODCOD);
+                       pilots = stv0900_get_bits(intp, DEMOD_TYPE) & 0x01;
+                       aclc = stv0900_get_optim_carr_loop(srate,
+                                                       foundModcod,
+                                                       pilots,
+                                                       intp->chip_id);
+                       if (foundModcod <= STV0900_QPSK_910)
+                               stv0900_write_reg(intp, ACLC2S2Q, aclc);
+                       else if (foundModcod <= STV0900_8PSK_910) {
+                               stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                               stv0900_write_reg(intp, ACLC2S28, aclc);
                        }
 
-                       if (i_params->chip_id <= 0x11) {
-                               if (i_params->demod_mode != STV0900_SINGLE)
-                                       stv0900_activate_s2_modcode(i_params, demod);
+                       if ((intp->demod_mode == STV0900_SINGLE) &&
+                                       (foundModcod > STV0900_8PSK_910)) {
+                               if (foundModcod <= STV0900_16APSK_910) {
+                                       stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                                       stv0900_write_reg(intp, ACLC2S216A,
+                                                                       aclc);
+                               } else if (foundModcod <= STV0900_32APSK_910) {
+                                       stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                                       stv0900_write_reg(intp, ACLC2S232A,
+                                                                       aclc);
+                               }
+                       }
 
+               } else {
+                       modulation = intp->result[demod].modulation;
+                       aclc = stv0900_get_optim_short_carr_loop(srate,
+                                       modulation, intp->chip_id);
+                       if (modulation == STV0900_QPSK)
+                               stv0900_write_reg(intp, ACLC2S2Q, aclc);
+                       else if (modulation == STV0900_8PSK) {
+                               stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                               stv0900_write_reg(intp, ACLC2S28, aclc);
+                       } else if (modulation == STV0900_16APSK) {
+                               stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                               stv0900_write_reg(intp, ACLC2S216A, aclc);
+                       } else if (modulation == STV0900_32APSK) {
+                               stv0900_write_reg(intp, ACLC2S2Q, 0x2a);
+                               stv0900_write_reg(intp, ACLC2S232A, aclc);
                        }
 
-                       stv0900_write_reg(i_params, R0900_P1_ERRCTRL1, 0x67);
-                       break;
-               case STV0900_UNKNOWN_STANDARD:
-               default:
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 1);
-                       break;
                }
 
-               freq1 = stv0900_read_reg(i_params, R0900_P1_CFR2);
-               freq0 = stv0900_read_reg(i_params, R0900_P1_CFR1);
-               rolloff = stv0900_get_bits(i_params, F0900_P1_ROLLOFF_STATUS);
-               if (i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH) {
-                       stv0900_write_reg(i_params, R0900_P1_SFRSTEP, 0x00);
-                       stv0900_write_bits(i_params, F0900_P1_SCAN_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 0);
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG2, 0x01);
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       stv0900_set_max_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       stv0900_set_min_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       blindTunSw = 1;
-               }
+               if (intp->chip_id <= 0x11) {
+                       if (intp->demod_mode != STV0900_SINGLE)
+                               stv0900_activate_s2_modcod(intp, demod);
 
-               if (i_params->chip_id >= 0x20) {
-                       if ((i_params->dmd1_srch_standard == STV0900_SEARCH_DVBS1) || (i_params->dmd1_srch_standard == STV0900_SEARCH_DSS) || (i_params->dmd1_srch_standard == STV0900_AUTO_SEARCH)) {
-                               stv0900_write_reg(i_params, R0900_P1_VAVSRVIT, 0x0a);
-                               stv0900_write_reg(i_params, R0900_P1_VITSCALE, 0x0);
-                       }
                }
 
-               if (i_params->chip_id < 0x20)
-                       stv0900_write_reg(i_params, R0900_P1_CARHDR, 0x08);
+               stv0900_write_reg(intp, ERRCTRL1, 0x67);
+               break;
+       case STV0900_UNKNOWN_STANDARD:
+       default:
+               dprintk("%s: found unknown standard\n", __func__);
+               stv0900_write_bits(intp, DVBS1_ENABLE, 1);
+               stv0900_write_bits(intp, DVBS2_ENABLE, 1);
+               break;
+       }
 
-               if (i_params->chip_id == 0x10)
-                       stv0900_write_reg(i_params, R0900_P1_CORRELEXP, 0x0A);
+       freq1 = stv0900_read_reg(intp, CFR2);
+       freq0 = stv0900_read_reg(intp, CFR1);
+       rolloff = stv0900_get_bits(intp, ROLLOFF_STATUS);
+       if (intp->srch_algo[demod] == STV0900_BLIND_SEARCH) {
+               stv0900_write_reg(intp, SFRSTEP, 0x00);
+               stv0900_write_bits(intp, SCAN_ENABLE, 0);
+               stv0900_write_bits(intp, CFR_AUTOSCAN, 0);
+               stv0900_write_reg(intp, TMGCFG2, 0xc1);
+               stv0900_set_symbol_rate(intp, intp->mclk, srate, demod);
+               blind_tun_sw = 1;
+               if (intp->result[demod].standard != STV0900_DVBS2_STANDARD)
+                       stv0900_set_dvbs1_track_car_loop(intp, demod, srate);
 
-               stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x38);
+       }
 
-               if ((i_params->chip_id >= 0x20) || (blindTunSw == 1) || (i_params->dmd1_symbol_rate < 10000000)) {
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1, freq1);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0, freq0);
-                       i_params->tuner1_bw = stv0900_carrier_width(srate, i_params->rolloff) + 10000000;
+       if (intp->chip_id >= 0x20) {
+               if ((intp->srch_standard[demod] == STV0900_SEARCH_DVBS1) ||
+                               (intp->srch_standard[demod] ==
+                                                       STV0900_SEARCH_DSS) ||
+                               (intp->srch_standard[demod] ==
+                                                       STV0900_AUTO_SEARCH)) {
+                       stv0900_write_reg(intp, VAVSRVIT, 0x0a);
+                       stv0900_write_reg(intp, VITSCALE, 0x0);
+               }
+       }
 
-                       if ((i_params->chip_id >= 0x20) || (blindTunSw == 1)) {
-                               if (i_params->dmd1_srch_algo != STV0900_WARM_START)
-                                       stv0900_set_bandwidth(fe, i_params->tuner1_bw);
-                       }
+       if (intp->chip_id < 0x20)
+               stv0900_write_reg(intp, CARHDR, 0x08);
 
-                       if ((i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH) || (i_params->dmd1_symbol_rate < 10000000))
-                               msleep(50);
-                       else
-                               msleep(5);
-
-                       stv0900_get_lock_timeout(&timed, &timef, srate, STV0900_WARM_START);
-
-                       if (stv0900_get_demod_lock(i_params, demod, timed / 2) == FALSE) {
-                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1F);
-                               stv0900_write_reg(i_params, R0900_P1_CFRINIT1, freq1);
-                               stv0900_write_reg(i_params, R0900_P1_CFRINIT0, freq0);
-                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-                               i = 0;
-                               while ((stv0900_get_demod_lock(i_params, demod, timed / 2) == FALSE) && (i <= 2)) {
-                                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1F);
-                                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1, freq1);
-                                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0, freq0);
-                                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-                                       i++;
-                               }
-                       }
+       if (intp->chip_id == 0x10)
+               stv0900_write_reg(intp, CORRELEXP, 0x0a);
 
-               }
+       stv0900_write_reg(intp, AGC2REF, 0x38);
 
-               if (i_params->chip_id >= 0x20)
-                       stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0x49);
+       if ((intp->chip_id >= 0x20) ||
+                       (blind_tun_sw == 1) ||
+                       (intp->symbol_rate[demod] < 10000000)) {
+               stv0900_write_reg(intp, CFRINIT1, freq1);
+               stv0900_write_reg(intp, CFRINIT0, freq0);
+               intp->bw[demod] = stv0900_carrier_width(srate,
+                                       intp->rolloff) + 10000000;
 
-               if ((i_params->dmd1_rslts.standard == STV0900_DVBS1_STANDARD) || (i_params->dmd1_rslts.standard == STV0900_DSS_STANDARD))
-                       stv0900_set_viterbi_tracq(i_params, demod);
+               if ((intp->chip_id >= 0x20) || (blind_tun_sw == 1)) {
+                       if (intp->srch_algo[demod] != STV0900_WARM_START)
+                               stv0900_set_bandwidth(fe, intp->bw[demod]);
+               }
 
-               break;
+               if ((intp->srch_algo[demod] == STV0900_BLIND_SEARCH) ||
+                               (intp->symbol_rate[demod] < 10000000))
+                       msleep(50);
+               else
+                       msleep(5);
 
-       case STV0900_DEMOD_2:
-               switch (i_params->dmd2_rslts.standard) {
-               case STV0900_DVBS1_STANDARD:
+               stv0900_get_lock_timeout(&timed, &timef, srate,
+                                               STV0900_WARM_START);
 
-                       if (i_params->dmd2_srch_stndrd == STV0900_AUTO_SEARCH) {
-                               stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                               stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
+               if (stv0900_get_demod_lock(intp, demod, timed / 2) == FALSE) {
+                       stv0900_write_reg(intp, DMDISTATE, 0x1f);
+                       stv0900_write_reg(intp, CFRINIT1, freq1);
+                       stv0900_write_reg(intp, CFRINIT0, freq0);
+                       stv0900_write_reg(intp, DMDISTATE, 0x18);
+                       i = 0;
+                       while ((stv0900_get_demod_lock(intp,
+                                                       demod,
+                                                       timed / 2) == FALSE) &&
+                                               (i <= 2)) {
+                               stv0900_write_reg(intp, DMDISTATE, 0x1f);
+                               stv0900_write_reg(intp, CFRINIT1, freq1);
+                               stv0900_write_reg(intp, CFRINIT0, freq0);
+                               stv0900_write_reg(intp, DMDISTATE, 0x18);
+                               i++;
                        }
+               }
 
-                       stv0900_write_bits(i_params, F0900_P2_ROLLOFF_CONTROL, i_params->rolloff);
-                       stv0900_write_bits(i_params, F0900_P2_MANUAL_ROLLOFF, 1);
-                       stv0900_write_reg(i_params, R0900_P2_ERRCTRL1, 0x75);
-                       break;
-               case STV0900_DSS_STANDARD:
-                       if (i_params->dmd2_srch_stndrd == STV0900_AUTO_SEARCH) {
-                               stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                               stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
-                       }
+       }
 
-                       stv0900_write_bits(i_params, F0900_P2_ROLLOFF_CONTROL, i_params->rolloff);
-                       stv0900_write_bits(i_params, F0900_P2_MANUAL_ROLLOFF, 1);
-                       stv0900_write_reg(i_params, R0900_P2_ERRCTRL1, 0x75);
-                       break;
-               case STV0900_DVBS2_STANDARD:
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 1);
-                       stv0900_write_reg(i_params, R0900_P2_ACLC, 0);
-                       stv0900_write_reg(i_params, R0900_P2_BCLC, 0);
-                       if (i_params->dmd2_rslts.frame_length == STV0900_LONG_FRAME) {
-                               foundModcod = stv0900_get_bits(i_params, F0900_P2_DEMOD_MODCOD);
-                               pilots = stv0900_get_bits(i_params, F0900_P2_DEMOD_TYPE) & 0x01;
-                               aclc = stv0900_get_optim_carr_loop(srate, foundModcod, pilots, i_params->chip_id);
-                               if (foundModcod <= STV0900_QPSK_910)
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, aclc);
-                               else if (foundModcod <= STV0900_8PSK_910) {
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S28, aclc);
-                               }
+       if (intp->chip_id >= 0x20)
+               stv0900_write_reg(intp, CARFREQ, 0x49);
 
-                               if ((i_params->demod_mode == STV0900_SINGLE) && (foundModcod > STV0900_8PSK_910)) {
-                                       if (foundModcod <= STV0900_16APSK_910) {
-                                               stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                               stv0900_write_reg(i_params, R0900_P2_ACLC2S216A, aclc);
-                                       } else if (foundModcod <= STV0900_32APSK_910) {
-                                               stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                               stv0900_write_reg(i_params, R0900_P2_ACLC2S232A, aclc);
-                                       }
+       if ((intp->result[demod].standard == STV0900_DVBS1_STANDARD) ||
+                       (intp->result[demod].standard == STV0900_DSS_STANDARD))
+               stv0900_set_viterbi_tracq(intp, demod);
 
-                               }
+}
 
-                       } else {
-                               aclc = stv0900_get_optim_short_carr_loop(srate,
-                                                                       i_params->dmd2_rslts.modulation,
-                                                                       i_params->chip_id);
-
-                               if (i_params->dmd2_rslts.modulation == STV0900_QPSK)
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, aclc);
-
-                               else if (i_params->dmd2_rslts.modulation == STV0900_8PSK) {
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S28, aclc);
-                               } else if (i_params->dmd2_rslts.modulation == STV0900_16APSK) {
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S216A, aclc);
-                               } else if (i_params->dmd2_rslts.modulation == STV0900_32APSK) {
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S2Q, 0x2a);
-                                       stv0900_write_reg(i_params, R0900_P2_ACLC2S232A, aclc);
-                               }
-                       }
+static int stv0900_get_fec_lock(struct stv0900_internal *intp,
+                               enum fe_stv0900_demod_num demod, s32 time_out)
+{
+       s32 timer = 0, lock = 0;
 
-                       stv0900_write_reg(i_params, R0900_P2_ERRCTRL1, 0x67);
-
-                       break;
-               case STV0900_UNKNOWN_STANDARD:
-               default:
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 1);
-                       break;
-               }
-
-               freq1 = stv0900_read_reg(i_params, R0900_P2_CFR2);
-               freq0 = stv0900_read_reg(i_params, R0900_P2_CFR1);
-               rolloff = stv0900_get_bits(i_params, F0900_P2_ROLLOFF_STATUS);
-               if (i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH) {
-                       stv0900_write_reg(i_params, R0900_P2_SFRSTEP, 0x00);
-                       stv0900_write_bits(i_params, F0900_P2_SCAN_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 0);
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG2, 0x01);
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       stv0900_set_max_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       stv0900_set_min_symbol_rate(i_params, i_params->mclk, srate, demod);
-                       blindTunSw = 1;
-               }
-
-               if (i_params->chip_id >= 0x20) {
-                       if ((i_params->dmd2_srch_stndrd == STV0900_SEARCH_DVBS1) || (i_params->dmd2_srch_stndrd == STV0900_SEARCH_DSS) || (i_params->dmd2_srch_stndrd == STV0900_AUTO_SEARCH)) {
-                               stv0900_write_reg(i_params, R0900_P2_VAVSRVIT, 0x0a);
-                               stv0900_write_reg(i_params, R0900_P2_VITSCALE, 0x0);
-                       }
-               }
-
-               if (i_params->chip_id < 0x20)
-                       stv0900_write_reg(i_params, R0900_P2_CARHDR, 0x08);
-
-               if (i_params->chip_id == 0x10)
-                       stv0900_write_reg(i_params, R0900_P2_CORRELEXP, 0x0a);
-
-               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x38);
-               if ((i_params->chip_id >= 0x20) || (blindTunSw == 1) || (i_params->dmd2_symbol_rate < 10000000)) {
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1, freq1);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0, freq0);
-                       i_params->tuner2_bw = stv0900_carrier_width(srate, i_params->rolloff) + 10000000;
-
-                       if ((i_params->chip_id >= 0x20) || (blindTunSw == 1)) {
-                               if (i_params->dmd2_srch_algo != STV0900_WARM_START)
-                                       stv0900_set_bandwidth(fe, i_params->tuner2_bw);
-                       }
-
-                       if ((i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH) || (i_params->dmd2_symbol_rate < 10000000))
-                               msleep(50);
-                       else
-                               msleep(5);
-
-                       stv0900_get_lock_timeout(&timed, &timef, srate, STV0900_WARM_START);
-                       if (stv0900_get_demod_lock(i_params, demod, timed / 2) == FALSE) {
-                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1F);
-                               stv0900_write_reg(i_params, R0900_P2_CFRINIT1, freq1);
-                               stv0900_write_reg(i_params, R0900_P2_CFRINIT0, freq0);
-                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-                               i = 0;
-                               while ((stv0900_get_demod_lock(i_params, demod, timed / 2) == FALSE) && (i <= 2)) {
-                                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1F);
-                                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1, freq1);
-                                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0, freq0);
-                                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-                                       i++;
-                               }
-                       }
-               }
-
-               if (i_params->chip_id >= 0x20)
-                       stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0x49);
-
-               if ((i_params->dmd2_rslts.standard == STV0900_DVBS1_STANDARD) || (i_params->dmd2_rslts.standard == STV0900_DSS_STANDARD))
-                       stv0900_set_viterbi_tracq(i_params, demod);
-
-               break;
-       }
-}
-
-static int stv0900_get_fec_lock(struct stv0900_internal *i_params, enum fe_stv0900_demod_num demod, s32 time_out)
-{
-       s32 timer = 0, lock = 0, header_field, pktdelin_field, lock_vit_field;
-
-       enum fe_stv0900_search_state dmd_state;
+       enum fe_stv0900_search_state dmd_state;
 
        dprintk("%s\n", __func__);
 
-       dmd_reg(header_field, F0900_P1_HEADER_MODE, F0900_P2_HEADER_MODE);
-       dmd_reg(pktdelin_field, F0900_P1_PKTDELIN_LOCK, F0900_P2_PKTDELIN_LOCK);
-       dmd_reg(lock_vit_field, F0900_P1_LOCKEDVIT, F0900_P2_LOCKEDVIT);
-
-       dmd_state = stv0900_get_bits(i_params, header_field);
+       dmd_state = stv0900_get_bits(intp, HEADER_MODE);
 
        while ((timer < time_out) && (lock == 0)) {
                switch (dmd_state) {
@@ -1386,10 +1037,10 @@ static int stv0900_get_fec_lock(struct stv0900_internal *i_params, enum fe_stv09
                        lock = 0;
                        break;
                case STV0900_DVBS2_FOUND:
-                       lock = stv0900_get_bits(i_params, pktdelin_field);
+                       lock = stv0900_get_bits(intp, PKTDELIN_LOCK);
                        break;
                case STV0900_DVBS_FOUND:
-                       lock = stv0900_get_bits(i_params, lock_vit_field);
+                       lock = stv0900_get_bits(intp, LOCKEDVIT);
                        break;
                }
 
@@ -1400,38 +1051,35 @@ static int stv0900_get_fec_lock(struct stv0900_internal *i_params, enum fe_stv09
        }
 
        if (lock)
-               dprintk("DEMOD FEC LOCK OK\n");
+               dprintk("%s: DEMOD FEC LOCK OK\n", __func__);
        else
-               dprintk("DEMOD FEC LOCK FAIL\n");
+               dprintk("%s: DEMOD FEC LOCK FAIL\n", __func__);
 
        return lock;
 }
 
-static int stv0900_wait_for_lock(struct stv0900_internal *i_params,
+static int stv0900_wait_for_lock(struct stv0900_internal *intp,
                                enum fe_stv0900_demod_num demod,
                                s32 dmd_timeout, s32 fec_timeout)
 {
 
-       s32 timer = 0, lock = 0, str_merg_rst_fld, str_merg_lock_fld;
+       s32 timer = 0, lock = 0;
 
        dprintk("%s\n", __func__);
 
-       dmd_reg(str_merg_rst_fld, F0900_P1_RST_HWARE, F0900_P2_RST_HWARE);
-       dmd_reg(str_merg_lock_fld, F0900_P1_TSFIFO_LINEOK, F0900_P2_TSFIFO_LINEOK);
-
-       lock = stv0900_get_demod_lock(i_params, demod, dmd_timeout);
+       lock = stv0900_get_demod_lock(intp, demod, dmd_timeout);
 
        if (lock)
-               lock = lock && stv0900_get_fec_lock(i_params, demod, fec_timeout);
+               lock = lock && stv0900_get_fec_lock(intp, demod, fec_timeout);
 
        if (lock) {
                lock = 0;
 
-               dprintk("%s: Timer = %d, time_out = %d\n", __func__, timer,
-                                                               fec_timeout);
+               dprintk("%s: Timer = %d, time_out = %d\n",
+                               __func__, timer, fec_timeout);
 
                while ((timer < fec_timeout) && (lock == 0)) {
-                       lock = stv0900_get_bits(i_params, str_merg_lock_fld);
+                       lock = stv0900_get_bits(intp, TSFIFO_LINEOK);
                        msleep(1);
                        timer++;
                }
@@ -1452,43 +1100,43 @@ enum fe_stv0900_tracking_standard stv0900_get_standard(struct dvb_frontend *fe,
                                                enum fe_stv0900_demod_num demod)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_tracking_standard fnd_standard;
-       s32 state_field,
-       dss_dvb_field;
 
-       dprintk("%s\n", __func__);
-
-       dmd_reg(state_field, F0900_P1_HEADER_MODE, F0900_P2_HEADER_MODE);
-       dmd_reg(dss_dvb_field, F0900_P1_DSS_DVB, F0900_P2_DSS_DVB);
+       int hdr_mode = stv0900_get_bits(intp, HEADER_MODE);
 
-       if (stv0900_get_bits(i_params, state_field) == 2)
+       switch (hdr_mode) {
+       case 2:
                fnd_standard = STV0900_DVBS2_STANDARD;
-
-       else if (stv0900_get_bits(i_params, state_field) == 3) {
-               if (stv0900_get_bits(i_params, dss_dvb_field) == 1)
+               break;
+       case 3:
+               if (stv0900_get_bits(intp, DSS_DVB) == 1)
                        fnd_standard = STV0900_DSS_STANDARD;
                else
                        fnd_standard = STV0900_DVBS1_STANDARD;
-       } else
+
+               break;
+       default:
                fnd_standard = STV0900_UNKNOWN_STANDARD;
+       }
+
+       dprintk("%s: standard %d\n", __func__, fnd_standard);
 
        return fnd_standard;
 }
 
-static s32 stv0900_get_carr_freq(struct stv0900_internal *i_params, u32 mclk,
+static s32 stv0900_get_carr_freq(struct stv0900_internal *intp, u32 mclk,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 cfr_field2, cfr_field1, cfr_field0,
-               derot, rem1, rem2, intval1, intval2;
-
-       dmd_reg(cfr_field2, F0900_P1_CAR_FREQ2, F0900_P2_CAR_FREQ2);
-       dmd_reg(cfr_field1, F0900_P1_CAR_FREQ1, F0900_P2_CAR_FREQ1);
-       dmd_reg(cfr_field0, F0900_P1_CAR_FREQ0, F0900_P2_CAR_FREQ0);
+       s32     derot,
+               rem1,
+               rem2,
+               intval1,
+               intval2;
 
-       derot = (stv0900_get_bits(i_params, cfr_field2) << 16) +
-               (stv0900_get_bits(i_params, cfr_field1) << 8) +
-               (stv0900_get_bits(i_params, cfr_field0));
+       derot = (stv0900_get_bits(intp, CAR_FREQ2) << 16) +
+               (stv0900_get_bits(intp, CAR_FREQ1) << 8) +
+               (stv0900_get_bits(intp, CAR_FREQ0));
 
        derot = ge2comp(derot, 24);
        intval1 = mclk >> 12;
@@ -1506,7 +1154,7 @@ static u32 stv0900_get_tuner_freq(struct dvb_frontend *fe)
 {
        struct dvb_frontend_ops *frontend_ops = NULL;
        struct dvb_tuner_ops *tuner_ops = NULL;
-       u32 frequency = 0;
+       u32 freq = 0;
 
        if (&fe->ops)
                frontend_ops = &fe->ops;
@@ -1515,304 +1163,159 @@ static u32 stv0900_get_tuner_freq(struct dvb_frontend *fe)
                tuner_ops = &frontend_ops->tuner_ops;
 
        if (tuner_ops->get_frequency) {
-               if ((tuner_ops->get_frequency(fe, &frequency)) < 0)
+               if ((tuner_ops->get_frequency(fe, &freq)) < 0)
                        dprintk("%s: Invalid parameter\n", __func__);
                else
-                       dprintk("%s: Frequency=%d\n", __func__, frequency);
-
-       }
-
-       return frequency;
-}
-
-static enum fe_stv0900_fec stv0900_get_vit_fec(struct stv0900_internal *i_params,
-                                               enum fe_stv0900_demod_num demod)
-{
-       s32 rate_fld, vit_curpun_fld;
-       enum fe_stv0900_fec prate;
+                       dprintk("%s: Frequency=%d\n", __func__, freq);
 
-       dmd_reg(vit_curpun_fld, F0900_P1_VIT_CURPUN, F0900_P2_VIT_CURPUN);
-       rate_fld = stv0900_get_bits(i_params, vit_curpun_fld);
-
-       switch (rate_fld) {
-       case 13:
-               prate = STV0900_FEC_1_2;
-               break;
-       case 18:
-               prate = STV0900_FEC_2_3;
-               break;
-       case 21:
-               prate = STV0900_FEC_3_4;
-               break;
-       case 24:
-               prate = STV0900_FEC_5_6;
-               break;
-       case 25:
-               prate = STV0900_FEC_6_7;
-               break;
-       case 26:
-               prate = STV0900_FEC_7_8;
-               break;
-       default:
-               prate = STV0900_FEC_UNKNOWN;
-               break;
        }
 
-       return prate;
+       return freq;
 }
 
-static enum fe_stv0900_signal_type stv0900_get_signal_params(struct dvb_frontend *fe)
+static enum
+fe_stv0900_signal_type stv0900_get_signal_params(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
        enum fe_stv0900_signal_type range = STV0900_OUTOFRANGE;
-       s32 offsetFreq,
-       srate_offset,
-       i = 0;
+       struct stv0900_signal_info *result = &intp->result[demod];
+       s32     offsetFreq,
+               srate_offset;
+       int     i = 0,
+               d = demod;
 
        u8 timing;
 
        msleep(5);
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               if (i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH) {
-                       timing = stv0900_read_reg(i_params, R0900_P1_TMGREG2);
-                       i = 0;
-                       stv0900_write_reg(i_params, R0900_P1_SFRSTEP, 0x5c);
-
-                       while ((i <= 50) && (timing != 0) && (timing != 0xFF)) {
-                               timing = stv0900_read_reg(i_params, R0900_P1_TMGREG2);
-                               msleep(5);
-                               i += 5;
-                       }
-               }
-
-               i_params->dmd1_rslts.standard = stv0900_get_standard(fe, demod);
-               i_params->dmd1_rslts.frequency = stv0900_get_tuner_freq(fe);
-               offsetFreq = stv0900_get_carr_freq(i_params, i_params->mclk, demod) / 1000;
-               i_params->dmd1_rslts.frequency += offsetFreq;
-               i_params->dmd1_rslts.symbol_rate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-               srate_offset = stv0900_get_timing_offst(i_params, i_params->dmd1_rslts.symbol_rate, demod);
-               i_params->dmd1_rslts.symbol_rate += srate_offset;
-               i_params->dmd1_rslts.fec = stv0900_get_vit_fec(i_params, demod);
-               i_params->dmd1_rslts.modcode = stv0900_get_bits(i_params, F0900_P1_DEMOD_MODCOD);
-               i_params->dmd1_rslts.pilot = stv0900_get_bits(i_params, F0900_P1_DEMOD_TYPE) & 0x01;
-               i_params->dmd1_rslts.frame_length = ((u32)stv0900_get_bits(i_params, F0900_P1_DEMOD_TYPE)) >> 1;
-               i_params->dmd1_rslts.rolloff = stv0900_get_bits(i_params, F0900_P1_ROLLOFF_STATUS);
-               switch (i_params->dmd1_rslts.standard) {
-               case STV0900_DVBS2_STANDARD:
-                       i_params->dmd1_rslts.spectrum = stv0900_get_bits(i_params, F0900_P1_SPECINV_DEMOD);
-                       if (i_params->dmd1_rslts.modcode <= STV0900_QPSK_910)
-                               i_params->dmd1_rslts.modulation = STV0900_QPSK;
-                       else if (i_params->dmd1_rslts.modcode <= STV0900_8PSK_910)
-                               i_params->dmd1_rslts.modulation = STV0900_8PSK;
-                       else if (i_params->dmd1_rslts.modcode <= STV0900_16APSK_910)
-                               i_params->dmd1_rslts.modulation = STV0900_16APSK;
-                       else if (i_params->dmd1_rslts.modcode <= STV0900_32APSK_910)
-                               i_params->dmd1_rslts.modulation = STV0900_32APSK;
-                       else
-                               i_params->dmd1_rslts.modulation = STV0900_UNKNOWN;
-                       break;
-               case STV0900_DVBS1_STANDARD:
-               case STV0900_DSS_STANDARD:
-                       i_params->dmd1_rslts.spectrum = stv0900_get_bits(i_params, F0900_P1_IQINV);
-                       i_params->dmd1_rslts.modulation = STV0900_QPSK;
-                       break;
-               default:
-                       break;
+       if (intp->srch_algo[d] == STV0900_BLIND_SEARCH) {
+               timing = stv0900_read_reg(intp, TMGREG2);
+               i = 0;
+               stv0900_write_reg(intp, SFRSTEP, 0x5c);
+
+               while ((i <= 50) && (timing != 0) && (timing != 0xff)) {
+                       timing = stv0900_read_reg(intp, TMGREG2);
+                       msleep(5);
+                       i += 5;
                }
+       }
 
-               if ((i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH) || (i_params->dmd1_symbol_rate < 10000000)) {
-                       offsetFreq =    i_params->dmd1_rslts.frequency - i_params->tuner1_freq;
-                       i_params->tuner1_freq = stv0900_get_tuner_freq(fe);
-                       if (ABS(offsetFreq) <= ((i_params->dmd1_srch_range / 2000) + 500))
-                               range = STV0900_RANGEOK;
-                       else
-                               if (ABS(offsetFreq) <= (stv0900_carrier_width(i_params->dmd1_rslts.symbol_rate, i_params->dmd1_rslts.rolloff) / 2000))
-                                       range = STV0900_RANGEOK;
-                               else
-                                       range = STV0900_OUTOFRANGE;
-
-               } else {
-                       if (ABS(offsetFreq) <= ((i_params->dmd1_srch_range / 2000) + 500))
-                               range = STV0900_RANGEOK;
-                       else
-                               range = STV0900_OUTOFRANGE;
-               }
+       result->standard = stv0900_get_standard(fe, d);
+       result->frequency = stv0900_get_tuner_freq(fe);
+       offsetFreq = stv0900_get_carr_freq(intp, intp->mclk, d) / 1000;
+       result->frequency += offsetFreq;
+       result->symbol_rate = stv0900_get_symbol_rate(intp, intp->mclk, d);
+       srate_offset = stv0900_get_timing_offst(intp, result->symbol_rate, d);
+       result->symbol_rate += srate_offset;
+       result->fec = stv0900_get_vit_fec(intp, d);
+       result->modcode = stv0900_get_bits(intp, DEMOD_MODCOD);
+       result->pilot = stv0900_get_bits(intp, DEMOD_TYPE) & 0x01;
+       result->frame_len = ((u32)stv0900_get_bits(intp, DEMOD_TYPE)) >> 1;
+       result->rolloff = stv0900_get_bits(intp, ROLLOFF_STATUS);
+       switch (result->standard) {
+       case STV0900_DVBS2_STANDARD:
+               result->spectrum = stv0900_get_bits(intp, SPECINV_DEMOD);
+               if (result->modcode <= STV0900_QPSK_910)
+                       result->modulation = STV0900_QPSK;
+               else if (result->modcode <= STV0900_8PSK_910)
+                       result->modulation = STV0900_8PSK;
+               else if (result->modcode <= STV0900_16APSK_910)
+                       result->modulation = STV0900_16APSK;
+               else if (result->modcode <= STV0900_32APSK_910)
+                       result->modulation = STV0900_32APSK;
+               else
+                       result->modulation = STV0900_UNKNOWN;
                break;
-       case STV0900_DEMOD_2:
-               if (i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH) {
-                       timing = stv0900_read_reg(i_params, R0900_P2_TMGREG2);
-                       i = 0;
-                       stv0900_write_reg(i_params, R0900_P2_SFRSTEP, 0x5c);
-
-                       while ((i <= 50) && (timing != 0) && (timing != 0xff)) {
-                               timing = stv0900_read_reg(i_params, R0900_P2_TMGREG2);
-                               msleep(5);
-                               i += 5;
-                       }
-               }
-
-               i_params->dmd2_rslts.standard = stv0900_get_standard(fe, demod);
-               i_params->dmd2_rslts.frequency = stv0900_get_tuner_freq(fe);
-               offsetFreq = stv0900_get_carr_freq(i_params, i_params->mclk, demod) / 1000;
-               i_params->dmd2_rslts.frequency += offsetFreq;
-               i_params->dmd2_rslts.symbol_rate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-               srate_offset = stv0900_get_timing_offst(i_params, i_params->dmd2_rslts.symbol_rate, demod);
-               i_params->dmd2_rslts.symbol_rate += srate_offset;
-               i_params->dmd2_rslts.fec = stv0900_get_vit_fec(i_params, demod);
-               i_params->dmd2_rslts.modcode = stv0900_get_bits(i_params, F0900_P2_DEMOD_MODCOD);
-               i_params->dmd2_rslts.pilot = stv0900_get_bits(i_params, F0900_P2_DEMOD_TYPE) & 0x01;
-               i_params->dmd2_rslts.frame_length = ((u32)stv0900_get_bits(i_params, F0900_P2_DEMOD_TYPE)) >> 1;
-               i_params->dmd2_rslts.rolloff = stv0900_get_bits(i_params, F0900_P2_ROLLOFF_STATUS);
-               switch (i_params->dmd2_rslts.standard) {
-               case STV0900_DVBS2_STANDARD:
-                       i_params->dmd2_rslts.spectrum = stv0900_get_bits(i_params, F0900_P2_SPECINV_DEMOD);
-                       if (i_params->dmd2_rslts.modcode <= STV0900_QPSK_910)
-                               i_params->dmd2_rslts.modulation = STV0900_QPSK;
-                       else if (i_params->dmd2_rslts.modcode <= STV0900_8PSK_910)
-                               i_params->dmd2_rslts.modulation = STV0900_8PSK;
-                       else if (i_params->dmd2_rslts.modcode <= STV0900_16APSK_910)
-                               i_params->dmd2_rslts.modulation = STV0900_16APSK;
-                       else if (i_params->dmd2_rslts.modcode <= STV0900_32APSK_910)
-                               i_params->dmd2_rslts.modulation = STV0900_32APSK;
-                       else
-                               i_params->dmd2_rslts.modulation = STV0900_UNKNOWN;
-                       break;
-               case STV0900_DVBS1_STANDARD:
-               case STV0900_DSS_STANDARD:
-                       i_params->dmd2_rslts.spectrum = stv0900_get_bits(i_params, F0900_P2_IQINV);
-                       i_params->dmd2_rslts.modulation = STV0900_QPSK;
-                       break;
-               default:
-                       break;
-               }
+       case STV0900_DVBS1_STANDARD:
+       case STV0900_DSS_STANDARD:
+               result->spectrum = stv0900_get_bits(intp, IQINV);
+               result->modulation = STV0900_QPSK;
+               break;
+       default:
+               break;
+       }
 
-               if ((i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH) || (i_params->dmd2_symbol_rate < 10000000)) {
-                       offsetFreq =    i_params->dmd2_rslts.frequency - i_params->tuner2_freq;
-                       i_params->tuner2_freq = stv0900_get_tuner_freq(fe);
+       if ((intp->srch_algo[d] == STV0900_BLIND_SEARCH) ||
+                               (intp->symbol_rate[d] < 10000000)) {
+               offsetFreq = result->frequency - intp->freq[d];
+               intp->freq[d] = stv0900_get_tuner_freq(fe);
+               if (ABS(offsetFreq) <= ((intp->srch_range[d] / 2000) + 500))
+                       range = STV0900_RANGEOK;
+               else if (ABS(offsetFreq) <=
+                               (stv0900_carrier_width(result->symbol_rate,
+                                               result->rolloff) / 2000))
+                       range = STV0900_RANGEOK;
 
-                       if (ABS(offsetFreq) <= ((i_params->dmd2_srch_range / 2000) + 500))
-                               range = STV0900_RANGEOK;
-                       else
-                               if (ABS(offsetFreq) <= (stv0900_carrier_width(i_params->dmd2_rslts.symbol_rate, i_params->dmd2_rslts.rolloff) / 2000))
-                                       range = STV0900_RANGEOK;
-                               else
-                                       range = STV0900_OUTOFRANGE;
-               } else {
-                       if (ABS(offsetFreq) <= ((i_params->dmd2_srch_range / 2000) + 500))
-                               range = STV0900_RANGEOK;
-                       else
-                               range = STV0900_OUTOFRANGE;
-               }
+       } else if (ABS(offsetFreq) <= ((intp->srch_range[d] / 2000) + 500))
+               range = STV0900_RANGEOK;
 
-               break;
-       }
+       dprintk("%s: range %d\n", __func__, range);
 
        return range;
 }
 
-static enum fe_stv0900_signal_type stv0900_dvbs1_acq_workaround(struct dvb_frontend *fe)
+static enum
+fe_stv0900_signal_type stv0900_dvbs1_acq_workaround(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
-
-       s32 srate, demod_timeout,
-               fec_timeout, freq1, freq0;
        enum fe_stv0900_signal_type signal_type = STV0900_NODATA;
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               i_params->dmd1_rslts.locked = FALSE;
-               if (stv0900_get_bits(i_params, F0900_P1_HEADER_MODE) == STV0900_DVBS_FOUND) {
-                       srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-                       srate += stv0900_get_timing_offst(i_params, srate, demod);
-                       if (i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH)
-                               stv0900_set_symbol_rate(i_params, i_params->mclk, srate, demod);
-
-                       stv0900_get_lock_timeout(&demod_timeout, &fec_timeout, srate, STV0900_WARM_START);
-                       freq1 = stv0900_read_reg(i_params, R0900_P1_CFR2);
-                       freq0 = stv0900_read_reg(i_params, R0900_P1_CFR1);
-                       stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 0);
-                       stv0900_write_bits(i_params, F0900_P1_SPECINV_CONTROL, STV0900_IQ_FORCE_SWAPPED);
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1C);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1, freq1);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0, freq0);
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-                       if (stv0900_wait_for_lock(i_params, demod, demod_timeout, fec_timeout) == TRUE) {
-                               i_params->dmd1_rslts.locked = TRUE;
-                               signal_type = stv0900_get_signal_params(fe);
-                               stv0900_track_optimization(fe);
-                       } else {
-                               stv0900_write_bits(i_params, F0900_P1_SPECINV_CONTROL, STV0900_IQ_FORCE_NORMAL);
-                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1c);
-                               stv0900_write_reg(i_params, R0900_P1_CFRINIT1, freq1);
-                               stv0900_write_reg(i_params, R0900_P1_CFRINIT0, freq0);
-                               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x18);
-                               if (stv0900_wait_for_lock(i_params, demod, demod_timeout, fec_timeout) == TRUE) {
-                                       i_params->dmd1_rslts.locked = TRUE;
-                                       signal_type = stv0900_get_signal_params(fe);
-                                       stv0900_track_optimization(fe);
-                               }
-
-                       }
-
-               } else
-                       i_params->dmd1_rslts.locked = FALSE;
-
-               break;
-       case STV0900_DEMOD_2:
-               i_params->dmd2_rslts.locked = FALSE;
-               if (stv0900_get_bits(i_params, F0900_P2_HEADER_MODE) == STV0900_DVBS_FOUND) {
-                       srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-                       srate += stv0900_get_timing_offst(i_params, srate, demod);
-
-                       if (i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH)
-                               stv0900_set_symbol_rate(i_params, i_params->mclk, srate, demod);
-
-                       stv0900_get_lock_timeout(&demod_timeout, &fec_timeout, srate, STV0900_WARM_START);
-                       freq1 = stv0900_read_reg(i_params, R0900_P2_CFR2);
-                       freq0 = stv0900_read_reg(i_params, R0900_P2_CFR1);
-                       stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 0);
-                       stv0900_write_bits(i_params, F0900_P2_SPECINV_CONTROL, STV0900_IQ_FORCE_SWAPPED);
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1C);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1, freq1);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0, freq0);
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-
-                       if (stv0900_wait_for_lock(i_params, demod, demod_timeout, fec_timeout) == TRUE) {
-                               i_params->dmd2_rslts.locked = TRUE;
+       s32     srate,
+               demod_timeout,
+               fec_timeout,
+               freq1,
+               freq0;
+
+       intp->result[demod].locked = FALSE;
+
+       if (stv0900_get_bits(intp, HEADER_MODE) == STV0900_DVBS_FOUND) {
+               srate = stv0900_get_symbol_rate(intp, intp->mclk, demod);
+               srate += stv0900_get_timing_offst(intp, srate, demod);
+               if (intp->srch_algo[demod] == STV0900_BLIND_SEARCH)
+                       stv0900_set_symbol_rate(intp, intp->mclk, srate, demod);
+
+               stv0900_get_lock_timeout(&demod_timeout, &fec_timeout,
+                                       srate, STV0900_WARM_START);
+               freq1 = stv0900_read_reg(intp, CFR2);
+               freq0 = stv0900_read_reg(intp, CFR1);
+               stv0900_write_bits(intp, CFR_AUTOSCAN, 0);
+               stv0900_write_bits(intp, SPECINV_CONTROL,
+                                       STV0900_IQ_FORCE_SWAPPED);
+               stv0900_write_reg(intp, DMDISTATE, 0x1c);
+               stv0900_write_reg(intp, CFRINIT1, freq1);
+               stv0900_write_reg(intp, CFRINIT0, freq0);
+               stv0900_write_reg(intp, DMDISTATE, 0x18);
+               if (stv0900_wait_for_lock(intp, demod,
+                               demod_timeout, fec_timeout) == TRUE) {
+                       intp->result[demod].locked = TRUE;
+                       signal_type = stv0900_get_signal_params(fe);
+                       stv0900_track_optimization(fe);
+               } else {
+                       stv0900_write_bits(intp, SPECINV_CONTROL,
+                                       STV0900_IQ_FORCE_NORMAL);
+                       stv0900_write_reg(intp, DMDISTATE, 0x1c);
+                       stv0900_write_reg(intp, CFRINIT1, freq1);
+                       stv0900_write_reg(intp, CFRINIT0, freq0);
+                       stv0900_write_reg(intp, DMDISTATE, 0x18);
+                       if (stv0900_wait_for_lock(intp, demod,
+                                       demod_timeout, fec_timeout) == TRUE) {
+                               intp->result[demod].locked = TRUE;
                                signal_type = stv0900_get_signal_params(fe);
                                stv0900_track_optimization(fe);
-                       } else {
-                               stv0900_write_bits(i_params, F0900_P2_SPECINV_CONTROL, STV0900_IQ_FORCE_NORMAL);
-                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1c);
-                               stv0900_write_reg(i_params, R0900_P2_CFRINIT1, freq1);
-                               stv0900_write_reg(i_params, R0900_P2_CFRINIT0, freq0);
-                               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x18);
-
-                               if (stv0900_wait_for_lock(i_params, demod, demod_timeout, fec_timeout) == TRUE) {
-                                       i_params->dmd2_rslts.locked = TRUE;
-                                       signal_type = stv0900_get_signal_params(fe);
-                                       stv0900_track_optimization(fe);
-                               }
-
                        }
 
-               } else
-                       i_params->dmd1_rslts.locked = FALSE;
+               }
 
-               break;
-       }
+       } else
+               intp->result[demod].locked = FALSE;
 
        return signal_type;
 }
 
-static u16 stv0900_blind_check_agc2_min_level(struct stv0900_internal *i_params,
+static u16 stv0900_blind_check_agc2_min_level(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
        u32 minagc2level = 0xffff,
@@ -1823,103 +1326,52 @@ static u16 stv0900_blind_check_agc2_min_level(struct stv0900_internal *i_params,
 
        dprintk("%s\n", __func__);
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x38);
-               stv0900_write_bits(i_params, F0900_P1_SCAN_ENABLE, 1);
-               stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 1);
+       stv0900_write_reg(intp, AGC2REF, 0x38);
+       stv0900_write_bits(intp, SCAN_ENABLE, 0);
+       stv0900_write_bits(intp, CFR_AUTOSCAN, 0);
 
-               stv0900_write_reg(i_params, R0900_P1_SFRUP1, 0x83);
-               stv0900_write_reg(i_params, R0900_P1_SFRUP0, 0xc0);
+       stv0900_write_bits(intp, AUTO_GUP, 1);
+       stv0900_write_bits(intp, AUTO_GLOW, 1);
 
-               stv0900_write_reg(i_params, R0900_P1_SFRLOW1, 0x82);
-               stv0900_write_reg(i_params, R0900_P1_SFRLOW0, 0xa0);
-               stv0900_write_reg(i_params, R0900_P1_DMDT0M, 0x0);
+       stv0900_write_reg(intp, DMDT0M, 0x0);
 
-               stv0900_set_symbol_rate(i_params, i_params->mclk, 1000000, demod);
-               nb_steps = -1 + (i_params->dmd1_srch_range / 1000000);
-               nb_steps /= 2;
-               nb_steps = (2 * nb_steps) + 1;
+       stv0900_set_symbol_rate(intp, intp->mclk, 1000000, demod);
+       nb_steps = -1 + (intp->srch_range[demod] / 1000000);
+       nb_steps /= 2;
+       nb_steps = (2 * nb_steps) + 1;
 
-               if (nb_steps < 0)
-                       nb_steps = 1;
+       if (nb_steps < 0)
+               nb_steps = 1;
 
-               direction = 1;
+       direction = 1;
 
-               freq_step = (1000000 << 8) / (i_params->mclk >> 8);
+       freq_step = (1000000 << 8) / (intp->mclk >> 8);
 
-               init_freq = 0;
+       init_freq = 0;
 
-               for (i = 0; i < nb_steps; i++) {
-                       if (direction > 0)
-                               init_freq = init_freq + (freq_step * i);
-                       else
-                               init_freq = init_freq - (freq_step * i);
-
-                       direction *= -1;
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x5C);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1, (init_freq >> 8) & 0xff);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0, init_freq  & 0xff);
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x58);
-                       msleep(10);
-                       agc2level = 0;
-
-                       for (j = 0; j < 10; j++)
-                               agc2level += (stv0900_read_reg(i_params, R0900_P1_AGC2I1) << 8)
-                                               | stv0900_read_reg(i_params, R0900_P1_AGC2I0);
-
-                       agc2level /= 10;
-
-                       if (agc2level < minagc2level)
-                               minagc2level = agc2level;
-               }
-               break;
-       case STV0900_DEMOD_2:
-               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x38);
-               stv0900_write_bits(i_params, F0900_P2_SCAN_ENABLE, 1);
-               stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 1);
-               stv0900_write_reg(i_params, R0900_P2_SFRUP1, 0x83);
-               stv0900_write_reg(i_params, R0900_P2_SFRUP0, 0xc0);
-               stv0900_write_reg(i_params, R0900_P2_SFRLOW1, 0x82);
-               stv0900_write_reg(i_params, R0900_P2_SFRLOW0, 0xa0);
-               stv0900_write_reg(i_params, R0900_P2_DMDT0M, 0x0);
-               stv0900_set_symbol_rate(i_params, i_params->mclk, 1000000, demod);
-               nb_steps = -1 + (i_params->dmd2_srch_range / 1000000);
-               nb_steps /= 2;
-               nb_steps = (2 * nb_steps) + 1;
-
-               if (nb_steps < 0)
-                       nb_steps = 1;
-
-               direction = 1;
-               freq_step = (1000000 << 8) / (i_params->mclk >> 8);
-               init_freq = 0;
-               for (i = 0; i < nb_steps; i++) {
-                       if (direction > 0)
-                               init_freq = init_freq + (freq_step * i);
-                       else
-                               init_freq = init_freq - (freq_step * i);
+       for (i = 0; i < nb_steps; i++) {
+               if (direction > 0)
+                       init_freq = init_freq + (freq_step * i);
+               else
+                       init_freq = init_freq - (freq_step * i);
 
-                       direction *= -1;
+               direction *= -1;
+               stv0900_write_reg(intp, DMDISTATE, 0x5C);
+               stv0900_write_reg(intp, CFRINIT1, (init_freq >> 8) & 0xff);
+               stv0900_write_reg(intp, CFRINIT0, init_freq  & 0xff);
+               stv0900_write_reg(intp, DMDISTATE, 0x58);
+               msleep(10);
+               agc2level = 0;
 
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x5C);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1, (init_freq >> 8) & 0xff);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0, init_freq  & 0xff);
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x58);
+               for (j = 0; j < 10; j++)
+                       agc2level += (stv0900_read_reg(intp, AGC2I1) << 8)
+                                       | stv0900_read_reg(intp, AGC2I0);
 
-                       msleep(10);
-                       agc2level = 0;
-                       for (j = 0; j < 10; j++)
-                               agc2level += (stv0900_read_reg(i_params, R0900_P2_AGC2I1) << 8)
-                                               | stv0900_read_reg(i_params, R0900_P2_AGC2I0);
+               agc2level /= 10;
 
-                       agc2level /= 10;
+               if (agc2level < minagc2level)
+                       minagc2level = agc2level;
 
-                       if (agc2level < minagc2level)
-                               minagc2level = agc2level;
-               }
-               break;
        }
 
        return (u16)minagc2level;
@@ -1928,336 +1380,192 @@ static u16 stv0900_blind_check_agc2_min_level(struct stv0900_internal *i_params,
 static u32 stv0900_search_srate_coarse(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
-       int timingLock = FALSE;
+       int timing_lck = FALSE;
        s32 i, timingcpt = 0,
                direction = 1,
                nb_steps,
                current_step = 0,
                tuner_freq;
+       u32 agc2_th,
+               coarse_srate = 0,
+               agc2_integr = 0,
+               currier_step = 1200;
 
-       u32 coarse_srate = 0, agc2_integr = 0, currier_step = 1200;
-
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               stv0900_write_bits(i_params, F0900_P1_I2C_DEMOD_MODE, 0x1F);
-               stv0900_write_reg(i_params, R0900_P1_TMGCFG, 0x12);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHRISE, 0xf0);
-               stv0900_write_reg(i_params, R0900_P1_TMGTHFALL, 0xe0);
-               stv0900_write_bits(i_params, F0900_P1_SCAN_ENABLE, 1);
-               stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 1);
-               stv0900_write_reg(i_params, R0900_P1_SFRUP1, 0x83);
-               stv0900_write_reg(i_params, R0900_P1_SFRUP0, 0xc0);
-               stv0900_write_reg(i_params, R0900_P1_SFRLOW1, 0x82);
-               stv0900_write_reg(i_params, R0900_P1_SFRLOW0, 0xa0);
-               stv0900_write_reg(i_params, R0900_P1_DMDT0M, 0x0);
-               stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x50);
-
-               if (i_params->chip_id >= 0x20) {
-                       stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0x6a);
-                       stv0900_write_reg(i_params, R0900_P1_SFRSTEP, 0x95);
-               } else {
-                       stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0xed);
-                       stv0900_write_reg(i_params, R0900_P1_SFRSTEP, 0x73);
-               }
+       if (intp->chip_id >= 0x30)
+               agc2_th = 0x2e00;
+       else
+               agc2_th = 0x1f00;
+
+       stv0900_write_bits(intp, DEMOD_MODE, 0x1f);
+       stv0900_write_reg(intp, TMGCFG, 0x12);
+       stv0900_write_reg(intp, TMGTHRISE, 0xf0);
+       stv0900_write_reg(intp, TMGTHFALL, 0xe0);
+       stv0900_write_bits(intp, SCAN_ENABLE, 1);
+       stv0900_write_bits(intp, CFR_AUTOSCAN, 1);
+       stv0900_write_reg(intp, SFRUP1, 0x83);
+       stv0900_write_reg(intp, SFRUP0, 0xc0);
+       stv0900_write_reg(intp, SFRLOW1, 0x82);
+       stv0900_write_reg(intp, SFRLOW0, 0xa0);
+       stv0900_write_reg(intp, DMDT0M, 0x0);
+       stv0900_write_reg(intp, AGC2REF, 0x50);
+
+       if (intp->chip_id >= 0x30) {
+               stv0900_write_reg(intp, CARFREQ, 0x99);
+               stv0900_write_reg(intp, SFRSTEP, 0x98);
+       } else if (intp->chip_id >= 0x20) {
+               stv0900_write_reg(intp, CARFREQ, 0x6a);
+               stv0900_write_reg(intp, SFRSTEP, 0x95);
+       } else {
+               stv0900_write_reg(intp, CARFREQ, 0xed);
+               stv0900_write_reg(intp, SFRSTEP, 0x73);
+       }
 
-               if (i_params->dmd1_symbol_rate <= 2000000)
-                       currier_step = 1000;
-               else if (i_params->dmd1_symbol_rate <= 5000000)
-                       currier_step = 2000;
-               else if (i_params->dmd1_symbol_rate <= 12000000)
-                       currier_step = 3000;
-               else
+       if (intp->symbol_rate[demod] <= 2000000)
+               currier_step = 1000;
+       else if (intp->symbol_rate[demod] <= 5000000)
+               currier_step = 2000;
+       else if (intp->symbol_rate[demod] <= 12000000)
+               currier_step = 3000;
+       else
                        currier_step = 5000;
 
-               nb_steps = -1 + ((i_params->dmd1_srch_range / 1000) / currier_step);
-               nb_steps /= 2;
-               nb_steps = (2 * nb_steps) + 1;
-
-               if (nb_steps < 0)
-                       nb_steps = 1;
-
-               else if (nb_steps > 10) {
-                       nb_steps = 11;
-                       currier_step = (i_params->dmd1_srch_range / 1000) / 10;
-               }
-
-               current_step = 0;
-
-               direction = 1;
-               tuner_freq = i_params->tuner1_freq;
-
-               while ((timingLock == FALSE) && (current_step < nb_steps)) {
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x5F);
-                       stv0900_write_bits(i_params, F0900_P1_I2C_DEMOD_MODE, 0x0);
-
-                       msleep(50);
-
-                       for (i = 0; i < 10; i++) {
-                               if (stv0900_get_bits(i_params, F0900_P1_TMGLOCK_QUALITY) >= 2)
-                                       timingcpt++;
-
-                               agc2_integr += (stv0900_read_reg(i_params, R0900_P1_AGC2I1) << 8) | stv0900_read_reg(i_params, R0900_P1_AGC2I0);
-
-                       }
-
-                       agc2_integr /= 10;
-                       coarse_srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-                       current_step++;
-                       direction *= -1;
-
-                       dprintk("lock: I2C_DEMOD_MODE_FIELD =0. Search started. tuner freq=%d agc2=0x%x srate_coarse=%d tmg_cpt=%d\n", tuner_freq, agc2_integr, coarse_srate, timingcpt);
+       nb_steps = -1 + ((intp->srch_range[demod] / 1000) / currier_step);
+       nb_steps /= 2;
+       nb_steps = (2 * nb_steps) + 1;
 
-                       if ((timingcpt >= 5) && (agc2_integr < 0x1F00) && (coarse_srate < 55000000) && (coarse_srate > 850000)) {
-                               timingLock = TRUE;
-                       }
+       if (nb_steps < 0)
+               nb_steps = 1;
+       else if (nb_steps > 10) {
+               nb_steps = 11;
+               currier_step = (intp->srch_range[demod] / 1000) / 10;
+       }
 
-                       else if (current_step < nb_steps) {
-                               if (direction > 0)
-                                       tuner_freq += (current_step * currier_step);
-                               else
-                                       tuner_freq -= (current_step * currier_step);
+       current_step = 0;
+       direction = 1;
 
-                               stv0900_set_tuner(fe, tuner_freq, i_params->tuner1_bw);
-                       }
-               }
+       tuner_freq = intp->freq[demod];
 
-               if (timingLock == FALSE)
-                       coarse_srate = 0;
-               else
-                       coarse_srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-               break;
-       case STV0900_DEMOD_2:
-               stv0900_write_bits(i_params, F0900_P2_I2C_DEMOD_MODE, 0x1F);
-               stv0900_write_reg(i_params, R0900_P2_TMGCFG, 0x12);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHRISE, 0xf0);
-               stv0900_write_reg(i_params, R0900_P2_TMGTHFALL, 0xe0);
-               stv0900_write_bits(i_params, F0900_P2_SCAN_ENABLE, 1);
-               stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 1);
-               stv0900_write_reg(i_params, R0900_P2_SFRUP1, 0x83);
-               stv0900_write_reg(i_params, R0900_P2_SFRUP0, 0xc0);
-               stv0900_write_reg(i_params, R0900_P2_SFRLOW1, 0x82);
-               stv0900_write_reg(i_params, R0900_P2_SFRLOW0, 0xa0);
-               stv0900_write_reg(i_params, R0900_P2_DMDT0M, 0x0);
-               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x50);
-
-               if (i_params->chip_id >= 0x20) {
-                       stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0x6a);
-                       stv0900_write_reg(i_params, R0900_P2_SFRSTEP, 0x95);
-               } else {
-                       stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0xed);
-                       stv0900_write_reg(i_params, R0900_P2_SFRSTEP, 0x73);
-               }
-
-               if (i_params->dmd2_symbol_rate <= 2000000)
-                       currier_step = 1000;
-               else if (i_params->dmd2_symbol_rate <= 5000000)
-                       currier_step = 2000;
-               else if (i_params->dmd2_symbol_rate <= 12000000)
-                       currier_step = 3000;
-               else
-                       currier_step = 5000;
+       while ((timing_lck == FALSE) && (current_step < nb_steps)) {
+               stv0900_write_reg(intp, DMDISTATE, 0x5f);
+               stv0900_write_bits(intp, DEMOD_MODE, 0);
 
+               msleep(50);
 
-               nb_steps = -1 + ((i_params->dmd2_srch_range / 1000) / currier_step);
-               nb_steps /= 2;
-               nb_steps = (2 * nb_steps) + 1;
+               for (i = 0; i < 10; i++) {
+                       if (stv0900_get_bits(intp, TMGLOCK_QUALITY) >= 2)
+                               timingcpt++;
 
-               if (nb_steps < 0)
-                       nb_steps = 1;
-               else if (nb_steps > 10) {
-                       nb_steps = 11;
-                       currier_step = (i_params->dmd2_srch_range / 1000) / 10;
+                       agc2_integr += (stv0900_read_reg(intp, AGC2I1) << 8) |
+                                       stv0900_read_reg(intp, AGC2I0);
                }
 
-               current_step = 0;
-               direction = 1;
-               tuner_freq = i_params->tuner2_freq;
-
-               while ((timingLock == FALSE) && (current_step < nb_steps)) {
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x5F);
-                       stv0900_write_bits(i_params, F0900_P2_I2C_DEMOD_MODE, 0x0);
-
-                       msleep(50);
-                       timingcpt = 0;
-
-                       for (i = 0; i < 20; i++) {
-                               if (stv0900_get_bits(i_params, F0900_P2_TMGLOCK_QUALITY) >= 2)
-                                       timingcpt++;
-                               agc2_integr += (stv0900_read_reg(i_params, R0900_P2_AGC2I1) << 8)
-                                                               | stv0900_read_reg(i_params, R0900_P2_AGC2I0);
-                       }
-
-                       agc2_integr /= 20;
-                       coarse_srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-                       if ((timingcpt >= 10) && (agc2_integr < 0x1F00) && (coarse_srate < 55000000) && (coarse_srate > 850000))
-                               timingLock = TRUE;
-                       else {
-                               current_step++;
-                               direction *= -1;
-
-                               if (direction > 0)
-                                       tuner_freq += (current_step * currier_step);
-                               else
-                                       tuner_freq -= (current_step * currier_step);
+               agc2_integr /= 10;
+               coarse_srate = stv0900_get_symbol_rate(intp, intp->mclk, demod);
+               current_step++;
+               direction *= -1;
+
+               dprintk("lock: I2C_DEMOD_MODE_FIELD =0. Search started."
+                       " tuner freq=%d agc2=0x%x srate_coarse=%d tmg_cpt=%d\n",
+                       tuner_freq, agc2_integr, coarse_srate, timingcpt);
+
+               if ((timingcpt >= 5) &&
+                               (agc2_integr < agc2_th) &&
+                               (coarse_srate < 55000000) &&
+                               (coarse_srate > 850000))
+                       timing_lck = TRUE;
+               else if (current_step < nb_steps) {
+                       if (direction > 0)
+                               tuner_freq += (current_step * currier_step);
+                       else
+                               tuner_freq -= (current_step * currier_step);
 
-                               stv0900_set_tuner(fe, tuner_freq, i_params->tuner2_bw);
-                       }
+                       stv0900_set_tuner(fe, tuner_freq, intp->bw[demod]);
                }
-
-               if (timingLock == FALSE)
-                       coarse_srate = 0;
-               else
-                       coarse_srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
-               break;
        }
 
+       if (timing_lck == FALSE)
+               coarse_srate = 0;
+       else
+               coarse_srate = stv0900_get_symbol_rate(intp, intp->mclk, demod);
+
        return coarse_srate;
 }
 
 static u32 stv0900_search_srate_fine(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
-       u32 coarse_srate,
-       coarse_freq,
-       symb;
+       u32     coarse_srate,
+               coarse_freq,
+               symb,
+               symbmax,
+               symbmin,
+               symbcomp;
+
+       coarse_srate = stv0900_get_symbol_rate(intp, intp->mclk, demod);
+
+       if (coarse_srate > 3000000) {
+               symbmax = 13 * (coarse_srate / 10);
+               symbmax = (symbmax / 1000) * 65536;
+               symbmax /= (intp->mclk / 1000);
+
+               symbmin = 10 * (coarse_srate / 13);
+               symbmin = (symbmin / 1000)*65536;
+               symbmin /= (intp->mclk / 1000);
+
+               symb = (coarse_srate / 1000) * 65536;
+               symb /= (intp->mclk / 1000);
+       } else {
+               symbmax = 13 * (coarse_srate / 10);
+               symbmax = (symbmax / 100) * 65536;
+               symbmax /= (intp->mclk / 100);
 
-       coarse_srate = stv0900_get_symbol_rate(i_params, i_params->mclk, demod);
+               symbmin = 10 * (coarse_srate / 14);
+               symbmin = (symbmin / 100) * 65536;
+               symbmin /= (intp->mclk / 100);
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               coarse_freq = (stv0900_read_reg(i_params, R0900_P1_CFR2) << 8)
-                                               | stv0900_read_reg(i_params, R0900_P1_CFR1);
-               symb = 13 * (coarse_srate / 10);
-
-               if (symb < i_params->dmd1_symbol_rate)
-                       coarse_srate = 0;
-               else {
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x1F);
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG2, 0x01);
-                       stv0900_write_reg(i_params, R0900_P1_TMGTHRISE, 0x20);
-                       stv0900_write_reg(i_params, R0900_P1_TMGTHFALL, 0x00);
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG, 0xd2);
-                       stv0900_write_bits(i_params, F0900_P1_CFR_AUTOSCAN, 0);
-
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0x49);
-                       else
-                               stv0900_write_reg(i_params, R0900_P1_CARFREQ, 0xed);
-
-                       if (coarse_srate > 3000000) {
-                               symb = 13 * (coarse_srate / 10);
-                               symb = (symb / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-                               stv0900_write_reg(i_params, R0900_P1_SFRUP1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P1_SFRUP0, (symb & 0xFF));
-
-                               symb = 10 * (coarse_srate / 13);
-                               symb = (symb / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-
-                               stv0900_write_reg(i_params, R0900_P1_SFRLOW1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P1_SFRLOW0, (symb & 0xFF));
-
-                               symb = (coarse_srate / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-                               stv0900_write_reg(i_params, R0900_P1_SFRINIT1, (symb >> 8) & 0xFF);
-                               stv0900_write_reg(i_params, R0900_P1_SFRINIT0, (symb & 0xFF));
-                       } else {
-                               symb = 13 * (coarse_srate / 10);
-                               symb = (symb / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P1_SFRUP1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P1_SFRUP0, (symb & 0xFF));
-
-                               symb = 10 * (coarse_srate / 14);
-                               symb = (symb / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P1_SFRLOW1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P1_SFRLOW0, (symb & 0xFF));
-
-                               symb = (coarse_srate / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P1_SFRINIT1, (symb >> 8) & 0xFF);
-                               stv0900_write_reg(i_params, R0900_P1_SFRINIT0, (symb & 0xFF));
-                       }
+               symb = (coarse_srate / 100) * 65536;
+               symb /= (intp->mclk / 100);
+       }
 
-                       stv0900_write_reg(i_params, R0900_P1_DMDT0M, 0x20);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT1, (coarse_freq >> 8) & 0xff);
-                       stv0900_write_reg(i_params, R0900_P1_CFRINIT0, coarse_freq  & 0xff);
-                       stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x15);
-               }
-               break;
-       case STV0900_DEMOD_2:
-               coarse_freq = (stv0900_read_reg(i_params, R0900_P2_CFR2) << 8)
-                                               | stv0900_read_reg(i_params, R0900_P2_CFR1);
-
-               symb = 13 * (coarse_srate / 10);
-
-               if (symb < i_params->dmd2_symbol_rate)
-                       coarse_srate = 0;
-               else {
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x1F);
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG2, 0x01);
-                       stv0900_write_reg(i_params, R0900_P2_TMGTHRISE, 0x20);
-                       stv0900_write_reg(i_params, R0900_P2_TMGTHFALL, 0x00);
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG, 0xd2);
-                       stv0900_write_bits(i_params, F0900_P2_CFR_AUTOSCAN, 0);
-
-                       if (i_params->chip_id >= 0x20)
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0x49);
-                       else
-                               stv0900_write_reg(i_params, R0900_P2_CARFREQ, 0xed);
-
-                       if (coarse_srate > 3000000) {
-                               symb = 13 * (coarse_srate / 10);
-                               symb = (symb / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-                               stv0900_write_reg(i_params, R0900_P2_SFRUP1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P2_SFRUP0, (symb & 0xFF));
-
-                               symb = 10 * (coarse_srate / 13);
-                               symb = (symb / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-
-                               stv0900_write_reg(i_params, R0900_P2_SFRLOW1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P2_SFRLOW0, (symb & 0xFF));
-
-                               symb = (coarse_srate / 1000) * 65536;
-                               symb /= (i_params->mclk / 1000);
-                               stv0900_write_reg(i_params, R0900_P2_SFRINIT1, (symb >> 8) & 0xFF);
-                               stv0900_write_reg(i_params, R0900_P2_SFRINIT0, (symb & 0xFF));
-                       } else {
-                               symb = 13 * (coarse_srate / 10);
-                               symb = (symb / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P2_SFRUP1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P2_SFRUP0, (symb & 0xFF));
-
-                               symb = 10 * (coarse_srate / 14);
-                               symb = (symb / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P2_SFRLOW1, (symb >> 8) & 0x7F);
-                               stv0900_write_reg(i_params, R0900_P2_SFRLOW0, (symb & 0xFF));
-
-                               symb = (coarse_srate / 100) * 65536;
-                               symb /= (i_params->mclk / 100);
-                               stv0900_write_reg(i_params, R0900_P2_SFRINIT1, (symb >> 8) & 0xFF);
-                               stv0900_write_reg(i_params, R0900_P2_SFRINIT0, (symb & 0xFF));
-                       }
+       symbcomp = 13 * (coarse_srate / 10);
+               coarse_freq = (stv0900_read_reg(intp, CFR2) << 8)
+                                       | stv0900_read_reg(intp, CFR1);
+
+       if (symbcomp < intp->symbol_rate[demod])
+               coarse_srate = 0;
+       else {
+               stv0900_write_reg(intp, DMDISTATE, 0x1f);
+               stv0900_write_reg(intp, TMGCFG2, 0xc1);
+               stv0900_write_reg(intp, TMGTHRISE, 0x20);
+               stv0900_write_reg(intp, TMGTHFALL, 0x00);
+               stv0900_write_reg(intp, TMGCFG, 0xd2);
+               stv0900_write_bits(intp, CFR_AUTOSCAN, 0);
+               stv0900_write_reg(intp, AGC2REF, 0x38);
+
+               if (intp->chip_id >= 0x30)
+                       stv0900_write_reg(intp, CARFREQ, 0x79);
+               else if (intp->chip_id >= 0x20)
+                       stv0900_write_reg(intp, CARFREQ, 0x49);
+               else
+                       stv0900_write_reg(intp, CARFREQ, 0xed);
 
-                       stv0900_write_reg(i_params, R0900_P2_DMDT0M, 0x20);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT1, (coarse_freq >> 8) & 0xff);
-                       stv0900_write_reg(i_params, R0900_P2_CFRINIT0, coarse_freq  & 0xff);
-                       stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x15);
-               }
+               stv0900_write_reg(intp, SFRUP1, (symbmax >> 8) & 0x7f);
+               stv0900_write_reg(intp, SFRUP0, (symbmax & 0xff));
 
-               break;
+               stv0900_write_reg(intp, SFRLOW1, (symbmin >> 8) & 0x7f);
+               stv0900_write_reg(intp, SFRLOW0, (symbmin & 0xff));
+
+               stv0900_write_reg(intp, SFRINIT1, (symb >> 8) & 0xff);
+               stv0900_write_reg(intp, SFRINIT0, (symb & 0xff));
+
+               stv0900_write_reg(intp, DMDT0M, 0x20);
+               stv0900_write_reg(intp, CFRINIT1, (coarse_freq >> 8) & 0xff);
+               stv0900_write_reg(intp, CFRINIT0, coarse_freq  & 0xff);
+               stv0900_write_reg(intp, DMDISTATE, 0x15);
        }
 
        return coarse_srate;
@@ -2266,163 +1574,135 @@ static u32 stv0900_search_srate_fine(struct dvb_frontend *fe)
 static int stv0900_blind_search_algo(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
-       u8 k_ref_tmg, k_ref_tmg_max, k_ref_tmg_min;
-       u32 coarse_srate;
-       int lock = FALSE, coarse_fail = FALSE;
-       s32 demod_timeout = 500, fec_timeout = 50, kref_tmg_reg, fail_cpt, i, agc2_overflow;
-       u16 agc2_integr;
-       u8 dstatus2;
+       u8      k_ref_tmg,
+               k_ref_tmg_max,
+               k_ref_tmg_min;
+       u32     coarse_srate,
+               agc2_th;
+       int     lock = FALSE,
+               coarse_fail = FALSE;
+       s32     demod_timeout = 500,
+               fec_timeout = 50,
+               fail_cpt,
+               i,
+               agc2_overflow;
+       u16     agc2_int;
+       u8      dstatus2;
 
        dprintk("%s\n", __func__);
 
-       if (i_params->chip_id < 0x20) {
+       if (intp->chip_id < 0x20) {
                k_ref_tmg_max = 233;
                k_ref_tmg_min = 143;
        } else {
-               k_ref_tmg_max = 120;
-               k_ref_tmg_min = 30;
+               k_ref_tmg_max = 110;
+               k_ref_tmg_min = 10;
        }
 
-       agc2_integr = stv0900_blind_check_agc2_min_level(i_params, demod);
-
-       if (agc2_integr > STV0900_BLIND_SEARCH_AGC2_TH) {
-               lock = FALSE;
-
-       } else {
-               switch (demod) {
-               case STV0900_DEMOD_1:
-               default:
-                       if (i_params->chip_id == 0x10)
-                               stv0900_write_reg(i_params, R0900_P1_CORRELEXP, 0xAA);
-
-                       if (i_params->chip_id < 0x20)
-                               stv0900_write_reg(i_params, R0900_P1_CARHDR, 0x55);
-
-                       stv0900_write_reg(i_params, R0900_P1_CARCFG, 0xC4);
-                       stv0900_write_reg(i_params, R0900_P1_RTCS2, 0x44);
-
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P1_EQUALCFG, 0x41);
-                               stv0900_write_reg(i_params, R0900_P1_FFECFG, 0x41);
-                               stv0900_write_reg(i_params, R0900_P1_VITSCALE, 0x82);
-                               stv0900_write_reg(i_params, R0900_P1_VAVSRVIT, 0x0);
-                       }
-
-                       kref_tmg_reg = R0900_P1_KREFTMG;
-                       break;
-               case STV0900_DEMOD_2:
-                       if (i_params->chip_id == 0x10)
-                               stv0900_write_reg(i_params, R0900_P2_CORRELEXP, 0xAA);
+       if (intp->chip_id <= 0x20)
+               agc2_th = STV0900_BLIND_SEARCH_AGC2_TH;
+       else
+               agc2_th = STV0900_BLIND_SEARCH_AGC2_TH_CUT30;
 
-                       if (i_params->chip_id < 0x20)
-                               stv0900_write_reg(i_params, R0900_P2_CARHDR, 0x55);
+       agc2_int = stv0900_blind_check_agc2_min_level(intp, demod);
 
-                       stv0900_write_reg(i_params, R0900_P2_CARCFG, 0xC4);
-                       stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x44);
+       if (agc2_int > STV0900_BLIND_SEARCH_AGC2_TH)
+               return FALSE;
 
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P2_EQUALCFG, 0x41);
-                               stv0900_write_reg(i_params, R0900_P2_FFECFG, 0x41);
-                               stv0900_write_reg(i_params, R0900_P2_VITSCALE, 0x82);
-                               stv0900_write_reg(i_params, R0900_P2_VAVSRVIT, 0x0);
-                       }
+       if (intp->chip_id == 0x10)
+               stv0900_write_reg(intp, CORRELEXP, 0xaa);
 
-                       kref_tmg_reg = R0900_P2_KREFTMG;
-                       break;
-               }
+       if (intp->chip_id < 0x20)
+               stv0900_write_reg(intp, CARHDR, 0x55);
+       else
+               stv0900_write_reg(intp, CARHDR, 0x20);
 
-               k_ref_tmg = k_ref_tmg_max;
+       if (intp->chip_id <= 0x20)
+               stv0900_write_reg(intp, CARCFG, 0xc4);
+       else
+               stv0900_write_reg(intp, CARCFG, 0x6);
 
-               do {
-                       stv0900_write_reg(i_params, kref_tmg_reg, k_ref_tmg);
-                       if (stv0900_search_srate_coarse(fe) != 0) {
-                               coarse_srate = stv0900_search_srate_fine(fe);
+       stv0900_write_reg(intp, RTCS2, 0x44);
 
-                               if (coarse_srate != 0) {
-                                       stv0900_get_lock_timeout(&demod_timeout, &fec_timeout, coarse_srate, STV0900_BLIND_SEARCH);
-                                       lock = stv0900_get_demod_lock(i_params, demod, demod_timeout);
-                               } else
-                                       lock = FALSE;
-                       } else {
-                               fail_cpt = 0;
-                               agc2_overflow = 0;
-
-                               switch (demod) {
-                               case STV0900_DEMOD_1:
-                               default:
-                                       for (i = 0; i < 10; i++) {
-                                               agc2_integr = (stv0900_read_reg(i_params, R0900_P1_AGC2I1) << 8)
-                                                               | stv0900_read_reg(i_params, R0900_P1_AGC2I0);
+       if (intp->chip_id >= 0x20) {
+               stv0900_write_reg(intp, EQUALCFG, 0x41);
+               stv0900_write_reg(intp, FFECFG, 0x41);
+               stv0900_write_reg(intp, VITSCALE, 0x82);
+               stv0900_write_reg(intp, VAVSRVIT, 0x0);
+       }
 
-                                               if (agc2_integr >= 0xff00)
-                                                       agc2_overflow++;
+       k_ref_tmg = k_ref_tmg_max;
 
-                                               dstatus2 = stv0900_read_reg(i_params, R0900_P1_DSTATUS2);
+       do {
+               stv0900_write_reg(intp, KREFTMG, k_ref_tmg);
+               if (stv0900_search_srate_coarse(fe) != 0) {
+                       coarse_srate = stv0900_search_srate_fine(fe);
+
+                       if (coarse_srate != 0) {
+                               stv0900_get_lock_timeout(&demod_timeout,
+                                                       &fec_timeout,
+                                                       coarse_srate,
+                                                       STV0900_BLIND_SEARCH);
+                               lock = stv0900_get_demod_lock(intp,
+                                                       demod,
+                                                       demod_timeout);
+                       } else
+                               lock = FALSE;
+               } else {
+                       fail_cpt = 0;
+                       agc2_overflow = 0;
 
-                                               if (((dstatus2 & 0x1) == 0x1) && ((dstatus2 >> 7) == 1))
-                                                       fail_cpt++;
-                                       }
-                                       break;
-                               case STV0900_DEMOD_2:
-                                       for (i = 0; i < 10; i++) {
-                                               agc2_integr = (stv0900_read_reg(i_params, R0900_P2_AGC2I1) << 8)
-                                                               | stv0900_read_reg(i_params, R0900_P2_AGC2I0);
+                       for (i = 0; i < 10; i++) {
+                               agc2_int = (stv0900_read_reg(intp, AGC2I1) << 8)
+                                       | stv0900_read_reg(intp, AGC2I0);
 
-                                               if (agc2_integr >= 0xff00)
-                                                       agc2_overflow++;
+                               if (agc2_int >= 0xff00)
+                                       agc2_overflow++;
 
-                                               dstatus2 = stv0900_read_reg(i_params, R0900_P2_DSTATUS2);
+                               dstatus2 = stv0900_read_reg(intp, DSTATUS2);
 
-                                               if (((dstatus2 & 0x1) == 0x1) && ((dstatus2 >> 7) == 1))
-                                                       fail_cpt++;
-                                       }
-                                       break;
-                               }
+                               if (((dstatus2 & 0x1) == 0x1) &&
+                                               ((dstatus2 >> 7) == 1))
+                                       fail_cpt++;
+                       }
 
-                               if ((fail_cpt > 7) || (agc2_overflow > 7))
-                                       coarse_fail = TRUE;
+                       if ((fail_cpt > 7) || (agc2_overflow > 7))
+                               coarse_fail = TRUE;
 
-                               lock = FALSE;
-                       }
-                       k_ref_tmg -= 30;
-               } while ((k_ref_tmg >= k_ref_tmg_min) && (lock == FALSE) && (coarse_fail == FALSE));
-       }
+                       lock = FALSE;
+               }
+               k_ref_tmg -= 30;
+       } while ((k_ref_tmg >= k_ref_tmg_min) &&
+                               (lock == FALSE) &&
+                               (coarse_fail == FALSE));
 
        return lock;
 }
 
-static void stv0900_set_viterbi_acq(struct stv0900_internal *i_params,
+static void stv0900_set_viterbi_acq(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
-       s32 vth_reg;
+       s32 vth_reg = VTH12;
 
        dprintk("%s\n", __func__);
 
-       dmd_reg(vth_reg, R0900_P1_VTH12, R0900_P2_VTH12);
-
-       stv0900_write_reg(i_params, vth_reg++, 0x96);
-       stv0900_write_reg(i_params, vth_reg++, 0x64);
-       stv0900_write_reg(i_params, vth_reg++, 0x36);
-       stv0900_write_reg(i_params, vth_reg++, 0x23);
-       stv0900_write_reg(i_params, vth_reg++, 0x1E);
-       stv0900_write_reg(i_params, vth_reg++, 0x19);
+       stv0900_write_reg(intp, vth_reg++, 0x96);
+       stv0900_write_reg(intp, vth_reg++, 0x64);
+       stv0900_write_reg(intp, vth_reg++, 0x36);
+       stv0900_write_reg(intp, vth_reg++, 0x23);
+       stv0900_write_reg(intp, vth_reg++, 0x1e);
+       stv0900_write_reg(intp, vth_reg++, 0x19);
 }
 
-static void stv0900_set_search_standard(struct stv0900_internal *i_params,
+static void stv0900_set_search_standard(struct stv0900_internal *intp,
                                        enum fe_stv0900_demod_num demod)
 {
 
-       int sstndrd;
-
        dprintk("%s\n", __func__);
 
-       sstndrd = i_params->dmd1_srch_standard;
-       if (demod == 1)
-               sstndrd = i_params->dmd2_srch_stndrd;
-
-       switch (sstndrd) {
+       switch (intp->srch_standard[demod]) {
        case STV0900_SEARCH_DVBS1:
                dprintk("Search Standard = DVBS1\n");
                break;
@@ -2437,129 +1717,74 @@ static void stv0900_set_search_standard(struct stv0900_internal *i_params,
                break;
        }
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               switch (i_params->dmd1_srch_standard) {
-               case STV0900_SEARCH_DVBS1:
-               case STV0900_SEARCH_DSS:
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT1, 0);
-                       stv0900_write_reg(i_params, R0900_P1_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P1_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P1_CAR2CFG, 0x22);
-
-                       stv0900_set_viterbi_acq(i_params, demod);
-                       stv0900_set_viterbi_standard(i_params,
-                                               i_params->dmd1_srch_standard,
-                                               i_params->dmd1_fec, demod);
-
-                       break;
-               case STV0900_SEARCH_DVBS2:
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT1, 1);
-                       stv0900_write_reg(i_params, R0900_P1_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P1_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P1_CAR2CFG, 0x26);
-                       if (i_params->demod_mode != STV0900_SINGLE) {
-                               if (i_params->chip_id <= 0x11)
-                                       stv0900_stop_all_s2_modcod(i_params, demod);
-                               else
-                                       stv0900_activate_s2_modcode(i_params, demod);
-
-                       } else
-                               stv0900_activate_s2_modcode_single(i_params, demod);
-
-                       stv0900_set_viterbi_tracq(i_params, demod);
-
-                       break;
-               case STV0900_AUTO_SEARCH:
-               default:
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P1_DVBS2_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT1, 0);
-                       stv0900_write_reg(i_params, R0900_P1_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P1_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P1_CAR2CFG, 0x26);
-                       if (i_params->demod_mode != STV0900_SINGLE) {
-                               if (i_params->chip_id <= 0x11)
-                                       stv0900_stop_all_s2_modcod(i_params, demod);
-                               else
-                                       stv0900_activate_s2_modcode(i_params, demod);
+       switch (intp->srch_standard[demod]) {
+       case STV0900_SEARCH_DVBS1:
+       case STV0900_SEARCH_DSS:
+               stv0900_write_bits(intp, DVBS1_ENABLE, 1);
+               stv0900_write_bits(intp, DVBS2_ENABLE, 0);
+               stv0900_write_bits(intp, STOP_CLKVIT, 0);
+               stv0900_set_dvbs1_track_car_loop(intp,
+                                               demod,
+                                               intp->symbol_rate[demod]);
+               stv0900_write_reg(intp, CAR2CFG, 0x22);
+
+               stv0900_set_viterbi_acq(intp, demod);
+               stv0900_set_viterbi_standard(intp,
+                                       intp->srch_standard[demod],
+                                       intp->fec[demod], demod);
 
-                       } else
-                               stv0900_activate_s2_modcode_single(i_params, demod);
+               break;
+       case STV0900_SEARCH_DVBS2:
+               stv0900_write_bits(intp, DVBS1_ENABLE, 0);
+               stv0900_write_bits(intp, DVBS2_ENABLE, 1);
+               stv0900_write_bits(intp, STOP_CLKVIT, 1);
+               stv0900_write_reg(intp, ACLC, 0x1a);
+               stv0900_write_reg(intp, BCLC, 0x09);
+               if (intp->chip_id <= 0x20) /*cut 1.x and 2.0*/
+                       stv0900_write_reg(intp, CAR2CFG, 0x26);
+               else
+                       stv0900_write_reg(intp, CAR2CFG, 0x66);
 
-                       if (i_params->dmd1_symbol_rate >= 2000000)
-                               stv0900_set_viterbi_acq(i_params, demod);
+               if (intp->demod_mode != STV0900_SINGLE) {
+                       if (intp->chip_id <= 0x11)
+                               stv0900_stop_all_s2_modcod(intp, demod);
                        else
-                               stv0900_set_viterbi_tracq(i_params, demod);
+                               stv0900_activate_s2_modcod(intp, demod);
 
-                       stv0900_set_viterbi_standard(i_params, i_params->dmd1_srch_standard, i_params->dmd1_fec, demod);
+               } else
+                       stv0900_activate_s2_modcod_single(intp, demod);
 
-                       break;
-               }
-               break;
-       case STV0900_DEMOD_2:
-               switch (i_params->dmd2_srch_stndrd) {
-               case STV0900_SEARCH_DVBS1:
-               case STV0900_SEARCH_DSS:
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT2, 0);
-                       stv0900_write_reg(i_params, R0900_P2_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P2_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P2_CAR2CFG, 0x22);
-                       stv0900_set_viterbi_acq(i_params, demod);
-                       stv0900_set_viterbi_standard(i_params, i_params->dmd2_srch_stndrd, i_params->dmd2_fec, demod);
-                       break;
-               case STV0900_SEARCH_DVBS2:
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT2, 1);
-                       stv0900_write_reg(i_params, R0900_P2_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P2_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P2_CAR2CFG, 0x26);
-                       if (i_params->demod_mode != STV0900_SINGLE)
-                               stv0900_activate_s2_modcode(i_params, demod);
-                       else
-                               stv0900_activate_s2_modcode_single(i_params, demod);
+               stv0900_set_viterbi_tracq(intp, demod);
 
-                       stv0900_set_viterbi_tracq(i_params, demod);
-                       break;
-               case STV0900_AUTO_SEARCH:
-               default:
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 0);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS1_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_P2_DVBS2_ENABLE, 1);
-                       stv0900_write_bits(i_params, F0900_STOP_CLKVIT2, 0);
-                       stv0900_write_reg(i_params, R0900_P2_ACLC, 0x1a);
-                       stv0900_write_reg(i_params, R0900_P2_BCLC, 0x09);
-                       stv0900_write_reg(i_params, R0900_P2_CAR2CFG, 0x26);
-                       if (i_params->demod_mode != STV0900_SINGLE)
-                               stv0900_activate_s2_modcode(i_params, demod);
-                       else
-                               stv0900_activate_s2_modcode_single(i_params, demod);
+               break;
+       case STV0900_AUTO_SEARCH:
+       default:
+               stv0900_write_bits(intp, DVBS1_ENABLE, 1);
+               stv0900_write_bits(intp, DVBS2_ENABLE, 1);
+               stv0900_write_bits(intp, STOP_CLKVIT, 0);
+               stv0900_write_reg(intp, ACLC, 0x1a);
+               stv0900_write_reg(intp, BCLC, 0x09);
+               stv0900_set_dvbs1_track_car_loop(intp,
+                                               demod,
+                                               intp->symbol_rate[demod]);
+               if (intp->chip_id <= 0x20) /*cut 1.x and 2.0*/
+                       stv0900_write_reg(intp, CAR2CFG, 0x26);
+               else
+                       stv0900_write_reg(intp, CAR2CFG, 0x66);
 
-                       if (i_params->dmd2_symbol_rate >= 2000000)
-                               stv0900_set_viterbi_acq(i_params, demod);
+               if (intp->demod_mode != STV0900_SINGLE) {
+                       if (intp->chip_id <= 0x11)
+                               stv0900_stop_all_s2_modcod(intp, demod);
                        else
-                               stv0900_set_viterbi_tracq(i_params, demod);
+                               stv0900_activate_s2_modcod(intp, demod);
 
-                       stv0900_set_viterbi_standard(i_params, i_params->dmd2_srch_stndrd, i_params->dmd2_fec, demod);
+               } else
+                       stv0900_activate_s2_modcod_single(intp, demod);
 
-                       break;
-               }
+               stv0900_set_viterbi_tracq(intp, demod);
+               stv0900_set_viterbi_standard(intp,
+                                               intp->srch_standard[demod],
+                                               intp->fec[demod], demod);
 
                break;
        }
@@ -2568,10 +1793,11 @@ static void stv0900_set_search_standard(struct stv0900_internal *i_params,
 enum fe_stv0900_signal_type stv0900_algo(struct dvb_frontend *fe)
 {
        struct stv0900_state *state = fe->demodulator_priv;
-       struct stv0900_internal *i_params = state->internal;
+       struct stv0900_internal *intp = state->internal;
        enum fe_stv0900_demod_num demod = state->demod;
 
-       s32 demod_timeout = 500, fec_timeout = 50, stream_merger_field;
+       s32 demod_timeout = 500, fec_timeout = 50;
+       s32 aq_power, agc1_power, i;
 
        int lock = FALSE, low_sr = FALSE;
 
@@ -2581,155 +1807,115 @@ enum fe_stv0900_signal_type stv0900_algo(struct dvb_frontend *fe)
 
        dprintk("%s\n", __func__);
 
-       switch (demod) {
-       case STV0900_DEMOD_1:
-       default:
-               algo = i_params->dmd1_srch_algo;
-
-               stv0900_write_bits(i_params, F0900_P1_RST_HWARE, 1);
-               stream_merger_field = F0900_P1_RST_HWARE;
-
-               stv0900_write_reg(i_params, R0900_P1_DMDISTATE, 0x5C);
-
-               if (i_params->chip_id >= 0x20)
-                       stv0900_write_reg(i_params, R0900_P1_CORRELABS, 0x9e);
+       algo = intp->srch_algo[demod];
+       stv0900_write_bits(intp, RST_HWARE, 1);
+       stv0900_write_reg(intp, DMDISTATE, 0x5c);
+       if (intp->chip_id >= 0x20) {
+               if (intp->symbol_rate[demod] > 5000000)
+                       stv0900_write_reg(intp, CORRELABS, 0x9e);
                else
-                       stv0900_write_reg(i_params, R0900_P1_CORRELABS, 0x88);
-
-               stv0900_get_lock_timeout(&demod_timeout, &fec_timeout, i_params->dmd1_symbol_rate, i_params->dmd1_srch_algo);
-
-               if (i_params->dmd1_srch_algo == STV0900_BLIND_SEARCH) {
-                       i_params->tuner1_bw = 2 * 36000000;
-
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG2, 0x00);
-                       stv0900_write_reg(i_params, R0900_P1_CORRELMANT, 0x70);
-
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, 1000000, demod);
-               } else {
-                       stv0900_write_reg(i_params, R0900_P1_DMDT0M, 0x20);
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG, 0xd2);
-
-                       if (i_params->dmd1_symbol_rate < 2000000)
-                               stv0900_write_reg(i_params, R0900_P1_CORRELMANT, 0x63);
-                       else
-                               stv0900_write_reg(i_params, R0900_P1_CORRELMANT, 0x70);
-
-                       stv0900_write_reg(i_params, R0900_P1_AGC2REF, 0x38);
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P1_KREFTMG, 0x5a);
-
-                               if (i_params->dmd1_srch_algo == STV0900_COLD_START)
-                                       i_params->tuner1_bw = (15 * (stv0900_carrier_width(i_params->dmd1_symbol_rate, i_params->rolloff) + 10000000)) / 10;
-                               else if (i_params->dmd1_srch_algo == STV0900_WARM_START)
-                                       i_params->tuner1_bw = stv0900_carrier_width(i_params->dmd1_symbol_rate, i_params->rolloff) + 10000000;
-                       } else {
-                               stv0900_write_reg(i_params, R0900_P1_KREFTMG, 0xc1);
-                               i_params->tuner1_bw = (15 * (stv0900_carrier_width(i_params->dmd1_symbol_rate, i_params->rolloff) + 10000000)) / 10;
-                       }
-
-                       stv0900_write_reg(i_params, R0900_P1_TMGCFG2, 0x01);
-
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, i_params->dmd1_symbol_rate, demod);
-                       stv0900_set_max_symbol_rate(i_params, i_params->mclk, i_params->dmd1_symbol_rate, demod);
-                       stv0900_set_min_symbol_rate(i_params, i_params->mclk, i_params->dmd1_symbol_rate, demod);
-                       if (i_params->dmd1_symbol_rate >= 10000000)
-                               low_sr = FALSE;
-                       else
-                               low_sr = TRUE;
-
-               }
-
-               stv0900_set_tuner(fe, i_params->tuner1_freq, i_params->tuner1_bw);
-
-               stv0900_write_bits(i_params, F0900_P1_SPECINV_CONTROL, i_params->dmd1_srch_iq_inv);
-               stv0900_write_bits(i_params, F0900_P1_MANUAL_ROLLOFF, 1);
-
-               stv0900_set_search_standard(i_params, demod);
+                       stv0900_write_reg(intp, CORRELABS, 0x82);
+       } else
+               stv0900_write_reg(intp, CORRELABS, 0x88);
 
-               if (i_params->dmd1_srch_algo != STV0900_BLIND_SEARCH)
-                       stv0900_start_search(i_params, demod);
-               break;
-       case STV0900_DEMOD_2:
-               algo = i_params->dmd2_srch_algo;
+       stv0900_get_lock_timeout(&demod_timeout, &fec_timeout,
+                               intp->symbol_rate[demod],
+                               intp->srch_algo[demod]);
 
-               stv0900_write_bits(i_params, F0900_P2_RST_HWARE, 1);
+       if (intp->srch_algo[demod] == STV0900_BLIND_SEARCH) {
+               intp->bw[demod] = 2 * 36000000;
 
-               stream_merger_field = F0900_P2_RST_HWARE;
+               stv0900_write_reg(intp, TMGCFG2, 0xc0);
+               stv0900_write_reg(intp, CORRELMANT, 0x70);
 
-               stv0900_write_reg(i_params, R0900_P2_DMDISTATE, 0x5C);
+               stv0900_set_symbol_rate(intp, intp->mclk, 1000000, demod);
+       } else {
+               stv0900_write_reg(intp, DMDT0M, 0x20);
+               stv0900_write_reg(intp, TMGCFG, 0xd2);
 
-               if (i_params->chip_id >= 0x20)
-                       stv0900_write_reg(i_params, R0900_P2_CORRELABS, 0x9e);
+               if (intp->symbol_rate[demod] < 2000000)
+                       stv0900_write_reg(intp, CORRELMANT, 0x63);
                else
-                       stv0900_write_reg(i_params, R0900_P2_CORRELABS, 0x88);
+                       stv0900_write_reg(intp, CORRELMANT, 0x70);
 
-               stv0900_get_lock_timeout(&demod_timeout, &fec_timeout, i_params->dmd2_symbol_rate, i_params->dmd2_srch_algo);
+               stv0900_write_reg(intp, AGC2REF, 0x38);
 
-               if (i_params->dmd2_srch_algo == STV0900_BLIND_SEARCH) {
-                       i_params->tuner2_bw = 2 * 36000000;
+               intp->bw[demod] =
+                               stv0900_carrier_width(intp->symbol_rate[demod],
+                                                               intp->rolloff);
+               if (intp->chip_id >= 0x20) {
+                       stv0900_write_reg(intp, KREFTMG, 0x5a);
 
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG2, 0x00);
-                       stv0900_write_reg(i_params, R0900_P2_CORRELMANT, 0x70);
+                       if (intp->srch_algo[demod] == STV0900_COLD_START) {
+                               intp->bw[demod] += 10000000;
+                               intp->bw[demod] *= 15;
+                               intp->bw[demod] /= 10;
+                       } else if (intp->srch_algo[demod] == STV0900_WARM_START)
+                               intp->bw[demod] += 10000000;
 
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, 1000000, demod);
                } else {
-                       stv0900_write_reg(i_params, R0900_P2_DMDT0M, 0x20);
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG, 0xd2);
+                       stv0900_write_reg(intp, KREFTMG, 0xc1);
+                       intp->bw[demod] += 10000000;
+                       intp->bw[demod] *= 15;
+                       intp->bw[demod] /= 10;
+               }
 
-                       if (i_params->dmd2_symbol_rate < 2000000)
-                               stv0900_write_reg(i_params, R0900_P2_CORRELMANT, 0x63);
-                       else
-                               stv0900_write_reg(i_params, R0900_P2_CORRELMANT, 0x70);
+               stv0900_write_reg(intp, TMGCFG2, 0xc1);
 
-                       if (i_params->dmd2_symbol_rate >= 10000000)
-                               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x38);
-                       else
-                               stv0900_write_reg(i_params, R0900_P2_AGC2REF, 0x60);
+               stv0900_set_symbol_rate(intp, intp->mclk,
+                                       intp->symbol_rate[demod], demod);
+               stv0900_set_max_symbol_rate(intp, intp->mclk,
+                                       intp->symbol_rate[demod], demod);
+               stv0900_set_min_symbol_rate(intp, intp->mclk,
+                                       intp->symbol_rate[demod], demod);
+               if (intp->symbol_rate[demod] >= 10000000)
+                       low_sr = FALSE;
+               else
+                       low_sr = TRUE;
 
-                       if (i_params->chip_id >= 0x20) {
-                               stv0900_write_reg(i_params, R0900_P2_KREFTMG, 0x5a);
+       }
 
-                               if (i_params->dmd2_srch_algo == STV0900_COLD_START)
-                                       i_params->tuner2_bw = (15 * (stv0900_carrier_width(i_params->dmd2_symbol_rate,
-                                                       i_params->rolloff) + 10000000)) / 10;
-                               else if (i_params->dmd2_srch_algo == STV0900_WARM_START)
-                                       i_params->tuner2_bw = stv0900_carrier_width(i_params->dmd2_symbol_rate,
-                                                       i_params->rolloff) + 10000000;
-                       } else {
-                               stv0900_write_reg(i_params, R0900_P2_KREFTMG, 0xc1);
-                               i_params->tuner2_bw = (15 * (stv0900_carrier_width(i_params->dmd2_symbol_rate,
-                                                                       i_params->rolloff) + 10000000)) / 10;
-                       }
+       stv0900_set_tuner(fe, intp->freq[demod], intp->bw[demod]);
 
-                       stv0900_write_reg(i_params, R0900_P2_TMGCFG2, 0x01);
+       agc1_power = MAKEWORD(stv0900_get_bits(intp, AGCIQ_VALUE1),
+                               stv0900_get_bits(intp, AGCIQ_VALUE0));
 
-                       stv0900_set_symbol_rate(i_params, i_params->mclk, i_params->dmd2_symbol_rate, demod);
-                       stv0900_set_max_symbol_rate(i_params, i_params->mclk, i_params->dmd2_symbol_rate, demod);
-                       stv0900_set_min_symbol_rate(i_params, i_params->mclk, i_params->dmd2_symbol_rate, demod);
-                       if (i_params->dmd2_symbol_rate >= 10000000)
-                               low_sr = FALSE;
-                       else
-                               low_sr = TRUE;
+       aq_power = 0;
 
-               }
+       if (agc1_power == 0) {
+               for (i = 0; i < 5; i++)
+                       aq_power += (stv0900_get_bits(intp, POWER_I) +
+                                       stv0900_get_bits(intp, POWER_Q)) / 2;
 
-               stv0900_set_tuner(fe, i_params->tuner2_freq, i_params->tuner2_bw);
+               aq_power /= 5;
+       }
 
-               stv0900_write_bits(i_params, F0900_P2_SPECINV_CONTROL, i_params->dmd2_srch_iq_inv);
-               stv0900_write_bits(i_params, F0900_P2_MANUAL_ROLLOFF, 1);
+       if ((agc1_power == 0) && (aq_power < IQPOWER_THRESHOLD)) {
+               intp->result[demod].locked = FALSE;
+               signal_type = STV0900_NOAGC1;
+               dprintk("%s: NO AGC1, POWERI, POWERQ\n", __func__);
+       } else {
+               stv0900_write_bits(intp, SPECINV_CONTROL,
+                                       intp->srch_iq_inv[demod]);
+               if (intp->chip_id <= 0x20) /*cut 2.0*/
+                       stv0900_write_bits(intp, MANUALSX_ROLLOFF, 1);
+               else /*cut 3.0*/
+                       stv0900_write_bits(intp, MANUALS2_ROLLOFF, 1);
 
-               stv0900_set_search_standard(i_params, demod);
+               stv0900_set_search_standard(intp, demod);
 
-               if (i_params->dmd2_srch_algo != STV0900_BLIND_SEARCH)
-                       stv0900_start_search(i_params, demod);
-               break;
+               if (intp->srch_algo[demod] != STV0900_BLIND_SEARCH)
+                       stv0900_start_search(intp, demod);
        }
 
-       if (i_params->chip_id == 0x12) {
-               stv0900_write_bits(i_params, stream_merger_field, 0);
+       if (signal_type == STV0900_NOAGC1)
+               return signal_type;
+
+       if (intp->chip_id == 0x12) {
+               stv0900_write_bits(intp, RST_HWARE, 0);
                msleep(3);
-               stv0900_write_bits(i_params, stream_merger_field, 1);
-               stv0900_write_bits(i_params, stream_merger_field, 0);
+               stv0900_write_bits(intp, RST_HWARE, 1);
+               stv0900_write_bits(intp, RST_HWARE, 0);
        }
 
        if (algo == STV0900_BLIND_SEARCH)
@@ -2737,12 +1923,12 @@ enum fe_stv0900_signal_type stv0900_algo(struct dvb_frontend *fe)
        else if (algo == STV0900_COLD_START)
                lock = stv0900_get_demod_cold_lock(fe, demod_timeout);
        else if (algo == STV0900_WARM_START)
-               lock = stv0900_get_demod_lock(i_params, demod, demod_timeout);
+               lock = stv0900_get_demod_lock(intp, demod, demod_timeout);
 
        if ((lock == FALSE) && (algo == STV0900_COLD_START)) {
                if (low_sr == FALSE) {
-                       if (stv0900_check_timing_lock(i_params, demod) == TRUE)
-                               lock = stv0900_sw_algo(i_params, demod);
+                       if (stv0900_check_timing_lock(intp, demod) == TRUE)
+                               lock = stv0900_sw_algo(intp, demod);
                }
        }
 
@@ -2751,98 +1937,64 @@ enum fe_stv0900_signal_type stv0900_algo(struct dvb_frontend *fe)
 
        if ((lock == TRUE) && (signal_type == STV0900_RANGEOK)) {
                stv0900_track_optimization(fe);
-               if (i_params->chip_id <= 0x11) {
-                       if ((stv0900_get_standard(fe, STV0900_DEMOD_1) == STV0900_DVBS1_STANDARD) && (stv0900_get_standard(fe, STV0900_DEMOD_2) == STV0900_DVBS1_STANDARD)) {
+               if (intp->chip_id <= 0x11) {
+                       if ((stv0900_get_standard(fe, 0) ==
+                                               STV0900_DVBS1_STANDARD) &&
+                          (stv0900_get_standard(fe, 1) ==
+                                               STV0900_DVBS1_STANDARD)) {
                                msleep(20);
-                               stv0900_write_bits(i_params, stream_merger_field, 0);
+                               stv0900_write_bits(intp, RST_HWARE, 0);
                        } else {
-                               stv0900_write_bits(i_params, stream_merger_field, 0);
+                               stv0900_write_bits(intp, RST_HWARE, 0);
                                msleep(3);
-                               stv0900_write_bits(i_params, stream_merger_field, 1);
-                               stv0900_write_bits(i_params, stream_merger_field, 0);
+                               stv0900_write_bits(intp, RST_HWARE, 1);
+                               stv0900_write_bits(intp, RST_HWARE, 0);
                        }
-               } else if (i_params->chip_id == 0x20) {
-                       stv0900_write_bits(i_params, stream_merger_field, 0);
+
+               } else if (intp->chip_id >= 0x20) {
+                       stv0900_write_bits(intp, RST_HWARE, 0);
                        msleep(3);
-                       stv0900_write_bits(i_params, stream_merger_field, 1);
-                       stv0900_write_bits(i_params, stream_merger_field, 0);
+                       stv0900_write_bits(intp, RST_HWARE, 1);
+                       stv0900_write_bits(intp, RST_HWARE, 0);
                }
 
-               if (stv0900_wait_for_lock(i_params, demod, fec_timeout, fec_timeout) == TRUE) {
+               if (stv0900_wait_for_lock(intp, demod,
+                                       fec_timeout, fec_timeout) == TRUE) {
                        lock = TRUE;
-                       switch (demod) {
-                       case STV0900_DEMOD_1:
-                       default:
-                               i_params->dmd1_rslts.locked = TRUE;
-                               if (i_params->dmd1_rslts.standard == STV0900_DVBS2_STANDARD) {
-                                       stv0900_set_dvbs2_rolloff(i_params, demod);
-                                       stv0900_write_reg(i_params, R0900_P1_PDELCTRL2, 0x40);
-                                       stv0900_write_reg(i_params, R0900_P1_PDELCTRL2, 0);
-                                       stv0900_write_reg(i_params, R0900_P1_ERRCTRL1, 0x67);
-                               } else {
-                                       stv0900_write_reg(i_params, R0900_P1_ERRCTRL1, 0x75);
-                               }
-
-                               stv0900_write_reg(i_params, R0900_P1_FBERCPT4, 0);
-                               stv0900_write_reg(i_params, R0900_P1_ERRCTRL2, 0xc1);
-                               break;
-                       case STV0900_DEMOD_2:
-                               i_params->dmd2_rslts.locked = TRUE;
-
-                               if (i_params->dmd2_rslts.standard == STV0900_DVBS2_STANDARD) {
-                                       stv0900_set_dvbs2_rolloff(i_params, demod);
-                                       stv0900_write_reg(i_params, R0900_P2_PDELCTRL2, 0x60);
-                                       stv0900_write_reg(i_params, R0900_P2_PDELCTRL2, 0x20);
-                                       stv0900_write_reg(i_params, R0900_P2_ERRCTRL1, 0x67);
-                               } else {
-                                       stv0900_write_reg(i_params, R0900_P2_ERRCTRL1, 0x75);
-                               }
-
-                               stv0900_write_reg(i_params, R0900_P2_FBERCPT4, 0);
-
-                               stv0900_write_reg(i_params, R0900_P2_ERRCTRL2, 0xc1);
-                               break;
+                       intp->result[demod].locked = TRUE;
+                       if (intp->result[demod].standard ==
+                                               STV0900_DVBS2_STANDARD) {
+                               stv0900_set_dvbs2_rolloff(intp, demod);
+                               stv0900_write_bits(intp, RESET_UPKO_COUNT, 1);
+                               stv0900_write_bits(intp, RESET_UPKO_COUNT, 0);
+                               stv0900_write_reg(intp, ERRCTRL1, 0x67);
+                       } else {
+                               stv0900_write_reg(intp, ERRCTRL1, 0x75);
                        }
+
+                       stv0900_write_reg(intp, FBERCPT4, 0);
+                       stv0900_write_reg(intp, ERRCTRL2, 0xc1);
                } else {
                        lock = FALSE;
                        signal_type = STV0900_NODATA;
-                       no_signal = stv0900_check_signal_presence(i_params, demod);
-
-                       switch (demod) {
-                       case STV0900_DEMOD_1:
-                       default:
-                               i_params->dmd1_rslts.locked = FALSE;
-                               break;
-                       case STV0900_DEMOD_2:
-                               i_params->dmd2_rslts.locked = FALSE;
-                               break;
-                       }
+                       no_signal = stv0900_check_signal_presence(intp, demod);
+
+                               intp->result[demod].locked = FALSE;
                }
        }
 
-       if ((signal_type == STV0900_NODATA) && (no_signal == FALSE)) {
-               switch (demod) {
-               case STV0900_DEMOD_1:
-               default:
-                       if (i_params->chip_id <= 0x11) {
-                               if ((stv0900_get_bits(i_params, F0900_P1_HEADER_MODE) == STV0900_DVBS_FOUND) &&
-                                               (i_params->dmd1_srch_iq_inv <= STV0900_IQ_AUTO_NORMAL_FIRST))
-                                       signal_type = stv0900_dvbs1_acq_workaround(fe);
-                       } else
-                               i_params->dmd1_rslts.locked = FALSE;
+       if ((signal_type != STV0900_NODATA) || (no_signal != FALSE))
+               return signal_type;
 
-                       break;
-               case STV0900_DEMOD_2:
-                       if (i_params->chip_id <= 0x11) {
-                               if ((stv0900_get_bits(i_params, F0900_P2_HEADER_MODE) == STV0900_DVBS_FOUND) &&
-                                               (i_params->dmd2_srch_iq_inv <= STV0900_IQ_AUTO_NORMAL_FIRST))
-                                       signal_type = stv0900_dvbs1_acq_workaround(fe);
-                       } else
-                               i_params->dmd2_rslts.locked = FALSE;
-                       break;
-               }
+       if (intp->chip_id > 0x11) {
+               intp->result[demod].locked = FALSE;
+               return signal_type;
        }
 
+       if ((stv0900_get_bits(intp, HEADER_MODE) == STV0900_DVBS_FOUND) &&
+          (intp->srch_iq_inv[demod] <= STV0900_IQ_AUTO_NORMAL_FIRST))
+               signal_type = stv0900_dvbs1_acq_workaround(fe);
+
        return signal_type;
 }