---

yaml --- r: 167287 b: refs/heads/master c: 078a10d h: refs/heads/master i: 167285: 9978464 167283: d179861 167279: 81933b2 v: v3
git-mirror · Oct 9, 2009 · a9743c7 · a9743c7
1 parent cdfe821
commit a9743c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b49d7c40ec0806d93ced89ac6039ddcf223dea7
+refs/heads/master: 078a10df24ac87d18c2d52fb501ff652f481fb5b
diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
@@ -457,6 +457,12 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
 		port_read_bits =
 		    readb(private(dev)->mite->daq_io_addr + Port_Data(port));
 /* printk("read 0x%x from port %i\n", port_read_bits, port); */
+		if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) {
+			/* Outputs inverted, so invert value read back from
+			 * DO subdevice.  (Does not apply to boards with DIO
+			 * subdevice.) */
+			port_read_bits ^= 0xFF;
+		}
 		if (bitshift > 0) {
 			port_read_bits <<= bitshift;
 		} else {