Skip to content

Commit

Permalink
V4L/DVB (13674): stv090x: Add DiSEqC envelope mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oliver Endriss authored and Mauro Carvalho Chehab committed Dec 16, 2009
1 parent 9efc1bd commit 30e8ca2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/media/dvb/frontends/stv090x.c
Original file line number Diff line number Diff line change
Expand Up @@ -3597,7 +3597,8 @@ static int stv090x_send_diseqc_msg(struct dvb_frontend *fe, struct dvb_diseqc_ma

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);
if (STV090x_WRITE_DEMOD(state, DISTXCTL, reg) < 0)
goto err;
Expand Down Expand Up @@ -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);

if (burst == SEC_MINI_A) {
mode = 3;
mode = (state->config->diseqc_envelope_mode) ? 5 : 3;
value = 0x00;
} else {
mode = 2;
mode = (state->config->diseqc_envelope_mode) ? 4 : 2;
value = 0xFF;
}

Expand Down
2 changes: 2 additions & 0 deletions drivers/media/dvb/frontends/stv090x.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ struct stv090x_config {

enum stv090x_i2crpt repeater_level;

bool diseqc_envelope_mode;

int (*tuner_init) (struct dvb_frontend *fe);
int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
Expand Down

0 comments on commit 30e8ca2

Please sign in to comment.