Commit 99c9fa48 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_3501: move range_apci3501_ao to driver

Move the analog output range definition from hwdrv_apci3501.c into
the main driver file.

For aesthetic reasons, rename the range table so it has namespace
associated with the driver.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53b28a23
...@@ -64,14 +64,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour ...@@ -64,14 +64,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
#define ADDIDATA_TIMER 0 #define ADDIDATA_TIMER 0
#define ADDIDATA_WATCHDOG 2 #define ADDIDATA_WATCHDOG 2
/* ANALOG OUTPUT RANGE */
static struct comedi_lrange range_apci3501_ao = {
2, {
BIP_RANGE(10),
UNI_RANGE(10)
}
};
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ConfigAnalogOutput | | Function Name : int i_APCI3501_ConfigAnalogOutput |
......
...@@ -40,6 +40,13 @@ struct apci3501_private { ...@@ -40,6 +40,13 @@ struct apci3501_private {
unsigned char b_InterruptMode; unsigned char b_InterruptMode;
}; };
static struct comedi_lrange apci3501_ao_range = {
2, {
BIP_RANGE(10),
UNI_RANGE(10)
}
};
#include "addi-data/hwdrv_apci3501.c" #include "addi-data/hwdrv_apci3501.c"
static int apci3501_di_insn_bits(struct comedi_device *dev, static int apci3501_di_insn_bits(struct comedi_device *dev,
...@@ -274,7 +281,7 @@ static int apci3501_auto_attach(struct comedi_device *dev, ...@@ -274,7 +281,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = ao_n_chan; s->n_chan = ao_n_chan;
s->maxdata = 0x3fff; s->maxdata = 0x3fff;
s->range_table = &range_apci3501_ao; s->range_table = &apci3501_ao_range;
s->insn_config = i_APCI3501_ConfigAnalogOutput; s->insn_config = i_APCI3501_ConfigAnalogOutput;
s->insn_write = i_APCI3501_WriteAnalogOutput; s->insn_write = i_APCI3501_WriteAnalogOutput;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment