kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: me_daq: use plx9052.h defines

Browse source 
Use the PLX 9052 register defines in plx9052.h instead of using
magic numbers for the register bits.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-04-12 13:41:55 -07:00 committed by Greg Kroah-Hartman
parent 4564cfd052
commit fb86854109
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/comedi/drivers/me_daq.c
View file

@ -41,9 +41,10 @@
#include "../comedidev.h"
#include "plx9052.h"
#define ME2600_FIRMWARE "me2600_firmware.bin"
#define PLX_INTCSR 0x4C /* PLX interrupt status register */
#define XILINX_DOWNLOAD_RESET 0x42 /* Xilinx registers */
#define ME_CONTROL_1 0x0000 /* - | W */
@ -398,7 +399,7 @@ static int me2600_xilinx_download(struct comedi_device *dev,
unsigned int i;
/* disable irq's on PLX */
writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
writel(0x00, dev_private->plx_regbase + PLX9052_INTCSR);
/* First, make a dummy read to reset xilinx */
value = readw(dev_private->me_regbase + XILINX_DOWNLOAD_RESET);
@ -439,10 +440,10 @@ static int me2600_xilinx_download(struct comedi_device *dev,
writeb(0x00, dev_private->me_regbase + 0x0);
/* Test if there was an error during download -> INTB was thrown */
value = readl(dev_private->plx_regbase + PLX_INTCSR);
if (value & 0x20) {
value = readl(dev_private->plx_regbase + PLX9052_INTCSR);
if (value & PLX9052_INTCSR_LI2STAT) {
/* Disable interrupt */
writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
writel(0x00, dev_private->plx_regbase + PLX9052_INTCSR);
dev_err(dev->class_dev, "Xilinx download failed\n");
return -EIO;
}
@ -451,7 +452,10 @@ static int me2600_xilinx_download(struct comedi_device *dev,
sleep(1);
/* Enable PLX-Interrupts */
writel(0x43, dev_private->plx_regbase + PLX_INTCSR);
writel(PLX9052_INTCSR_LI1ENAB |
PLX9052_INTCSR_LI1POL |
PLX9052_INTCSR_PCIENAB,
dev_private->plx_regbase + PLX9052_INTCSR);
return 0;
}