Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354448
b: refs/heads/master
c: a348b72
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 3709955 commit ce2208b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 51 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 03754bdbb10a8045b2c18cfec8f2272d7df004c6
refs/heads/master: a348b72eae946dd5d2cc9e00c4344c7814979eb0
50 changes: 0 additions & 50 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,55 +750,6 @@ static int vmk80xx_di_insn_read(struct comedi_device *dev,
return n;
}

static int vmk80xx_do_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct vmk80xx_private *devpriv = dev->private;
int chan;
unsigned char *tx_buf;
int reg;
int cmd;
int n;

n = rudimentary_check(devpriv, DIR_OUT);
if (n)
return n;

down(&devpriv->limit_sem);
chan = CR_CHAN(insn->chanspec);

tx_buf = devpriv->usb_tx_buf;

for (n = 0; n < insn->n; n++) {
if (devpriv->model == VMK8055_MODEL) {
reg = VMK8055_DO_REG;
cmd = VMK8055_CMD_WRT_AD;
if (data[n] == 1)
tx_buf[reg] |= (1 << chan);
else
tx_buf[reg] ^= (1 << chan);
} else { /* VMK8061_MODEL */
reg = VMK8061_DO_REG;
if (data[n] == 1) {
cmd = VMK8061_CMD_SET_DO;
tx_buf[reg] = 1 << chan;
} else {
cmd = VMK8061_CMD_CLR_DO;
tx_buf[reg] = 0xff - (1 << chan);
}
}

if (vmk80xx_write_packet(devpriv, cmd))
break;
}

up(&devpriv->limit_sem);

return n;
}

static int vmk80xx_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
Expand Down Expand Up @@ -1209,7 +1160,6 @@ static int vmk80xx_attach_common(struct comedi_device *dev)
s->n_chan = 8;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_write = vmk80xx_do_insn_write;
s->insn_bits = vmk80xx_do_insn_bits;

/* Counter subdevice */
Expand Down

0 comments on commit ce2208b

Please sign in to comment.