diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-03-04 22:30:27 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-07 05:06:19 +0400 |
| commit | bc7d7fc0e377c5028bb3d2945a5d4a3162c461dc (patch) | |
| tree | 11ff553047971048edbc8223f888ad3854218f49 | |
| parent | 708df4c4491ccbe70748de56fbd9ee239b22e751 (diff) | |
| download | linux-bc7d7fc0e377c5028bb3d2945a5d4a3162c461dc.tar.xz | |
staging: comedi: pcl818: clarify pcl818_reset()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl818.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index a2d65e429709..d4d5c384aa1b 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -1004,6 +1004,7 @@ static void pcl818_reset(struct comedi_device *dev) { const struct pcl818_board *board = comedi_board(dev); unsigned long timer_base = dev->iobase + PCL818_TIMER_BASE; + unsigned int chan; /* flush and disable the 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_ENABLE); } - /* set analog output channel 0 to 0V */ - outb(0, dev->iobase + PCL818_AO_LSB_REG(0)); - 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); + + /* disable analog input trigger */ 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); - /* 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, 1, I8254_MODE0 | I8254_BINARY); i8254_set_mode(timer_base, 0, 0, I8254_MODE0 | I8254_BINARY); - if (board->is_818) { - outb(0, dev->iobase + PCL818_RANGE_REG); - } else { - /* set analog output channel 1 to 0V */ - outb(0, dev->iobase + PCL818_AO_LSB_REG(1)); - outb(0, dev->iobase + PCL818_AO_MSB_REG(1)); + /* set analog output channels to 0V */ + for (chan = 0; chan < board->n_aochan; chan++) { + outb(0, dev->iobase + PCL818_AO_LSB_REG(chan)); + outb(0, dev->iobase + PCL818_AO_MSB_REG(chan)); } + + /* 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, |