diff options
| author | Holger Waechtler <devnull@localhost> | 2003-01-23 16:51:41 +0000 |
|---|---|---|
| committer | Holger Waechtler <devnull@localhost> | 2003-01-23 16:51:41 +0000 |
| commit | 5635f7b773082be731d50738b45b4e639db56f1a (patch) | |
| tree | f93a58e30083f4fc571d5f807734b8882ff6a586 /linux | |
| parent | 86afdf2daa0548e1888201a870348acff86583cb (diff) | |
| download | mediapointer-dvb-s2-5635f7b773082be731d50738b45b4e639db56f1a.tar.gz mediapointer-dvb-s2-5635f7b773082be731d50738b45b4e639db56f1a.tar.bz2 | |
apply core patch by <emard@softhome.net>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/common/saa7146.h | 7 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci-budget/budget-core.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci-budget/budget.c | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h index 44f3ce2c2..fd1cb221d 100644 --- a/linux/drivers/media/common/saa7146.h +++ b/linux/drivers/media/common/saa7146.h @@ -201,6 +201,13 @@ void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data); #define CMD_O_FID_A MASK_12 #define CMD_E_FID_A MASK_11 +/* some events and command modifiers for rps1 squarewave generator */ +#define EVT_HS (1<<15) // Source Line Threshold reached +#define EVT_VBI_B (1<<9) // VSYNC Event +#define RPS_OAN (1<<27) // 1: OR events, 0: AND events +#define RPS_INV (1<<26) // Invert (compound) event +#define GPIO3_MSK 0xFF000000 // GPIO #3 control bits + /* Bit mask constants */ #define MASK_00 0x00000001 /* Mask value for bit 0 */ #define MASK_01 0x00000002 /* Mask value for bit 1 */ diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-core.c b/linux/drivers/media/dvb/ttpci-budget/budget-core.c index d580488d2..72eee8b0c 100644 --- a/linux/drivers/media/dvb/ttpci-budget/budget-core.c +++ b/linux/drivers/media/dvb/ttpci-budget/budget-core.c @@ -402,6 +402,11 @@ int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *i dvb_register_adapter(&budget->dvb_adapter, budget->card->name); + /* set dd1 stream a & b */ + saa7146_write(dev, DD1_STREAM_B, 0x00000000); + saa7146_write(dev, DD1_INIT, 0x02000000); + saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); + /* the Siemens DVB needs this if you want to have the i2c chips get recognized before the main driver is loaded */ saa7146_write(dev, GPIO_CTRL, 0x500000); diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.c b/linux/drivers/media/dvb/ttpci-budget/budget.c index b632e1901..93f4789ac 100644 --- a/linux/drivers/media/dvb/ttpci-budget/budget.c +++ b/linux/drivers/media/dvb/ttpci-budget/budget.c @@ -66,11 +66,6 @@ int this_budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_da } budget = (struct budget_s*)dev->ext_priv; - /* set dd1 stream a & b */ - saa7146_write(dev, DD1_STREAM_B, 0x00000000); - saa7146_write(dev, DD1_INIT, 0x02000000); - saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); - // FIXME: cope with error here! budget_register(budget); printk(KERN_INFO "budget: found budget card '%s'.\n",budget->card->name); |