git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge ../linux-2.6
[pandora-kernel.git] / drivers / media / dvb / ttpci / av7110.c
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 939a493..4506165 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -30,7 +30,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/delay.h>
@@ -152,13 +151,9 @@ static void init_av7110_av(struct av7110 *av7110)
        /* remaining inits according to card and frontend type */
        av7110->analog_tuner_flags = 0;
        av7110->current_input = 0;
-       if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000a) {
-               printk("dvb-ttpci: MSP3415 audio DAC @ card %d\n",
-                       av7110->dvb_adapter.num);
-               av7110->adac_type = DVB_ADAC_MSP34x5;
+       if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000a)
                av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 0); // SPDIF on
-       }
-       else if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
+       if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
                printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
                        av7110->dvb_adapter.num);
                av7110->adac_type = DVB_ADAC_CRYSTAL;
@@ -1575,8 +1570,8 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
                return -EIO;
        return 0;
@@ -1602,8 +1597,8 @@ static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
        data[2] = 0x85 | ((div >> 10) & 0x60);
        data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                return -EIO;
        return 0;
@@ -1632,8 +1627,8 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dv
        data[2] = 0x8e;
        data[3] = 0x00;
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                return -EIO;
        return 0;
@@ -1660,8 +1655,8 @@ static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_f
        data[2] = 0x8e;
        data[3] = (f < 174000000 ? 0xa1 : f < 470000000 ? 0x92 : 0x34);
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                return -EIO;
        return 0;
@@ -1695,8 +1690,8 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
        data[2] = 0x85;
        data[3] = pwr << 6;
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                return -EIO;
        return 0;
@@ -1835,8 +1830,8 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_
        else
                return -EINVAL;
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) {
                printk("nexusca: pll transfer failed!\n");
                return -EIO;
@@ -1844,8 +1839,8 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_
 
        // wait for PLL lock
        for(i = 0; i < 20; i++) {
-               if (fe->ops->i2c_gate_ctrl)
-                       fe->ops->i2c_gate_ctrl(fe, 1);
+               if (fe->ops.i2c_gate_ctrl)
+                       fe->ops.i2c_gate_ctrl(fe, 1);
                if (i2c_transfer(&av7110->i2c_adap, &readmsg, 1) == 1)
                        if (data[0] & 0x40) break;
                msleep(10);
@@ -1859,6 +1854,7 @@ static struct stv0297_config nexusca_stv0297_config = {
        .demod_address = 0x1C,
        .inittab = nexusca_stv0297_inittab,
        .invert = 1,
+       .stop_during_read = 1,
 };
 
 
@@ -1890,8 +1886,8 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dv
        data[2] = ((div >> 10) & 0x60) | cfg;
        data[3] = (cpump << 6) | band_select;
 
-       if (fe->ops->i2c_gate_ctrl)
-               fe->ops->i2c_gate_ctrl(fe, 1);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
        if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) return -EIO;
        return 0;
 }
@@ -2083,7 +2079,9 @@ static int frontend_init(struct av7110 *av7110)
                case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??))
                        av7110->fe = ves1820_attach(&philips_cd1516_config,
                                                    &av7110->i2c_adap, read_pwm(av7110));
-                       av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                       if (av7110->fe) {
+                               av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                       }
                        break;
                }
 
@@ -2096,10 +2094,10 @@ static int frontend_init(struct av7110 *av7110)
                        // try the ALPS BSRV2 first of all
                        av7110->fe = ves1x93_attach(&alps_bsrv2_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                               av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                               av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                               av7110->fe->ops->set_tone = av7110_set_tone;
+                               av7110->fe->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                               av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                               av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                               av7110->fe->ops.set_tone = av7110_set_tone;
                                av7110->recover = dvb_s_recover;
                                break;
                        }
@@ -2107,12 +2105,12 @@ static int frontend_init(struct av7110 *av7110)
                        // try the ALPS BSRU6 now
                        av7110->fe = stv0299_attach(&alps_bsru6_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                               av7110->fe->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                                av7110->fe->tuner_priv = &av7110->i2c_adap;
 
-                               av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                               av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                               av7110->fe->ops->set_tone = av7110_set_tone;
+                               av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                               av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                               av7110->fe->ops.set_tone = av7110_set_tone;
                                av7110->recover = dvb_s_recover;
                                break;
                        }
@@ -2120,10 +2118,10 @@ static int frontend_init(struct av7110 *av7110)
                        // Try the grundig 29504-451
                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                               av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                               av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                               av7110->fe->ops->set_tone = av7110_set_tone;
+                               av7110->fe->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                               av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                               av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                               av7110->fe->ops.set_tone = av7110_set_tone;
                                av7110->recover = dvb_s_recover;
                                break;
                        }
@@ -2134,13 +2132,17 @@ static int frontend_init(struct av7110 *av7110)
                                /* Siemens DVB-C (full-length card) VES1820/Philips CD1516 */
                                av7110->fe = ves1820_attach(&philips_cd1516_config, &av7110->i2c_adap,
                                                        read_pwm(av7110));
-                               av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                               if (av7110->fe) {
+                                       av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                               }
                                break;
                        case 0x0003:
                                /* Hauppauge DVB-C 2.1 VES1820/ALPS TDBE2 */
                                av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap,
                                                        read_pwm(av7110));
