vserver 2.0 rc7
[linux-2.6.git] / drivers / media / dvb / bt8xx / dvb-bt8xx.c
index 80e1f52..6f857c6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Bt8xx based DVB adapter driver 
+ * Bt8xx based DVB adapter driver
  *
  * Copyright (C) 2002,2003 Florian Schirmer <jolt@tuxbox.org>
  *
@@ -71,7 +71,7 @@ static int dvb_bt8xx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
        int rc;
 
        dprintk("dvb_bt8xx: start_feed\n");
-       
+
        if (!dvbdmx->dmx.frontend)
                return -EINVAL;
 
@@ -91,10 +91,10 @@ static int dvb_bt8xx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
        struct dvb_bt8xx_card *card = dvbdmx->priv;
 
        dprintk("dvb_bt8xx: stop_feed\n");
-       
+
        if (!dvbdmx->dmx.frontend)
                return -EINVAL;
-               
+
        down(&card->lock);
        card->nfeeds--;
        if (card->nfeeds == 0)
@@ -117,7 +117,7 @@ static int is_pci_slot_eq(struct pci_dev* adev, struct pci_dev* bdev)
 static struct bt878 __init *dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev* bttv_pci_dev)
 {
        unsigned int card_nr;
-       
+
        /* Hmm, n squared. Hope n is small */
        for (card_nr = 0; card_nr < bt878_num; card_nr++) {
                if (is_pci_slot_eq(bt878[card_nr].dev, bttv_pci_dev))
@@ -133,7 +133,7 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)
        static u8 mt352_reset [] = { 0x50, 0x80 };
        static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
        static u8 mt352_agc_cfg [] = { 0x67, 0x28, 0x20 };
-       static u8 mt352_gpp_ctl_cfg [] = { 0x75, 0x33 };
+       static u8 mt352_gpp_ctl_cfg [] = { 0x8C, 0x33 };
        static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
 
        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
@@ -142,7 +142,7 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)
        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
 
        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
-        mt352_write(fe, mt352_gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg));
+       mt352_write(fe, mt352_gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg));
        mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg));
 
        return 0;
@@ -161,15 +161,15 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_
        else if (params->frequency < 771000000) cp = 0xbc;
        else cp = 0xf4;
 
-        if (params->frequency == 0) bs = 0x03;
+       if (params->frequency == 0) bs = 0x03;
        else if (params->frequency < 443250000) bs = 0x02;
        else bs = 0x08;
 
        pllbuf[0] = 0xc0; // Note: non-linux standard PLL i2c address
        pllbuf[1] = div >> 8;
-       pllbuf[2] = div & 0xff;
-       pllbuf[3] = cp;
-       pllbuf[4] = bs;
+       pllbuf[2] = div & 0xff;
+       pllbuf[3] = cp;
+       pllbuf[4] = bs;
 
        return 0;
 }
@@ -184,50 +184,50 @@ static struct mt352_config thomson_dtt7579_config = {
 static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
    u32 freq = params->frequency;
-   
-   int i, a, n, pump; 
+
+   int i, a, n, pump;
    u32 band, pll;
-   
-   
+
+
    u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
-               1576000,1718000,1856000,2036000,2150000};
+              1576000,1718000,1856000,2036000,2150000};
    u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
-               0x00102000,0x00104000,0x00108000,0x00110000,
-               0x00120000,0x00140000};
-   
+              0x00102000,0x00104000,0x00108000,0x00110000,
+              0x00120000,0x00140000};
+
 #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
