diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-11-21 22:36:55 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-11-21 22:36:55 +0000 |
| commit | 83702e44e68343db073aec7f666e5207046d7af2 (patch) | |
| tree | d804111bb9b3e2c170884eb7d1c4bd54e7c1d59e /linux/drivers/media/dvb/ttpci/av7110_hw.c | |
| parent | 61f76e43e1717def1801bd3c5ee7c67a289e43a5 (diff) | |
| download | mediapointer-dvb-s2-83702e44e68343db073aec7f666e5207046d7af2.tar.gz mediapointer-dvb-s2-83702e44e68343db073aec7f666e5207046d7af2.tar.bz2 | |
- prefix IER_DISABLE and IER_ENABLE with SAA7146_
- add SAA7146_ISR_CLEAR
- use those consistently in the ttpci driver
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 f47b6d42c..82cf9c4ab 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.c +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c @@ -110,16 +110,16 @@ void av7110_reset_arm(struct av7110 *av7110) saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO); /* Disable DEBI and GPIO irq */ - IER_DISABLE(av7110->dev, (MASK_19 | MASK_03)); - saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03)); + SAA7146_IER_DISABLE(av7110->dev, MASK_19 | MASK_03); + SAA7146_ISR_CLEAR(av7110->dev, MASK_19 | MASK_03); saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTHI); msleep(30); /* the firmware needs some time to initialize */ ARM_ResetMailBox(av7110); - saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03)); - IER_ENABLE(av7110->dev, MASK_03); + SAA7146_ISR_CLEAR(av7110->dev, MASK_19 | MASK_03); + SAA7146_IER_ENABLE(av7110->dev, MASK_03); av7110->arm_ready = 1; dprintk(1, "reset ARM\n"); @@ -223,8 +223,8 @@ int av7110_bootarm(struct av7110 *av7110) saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO); /* Disable DEBI and GPIO irq */ - IER_DISABLE(av7110->dev, MASK_03 | MASK_19); - saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03)); + SAA7146_IER_DISABLE(av7110->dev, MASK_03 | MASK_19); + SAA7146_ISR_CLEAR(av7110->dev, MASK_19 | MASK_03); /* enable DEBI */ saa7146_write(av7110->dev, MC1, 0x08800880); @@ -280,8 +280,8 @@ int av7110_bootarm(struct av7110 *av7110) //ARM_ClearIrq(av7110); ARM_ResetMailBox(av7110); - saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03)); - IER_ENABLE(av7110->dev, MASK_03); + SAA7146_ISR_CLEAR(av7110->dev, MASK_19 | MASK_03); + SAA7146_IER_ENABLE(av7110->dev, MASK_03); av7110->arm_errors = 0; av7110->arm_ready = 1; |