-                               av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                               if (av7110->fe) {
+                                       av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                               }
                                break;
                        }
                        break;
@@ -2149,23 +2151,27 @@ static int frontend_init(struct av7110 *av7110)
 
                        // ALPS TDLB7
                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
-                       av7110->fe->ops->tuner_ops.set_params = alps_tdlb7_tuner_set_params;
+                       if (av7110->fe) {
+                               av7110->fe->ops.tuner_ops.set_params = alps_tdlb7_tuner_set_params;
+                       }
                        break;
 
                case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
 
                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
-                       av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                       if (av7110->fe) {
+                               av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                       }
                        break;
 
                case 0x0004: // Galaxis DVB-S rev1.3
                        /* ALPS BSRV2 */
                        av7110->fe = ves1x93_attach(&alps_bsrv2_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                               av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                               av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                               av7110->fe->ops->set_tone = av7110_set_tone;
+                               av7110->fe->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                               av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                               av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                               av7110->fe->ops.set_tone = av7110_set_tone;
                                av7110->recover = dvb_s_recover;
                        }
                        break;
@@ -2174,10 +2180,10 @@ static int frontend_init(struct av7110 *av7110)
                        /* Grundig 29504-451 */
                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                               av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                               av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                               av7110->fe->ops->set_tone = av7110_set_tone;
+                               av7110->fe->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                               av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                               av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                               av7110->fe->ops.set_tone = av7110_set_tone;
                                av7110->recover = dvb_s_recover;
                        }
                        break;
@@ -2185,18 +2191,20 @@ static int frontend_init(struct av7110 *av7110)
                case 0x0008: // Hauppauge/TT DVB-T
 
                        av7110->fe = l64781_attach(&grundig_29504_401_config, &av7110->i2c_adap);
-                       av7110->fe->ops->tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                       if (av7110->fe) {
+                               av7110->fe->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                       }
                        break;
 
                case 0x000A: // Hauppauge/TT Nexus-CA rev1.X
 
                        av7110->fe = stv0297_attach(&nexusca_stv0297_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
+                               av7110->fe->ops.tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
 
                                /* set TDA9819 into DVB mode */
-                               saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
-                               saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                               saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
+                               saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
 
                                /* tuner on this needs a slower i2c bus speed */
                                av7110->dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
@@ -2208,16 +2216,16 @@ static int frontend_init(struct av7110 *av7110)
                        /* ALPS BSBE1 */
                        av7110->fe = stv0299_attach(&alps_bsbe1_config, &av7110->i2c_adap);
                        if (av7110->fe) {
-                               av7110->fe->ops->tuner_ops.set_params = alps_bsbe1_tuner_set_params;
+                               av7110->fe->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;
                                av7110->fe->tuner_priv = &av7110->i2c_adap;
 
-                               if (lnbp21_init(av7110->fe, &av7110->i2c_adap, 0, 0)) {
+                               if (lnbp21_attach(av7110->fe, &av7110->i2c_adap, 0, 0)) {
                                        printk("dvb-ttpci: LNBP21 not found!\n");
-                                       if (av7110->fe->ops->release)
-                                               av7110->fe->ops->release(av7110->fe);
+                                       if (av7110->fe->ops.release)
+                                               av7110->fe->ops.release(av7110->fe);
                                        av7110->fe = NULL;
                                } else {
-                                       av7110->fe->ops->dishnetwork_send_legacy_command = NULL;
+                                       av7110->fe->ops.dishnetwork_send_legacy_command = NULL;
                                        av7110->recover = dvb_s_recover;
                                }
                        }
@@ -2234,21 +2242,21 @@ static int frontend_init(struct av7110 *av7110)
                       av7110->dev->pci->subsystem_vendor,
                       av7110->dev->pci->subsystem_device);
        } else {
-               FE_FUNC_OVERRIDE(av7110->fe->ops->init, av7110->fe_init, av7110_fe_init);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->read_status, av7110->fe_read_status, av7110_fe_read_status);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_reset_overload, av7110->fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_send_master_cmd, av7110->fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_send_burst, av7110->fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->set_tone, av7110->fe_set_tone, av7110_fe_set_tone);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage;)
-               FE_FUNC_OVERRIDE(av7110->fe->ops->dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
-               FE_FUNC_OVERRIDE(av7110->fe->ops->set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.init, av7110->fe_init, av7110_fe_init);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.read_status, av7110->fe_read_status, av7110_fe_read_status);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_reset_overload, av7110->fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_master_cmd, av7110->fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_burst, av7110->fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.set_tone, av7110->fe_set_tone, av7110_fe_set_tone);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage;)
+               FE_FUNC_OVERRIDE(av7110->fe->ops.dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
+               FE_FUNC_OVERRIDE(av7110->fe->ops.set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
 
                ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
                if (ret < 0) {
                        printk("av7110: Frontend registration failed!\n");
-                       if (av7110->fe->ops->release)
-                               av7110->fe->ops->release(av7110->fe);
+                       if (av7110->fe->ops.release)
+                               av7110->fe->ops.release(av7110->fe);
                        av7110->fe = NULL;
                }
        }
Pandora Kernel Repository