diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/dmm32at.c')
-rw-r--r-- | drivers/staging/comedi/drivers/dmm32at.c | 69 |
1 files changed, 24 insertions, 45 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index e9cd2517ad81..7215e09305cf 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -47,9 +47,10 @@ Configuration Options: #define DMM32AT_AILOW 0x02 #define DMM32AT_AIHIGH 0x03 -#define DMM32AT_DACLSB 0x04 #define DMM32AT_DACSTAT 0x04 -#define DMM32AT_DACMSB 0x05 +#define DMM32AT_DACLSB_REG 0x04 +#define DMM32AT_DACMSB_REG 0x05 +#define DMM32AT_DACMSB_CHAN(x) ((x) << 6) #define DMM32AT_FIFOCNTRL 0x07 #define DMM32AT_FIFOSTAT 0x07 @@ -150,15 +151,10 @@ static const struct comedi_lrange dmm32at_aoranges = { }; struct dmm32at_private { - int data; int ai_inuse; unsigned int ai_scans_left; - - /* Used for AO readback */ - unsigned int ao_readback[4]; unsigned char dio_config; - }; static int dmm32at_ai_status(struct comedi_device *dev, @@ -540,56 +536,35 @@ static int dmm32at_ao_eoc(struct comedi_device *dev, return -EBUSY; } -static int dmm32at_ao_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int dmm32at_ao_insn_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { - struct dmm32at_private *devpriv = dev->private; + unsigned int chan = CR_CHAN(insn->chanspec); int i; - int chan = CR_CHAN(insn->chanspec); - unsigned char hi, lo, status; - int ret; - /* Writing a list of values to an AO channel is probably not - * very useful, but that's how the interface is defined. */ for (i = 0; i < insn->n; i++) { + unsigned int val = data[i]; + int ret; - devpriv->ao_readback[chan] = data[i]; - - /* get the low byte */ - lo = data[i] & 0x00ff; - /* high byte also contains channel number */ - hi = (data[i] >> 8) + chan * (1 << 6); - /* write the low and high values to the board */ - outb(lo, dev->iobase + DMM32AT_DACLSB); - outb(hi, dev->iobase + DMM32AT_DACMSB); + /* write LSB then MSB + chan to load DAC */ + outb(val & 0xff, dev->iobase + DMM32AT_DACLSB_REG); + outb((val >> 8) | DMM32AT_DACMSB_CHAN(chan), + dev->iobase + DMM32AT_DACMSB_REG); /* wait for circuit to settle */ ret = comedi_timeout(dev, s, insn, dmm32at_ao_eoc, 0); if (ret) return ret; - /* dummy read to update trigger the output */ - status = inb(dev->iobase + DMM32AT_DACMSB); + /* dummy read to update DAC */ + inb(dev->iobase + DMM32AT_DACMSB_REG); + s->readback[chan] = val; } - /* return the number of samples read/written */ - return i; -} - -static int dmm32at_ao_rinsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) -{ - struct dmm32at_private *devpriv = dev->private; - int i; - int chan = CR_CHAN(insn->chanspec); - - for (i = 0; i < insn->n; i++) - data[i] = devpriv->ao_readback[chan]; - - return i; + return insn->n; } static int dmm32at_dio_insn_bits(struct comedi_device *dev, @@ -764,8 +739,12 @@ static int dmm32at_attach(struct comedi_device *dev, s->n_chan = 4; s->maxdata = 0x0fff; s->range_table = &dmm32at_aoranges; - s->insn_write = dmm32at_ao_winsn; - s->insn_read = dmm32at_ao_rinsn; + s->insn_write = dmm32at_ao_insn_write; + s->insn_read = comedi_readback_insn_read; + + ret = comedi_alloc_subdev_readback(s); + if (ret) + return ret; s = &dev->subdevices[2]; /* digital i/o subdevice */ |