V4L/DVB (10268): Proper implement set_voltage in cx24116.

Now there is a card, which uses cx24116 to control LNB DC voltage.
It is DVBWorld DVBS2 PCI-e 2005.
The patch is nedded to add support for that card.
1. Rename CMD_SET_TONEPRE to CMD_LNBDCLEVEL.
2. Fill set_voltage with actually control voltage code.
3. Correct set_tone to not affect voltage.

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 32 insertions, 19 deletions

diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 28ad609e73f4..a146c352df59 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -15,6 +15,9 @@
         September, 9th 2008
             Fixed locking on high symbol rates (>30000).
             Implement MPEG initialization parameter.
+        January, 17th 2009
+            Fill set_voltage with actually control voltage code.
+            Correct set tone to not affect voltage.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -146,7 +149,7 @@ enum cmds {
         CMD_GETAGC      = 0x19,
         CMD_LNBCONFIG   = 0x20,
         CMD_LNBSEND     = 0x21, /* Formerly CMD_SEND_DISEQC */
-        CMD_SET_TONEPRE = 0x22,
+        CMD_LNBDCLEVEL  = 0x22,
         CMD_SET_TONE    = 0x23,
         CMD_UPDFWVERS   = 0x35,
         CMD_TUNERSLEEP  = 0x36,
@@ -667,16 +670,6 @@ static int cx24116_load_firmware(struct dvb_frontend *fe,
         return 0;
 }
 
-static int cx24116_set_voltage(struct dvb_frontend *fe,
-        fe_sec_voltage_t voltage)
-{
-        /* The isl6421 module will override this function in the fops. */
-        dprintk("%s() This should never appear if the isl6421 module "
-                "is loaded correctly\n", __func__);
-
-        return -EOPNOTSUPP;
-}
-
 static int cx24116_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
         struct cx24116_state *state = fe->demodulator_priv;
@@ -837,6 +830,34 @@ static int cx24116_wait_for_lnb(struct dvb_frontend *fe)
         return -ETIMEDOUT; /* -EBUSY ? */
 }
 
+static int cx24116_set_voltage(struct dvb_frontend *fe,
+        fe_sec_voltage_t voltage)
+{
+        struct cx24116_cmd cmd;
+        int ret;
+
+        dprintk("%s: %s\n", __func__,
+                voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
+                voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");
+
+        /* Wait for LNB ready */
+        ret = cx24116_wait_for_lnb(fe);
+        if (ret != 0)
+                return ret;
+
+        /* Wait for voltage/min repeat delay */
+        msleep(100);
+
+        cmd.args[0x00] = CMD_LNBDCLEVEL;
+        cmd.args[0x01] = (voltage == SEC_VOLTAGE_18 ? 0x01 : 0x00);
+        cmd.len = 0x02;
+
+        /* Min delay time before DiSEqC send */
+        msleep(15);
+
+        return cx24116_cmd_execute(fe, &cmd);
+}
+
 static int cx24116_set_tone(struct dvb_frontend *fe,
         fe_sec_tone_mode_t tone)
 {
@@ -857,14 +878,6 @@ static int cx24116_set_tone(struct dvb_frontend *fe,
         /* Min delay time after DiSEqC send */
         msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */
 
-        /* This is always done before the tone is set */
-        cmd.args[0x00] = CMD_SET_TONEPRE;
-        cmd.args[0x01] = 0x00;
-        cmd.len = 0x02;
-        ret = cx24116_cmd_execute(fe, &cmd);
-        if (ret != 0)
-                return ret;
-
         /* Now we set the tone */
         cmd.args[0x00] = CMD_SET_TONE;
         cmd.args[0x01] = 0x00;