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 f33f8b541680c470e999c365083b2bdb84ef704f..e12603ecdfd99afe566e6477e627a2c95a6b2a5a 100644 (file)
--- 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;
 }