Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354446
b: refs/heads/master
c: 9a23a74
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 3518336 commit 0195422
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 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: 75a45d924dd33882caf80d3a78dd96c370a6580b
refs/heads/master: 9a23a7481ea860096acbc032dcb1159b8864fbf5
36 changes: 18 additions & 18 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ struct vmk80xx_board {
int ao_nchans;
int di_nchans;
unsigned int cnt_maxdata;
__u8 pwm_chans;
__le16 pwm_bits;
int pwm_nchans;
unsigned int pwm_maxdata;
};

static const struct vmk80xx_board vmk80xx_boardinfo[] = {
Expand All @@ -178,8 +178,6 @@ static const struct vmk80xx_board vmk80xx_boardinfo[] = {
.ao_nchans = 2,
.di_nchans = 6,
.cnt_maxdata = 0xffff,
.pwm_chans = 0,
.pwm_bits = 0,
},
[DEVICE_VMK8061] = {
.name = "K8061 (VM140)",
Expand All @@ -190,8 +188,8 @@ static const struct vmk80xx_board vmk80xx_boardinfo[] = {
.ao_nchans = 8,
.di_nchans = 8,
.cnt_maxdata = 0, /* unknown, device is not writeable */
.pwm_chans = 1,
.pwm_bits = 10,
.pwm_nchans = 1,
.pwm_maxdata = 0x03ff,
},
};

Expand Down Expand Up @@ -1043,9 +1041,10 @@ static int vmk80xx_cnt_insn_write(struct comedi_device *dev,
return n;
}

static int vmk80xx_pwm_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int vmk80xx_pwm_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct vmk80xx_private *devpriv = dev->private;
unsigned char *tx_buf;
Expand Down Expand Up @@ -1079,9 +1078,10 @@ static int vmk80xx_pwm_rinsn(struct comedi_device *dev,
return n;
}

static int vmk80xx_pwm_winsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int vmk80xx_pwm_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct vmk80xx_private *devpriv = dev->private;
unsigned char *tx_buf;
Expand Down Expand Up @@ -1265,12 +1265,12 @@ static int vmk80xx_attach_common(struct comedi_device *dev)
/* PWM subdevice */
if (devpriv->model == VMK8061_MODEL) {
s = &dev->subdevices[5];
s->type = COMEDI_SUBD_PWM;
s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
s->n_chan = boardinfo->pwm_chans;
s->maxdata = (1 << boardinfo->pwm_bits) - 1;
s->insn_read = vmk80xx_pwm_rinsn;
s->insn_write = vmk80xx_pwm_winsn;
s->type = COMEDI_SUBD_PWM;
s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
s->n_chan = boardinfo->pwm_nchans;
s->maxdata = boardinfo->pwm_maxdata;
s->insn_read = vmk80xx_pwm_insn_read;
s->insn_write = vmk80xx_pwm_insn_write;
}

up(&devpriv->limit_sem);
Expand Down

0 comments on commit 0195422

Please sign in to comment.