-        printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq);
-        
-        /* This is really the bit driving the tuner chip cx24108 */
-        
-        if(freq<950000) freq=950000; /* kHz */
-        if(freq>2150000) freq=2150000; /* satellite IF is 950..2150MHz */
-        
-        /* decide which VCO to use for the input frequency */
-        for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
-        printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
-        band=bandsel[i];
-        /* the gain values must be set by SetSymbolrate */
-        /* compute the pll divider needed, from Conexant data sheet,
-           resolved for (n*32+a), remember f(vco) is f(receive) *2 or *4,
-           depending on the divider bit. It is set to /4 on the 2 lowest 
-           bands  */
-        n=((i<=2?2:1)*freq*10L)/(XTAL/100);
-        a=n%32; n/=32; if(a==0) n--;
-        pump=(freq<(osci[i-1]+osci[i])/2);
-        pll=0xf8000000|
-            ((pump?1:2)<<(14+11))|
-            ((n&0x1ff)<<(5+11))|
-            ((a&0x1f)<<11);
-        /* everything is shifted left 11 bits to left-align the bits in the
-           32bit word. Output to the tuner goes MSB-aligned, after all */
-        printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a);
-        cx24110_pll_write(fe,band);
-        /* set vga and vca to their widest-band settings, as a precaution.
-           SetSymbolrate might not be called to set this up */
-        cx24110_pll_write(fe,0x500c0000);
-        cx24110_pll_write(fe,0x83f1f800);
-        cx24110_pll_write(fe,pll);
+       printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq);
+
+       /* This is really the bit driving the tuner chip cx24108 */
+
+       if(freq<950000) freq=950000; /* kHz */
+       if(freq>2150000) freq=2150000; /* satellite IF is 950..2150MHz */
+
+       /* decide which VCO to use for the input frequency */
+       for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
+       printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
+       band=bandsel[i];
+       /* the gain values must be set by SetSymbolrate */
+       /* compute the pll divider needed, from Conexant data sheet,
+          resolved for (n*32+a), remember f(vco) is f(receive) *2 or *4,
+          depending on the divider bit. It is set to /4 on the 2 lowest
+          bands  */
+       n=((i<=2?2:1)*freq*10L)/(XTAL/100);
+       a=n%32; n/=32; if(a==0) n--;
+       pump=(freq<(osci[i-1]+osci[i])/2);
+       pll=0xf8000000|
+           ((pump?1:2)<<(14+11))|
+           ((n&0x1ff)<<(5+11))|
+           ((a&0x1f)<<11);
+       /* everything is shifted left 11 bits to left-align the bits in the
+          32bit word. Output to the tuner goes MSB-aligned, after all */
+       printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a);
+       cx24110_pll_write(fe,band);
+       /* set vga and vca to their widest-band settings, as a precaution.
+          SetSymbolrate might not be called to set this up */
+       cx24110_pll_write(fe,0x500c0000);
+       cx24110_pll_write(fe,0x83f1f800);
+       cx24110_pll_write(fe,pll);
 /*        writereg(client,0x56,0x7f);*/
 
        return 0;
@@ -299,7 +299,7 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
        static u8 mt352_reset [] = { 0x50, 0x80 };
        static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
        static u8 mt352_agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF,
-                                      0x00, 0xFF, 0x00, 0x40, 0x40 };
+                                      0x00, 0xFF, 0x00, 0x40, 0x40 };
        static u8 mt352_av771_extra[] = { 0xB5, 0x7A };
        static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
 
@@ -348,9 +348,9 @@ static int advbt771_samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct
 
        pllbuf[0] = 0xc2; // Note: non-linux standard PLL i2c address
        pllbuf[1] = div >> 8;
-       pllbuf[2] = div & 0xff;
-       pllbuf[3] = cp;
-       pllbuf[4] = bs;
+       pllbuf[2] = div & 0xff;
+       pllbuf[3] = cp;
+       pllbuf[4] = bs;
 
        return 0;
 }
@@ -369,6 +369,63 @@ static struct dst_config dst_config = {
 };
 
 
