Removing budget patch support from dvb-core.c because it's

all in budget-patch.c and adjusting Makefile's and Kconfig
accordingly to properly compile.

3 files changed, 23 insertions, 51 deletions

diff --git a/linux/drivers/media/dvb/ttpci-budget/Kconfig b/linux/drivers/media/dvb/ttpci-budget/Kconfig
index c40dad9f5..0098520cc 100644
--- a/linux/drivers/media/dvb/ttpci-budget/Kconfig
+++ b/linux/drivers/media/dvb/ttpci-budget/Kconfig
@@ -43,5 +43,25 @@ config DVB_BUDGET_AV
 	  This driver is available as a module called
 	  dvb-ttpci-budget-av.o ( = code which can be inserted in
 	  and removed from the running kernel whenever you want).
+	  here and read <file:Documentation/modules.txt>.
+
+config DVB_BUDGET_PATCH
+	tristate "AV7110 cards with Budget Patch"
+	depends on DVB_CORE && DVB_BUDGET
+	help
+	  Support for Budget Patch (full TS) modification on 
+	  SAA7146+AV7110 based cards (DVB-S cards). This
+	  driver doesn't use onboard MPEG2 decoder. The 
+	  card is driven in Budget-only mode. Card is
+	  required to have loaded firmware to tune properly.
+	  Firmware can be loaded by insertion and removal of
+	  standard AV7110 driver prior to loading this
+	  driver.
+
+	  Say Y if you own such a card and want to use it.
+
+	  This driver is available as a module called
+	  dvb-ttpci-budget-patch.o ( = code which can be inserted in
+	  and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/linux/drivers/media/dvb/ttpci-budget/Makefile b/linux/drivers/media/dvb/ttpci-budget/Makefile
index 6fab02cda..21923cf20 100644
--- a/linux/drivers/media/dvb/ttpci-budget/Makefile
+++ b/linux/drivers/media/dvb/ttpci-budget/Makefile
@@ -1,13 +1,15 @@
 #
-# Makefile for the kernel AV7110 DVB device driver
+# Makefile for the kernel SAA7146 FULL TS DVB device driver
 #
 
 dvb-ttpci-budget-objs := budget.o
 dvb-ttpci-budget-av-objs := budget-av.o
 dvb-ttpci-budget-ci-objs := budget-ci.o
+dvb-ttpci-budget-patch-objs := budget-patch.o
 
 obj-$(CONFIG_DVB_BUDGET) += budget-core.o dvb-ttpci-budget.o
 obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o dvb-ttpci-budget-ci.o
 obj-$(CONFIG_DVB_BUDGET_AV) += budget-core.o dvb-ttpci-budget-av.o
+obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o dvb-ttpci-budget-patch.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -I$(src)/../../common/ -I$(src)/../../common/saa7146
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-core.c b/linux/drivers/media/dvb/ttpci-budget/budget-core.c
index abb1b9f39..684177f8e 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-core.c
+++ b/linux/drivers/media/dvb/ttpci-budget/budget-core.c
@@ -4,7 +4,6 @@
 #endif
 
 int budget_debug = 0;
-int budget_patch = 0;
 
 /****************************************************************************
  * General helper functions
@@ -270,9 +269,6 @@ int ttpci_budget_init (struct budget *budget,
 	int ret = 0;
 	struct budget_info *bi = info->ext_priv;
 
-	if (bi->type == BUDGET_PATCH && budget_patch <= 0)
-		return -EOPNOTSUPP;
-
 	memset(budget, 0, sizeof(struct budget));
 
 	DEB_EE(("dev: %p, budget: %p\n", dev, budget));
@@ -293,51 +289,6 @@ int ttpci_budget_init (struct budget *budget,
 	
 	saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_3200);
 
-	if (budget->card->type == BUDGET_PATCH && budget_patch > 0)
-        {
-                int cnt;
-/*
-**              This code will setup the SAA7146_RPS1 to generate a square 
-**              wave on GPIO3, changing when a field (TS_HEIGHT/2 "lines" of 
-**              TS_WIDTH packets) has been acquired on SAA7146_D1B video port; 
-**              then, this GPIO3 output which is connected to the D1B_VSYNC 
-**              input, will trigger the acquisition of the alternate field 
-**              and so on.
-**              Currently, the TT_budget / WinTV_Nova cards have two ICs 
-**              (74HCT4040, LVC74) for the generation of this VSYNC signal, 
-**              which seems that can be done perfectly without this :-)).
-*/                                                      
-                cnt = 0;                                // Setup RPS1 "program" (p35)
-                // Wait reset Source Line Counter Threshold                     (p36)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS);
-                // Wait Source Line Counter Threshold                           (p36)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_PAUSE | EVT_HS);
-                // Set GPIO3=1                                                  (p42)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2));
-                dev->rps1[cnt++]=cpu_to_le32(GPIO3_MSK);
-                dev->rps1[cnt++]=cpu_to_le32(SAA7146_GPIO_OUTHI<<24);
-                // Wait reset Source Line Counter Threshold                     (p36)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS);
-                // Wait Source Line Counter Threshold
-                dev->rps1[cnt++]=cpu_to_le32(CMD_PAUSE | EVT_HS);
-                // Set GPIO3=0                                                  (p42)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2));
-                dev->rps1[cnt++]=cpu_to_le32(GPIO3_MSK);
-                dev->rps1[cnt++]=cpu_to_le32(SAA7146_GPIO_OUTLO<<24);
-                // Jump to begin of RPS program                                 (p37)
-                dev->rps1[cnt++]=cpu_to_le32(CMD_JUMP);
-                dev->rps1[cnt++]=cpu_to_le32(virt_to_bus(&dev->rps1[0]));
-
-                // Fix VSYNC level
-                saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-                // Set RPS1 Address register to point to RPS code               (r108 p42)
-                saa7146_write(dev, RPS_ADDR1, virt_to_bus(&dev->rps1[0]));
-                // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-                saa7146_write(dev, RPS_THRESH1, ((TS_HEIGHT/2) | MASK_12));
-                // Enable RPS1                                                  (rFC p33)
-                saa7146_write(dev, MC1, (MASK_13 | MASK_29));
-        }
-
 	budget->i2c_bus = dvb_register_i2c_bus (master_xfer, dev,
 						budget->dvb_adapter, 0);
 
@@ -435,7 +386,6 @@ EXPORT_SYMBOL_GPL(ttpci_budget_irq10_handler);
 EXPORT_SYMBOL_GPL(budget_debug);
 
 MODULE_PARM(budget_debug,"i");
-MODULE_PARM(budget_patch,"i");
 MODULE_LICENSE("GPL");