diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/das08.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/das08.c | 85 |
1 files changed, 34 insertions, 51 deletions
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index fcf916a80c8d..bdb671a66e22 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -217,7 +217,7 @@ static int das08_ai_eoc(struct comedi_device *dev, static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; struct das08_private_struct *devpriv = dev->private; int n; int chan; @@ -337,8 +337,7 @@ static int das08jr_do_wbits(struct comedi_device *dev, static void das08_ao_set_data(struct comedi_device *dev, unsigned int chan, unsigned int data) { - const struct das08_board_struct *thisboard = comedi_board(dev); - struct das08_private_struct *devpriv = dev->private; + const struct das08_board_struct *thisboard = dev->board_ptr; unsigned char lsb; unsigned char msb; @@ -355,54 +354,29 @@ static void das08_ao_set_data(struct comedi_device *dev, /* load DACs */ inb(dev->iobase + DAS08AO_AO_UPDATE); } - devpriv->ao_readback[chan] = data; -} - -static void das08_ao_initialize(struct comedi_device *dev, - struct comedi_subdevice *s) -{ - int n; - unsigned int data; - - data = s->maxdata / 2; /* should be about 0 volts */ - for (n = 0; n < s->n_chan; n++) - das08_ao_set_data(dev, n, data); -} - -static int das08_ao_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) -{ - unsigned int n; - unsigned int chan; - - chan = CR_CHAN(insn->chanspec); - - for (n = 0; n < insn->n; n++) - das08_ao_set_data(dev, chan, *data); - - return n; } -static int das08_ao_rinsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int das08_ao_insn_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { - struct das08_private_struct *devpriv = dev->private; - unsigned int n; - unsigned int chan; - - chan = CR_CHAN(insn->chanspec); + unsigned int chan = CR_CHAN(insn->chanspec); + unsigned int val = s->readback[chan]; + int i; - for (n = 0; n < insn->n; n++) - data[n] = devpriv->ao_readback[chan]; + for (i = 0; i < insn->n; i++) { + val = data[i]; + das08_ao_set_data(dev, chan, val); + } + s->readback[chan] = val; - return n; + return insn->n; } static void i8254_initialize(struct comedi_device *dev) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; unsigned int mode = I8254_MODE0 | I8254_BINARY; int i; @@ -415,7 +389,7 @@ static int das08_counter_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; @@ -427,7 +401,7 @@ static int das08_counter_write(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; @@ -439,7 +413,7 @@ static int das08_counter_config(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; @@ -458,10 +432,11 @@ static int das08_counter_config(struct comedi_device *dev, int das08_common_attach(struct comedi_device *dev, unsigned long iobase) { - const struct das08_board_struct *thisboard = comedi_board(dev); + const struct das08_board_struct *thisboard = dev->board_ptr; struct das08_private_struct *devpriv = dev->private; struct comedi_subdevice *s; int ret; + int i; dev->iobase = iobase; @@ -498,9 +473,18 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->n_chan = 2; s->maxdata = (1 << thisboard->ao_nbits) - 1; s->range_table = &range_bipolar5; - s->insn_write = das08_ao_winsn; - s->insn_read = das08_ao_rinsn; - das08_ao_initialize(dev, s); + s->insn_write = das08_ao_insn_write; + s->insn_read = comedi_readback_insn_read; + + ret = comedi_alloc_subdev_readback(s); + if (ret) + return ret; + + /* intialize all channels to 0V */ + for (i = 0; i < s->n_chan; i++) { + s->readback[i] = s->maxdata / 2; + das08_ao_set_data(dev, i, s->readback[i]); + } } else { s->type = COMEDI_SUBD_UNUSED; } @@ -536,8 +520,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s = &dev->subdevices[4]; /* 8255 */ if (thisboard->i8255_offset != 0) { - ret = subdev_8255_init(dev, s, NULL, - dev->iobase + thisboard->i8255_offset); + ret = subdev_8255_init(dev, s, NULL, thisboard->i8255_offset); if (ret) return ret; } else { |