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

staging: comedi: das1800: refactor program_chanlist() 

Refactor this function so it can be used to program the chanlist for
the analog input (*do_cmd) and (*insn_read).

Rename the function so it has namespace associated with the driver.

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 2016-04-08 12:41:50 -07:00 committed by Greg Kroah-Hartman
parent ceba8220df
commit 7b1924b6fc
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/staging/comedi/drivers/das1800.c
View File

@ -828,30 +828,33 @@ static void das1800_ai_setup_dma(struct comedi_device *dev,
} }
} }
/* programs channel/gain list into card */ static void das1800_ai_set_chanlist(struct comedi_device *dev,
static void program_chanlist(struct comedi_device *dev, unsigned int *chanlist, unsigned int len)
const struct comedi_cmd *cmd)
{ {
int i, n, chan_range; unsigned long flags;
unsigned long irq_flags; unsigned int i;
const int range_mask = 0x3; /* masks unipolar/bipolar bit off range */
const int range_bitshift = 8; /* protects the indirect addressing selected by DAS1800_SELECT */
spin_lock_irqsave(&dev->spinlock, flags);
/* select QRAM register and set start address */
outb(QRAM, dev->iobase + DAS1800_SELECT);
outb(len - 1, dev->iobase + DAS1800_QRAM_ADDRESS);
n = cmd->chanlist_len;
/* spinlock protects indirect addressing */
spin_lock_irqsave(&dev->spinlock, irq_flags);
outb(QRAM, dev->iobase + DAS1800_SELECT); /* select QRAM for baseAddress + 0x0 */
outb(n - 1, dev->iobase + DAS1800_QRAM_ADDRESS); /*set QRAM address start */
/* make channel / gain list */ /* make channel / gain list */
for (i = 0; i < n; i++) { for (i = 0; i < len; i++) {
chan_range = unsigned int chan = CR_CHAN(chanlist[i]);
CR_CHAN(cmd->chanlist[i]) | unsigned int range = CR_RANGE(chanlist[i]);
((CR_RANGE(cmd->chanlist[i]) & range_mask) << unsigned short val;
range_bitshift);
outw(chan_range, dev->iobase + DAS1800_QRAM); val = chan | ((range & 0x3) << 8);
outw(val, dev->iobase + DAS1800_QRAM);
} }
outb(n - 1, dev->iobase + DAS1800_QRAM_ADDRESS); /*finish write to QRAM */
spin_unlock_irqrestore(&dev->spinlock, irq_flags); /* finish write to QRAM */
outb(len - 1, dev->iobase + DAS1800_QRAM_ADDRESS);
spin_unlock_irqrestore(&dev->spinlock, flags);
} }
static int das1800_ai_cmd(struct comedi_device *dev, static int das1800_ai_cmd(struct comedi_device *dev,
@ -904,8 +907,7 @@ static int das1800_ai_cmd(struct comedi_device *dev,
control_c |= BMDE | XPCLK; control_c |= BMDE | XPCLK;
} }
/* setup card and start */ das1800_ai_set_chanlist(dev, cmd->chanlist, cmd->chanlist_len);
program_chanlist(dev, cmd);
/* setup cascaded counters for conversion/scan frequency */ /* setup cascaded counters for conversion/scan frequency */
if ((cmd->scan_begin_src == TRIG_FOLLOW || if ((cmd->scan_begin_src == TRIG_FOLLOW ||
@ -940,14 +942,12 @@ static int das1800_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec);
bool is_unipolar = comedi_range_is_unipolar(s, range); bool is_unipolar = comedi_range_is_unipolar(s, range);
int i, n; int i, n;
int chan_range;
int timeout = 1000; int timeout = 1000;
unsigned short dpnt; unsigned short dpnt;
unsigned long irq_flags; unsigned long flags;
outb(das1800_ai_chanspec_bits(s, insn->chanspec), outb(das1800_ai_chanspec_bits(s, insn->chanspec),
dev->iobase + DAS1800_CONTROL_C); /* software pacer */ dev->iobase + DAS1800_CONTROL_C); /* software pacer */
@ -955,13 +955,13 @@ static int das1800_ai_insn_read(struct comedi_device *dev,
outb(0x0, dev->iobase + DAS1800_CONTROL_A); /* reset fifo */ outb(0x0, dev->iobase + DAS1800_CONTROL_A); /* reset fifo */
outb(FFEN, dev->iobase + DAS1800_CONTROL_A); outb(FFEN, dev->iobase + DAS1800_CONTROL_A);
chan_range = chan | ((range & 0x3) << 8); das1800_ai_set_chanlist(dev, &insn->chanspec, 1);
spin_lock_irqsave(&dev->spinlock, irq_flags);
outb(QRAM, dev->iobase + DAS1800_SELECT); /* select QRAM for baseAddress + 0x0 */ /* protects the indirect addressing selected by DAS1800_SELECT */
outb(0x0, dev->iobase + DAS1800_QRAM_ADDRESS); /* set QRAM address start */ spin_lock_irqsave(&dev->spinlock, flags);
outw(chan_range, dev->iobase + DAS1800_QRAM);
outb(0x0, dev->iobase + DAS1800_QRAM_ADDRESS); /*finish write to QRAM */ /* select ai fifo register */
outb(ADC, dev->iobase + DAS1800_SELECT); /* select ADC for baseAddress + 0x0 */ outb(ADC, dev->iobase + DAS1800_SELECT);
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
/* trigger conversion */ /* trigger conversion */
@ -981,7 +981,7 @@ static int das1800_ai_insn_read(struct comedi_device *dev,
data[n] = dpnt; data[n] = dpnt;
} }
exit: exit:
spin_unlock_irqrestore(&dev->spinlock, irq_flags); spin_unlock_irqrestore(&dev->spinlock, flags);
return n; return n;
} }