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

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

staging: comedi: addi_apci_3120: use comedi_async 'scans_done' to detect EOA 



Remove the private data member 'ai_AiActualScan' and use the comedi_async
'scans_done' member to detect the end-of-acquisition.

The function v_APCI3120_InterruptDmaMoveBlock16bit() is then just a wrapper
for comedi_buf_write_samples(). Remove it.

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 29ee9fba

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+6 −28
Original line number Diff line number Diff line
@@ -628,7 +628,6 @@ static int apci3120_cancel(struct comedi_device *dev, 
	/* Flush FIFO */

	inb(dev->iobase + APCI3120_RESET_FIFO);

	inw(dev->iobase + APCI3120_RD_STATUS);

	devpriv->ui_AiActualScan = 0;

	devpriv->ui_DmaActualBuffer = 0;



	devpriv->ai_running = 0;
@@ -756,7 +755,6 @@ static int apci3120_cyclic_ai(int mode, 
	inb(dev->iobase + APCI3120_RESET_FIFO);

	/* END JK 07.05.04: Comparison between WIN32 and Linux driver */



	devpriv->ui_AiActualScan = 0;

	devpriv->ui_DmaActualBuffer = 0;



	/* value for timer2  minus -2 has to be done */
@@ -1156,23 +1154,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev, 
	return apci3120_cyclic_ai(2, dev, s);

}



/*

 * This function copies the data from DMA buffer to the Comedi buffer.

 */

static void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,

						  struct comedi_subdevice *s,

						  unsigned short *dma_buffer,

						  unsigned int num_samples)

{

	struct apci3120_private *devpriv = dev->private;

	struct comedi_cmd *cmd = &s->async->cmd;



	devpriv->ui_AiActualScan +=

		(s->async->cur_chan + num_samples) / cmd->scan_end_arg;



	comedi_buf_write_samples(s, dma_buffer, num_samples);

}



/*

 * This is a handler for the DMA interrupt.

 * This function copies the data to Comedi Buffer.
@@ -1245,15 +1226,13 @@ static void apci3120_interrupt_dma(int irq, void *d) 


	}

	if (samplesinbuf) {

		v_APCI3120_InterruptDmaMoveBlock16bit(dev, s, dmabuf->virt,

						      samplesinbuf);

		comedi_buf_write_samples(s, dmabuf->virt, samplesinbuf);



		if (!(cmd->flags & CMDF_WAKE_EOS))

			s->async->events |= COMEDI_CB_EOS;

	}

	if (cmd->stop_src == TRIG_COUNT)

		if (devpriv->ui_AiActualScan >= cmd->stop_arg) {

			/*  all data sampled */

	if (cmd->stop_src == TRIG_COUNT &&

	    s->async->scans_done >= cmd->stop_arg) {

		s->async->events |= COMEDI_CB_EOA;

		return;

	}
@@ -1386,7 +1365,6 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 
			if (devpriv->ai_running) {

				ui_Check = 0;

				apci3120_interrupt_handle_eos(dev);

				devpriv->ui_AiActualScan++;

				devpriv->b_ModeSelectRegister =

					devpriv->

					b_ModeSelectRegister |

drivers/staging/comedi/drivers/addi_apci_3120.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct apci3120_dmabuf { 
struct apci3120_private {

	unsigned long amcc;

	unsigned long addon;

	unsigned int ui_AiActualScan;

	unsigned int ui_AiNbrofChannels;

	unsigned int ui_AiChannelList[32];

	unsigned int ui_AiReadData[32];