summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-03-04 22:30:24 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-07 05:06:18 +0400
commite8e7709f3346feb1d01cdaa4fbeed447f5a6a6e3 (patch)
tree4f1fe74323eb38384fe6c1b7bf7bec0215763386
parent10a2c50278d23c62e275b6c79d6a1ec023e1999e (diff)
downloadlinux-e8e7709f3346feb1d01cdaa4fbeed447f5a6a6e3.tar.xz
staging: comedi: pcl816: tidy up the remaining register defines
For aesthetics, rename the clear INT request register. 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>
-rw-r--r--drivers/staging/comedi/drivers/pcl816.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index f22cf8620670..6386ef7a0042 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -44,12 +44,16 @@ Configuration Options:
#include "comedi_fc.h"
#include "8253.h"
+/*
+ * Register I/O map
+ */
#define PCL816_DO_DI_LSB_REG 0x00
#define PCL816_DO_DI_MSB_REG 0x01
#define PCL816_TIMER_BASE 0x04
#define PCL816_AI_LSB_REG 0x08
#define PCL816_AI_MSB_REG 0x09
#define PCL816_RANGE_REG 0x09
+#define PCL816_CLRINT_REG 0x0a
#define PCL816_MUX_REG 0x0b
#define PCL816_MUX_SCAN(_first, _last) (((_last) << 4) | (_first))
#define PCL816_CTRL_REG 0x0c
@@ -73,9 +77,6 @@ Configuration Options:
#define PCL816_STATUS_INTACT (1 << 6)
#define PCL816_STATUS_DRDY (1 << 7)
-/* W: clear INT request */
-#define PCL816_CLRINT 10
-
#define MAGIC_DMA_WORD 0x5a5a
static const struct comedi_lrange range_pcl816 = {
@@ -255,7 +256,7 @@ static void pcl816_ai_setup_chanlist(struct comedi_device *dev,
static void pcl816_ai_clear_eoc(struct comedi_device *dev)
{
/* writing any value clears the interrupt request */
- outb(0, dev->iobase + PCL816_CLRINT);
+ outb(0, dev->iobase + PCL816_CLRINT_REG);
}
static void pcl816_ai_soft_trig(struct comedi_device *dev)