+static int or51211_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
+{
+       struct dvb_bt8xx_card* bt = (struct dvb_bt8xx_card*) fe->dvb->priv;
+
+       return request_firmware(fw, name, &bt->bt->dev->dev);
+}
+
+static void or51211_setmode(struct dvb_frontend * fe, int mode)
+{
+       struct dvb_bt8xx_card *bt = fe->dvb->priv;
+       bttv_write_gpio(bt->bttv_nr, 0x0002, mode);   /* Reset */
+       msleep(20);
+}
+
+static void or51211_reset(struct dvb_frontend * fe)
+{
+       struct dvb_bt8xx_card *bt = fe->dvb->priv;
+
+       /* RESET DEVICE
+        * reset is controled by GPIO-0
+        * when set to 0 causes reset and when to 1 for normal op
+        * must remain reset for 128 clock cycles on a 50Mhz clock
+        * also PRM1 PRM2 & PRM4 are controled by GPIO-1,GPIO-2 & GPIO-4
+        * We assume that the reset has be held low long enough or we
+        * have been reset by a power on.  When the driver is unloaded
+        * reset set to 0 so if reloaded we have been reset.
+        */
+       /* reset & PRM1,2&4 are outputs */
+       int ret = bttv_gpio_enable(bt->bttv_nr, 0x001F, 0x001F);
+       if (ret != 0) {
+               printk(KERN_WARNING "or51211: Init Error - Can't Reset DVR "
+                      "(%i)\n", ret);
+       }
+       bttv_write_gpio(bt->bttv_nr, 0x001F, 0x0000);   /* Reset */
+       msleep(20);
+       /* Now set for normal operation */
+       bttv_write_gpio(bt->bttv_nr, 0x0001F, 0x0001);
+       /* wait for operation to begin */
+       msleep(500);
+}
+
+static void or51211_sleep(struct dvb_frontend * fe)
+{
+       struct dvb_bt8xx_card *bt = fe->dvb->priv;
+       bttv_write_gpio(bt->bttv_nr, 0x0001, 0x0000);
+}
+
+static struct or51211_config or51211_config = {
+
+       .demod_address = 0x15,
+       .request_firmware = or51211_request_firmware,
+       .setmode = or51211_setmode,
+       .reset = or51211_reset,
+       .sleep = or51211_sleep,
+};
+
+
 static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
        struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
@@ -406,6 +463,9 @@ static struct nxt6000_config vp3021_alps_tded4_config = {
 
 static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 {
+       int ret;
+       struct dst_state* state = NULL;
+
        switch(type) {
 #ifdef BTTV_DVICO_DVBT_LITE
        case BTTV_DVICO_DVBT_LITE:
@@ -446,18 +506,43 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                break;
 
        case BTTV_TWINHAN_DST:
-               card->fe = dst_attach(&dst_config, card->i2c_adapter, card->bt);
+               /*      DST is not a frontend driver !!!                */
+               state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
+               /*      Setup the Card                                  */
+               state->config = &dst_config;
+               state->i2c = card->i2c_adapter;
+               state->bt = card->bt;
+
+               /*      DST is not a frontend, attaching the ASIC       */
+               if ((dst_attach(state, &card->dvb_adapter)) == NULL) {
+                       printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__);
+                       break;
+               }
+               card->fe = &state->frontend;
+
+               /*      Attach other DST peripherals if any             */
+               /*      Conditional Access device                       */
+               if (state->dst_hw_cap & DST_TYPE_HAS_CA) {
+                       ret = dst_ca_attach(state, &card->dvb_adapter);
+               }
                if (card->fe != NULL) {
                        break;
                }
                break;
-       
+
        case BTTV_PINNACLESAT:
                card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter);
                if (card->fe != NULL) {
                        break;
                }
                break;
+
+       case BTTV_PC_HDTV:
+               card->fe = or51211_attach(&or51211_config, card->i2c_adapter);
+               if (card->fe != NULL) {
+                       break;
+               }
+               break;
        }
 
        if (card->fe == NULL) {
@@ -467,7 +552,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                       card->bt->dev->subsystem_vendor,
                       card->bt->dev->subsystem_device);
        } else {
-               if (dvb_register_frontend(card->dvb_adapter, card->fe)) {
+               if (dvb_register_frontend(&card->dvb_adapter, card->fe)) {
                        printk("dvb-bt8xx: Frontend registration failed!\n");
                        if (card->fe->ops->release)
                                card->fe->ops->release(card->fe);
@@ -484,9 +569,9 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                                           THIS_MODULE)) < 0) {
                printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);
                return result;
-               
+
        }
-       card->dvb_adapter->priv = card;
+       card->dvb_adapter.priv = card;
 
        card->bt->adapter = card->i2c_adapter;
 
