Browse Source

V4L/DVB (13674): stv090x: Add DiSEqC envelope mode

Support DiSEqC envelope mode. Feature is enabled by setting
config->diseqc_envelope_mode = true (default: disabled).

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Oliver Endriss 15 years ago
parent
commit
30e8ca2cb0
2 changed files with 6 additions and 3 deletions
  1. 4 3
      drivers/media/dvb/frontends/stv090x.c
  2. 2 0
      drivers/media/dvb/frontends/stv090x.h

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

@@ -3597,7 +3597,8 @@ static int stv090x_send_diseqc_msg(struct dvb_frontend *fe, struct dvb_diseqc_ma
 
 
 	reg = STV090x_READ_DEMOD(state, DISTXCTL);
 	reg = STV090x_READ_DEMOD(state, DISTXCTL);
 
 
-	STV090x_SETFIELD_Px(reg, DISTX_MODE_FIELD, 2);
+	STV090x_SETFIELD_Px(reg, DISTX_MODE_FIELD,
+		(state->config->diseqc_envelope_mode) ? 4 : 2);
 	STV090x_SETFIELD_Px(reg, DISEQC_RESET_FIELD, 1);
 	STV090x_SETFIELD_Px(reg, DISEQC_RESET_FIELD, 1);
 	if (STV090x_WRITE_DEMOD(state, DISTXCTL, reg) < 0)
 	if (STV090x_WRITE_DEMOD(state, DISTXCTL, reg) < 0)
 		goto err;
 		goto err;
@@ -3649,10 +3650,10 @@ static int stv090x_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t
 	reg = STV090x_READ_DEMOD(state, DISTXCTL);
 	reg = STV090x_READ_DEMOD(state, DISTXCTL);
 
 
 	if (burst == SEC_MINI_A) {
 	if (burst == SEC_MINI_A) {
-		mode = 3;
+		mode = (state->config->diseqc_envelope_mode) ? 5 : 3;
 		value = 0x00;
 		value = 0x00;
 	} else {
 	} else {
-		mode = 2;
+		mode = (state->config->diseqc_envelope_mode) ? 4 : 2;
 		value = 0xFF;
 		value = 0xFF;
 	}
 	}
 
 

+ 2 - 0
drivers/media/dvb/frontends/stv090x.h

@@ -75,6 +75,8 @@ struct stv090x_config {
 
 
 	enum stv090x_i2crpt	repeater_level;
 	enum stv090x_i2crpt	repeater_level;
 
 
+	bool diseqc_envelope_mode;
+
 	int (*tuner_init) (struct dvb_frontend *fe);
 	int (*tuner_init) (struct dvb_frontend *fe);
 	int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
 	int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
 	int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
 	int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);