evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcl818: clarify pcl818_reset()

Browse source 
Like done in the pcl812 driver, use the boardinfo to determine what
should be reset.

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-03-04 11:30:27 -07:00 • committed by Greg Kroah-Hartman
parent 708df4c449
commit bc7d7fc0e3
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/comedi/drivers/pcl818.c
View file

@ -1004,6 +1004,7 @@ static void pcl818_reset(struct comedi_device *dev)
{ {
const struct pcl818_board *board = comedi_board(dev); const struct pcl818_board *board = comedi_board(dev);
unsigned long timer_base = dev->iobase + PCL818_TIMER_BASE; unsigned long timer_base = dev->iobase + PCL818_TIMER_BASE;
unsigned int chan;
/* flush and disable the FIFO */ /* flush and disable the FIFO */
if (board->has_fifo) { if (board->has_fifo) {
@ -1011,30 +1012,28 @@ static void pcl818_reset(struct comedi_device *dev)
outb(0, dev->iobase + PCL818_FI_FLUSH); outb(0, dev->iobase + PCL818_FI_FLUSH);
outb(0, dev->iobase + PCL818_FI_ENABLE); outb(0, dev->iobase + PCL818_FI_ENABLE);
} }
/* set analog output channel 0 to 0V */
outb(0, dev->iobase + PCL818_AO_LSB_REG(0)); /* disable analog input trigger */
outb(0, dev->iobase + PCL818_AO_MSB_REG(0));
udelay(1);
outb(0, dev->iobase + PCL818_DO_DI_MSB_REG);
outb(0, dev->iobase + PCL818_DO_DI_LSB_REG);
udelay(1);
outb(PCL818_CTRL_DISABLE_TRIG, dev->iobase + PCL818_CTRL_REG); outb(PCL818_CTRL_DISABLE_TRIG, dev->iobase + PCL818_CTRL_REG);
outb(PCL818_CNTENABLE_PACER_ENA, dev->iobase + PCL818_CNTENABLE_REG);
outb(0, dev->iobase + PCL818_MUX_REG);
pcl818_ai_clear_eoc(dev); pcl818_ai_clear_eoc(dev);
/* Stop pacer */ pcl818_ai_set_chan_range(dev, 0, 0);
/* stop pacer */
outb(PCL818_CNTENABLE_PACER_ENA, dev->iobase + PCL818_CNTENABLE_REG);
i8254_set_mode(timer_base, 0, 2, I8254_MODE0 | I8254_BINARY); i8254_set_mode(timer_base, 0, 2, I8254_MODE0 | I8254_BINARY);
i8254_set_mode(timer_base, 0, 1, I8254_MODE0 | I8254_BINARY); i8254_set_mode(timer_base, 0, 1, I8254_MODE0 | I8254_BINARY);
i8254_set_mode(timer_base, 0, 0, I8254_MODE0 | I8254_BINARY); i8254_set_mode(timer_base, 0, 0, I8254_MODE0 | I8254_BINARY);
if (board->is_818) { /* set analog output channels to 0V */
outb(0, dev->iobase + PCL818_RANGE_REG); for (chan = 0; chan < board->n_aochan; chan++) {
} else { outb(0, dev->iobase + PCL818_AO_LSB_REG(chan));
/* set analog output channel 1 to 0V */ outb(0, dev->iobase + PCL818_AO_MSB_REG(chan));
outb(0, dev->iobase + PCL818_AO_LSB_REG(1));
outb(0, dev->iobase + PCL818_AO_MSB_REG(1));
} }
/* set all digital outputs low */
outb(0, dev->iobase + PCL818_DO_DI_MSB_REG);
outb(0, dev->iobase + PCL818_DO_DI_LSB_REG);
} }
static void pcl818_set_ai_range_table(struct comedi_device *dev, static void pcl818_set_ai_range_table(struct comedi_device *dev,