From: David Schleef <ds@schleef.org>
Date: Wed, 26 Nov 2003 21:36:43 +0000 (+0000)
Subject: Fixes from Nils Juergens <ju@isf.rwth-aachen.de>
X-Git-Tag: r0_7_69~156
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aa7d41f6ea7a70c827469e261dca7a7bc575f093;p=comedi.git

Fixes from Nils Juergens <ju@isf.rwth-aachen.de>
---

diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index ea297d2b..1fe2e30f 100644
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -599,6 +599,11 @@ static void interrupt_pci1710_every_sample(void *d)
 #else
 		comedi_buf_put( s->async, inw(dev->iobase+PCI171x_AD_DATA) & 0x0fff);
 #endif
+		++s->async->cur_chan;
+
+		if(s->async->cur_chan>=devpriv->ai_n_chan){
+			s->async->cur_chan=0;
+		}
 
 		if(s->async->cur_chan == 0){	// one scan done
 		        devpriv->ai_act_scan++;
@@ -724,7 +729,9 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d, struct pt_regs *r
 
 	if (devpriv->ai_et) {	// Switch from initial TRIG_EXT to TRIG_xxx.
 		devpriv->ai_et = 0;
-		outw(Control_SW, dev->iobase+PCI171x_CONTROL);
+		devpriv->CntrlReg&=Control_CNT0;
+		devpriv->CntrlReg|=Control_SW;  // set software trigger
+		outw(devpriv->CntrlReg, dev->iobase+PCI171x_CONTROL);
 		devpriv->CntrlReg=devpriv->ai_et_CntrlReg;
 		outb(0,dev->iobase + PCI171x_CLRFIFO);
 		outb(0,dev->iobase + PCI171x_CLRINT);