diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-09 15:30:43 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 10:01:50 -0800 |
| commit | 2d314558d7748b233305f9719a4208640c831054 (patch) | |
| tree | ac77d14d781b5d6160317932d187c7362526dc08 | |
| parent | staging: comedi: pcmmio: return error if ai conversion times out (diff) | |
staging: comedi: pcmmio: define the offset to the 2nd ADC device
There are two ADC devices on this board. The first one handles ai
channels 0-7 and the second one channels 8-15.
Define the offset that is added to the iobase to access the 2nd
ADC device.
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/pcmmio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 5ff0e3ad4c1c..52f10851fef2 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -99,6 +99,7 @@ Configuration Options: #define PCMMIO_AI_STATUS_REG_SEL (1 << 3) #define PCMMIO_AI_STATUS_CMD_DRQ_ENA (1 << 1) #define PCMMIO_AI_STATUS_IRQ_ENA (1 << 0) +#define PCMMIO_AI_2ND_ADC_OFFSET 0x04 /* This stuff is all from pcmuio.c -- it refers to the DIO subdevices only */ #define CHANS_PER_PORT 8 @@ -815,7 +816,7 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev, if (chan > 7) { chan -= 8; - iobase += 0x4; + iobase += PCMMIO_AI_2ND_ADC_OFFSET; } if (aref == AREF_GROUND) |