[PATCH 8/14] various patches for non-av7110 dvb-drivers

Michael Hunold
2003-10-08T13:34:24Z

- [DVB] patch by Jon Burgess to fix DMA issues
- [DVB] reduce the number of dropped TS packets when an error is detected (Jon Burgess)
- [DVB] use budget-ci driver for new TT DVB-T cards with onboard MSP430.
diff -uNrwB --new-file xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-ci.c linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-ci.c
--- xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-ci.c 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-ci.c 2003-09-09 09:24:21.000000000 +0200
@@ -357,10 +363,12 @@
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 -uNrwB --new-file xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-core.c linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-core.c
--- xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-core.c 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test5/drivers/media/dvb/ttpci/budget-core.c 2003-09-09 09:24:21.000000000 +0200
@@ -46,12 +46,12 @@
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 -uNrwB --new-file xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget.c linux-2.6.0-test5/drivers/media/dvb/ttpci/budget.c
--- xx-linux-2.6.0-test5/drivers/media/dvb/ttpci/budget.c 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test5/drivers/media/dvb/ttpci/budget.c 2003-09-09 09:24:21.000000000 +0200
@@ -192,7 +192,6 @@
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 @@
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,