From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 18 Nov 2002 21:49:51 +0000 (+0000)
Subject: added udelay in ai read insn while waiting for conversion, added udelay between
X-Git-Tag: r0_7_66~43
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=921182d8fbaf38e5748c2c464a938135e53beef6;p=comedi.git

added udelay in ai read insn while waiting for conversion, added udelay between
writing lsb and msb of analog output (stab in the dark to get daqcard-1200 to work)
---

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 75cad1a6..62f81e7f 100644
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -1561,6 +1561,7 @@ static int labpc_ai_rinsn(comedi_device *dev, comedi_subdevice *s, comedi_insn *
 		{
 			if(thisboard->read_byte(dev->iobase + STATUS1_REG) & DATA_AVAIL_BIT)
 				break;
+			udelay( 1 );
 		}
 		if(i == timeout)
 		{
@@ -1585,6 +1586,8 @@ static int labpc_ao_winsn(comedi_device *dev, comedi_subdevice *s,
 	channel = CR_CHAN(insn->chanspec);
 
 	// turn off pacing of analog output channel
+	/* note: hardware bug in daqcard-1200 means pacing cannot
+	 * be independently enabled/disabled for its the two channels */
 	devpriv->command2_bits &= ~DAC_PACED_BIT(channel);
 	thisboard->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG);
 
@@ -1610,6 +1613,7 @@ static int labpc_ao_winsn(comedi_device *dev, comedi_subdevice *s,
 	lsb = data[0] & 0xff;
 	msb = (data[0] >> 8 ) & 0xff;
 	thisboard->write_byte(lsb, dev->iobase + DAC_LSB_REG(channel));
+	udelay( 1 );
 	thisboard->write_byte(msb, dev->iobase + DAC_MSB_REG(channel));
 
 	// remember value for readback