Commit 87c4e2c6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_pcidda: cleanup DADATA define

Rename the define used for the D/A Data register so that is has
namespace with this driver. Change the define so that it takes
the channel as a parameter to calculate the correct register
offset.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be2fcdbf
......@@ -97,7 +97,7 @@
/* manual says to set this bit with no explanation */
#define DUMMY_BIT 0x40
#define DADATA 8 /* FIRST D/A DATA REGISTER (0) */
#define CB_DDA_DA_DATA_REG(x) (0x08 + ((x) * 2))
static const struct comedi_lrange cb_pcidda_ranges = {
6, {
......@@ -393,7 +393,7 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev,
outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG);
/* write data */
outw(data[0], dev->iobase + DADATA + channel * 2);
outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel));
/* return the number of samples read/written */
return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment