diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2014-03-13 17:09:58 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 21:16:15 (GMT) |
| commit | 96653ed60eb45ad88a51a91e28a8a02e8c0ece0d (patch) | |
| tree | 6c1f1a2b8901840e78069c623a2fc8eeb953a4ab /drivers | |
| parent | 18c4110eb47942bc4f3da287ac6fc74818bdf4b8 (diff) | |
| download | linux-96653ed60eb45ad88a51a91e28a8a02e8c0ece0d.tar.xz | |
staging: comedi: fl512: define the register map
Define the register map and remove the magic values and some unnecessary
comments.
For aesthetics, remove the 'iobase' local variable and use dev->iobase
directly.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/fl512.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c index f285110..8cb1f1e 100644 --- a/drivers/staging/comedi/drivers/fl512.c +++ b/drivers/staging/comedi/drivers/fl512.c @@ -21,6 +21,16 @@ Configuration options: #include <linux/delay.h> +/* + * Register I/O map + */ +#define FL512_AI_LSB_REG 0x02 +#define FL512_AI_MSB_REG 0x03 +#define FL512_AI_MUX_REG 0x02 +#define FL512_AI_START_CONV_REG 0x03 +#define FL512_AO_DATA_REG(x) (0x04 + ((x) * 2)) +#define FL512_AO_TRIG_REG(x) (0x04 + ((x) * 2)) + struct fl512_private { unsigned short ao_readback[2]; }; @@ -45,17 +55,16 @@ static int fl512_ai_insn_read(struct comedi_device *dev, int n; unsigned int lo_byte, hi_byte; char chan = CR_CHAN(insn->chanspec); - unsigned long iobase = dev->iobase; for (n = 0; n < insn->n; n++) { /* sample n times on selected channel */ /* XXX probably can move next step out of for() loop -- will * make AI a little bit faster. */ - outb(chan, iobase + 2); /* select chan */ - outb(0, iobase + 3); /* start conversion */ + outb(chan, dev->iobase + FL512_AI_MUX_REG); + outb(0, dev->iobase + FL512_AI_START_CONV_REG); /* XXX should test "done" flag instead of delay */ udelay(30); /* sleep 30 usec */ - lo_byte = inb(iobase + 2); /* low 8 byte */ - hi_byte = inb(iobase + 3) & 0xf; /* high 4 bit and mask */ + lo_byte = inb(dev->iobase + FL512_AI_LSB_REG); + hi_byte = inb(dev->iobase + FL512_AI_MSB_REG) & 0xf; data[n] = lo_byte + (hi_byte << 8); } return n; @@ -69,14 +78,14 @@ static int fl512_ao_insn_write(struct comedi_device *dev, struct fl512_private *devpriv = dev->private; int n; int chan = CR_CHAN(insn->chanspec); /* get chan to write */ - unsigned long iobase = dev->iobase; /* get base address */ for (n = 0; n < insn->n; n++) { /* write n data set */ /* write low byte */ - outb(data[n] & 0x0ff, iobase + 4 + 2 * chan); + outb(data[n] & 0x0ff, dev->iobase + FL512_AO_DATA_REG(chan)); /* write high byte */ - outb((data[n] & 0xf00) >> 8, iobase + 4 + 2 * chan); - inb(iobase + 4 + 2 * chan); /* trig */ + outb((data[n] & 0xf00) >> 8, + dev->iobase + FL512_AO_DATA_REG(chan)); + inb(dev->iobase + FL512_AO_TRIG_REG(chan)); devpriv->ao_readback[chan] = data[n]; } |