staging: comedi: amplc_pci263: define the register map

For completeness, define the registers used by this driver and remove
the magic numbers.

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>

diff --git a/drivers/staging/comedi/drivers/amplc_pci263.c b/drivers/staging/comedi/drivers/amplc_pci263.c
index c47f042465e71c6164e727da8d92b0dbe2b77c90..8d4069bc5716cfc49b510e6e8f38a7fcfc9a3dae 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci263.c
+++ b/drivers/staging/comedi/drivers/amplc_pci263.c
@@ -36,14 +36,18 @@
 
 #include "../comedi_pci.h"
 
+/* PCI263 registers */
+#define PCI263_DO_0_7_REG      0x00
+#define PCI263_DO_8_15_REG     0x01
+
 static int pci263_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn,
                               unsigned int *data)
 {
        if (comedi_dio_update_state(s, data)) {
-               outb(s->state & 0xff, dev->iobase);
-               outb((s->state >> 8) & 0xff, dev->iobase + 1);
+               outb(s->state & 0xff, dev->iobase + PCI263_DO_0_7_REG);
+               outb((s->state >> 8) & 0xff, dev->iobase + PCI263_DO_8_15_REG);
        }
 
        data[1] = s->state;
@@ -77,7 +81,8 @@ static int pci263_auto_attach(struct comedi_device *dev,
        s->insn_bits    = pci263_do_insn_bits;
 
        /* read initial relay state */
-       s->state = inb(dev->iobase) | (inb(dev->iobase + 1) << 8);
+       s->state = inb(dev->iobase + PCI263_DO_0_7_REG) |
+                  (inb(dev->iobase + PCI263_DO_8_15_REG) << 8);
 
        return 0;
 }