Browse Source

V4L/DVB (13357): stv090x: adds an additional check for signal presence based on AGC1

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Andreas Regel 15 years ago
parent
commit
c4fa649a3b

+ 3 - 4
drivers/media/dvb/frontends/stv090x.c

@@ -3185,7 +3185,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
 	if ((agc1_power == 0) && (power_iq < STV090x_IQPOWER_THRESHOLD)) {
 	if ((agc1_power == 0) && (power_iq < STV090x_IQPOWER_THRESHOLD)) {
 		dprintk(FE_ERROR, 1, "No Signal: POWER_IQ=0x%02x", power_iq);
 		dprintk(FE_ERROR, 1, "No Signal: POWER_IQ=0x%02x", power_iq);
 		lock = 0;
 		lock = 0;
-
+		signal_state = STV090x_NOAGC1;
 	} else {
 	} else {
 		reg = STV090x_READ_DEMOD(state, DEMOD);
 		reg = STV090x_READ_DEMOD(state, DEMOD);
 		STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, state->inversion);
 		STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, state->inversion);
@@ -3209,9 +3209,8 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
 		}
 		}
 	}
 	}
 
 
-	/* need to check for AGC1 state */
-
-
+	if (signal_state == STV090x_NOAGC1)
+		return signal_state;
 
 
 	if (state->algo == STV090x_BLIND_SEARCH)
 	if (state->algo == STV090x_BLIND_SEARCH)
 		lock = stv090x_blind_search(state);
 		lock = stv090x_blind_search(state);

+ 1 - 0
drivers/media/dvb/frontends/stv090x_priv.h

@@ -91,6 +91,7 @@
 	STV090x_SEARCH_AGC2_TH_CUT30)
 	STV090x_SEARCH_AGC2_TH_CUT30)
 
 
 enum stv090x_signal_state {
 enum stv090x_signal_state {
+	STV090x_NOAGC1,
 	STV090x_NOCARRIER,
 	STV090x_NOCARRIER,
 	STV090x_NODATA,
 	STV090x_NODATA,
 	STV090x_DATAOK,
 	STV090x_DATAOK,