From: Ian Abbott <abbotti@mev.co.uk>
Date: Thu, 21 Feb 2008 12:36:10 +0000 (+0000)
Subject: Changed subdev_700_insn to include the state of the output channels
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cc7791d3825e091ee19cf4df48d02bd07bc6014f;p=comedi.git

Changed subdev_700_insn to include the state of the output channels
(0 to 7) in the returned data.  This may be inaccurate unless the output
channels have been written at least once.
---

diff --git a/comedi/drivers/ni_daq_700.c b/comedi/drivers/ni_daq_700.c
index f33f8b54..e12603ec 100644
--- a/comedi/drivers/ni_daq_700.c
+++ b/comedi/drivers/ni_daq_700.c
@@ -166,7 +166,8 @@ static int subdev_700_insn(comedi_device * dev, comedi_subdevice * s,
 				CALLBACK_ARG);
 	}
 
-	data[1] = CALLBACK_FUNC(0, _700_DATA, 0, CALLBACK_ARG) << 8;	/* shift bits to 8-15 */
+	data[1] = s->state & 0xff;
+	data[1] |= CALLBACK_FUNC(0, _700_DATA, 0, CALLBACK_ARG) << 8;
 
 	return 2;
 }