This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / drivers / media / dvb / ttpci / budget-patch.c
index 7a9c682..44118ec 100644 (file)
  * the project's page is at http://www.linuxtv.org/dvb/
  */
 
+#include "budget.h"
 #include "av7110.h"
 #include "av7110_hw.h"
-#include "budget.h"
-#include "stv0299.h"
-#include "ves1x93.h"
-#include "tda8083.h"
 
 #define budget_patch budget
 
@@ -54,7 +51,7 @@ static int budget_wdebi(struct budget_patch *budget, u32 config, int addr, u32 v
 {
         struct saa7146_dev *dev=budget->dev;
 
-        dprintk(2, "budget: %p\n", budget);
+        DEB_EE(("budget: %p\n", budget));
 
         if (count <= 0 || count > 4)
                 return -1;
@@ -74,7 +71,7 @@ static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int
 {
         int i;
 
-        dprintk(2, "budget: %p\n", budget);
+        DEB_EE(("budget: %p\n", budget));
 
         for (i = 2; i < length; i++)
                 budget_wdebi(budget, DEBINOSWAP, COMMAND + 2*i, (u32) buf[i], 2);
@@ -93,7 +90,7 @@ static void av7110_set22k(struct budget_patch *budget, int state)
 {
         u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
         
-        dprintk(2, "budget: %p\n", budget);
+        DEB_EE(("budget: %p\n", budget));
         budget_av7110_send_fw_cmd(budget, buf, 2);
 }
 
@@ -104,7 +101,7 @@ static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg,
         u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
                 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-        dprintk(2, "budget: %p\n", budget);
+        DEB_EE(("budget: %p\n", budget));
 
         if (len>10)
                 len=10;
@@ -124,11 +121,16 @@ static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg,
         return 0;
 }
 
-static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+
+int budget_patch_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 {
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
+        struct budget_patch *budget = fe->before_after_data;
 
-       switch (tone) {
+        DEB_EE(("budget: %p\n", budget));
+
+        switch (cmd) {
+        case FE_SET_TONE:
+                switch ((fe_sec_tone_mode_t) arg) {
                 case SEC_TONE_ON:
                         av7110_set22k (budget, 1);
                         break;
@@ -138,232 +140,27 @@ static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t ton
                 default:
                         return -EINVAL;
                 }
+                break;
 
-       return 0;
-}
-
-static int budget_patch_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
+        case FE_DISEQC_SEND_MASTER_CMD:
         {
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
+                struct dvb_diseqc_master_cmd *cmd = arg;
 
                 av7110_send_diseqc_msg (budget, cmd->msg_len, cmd->msg, 0);
-
-       return 0;
+                break;
         }
 
-static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
-{
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
+        case FE_DISEQC_SEND_BURST:
+                av7110_send_diseqc_msg (budget, 0, NULL, (int) (long) arg);
+                break;
 
-       av7110_send_diseqc_msg (budget, 0, NULL, minicmd);
-
-       return 0;
+        default:
+                return -EOPNOTSUPP;
         }
 
-static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
-{
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
-       u8 pwr = 0;
-       u8 buf[4];
-       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-       u32 div = (params->frequency + 479500) / 125;
-
-       if (params->frequency > 2000000) pwr = 3;
-       else if (params->frequency > 1800000) pwr = 2;
-       else if (params->frequency > 1600000) pwr = 1;
-       else if (params->frequency > 1200000) pwr = 0;
-       else if (params->frequency >= 1100000) pwr = 1;
-       else pwr = 2;
-
-       buf[0] = (div >> 8) & 0x7f;
-       buf[1] = div & 0xff;
-       buf[2] = ((div & 0x18000) >> 10) | 0x95;
-       buf[3] = (pwr << 6) | 0x30;
-
-        // NOTE: since we're using a prescaler of 2, we set the
-       // divisor frequency to 62.5kHz and divide by 125 above
-
-       if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-       return 0;
-}
-
-static struct ves1x93_config alps_bsrv2_config = {
-       .demod_address = 0x08,
-       .xin = 90100000UL,
-       .invert_pwm = 0,
-       .pll_set = alps_bsrv2_pll_set,
-};
-
-static u8 alps_bsru6_inittab[] = {
-       0x01, 0x15,
-       0x02, 0x00,
-       0x03, 0x00,
-        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
-       0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
-       0x06, 0x40,   /* DAC not used, set to high impendance mode */
-       0x07, 0x00,   /* DAC LSB */
-       0x08, 0x40,   /* DiSEqC off, LNB power on OP2/LOCK pin on */
-       0x09, 0x00,   /* FIFO */
-       0x0c, 0x51,   /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
-       0x0d, 0x82,   /* DC offset compensation = ON, beta_agc1 = 2 */
-       0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
-       0x10, 0x3f,   // AGC2  0x3d
-       0x11, 0x84,
-       0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
-       0x15, 0xc9,   // lock detector threshold
-       0x16, 0x00,
-       0x17, 0x00,
-       0x18, 0x00,
-       0x19, 0x00,
-       0x1a, 0x00,
-       0x1f, 0x50,
-       0x20, 0x00,
-       0x21, 0x00,
-       0x22, 0x00,
-       0x23, 0x00,
-       0x28, 0x00,  // out imp: normal  out type: parallel FEC mode:0
-       0x29, 0x1e,  // 1/2 threshold
-       0x2a, 0x14,  // 2/3 threshold
-       0x2b, 0x0f,  // 3/4 threshold
-       0x2c, 0x09,  // 5/6 threshold
-       0x2d, 0x05,  // 7/8 threshold
-       0x2e, 0x01,
-       0x31, 0x1f,  // test all FECs
-       0x32, 0x19,  // viterbi and synchro search
-       0x33, 0xfc,  // rs control
-       0x34, 0x93,  // error control
-       0x0f, 0x52,
-       0xff, 0xff
-};
-
-static int alps_bsru6_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ratio)
-{
-       u8 aclk = 0;
-       u8 bclk = 0;
-
-       if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
-       else if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
-       else if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
-       else if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
-       else if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
-       else if (srate < 45000000) { aclk = 0xb4; bclk = 0x51; }
-
-       stv0299_writereg (fe, 0x13, aclk);
-       stv0299_writereg (fe, 0x14, bclk);
-       stv0299_writereg (fe, 0x1f, (ratio >> 16) & 0xff);
-       stv0299_writereg (fe, 0x20, (ratio >>  8) & 0xff);
-       stv0299_writereg (fe, 0x21, (ratio      ) & 0xf0);
-
         return 0;
 }
 
-static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
-{
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
-       u8 data[4];
-       u32 div;
-       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
-
-       if ((params->frequency < 950000) || (params->frequency > 2150000)) return -EINVAL;
-
-       div = (params->frequency + (125 - 1)) / 125; // round correctly
-       data[0] = (div >> 8) & 0x7f;
-       data[1] = div & 0xff;
-       data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
-       data[3] = 0xC4;
-
-       if (params->frequency > 1530000) data[3] = 0xc0;
-
-       if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-       return 0;
-}
-
-static struct stv0299_config alps_bsru6_config = {
-
-       .demod_address = 0x68,
-       .inittab = alps_bsru6_inittab,
-       .mclk = 88000000UL,
-       .invert = 1,
-       .enhanced_tuning = 0,
-       .skip_reinit = 0,
-       .lock_output = STV0229_LOCKOUTPUT_1,
-       .volt13_op0_op1 = STV0299_VOLT13_OP1,
-       .min_delay_ms = 100,
-       .set_symbol_rate = alps_bsru6_set_symbol_rate,
-       .pll_set = alps_bsru6_pll_set,
-};
-
-static int grundig_29504_451_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
-{
-       struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
-       u32 div;
-       u8 data[4];
-       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
-
-       div = params->frequency / 125;
-       data[0] = (div >> 8) & 0x7f;
-       data[1] = div & 0xff;
-       data[2] = 0x8e;
-       data[3] = 0x00;
-
-       if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-       return 0;
-}
-
-struct tda8083_config grundig_29504_451_config = {
-       .demod_address = 0x68,
-       .pll_set = grundig_29504_451_pll_set,
-};
-
-static void frontend_init(struct budget_patch* budget)
-{
-       switch(budget->dev->pci->subsystem_device) {
-       case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X
-
-               // try the ALPS BSRV2 first of all
-               budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
-               if (budget->dvb_frontend) {
-                       budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;
-                       budget->dvb_frontend->ops->diseqc_send_burst = budget_patch_diseqc_send_burst;
-                       budget->dvb_frontend->ops->set_tone = budget_patch_set_tone;
-                       break;
-               }
-
-               // try the ALPS BSRU6 now
-               budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap);
-               if (budget->dvb_frontend) {
-                       budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;
-                       budget->dvb_frontend->ops->diseqc_send_burst = budget_patch_diseqc_send_burst;
-                       budget->dvb_frontend->ops->set_tone = budget_patch_set_tone;
-                       break;
-               }
-
-               // Try the grundig 29504-451
-               budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap);
-               if (budget->dvb_frontend) {
-                       budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;
-                       budget->dvb_frontend->ops->diseqc_send_burst = budget_patch_diseqc_send_burst;
-                       budget->dvb_frontend->ops->set_tone = budget_patch_set_tone;
-                       break;
-               }
-               break;
-       }
-
-       if (budget->dvb_frontend == NULL) {
-               printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
-                      budget->dev->pci->vendor,
-                      budget->dev->pci->device,
-                      budget->dev->pci->subsystem_vendor,
-                      budget->dev->pci->subsystem_device);
-       } else {
-               if (dvb_register_frontend(budget->dvb_adapter, budget->dvb_frontend)) {
-                       printk("budget-av: Frontend registration failed!\n");
-                       if (budget->dvb_frontend->ops->release)
-                               budget->dvb_frontend->ops->release(budget->dvb_frontend);
-                       budget->dvb_frontend = NULL;
-               }
-       }
-}
 
 static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
 {
@@ -374,9 +171,9 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
         if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
                 return -ENOMEM;
 
-        dprintk(2, "budget: %p\n", budget);
+        DEB_EE(("budget: %p\n",budget));
 
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+        if ((err = ttpci_budget_init (budget, dev, info))) {
                 kfree (budget);
                 return err;
         }
@@ -424,10 +221,10 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
         // Enable RPS1                                                  (rFC p33)
         saa7146_write(dev, MC1, (MASK_13 | MASK_29));
 
-        dev->ext_priv = budget;
+        dvb_add_frontend_ioctls (budget->dvb_adapter,
+                budget_patch_diseqc_ioctl, NULL, budget);
 
-       budget->dvb_adapter->priv = budget;
-       frontend_init(budget);
+        dev->ext_priv = budget;
 
         return 0;
 }
@@ -438,7 +235,8 @@ static int budget_patch_detach (struct saa7146_dev* dev)
         struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
         int err;
 
-       if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend);
+        dvb_remove_frontend_ioctls (budget->dvb_adapter,
+                budget_patch_diseqc_ioctl, NULL);
 
         err = ttpci_budget_deinit (budget);
 
@@ -453,8 +251,10 @@ static int __init budget_patch_init(void)
        return saa7146_register_extension(&budget_extension);
 }
 
+
 static void __exit budget_patch_exit(void)
 {
+        DEB_EE((".\n"));
         saa7146_unregister_extension(&budget_extension); 
 }