Commit fc110df6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbdux: tidy up usbdux_dio_insn_config()

Tidy up this function a bit.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a226948
...@@ -1273,32 +1273,30 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1273,32 +1273,30 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
static int usbdux_dio_insn_config(struct comedi_device *dev, static int usbdux_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
int chan = CR_CHAN(insn->chanspec); unsigned int mask = 1 << CR_CHAN(insn->chanspec);
/* The input or output configuration of each digital line is
* configured by a special insn_config instruction. chanspec
* contains the channel to be changed, and data[0] contains the
* value COMEDI_INPUT or COMEDI_OUTPUT. */
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_DIO_OUTPUT: case INSN_CONFIG_DIO_OUTPUT:
s->io_bits |= 1 << chan; /* 1 means Out */ s->io_bits |= mask;
break; break;
case INSN_CONFIG_DIO_INPUT: case INSN_CONFIG_DIO_INPUT:
s->io_bits &= ~(1 << chan); s->io_bits &= ~mask;
break; break;
case INSN_CONFIG_DIO_QUERY: case INSN_CONFIG_DIO_QUERY:
data[1] = data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT;
(s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT;
break; break;
default: default:
return -EINVAL; return -EINVAL;
break; break;
} }
/* we don't tell the firmware here as it would take 8 frames */
/* to submit the information. We do it in the insn_bits. */ /*
* We don't tell the firmware here as it would take 8 frames
* to submit the information. We do it in the insn_bits.
*/
return insn->n; return insn->n;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment