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

staging: comedi: dt282x: fix bug where DIO direction is reset to inputs

The direction of the 16 DIO channels is controlled with two bits in the
DACSR register. The HBOE bit controls the direction of channels 15-8 and
the LBOE bit channels 7-0.

The DACSR register is also used to control the Analog Output async command
support. Currently, starting or canceling an Analog Output command would
also reset the DIO directions so that all channels were inputs.

Fix the driver so that the DIO direction is not changed when starting or
canceling an Analog Output async command.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f8e8c5a
...@@ -993,9 +993,12 @@ static int dt282x_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -993,9 +993,12 @@ static int dt282x_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
outw(devpriv->divisor, dev->iobase + DT2821_TMRCTR_REG); outw(devpriv->divisor, dev->iobase + DT2821_TMRCTR_REG);
devpriv->dacsr = DT2821_DACSR_SSEL | /* clear all bits but the DIO direction bits */
DT2821_DACSR_DACLK | devpriv->dacsr &= (DT2821_DACSR_LBOE | DT2821_DACSR_HBOE);
DT2821_DACSR_IDARDY;
devpriv->dacsr |= (DT2821_DACSR_SSEL |
DT2821_DACSR_DACLK |
DT2821_DACSR_IDARDY);
outw(devpriv->dacsr, dev->iobase + DT2821_DACSR_REG); outw(devpriv->dacsr, dev->iobase + DT2821_DACSR_REG);
s->async->inttrig = dt282x_ao_inttrig; s->async->inttrig = dt282x_ao_inttrig;
...@@ -1010,7 +1013,9 @@ static int dt282x_ao_cancel(struct comedi_device *dev, ...@@ -1010,7 +1013,9 @@ static int dt282x_ao_cancel(struct comedi_device *dev,
dt282x_disable_dma(dev); dt282x_disable_dma(dev);
devpriv->dacsr = 0; /* clear all bits but the DIO direction bits */
devpriv->dacsr &= (DT2821_DACSR_LBOE | DT2821_DACSR_HBOE);
outw(devpriv->dacsr, dev->iobase + DT2821_DACSR_REG); outw(devpriv->dacsr, dev->iobase + DT2821_DACSR_REG);
devpriv->supcsr = 0; devpriv->supcsr = 0;
......
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