From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Wed, 12 Mar 2003 15:58:26 +0000 (+0000)
Subject: ripped out some settling delays
X-Git-Tag: r0_7_67x~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2417ac4c2953e568ae66b673712d92e003cb659c;p=comedi.git

ripped out some settling delays
---

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 013e11af..c1e85b36 100644
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -518,9 +518,6 @@ static int pci230_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *i
 	/* Specify uni/bip, se/diff, s/w conversion, and reset FIFO (even though we're not using it - MEV says so). */
 	outw_p(adccon, dev->iobase + PCI230_ADCCON);
 
-	/* Wait for mux to settle */
-	udelay(PCI230_MUX_SETTLE);
-
 	/* Convert n samples */
 	for(n=0;n<insn->n;n++){
 		/* trigger conversion */
@@ -571,14 +568,6 @@ static int pci230_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *i
 
 		/* Write value to DAC. */
 		pci230_ao_write(dev, data[i], chan);
-
-#if 0
-		/* XXX screw the user.  Only do this if the board gets upset if you don't */
-		/* If we're writing more than one sample, wait for output to settle between successive writes */
-		if (insn->n > 1) {
-	    	udelay(PCI230_DAC_SETTLE);
-		}
-#endif
 	}
 
 	/* return the number of samples read/written */
diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c
index 4bbe8bae..896747ae 100644
--- a/comedi/drivers/cb_pcimdas.c
+++ b/comedi/drivers/cb_pcimdas.c
@@ -467,9 +467,6 @@ static int cb_pcimdas_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_ins
 	chanlims=chan | (chan<<4);
 	outb(chanlims,devpriv->BADR3+0);
 
-	/* wait for mux to settle */
-	udelay(10); //docs say wait 10µs
-
 	/* convert n samples */
 	for(n=0;n<insn->n;n++){
 		/* trigger conversion */
diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 6bc999dc..16f9fce0 100644
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -556,9 +556,6 @@ static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
 		outb(devpriv->pg_gainlist[range],dev->iobase+DAS08AO_GAIN_CONTROL);
 	}
 
-	/* wait for MUX to settle */
-	udelay(2);
-
 	for(n=0;n<insn->n;n++){
 		/* clear over-range bits for 16-bit boards */
 		if (thisboard->ai_nbits == 16)