OSDN Git Service

staging: comedi: s526: add defines for the ao/ai data register
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 17 Aug 2015 23:58:16 +0000 (16:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Sep 2015 01:24:20 +0000 (18:24 -0700)
The same register is used for analog output and input data. Add defines
for both for added clarity.

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>
drivers/staging/comedi/drivers/s526.c

index ff576d3..5f8a5d3 100644 (file)
@@ -65,7 +65,8 @@
 #define S526_AI_CTRL_CONV(x)   (1 << (5 + ((x) & 0x9)))
 #define S526_AI_CTRL_READ(x)   (((x) & 0xf) << 1)
 #define S526_AI_CTRL_START     BIT(0)
-#define REG_ADD 0x08
+#define S526_AO_REG            0x08
+#define S526_AI_REG            0x08
 #define REG_DIO 0x0A
 #define REG_IER 0x0C
 #define REG_ISR 0x0E
@@ -445,8 +446,7 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
                outw(ISR_ADC_DONE, dev->iobase + REG_ISR);
 
-               /* read data */
-               d = inw(dev->iobase + REG_ADD);
+               d = inw(dev->iobase + S526_AI_REG);
 
                /* munge data */
                data[n] = d ^ 0x8000;
@@ -471,7 +471,7 @@ static int s526_ao_insn_write(struct comedi_device *dev,
 
        for (i = 0; i < insn->n; i++) {
                val = data[i];
-               outw(val, dev->iobase + REG_ADD);
+               outw(val, dev->iobase + S526_AO_REG);
                outw(ctrl, dev->iobase + S526_AO_CTRL_REG);
        }
        s->readback[chan] = val;