openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: move ai range table to driver source 

Move the analog input comedi_lrange table from the included hwdrv_apci3120.c
source file to the main driver source file.

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>
This commit is contained in:
H Hartley Sweeten 2014-11-04 10:54:12 -07:00 committed by Greg Kroah-Hartman
parent d0bb66aa08
commit 6ef6803255
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@ -125,20 +125,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
#define APCI3120_TIMER2_SELECT_EOS 0xc0 #define APCI3120_TIMER2_SELECT_EOS 0xc0
#define APCI3120_COUNTER 3 #define APCI3120_COUNTER 3
/* ANALOG INPUT RANGE */
static const struct comedi_lrange range_apci3120_ai = {
8, {
BIP_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(2),
BIP_RANGE(1),
UNI_RANGE(10),
UNI_RANGE(5),
UNI_RANGE(2),
UNI_RANGE(1)
}
};
static int apci3120_ai_insn_config(struct comedi_device *dev, static int apci3120_ai_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,

15
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@ -53,6 +53,19 @@
#define APCI3120_REVA_OSC_BASE 70 /* 70ns = 14.29MHz */ #define APCI3120_REVA_OSC_BASE 70 /* 70ns = 14.29MHz */
#define APCI3120_REVB_OSC_BASE 50 /* 50ns = 20MHz */ #define APCI3120_REVB_OSC_BASE 50 /* 50ns = 20MHz */
static const struct comedi_lrange apci3120_ai_range = {
8, {
BIP_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(2),
BIP_RANGE(1),
UNI_RANGE(10),
UNI_RANGE(5),
UNI_RANGE(2),
UNI_RANGE(1)
}
};
enum apci3120_boardid { enum apci3120_boardid {
BOARD_APCI3120, BOARD_APCI3120,
BOARD_APCI3001, BOARD_APCI3001,
@ -355,7 +368,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
s->n_chan = 16; s->n_chan = 16;
s->maxdata = this_board->ai_is_16bit ? 0xffff : 0x0fff; s->maxdata = this_board->ai_is_16bit ? 0xffff : 0x0fff;
s->range_table = &range_apci3120_ai; s->range_table = &apci3120_ai_range;
s->insn_config = apci3120_ai_insn_config; s->insn_config = apci3120_ai_insn_config;
s->insn_read = apci3120_ai_insn_read; s->insn_read = apci3120_ai_insn_read;
if (0 /* dev->irq */) { if (0 /* dev->irq */) {