@@ -500,23 +585,23 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
        card->demux.start_feed = dvb_bt8xx_start_feed;
        card->demux.stop_feed = dvb_bt8xx_stop_feed;
        card->demux.write_to_decoder = NULL;
-       
+
        if ((result = dvb_dmx_init(&card->demux)) < 0) {
                printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
 
-               dvb_unregister_adapter(card->dvb_adapter);
+               dvb_unregister_adapter(&card->dvb_adapter);
                return result;
        }
 
        card->dmxdev.filternum = 256;
        card->dmxdev.demux = &card->demux.dmx;
        card->dmxdev.capabilities = 0;
-       
-       if ((result = dvb_dmxdev_init(&card->dmxdev, card->dvb_adapter)) < 0) {
+
+       if ((result = dvb_dmxdev_init(&card->dmxdev, &card->dvb_adapter)) < 0) {
                printk("dvb_bt8xx: dvb_dmxdev_init failed (errno = %d)\n", result);
 
                dvb_dmx_release(&card->demux);
-               dvb_unregister_adapter(card->dvb_adapter);
+               dvb_unregister_adapter(&card->dvb_adapter);
                return result;
        }
 
@@ -527,10 +612,10 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
 
                dvb_dmxdev_release(&card->dmxdev);
                dvb_dmx_release(&card->demux);
-               dvb_unregister_adapter(card->dvb_adapter);
+               dvb_unregister_adapter(&card->dvb_adapter);
                return result;
        }
-       
+
        card->fe_mem.source = DMX_MEMORY_FE;
 
        if ((result = card->demux.dmx.add_frontend(&card->demux.dmx, &card->fe_mem)) < 0) {
@@ -539,7 +624,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
                dvb_dmxdev_release(&card->dmxdev);
                dvb_dmx_release(&card->demux);
-               dvb_unregister_adapter(card->dvb_adapter);
+               dvb_unregister_adapter(&card->dvb_adapter);
                return result;
        }
 
@@ -550,14 +635,14 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
                dvb_dmxdev_release(&card->dmxdev);
                dvb_dmx_release(&card->demux);
-               dvb_unregister_adapter(card->dvb_adapter);
+               dvb_unregister_adapter(&card->dvb_adapter);
                return result;
        }
 
-       dvb_net_init(card->dvb_adapter, &card->dvbnet, &card->demux.dmx);
+       dvb_net_init(&card->dvb_adapter, &card->dvbnet, &card->demux.dmx);
 
        tasklet_init(&card->bt->tasklet, dvb_bt8xx_task, (unsigned long) card);
-       
+
        frontend_init(card, type);
 
        return 0;
@@ -584,21 +669,21 @@ static int dvb_bt8xx_probe(struct device *dev)
        case BTTV_PINNACLESAT:
                card->gpio_mode = 0x0400c060;
                /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
-                             BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
+                             BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
                card->op_sync_orin = 0;
                card->irq_err_ignore = 0;
                break;
-               
+
 #ifdef BTTV_DVICO_DVBT_LITE
        case BTTV_DVICO_DVBT_LITE:
 #endif
                card->gpio_mode = 0x0400C060;
                card->op_sync_orin = 0;
                card->irq_err_ignore = 0;
-                               /* 26, 15, 14, 6, 5 
+               /* 26, 15, 14, 6, 5
                 * A_PWRDN  DA_DPM DA_SBR DA_IOM_DA
-                                * DA_APP(parallel) */
-                               break;
+                * DA_APP(parallel) */
+               break;
 
 #ifdef BTTV_TWINHAN_VP3021
        case BTTV_TWINHAN_VP3021:
@@ -609,40 +694,46 @@ static int dvb_bt8xx_probe(struct device *dev)
                card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5);
                card->op_sync_orin = 0;
                card->irq_err_ignore = 0;
