Skip to content

Commit

Permalink
comedi vmk80xx: simplify rinsn output calculation
Browse files Browse the repository at this point in the history
vmk80xx_di_rinsn() and vmk80xx_do_rinsn() extract the required channel
data by inconsistent and overly-complex algorithms. Simplify them both.

Signed-off-by: J. Ali Harlow <ali@avrc.city.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
J. Ali Harlow authored and Greg Kroah-Hartman committed May 18, 2011
1 parent 85a2f34 commit 9dc9989
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ static int vmk80xx_di_rinsn(struct comedi_device *cdev,
else
inp = rx_buf[reg];

data[n] = ((inp & (1 << chan)) > 0);
data[n] = (inp >> chan) & 1;
}

up(&dev->limit_sem);
Expand Down Expand Up @@ -812,7 +812,6 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev,
struct vmk80xx_usb *dev = cdev->private;
int chan;
int reg;
int mask;
int n;

dbgvm("vmk80xx: %s\n", __func__);
Expand All @@ -825,15 +824,14 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev,
chan = CR_CHAN(insn->chanspec);

reg = VMK8061_DO_REG;
mask = 1 << chan;

dev->usb_tx_buf[0] = VMK8061_CMD_RD_DO;

for (n = 0; n < insn->n; n++) {
if (vmk80xx_read_packet(dev))
break;

data[n] = (dev->usb_rx_buf[reg] & mask) >> chan;
data[n] = (dev->usb_rx_buf[reg] >> chan) & 1;
}

up(&dev->limit_sem);
Expand Down

0 comments on commit 9dc9989

Please sign in to comment.