diff options
| author | Andrew de Quincy <devnull@localhost> | 2004-11-12 17:30:07 +0000 |
|---|---|---|
| committer | Andrew de Quincy <devnull@localhost> | 2004-11-12 17:30:07 +0000 |
| commit | 0f191893b127c16c0a9ccfc3557ddf4dbae2f1a9 (patch) | |
| tree | d43ab2a49c06c0f98080aa61b059a91c218abc2b /linux/drivers/media/dvb/ttpci/av7110_hw.c | |
| parent | ff1fec5eac165d66fb5693c745a8ab7930d09fd2 (diff) | |
| download | mediapointer-dvb-s2-0f191893b127c16c0a9ccfc3557ddf4dbae2f1a9.tar.gz mediapointer-dvb-s2-0f191893b127c16c0a9ccfc3557ddf4dbae2f1a9.tar.bz2 | |
Updated to fix problems with some CAMs on KNC1 cards
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_hw.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_hw.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c index 3f58e097c..f80b8f633 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.c +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c @@ -55,7 +55,7 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config, if (count <= 0 || count > 32764) return -1; - if (saa7146_wait_for_debi_done(av7110->dev) < 0) + if (saa7146_wait_for_debi_done(av7110->dev, 1) < 0) return -1; saa7146_write(dev, DEBI_CONFIG, config); if (count <= 4) /* immediate transfer */ @@ -74,7 +74,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) if (count > 32764 || count <= 0) return 0; - if (saa7146_wait_for_debi_done(av7110->dev) < 0) + if (saa7146_wait_for_debi_done(av7110->dev, 1) < 0) return 0; saa7146_write(dev, DEBI_AD, av7110->debi_bus); saa7146_write(dev, DEBI_COMMAND, (count << 17) | 0x10000 | (addr & 0xffff)); @@ -83,7 +83,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) saa7146_write(dev, MC2, (2 << 16) | 2); if (count > 4) return count; - saa7146_wait_for_debi_done(av7110->dev); + saa7146_wait_for_debi_done(av7110->dev, 1); result = saa7146_read(dev, DEBI_AD); result &= (0xffffffffUL >> ((4 - count) * 8)); return result; @@ -240,7 +240,7 @@ int av7110_bootarm(struct av7110 *av7110) mwdebi(av7110, DEBISWAB, DPRAM_BASE, bootcode, sizeof(bootcode)); iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); - if (saa7146_wait_for_debi_done(av7110->dev)) { + if (saa7146_wait_for_debi_done(av7110->dev, 1)) { printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): " "saa7146_wait_for_debi_done() timed out\n"); return -1; @@ -258,7 +258,7 @@ int av7110_bootarm(struct av7110 *av7110) dprintk(1, "load dpram code\n"); mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram); - if (saa7146_wait_for_debi_done(av7110->dev)) { + if (saa7146_wait_for_debi_done(av7110->dev, 1)) { printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): " "saa7146_wait_for_debi_done() timed out after loading DRAM\n"); return -1; @@ -740,7 +740,7 @@ static inline int LoadBitmap(struct av7110 *av7110, u16 format, int d, delta; u8 c; int ret; - + dprintk(4, "%p\n", av7110); ret = wait_event_interruptible_timeout(av7110->bmpq, av7110->bmp_state != BMP_LOADING, HZ); @@ -912,14 +912,14 @@ static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) { int ret; - + ret = down_interruptible(&av7110->osd_sema); if (ret) return -ERESTARTSYS; /* stupid, but OSD functions don't provide a return code anyway */ ret = 0; - + switch (dc->cmd) { case OSD_Close: DestroyOSDWindow(av7110, av7110->osdwin); |