-                               /* A_PWRDN DA_SBR DA_APP (high speed serial) */
-                               break;
+               /* A_PWRDN DA_SBR DA_APP (high speed serial) */
+               break;
 
        case BTTV_AVDVBT_771: //case 0x07711461:
                card->gpio_mode = 0x0400402B;
                card->op_sync_orin = BT878_RISC_SYNC_MASK;
                card->irq_err_ignore = 0;
                /* A_PWRDN DA_SBR  DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/
-                               break;
+               break;
 
        case BTTV_TWINHAN_DST:
                card->gpio_mode = 0x2204f2c;
                card->op_sync_orin = BT878_RISC_SYNC_MASK;
                card->irq_err_ignore = BT878_APABORT | BT878_ARIPERR |
                                       BT878_APPERR | BT878_AFBUS;
-                               /* 25,21,14,11,10,9,8,3,2 then
-                                * 0x33 = 5,4,1,0
-                                * A_SEL=SML, DA_MLB, DA_SBR, 
-                                * DA_SDR=f, fifo trigger = 32 DWORDS
-                                * IOM = 0 == audio A/D
-                                * DPM = 0 == digital audio mode
-                                * == async data parallel port
-                                * then 0x33 (13 is set by start_capture)
-                                * DA_APP = async data parallel port, 
-                                * ACAP_EN = 1,
-                                * RISC+FIFO ENABLE */
-                               break;
-
-                       default:
+               /* 25,21,14,11,10,9,8,3,2 then
+                * 0x33 = 5,4,1,0
+                * A_SEL=SML, DA_MLB, DA_SBR,
+                * DA_SDR=f, fifo trigger = 32 DWORDS
+                * IOM = 0 == audio A/D
+                * DPM = 0 == digital audio mode
+                * == async data parallel port
+                * then 0x33 (13 is set by start_capture)
+                * DA_APP = async data parallel port,
+                * ACAP_EN = 1,
+                * RISC+FIFO ENABLE */
+               break;
+
+       case BTTV_PC_HDTV:
+               card->gpio_mode = 0x0100EC7B;
+               card->op_sync_orin = 0;
+               card->irq_err_ignore = 0;
+               break;
+
+       default:
                printk(KERN_WARNING "dvb_bt8xx: Unknown bttv card type: %d.\n",
                                sub->core->type);
                kfree(card);
                return -ENODEV;
-               }
+       }
 
        dprintk("dvb_bt8xx: identified card%d as %s\n", card->bttv_nr, card->card_name);
 
@@ -661,7 +752,7 @@ static int dvb_bt8xx_probe(struct device *dev)
                kfree(card);
                return -EFAULT;
 
-}
+       }
 
        init_MUTEX(&card->bt->gpio_lock);
        card->bt->bttv_nr = sub->core->nr;
@@ -678,23 +769,23 @@ static int dvb_bt8xx_probe(struct device *dev)
 static int dvb_bt8xx_remove(struct device *dev)
 {
        struct dvb_bt8xx_card *card = dev_get_drvdata(dev);
-               
-               dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
 
-               bt878_stop(card->bt);
-               tasklet_kill(&card->bt->tasklet);
-               dvb_net_release(&card->dvbnet);
-               card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_mem);
-               card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
-               dvb_dmxdev_release(&card->dmxdev);
-               dvb_dmx_release(&card->demux);
+       dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
+
+       bt878_stop(card->bt);
+       tasklet_kill(&card->bt->tasklet);
+       dvb_net_release(&card->dvbnet);
+       card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_mem);
+       card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
+       dvb_dmxdev_release(&card->dmxdev);
+       dvb_dmx_release(&card->demux);
        if (card->fe) dvb_unregister_frontend(card->fe);
-               dvb_unregister_adapter(card->dvb_adapter);
-               
-               kfree(card);
+       dvb_unregister_adapter(&card->dvb_adapter);
+
+       kfree(card);
 
        return 0;
-       }
+}
 
 static struct bttv_sub_driver driver = {
        .drv = {
@@ -721,7 +812,7 @@ static void __exit dvb_bt8xx_exit(void)
 
 module_init(dvb_bt8xx_init);
 module_exit(dvb_bt8xx_exit);
+
 MODULE_DESCRIPTION("Bt8xx based DVB adapter driver");
 MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>");
 MODULE_LICENSE("GPL");
-