Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec1a266 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci230: use comedi_buf_read_samples() 



Use comedi_buf_read_samples() to read the analog output samples from
the async buffer. That function will set the COMEDI_CB_BLOCK event
when samples are read from the async buffer. In addition, the core
will also handle the end-of-scan detection and set the COMEDI_CB_EOS
event.

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 e14c6a60

drivers/staging/comedi/drivers/amplc_pci230.c

+8 −9
Original line number Diff line number Diff line
@@ -1075,26 +1075,25 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev, 
				    struct comedi_subdevice *s)

{

	struct pci230_private *devpriv = dev->private;

	unsigned short data;

	int i, ret;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;

	unsigned short data;

	int i;



	if (cmd->stop_src == TRIG_COUNT && devpriv->ao_scan_count == 0)

		return;



	for (i = 0; i < cmd->chanlist_len; i++) {

		unsigned int chan = CR_CHAN(cmd->chanlist[i]);



		/* Read sample from Comedi's circular buffer. */

		ret = comedi_buf_get(s, &data);

		if (ret == 0) {

			s->async->events |= COMEDI_CB_OVERFLOW;

		if (!comedi_buf_read_samples(s, &data, 1)) {

			async->events |= COMEDI_CB_OVERFLOW;

			return;

		}

		pci230_ao_write_nofifo(dev, data, chan);

		s->readback[chan] = data;

	}

	async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;



	if (cmd->stop_src == TRIG_COUNT) {

		devpriv->ao_scan_count--;

		if (devpriv->ao_scan_count == 0) {
@@ -1171,12 +1170,12 @@ static bool pci230_handle_ao_fifo(struct comedi_device *dev, 
				unsigned int chan = CR_CHAN(cmd->chanlist[i]);

				unsigned short datum;



				comedi_buf_get(s, &datum);

				comedi_buf_read_samples(s, &datum, 1);

				pci230_ao_write_fifo(dev, datum, chan);

				s->readback[chan] = datum;

			}

		}

		events |= COMEDI_CB_EOS | COMEDI_CB_BLOCK;



		if (cmd->stop_src == TRIG_COUNT) {

			devpriv->ao_scan_count -= num_scans;

			if (devpriv->ao_scan_count == 0) {