[PATCH] various patches for non-av7110 dvb-drivers

 - patch by Jon Burgess to fix DMA issues
 - reduce the number of dropped TS packets when an error is detected
   (Jon Burgess)
 - use budget-ci driver for new TT DVB-T cards with onboard MSP430.

diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 88c9a223b21a9a37f22886442c8564de18830949..59a97599fe31b980364afe448eaeb31875854cda 100644 (file)
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -357,10 +357,12 @@ static int budget_ci_detach (struct saa7146_dev* dev)
 static struct saa7146_extension budget_extension; 
 
 MAKE_BUDGET_INFO(ttbci,        "TT-Budget/WinTV-NOVA-CI PCI",  BUDGET_TT_HW_DISEQC);
+MAKE_BUDGET_INFO(ttbt2,        "TT-Budget/WinTV-NOVA-T  PCI",  BUDGET_TT);
 
 static struct pci_device_id pci_tbl[] = {
        MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100c),
        MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100f),
+       MAKE_EXTENSION_PCI(ttbt2,  0x13c2, 0x1011),
        {
                .vendor    = 0,
        }

diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 6aa8d82450babd0d243e3b3f7f85bdb73a889d1a..e22be467afc41f8a52b58dfc01f0e468321f9c9f 100644 (file)
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -46,12 +46,12 @@ static int start_ts_capture (struct budget *budget)
         mdelay(10);
 
         saa7146_write(dev, BASE_ODD3, 0);
-        saa7146_write(dev, BASE_EVEN3, TS_WIDTH*TS_HEIGHT/2);
+        saa7146_write(dev, BASE_EVEN3, 0);
         saa7146_write(dev, PROT_ADDR3, TS_WIDTH*TS_HEIGHT);    
         saa7146_write(dev, BASE_PAGE3, budget->pt.dma |ME1|0x90);
         saa7146_write(dev, PITCH3, TS_WIDTH);
 
-        saa7146_write(dev, NUM_LINE_BYTE3, ((TS_HEIGHT/2)<<16)|TS_WIDTH);
+        saa7146_write(dev, NUM_LINE_BYTE3, (TS_HEIGHT<<16)|TS_WIDTH);
        saa7146_write(dev, MC2, (MASK_04 | MASK_20));
        saa7146_write(dev, MC1, (MASK_04 | MASK_20)); // DMA3 on
 

diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index ce5ed5ebd7275d1595934f17df9a299ec9216434..a71a2c64bc04b2fe8935f5a1595d01736a18a8cc 100644 (file)
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -192,7 +192,6 @@ static struct saa7146_extension budget_extension;
 MAKE_BUDGET_INFO(ttbs, "TT-Budget/WinTV-NOVA-S  PCI",  BUDGET_TT);
 MAKE_BUDGET_INFO(ttbc, "TT-Budget/WinTV-NOVA-C  PCI",  BUDGET_TT);
 MAKE_BUDGET_INFO(ttbt, "TT-Budget/WinTV-NOVA-T  PCI",  BUDGET_TT);
-MAKE_BUDGET_INFO(ttbt2,        "TT-Budget/WinTV-NOVA-T  PCI",  BUDGET_TT);
 MAKE_BUDGET_INFO(satel,        "SATELCO Multimedia PCI",       BUDGET_TT_HW_DISEQC);
 /* Uncomment for Budget Patch */
 /*MAKE_BUDGET_INFO(fs_1_3,"Siemens/Technotrend/Hauppauge PCI rev1.3+Budget_Patch", BUDGET_PATCH);*/
@@ -203,7 +202,6 @@ static struct pci_device_id pci_tbl[] = {
        MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),
        MAKE_EXTENSION_PCI(ttbc,  0x13c2, 0x1004),
        MAKE_EXTENSION_PCI(ttbt,  0x13c2, 0x1005),
-       MAKE_EXTENSION_PCI(ttbt2,  0x13c2, 0x1011),     
        MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
        {
                .vendor    = 0,