diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-03-22 18:48:49 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-03-22 18:48:49 +0000 |
| commit | ca11f46a0ae03be4eda64d4d9dbca2f2fc3df537 (patch) | |
| tree | dae20753cf9e807efb7c0151549ee11f903f4844 /linux | |
| parent | 785c1f7ddd1ece9bcc320b41c8e53feee0ef9b25 (diff) | |
| download | mediapointer-dvb-s2-ca11f46a0ae03be4eda64d4d9dbca2f2fc3df537.tar.gz mediapointer-dvb-s2-ca11f46a0ae03be4eda64d4d9dbca2f2fc3df537.tar.bz2 | |
resync changes from dvb-kernel-v4 (slightly faster fw loading)
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_hw.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_hw.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 10f76b46f..b06b99673 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -1453,7 +1453,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d av7110->adac_type = DVB_ADAC_TI; av7110_set_volume(av7110, 0xff, 0xff); - VidMode(av7110, vidmode); + av7710_set_video_mode(av7110, vidmode); /* handle different card types */ /* remaining inits according to card and frontend type */ diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c index 9cc974192..c5e74f7b7 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.c +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c @@ -106,9 +106,9 @@ void av7110_reset_arm(struct av7110 *av7110) saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03)); //FIXME: are those mdelays really necessary? - mdelay(800); + mdelay(100); saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTHI); - mdelay(800); + mdelay(100); ARM_ResetMailBox(av7110); @@ -126,10 +126,10 @@ static int waitdebi(struct av7110 *av7110, int adr, int state) DEB_EE(("av7110: %p\n", av7110)); - for (k = 0; k < 100; k++) { + for (k = 0; k < 1000; k++) { if (irdebi(av7110, DEBINOSWAP, adr, 0, 2) == state) return 0; - udelay(500); + udelay(50); } return -1; } @@ -276,7 +276,7 @@ int av7110_bootarm(struct av7110 *av7110) } saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI); //FIXME: necessary? - mdelay(800); + mdelay(100); //ARM_ClearIrq(av7110); ARM_ResetMailBox(av7110); diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.h b/linux/drivers/media/dvb/ttpci/av7110_hw.h index aa674b84e..6dc27e0bd 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.h +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.h @@ -457,7 +457,7 @@ static inline int SendDAC(struct av7110 *av7110, u8 addr, u8 data) return av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, AudioDAC, 2, addr, data); } -static inline void VidMode(struct av7110 *av7110, int mode) +static inline void av7710_set_video_mode(struct av7110 *av7110, int mode) { av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetVidMode, 1, mode); } |