Commit 65a62aae authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: das1800: sample types are unsigned

Sample values in comedi are generally represented by unsigned values.
Change the type of the `ao_update_bits` member of `struct
das1800_private` and the types of various local variables used to hold
sample values from `short` to `unsigned short` for consistency.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eabbf3f4
...@@ -438,7 +438,8 @@ struct das1800_private { ...@@ -438,7 +438,8 @@ struct das1800_private {
uint16_t *dma_current_buf; /* pointer to dma buffer currently being used */ uint16_t *dma_current_buf; /* pointer to dma buffer currently being used */
unsigned int dma_transfer_size; /* size of transfer currently used, in bytes */ unsigned int dma_transfer_size; /* size of transfer currently used, in bytes */
unsigned long iobase2; /* secondary io address used for analog out on 'ao' boards */ unsigned long iobase2; /* secondary io address used for analog out on 'ao' boards */
short ao_update_bits; /* remembers the last write to the 'update' dac */ unsigned short ao_update_bits; /* remembers the last write to the
* 'update' dac */
}; };
/* analog out range for 'ao' boards */ /* analog out range for 'ao' boards */
...@@ -501,7 +502,7 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev, ...@@ -501,7 +502,7 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct das1800_private *devpriv = dev->private; struct das1800_private *devpriv = dev->private;
short dpnt; unsigned short dpnt;
int unipolar; int unipolar;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
...@@ -1211,7 +1212,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev, ...@@ -1211,7 +1212,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
int i, n; int i, n;
int chan, range, aref, chan_range; int chan, range, aref, chan_range;
int timeout = 1000; int timeout = 1000;
short dpnt; unsigned short dpnt;
int conv_flags = 0; int conv_flags = 0;
unsigned long irq_flags; unsigned long irq_flags;
...@@ -1276,7 +1277,7 @@ static int das1800_ao_winsn(struct comedi_device *dev, ...@@ -1276,7 +1277,7 @@ static int das1800_ao_winsn(struct comedi_device *dev,
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
/* int range = CR_RANGE(insn->chanspec); */ /* int range = CR_RANGE(insn->chanspec); */
int update_chan = thisboard->ao_n_chan - 1; int update_chan = thisboard->ao_n_chan - 1;
short output; unsigned short output;
unsigned long irq_flags; unsigned long irq_flags;
/* card expects two's complement data */ /* card expects two's complement data */
......
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