evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: s626: sample types are unsigned

Browse source 
Sample values in comedi are generally represented as unsigned values.
Use unsigned types consistently in the "s626" module when dealing with
sample values.

Rewrite `s626_reg_to_uint()` as it can be done with a one-liner.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2013-10-16 14:40:36 +01:00 • committed by Greg Kroah-Hartman
parent 055a1e2c56
commit 5fd4b711be
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/comedi/drivers/s626.c
View file

@ -494,7 +494,7 @@ static void s626_send_dac(struct comedi_device *dev, uint32_t val)
* Private helper function: Write setpoint to an application DAC channel. * Private helper function: Write setpoint to an application DAC channel.
*/ */
static void s626_set_dac(struct comedi_device *dev, uint16_t chan, static void s626_set_dac(struct comedi_device *dev, uint16_t chan,
short dacdata) unsigned short dacdata)
{ {
struct s626_private *devpriv = dev->private; struct s626_private *devpriv = dev->private;
uint16_t signmask; uint16_t signmask;
@ -1329,17 +1329,9 @@ static const struct s626_enc_info s626_enc_chan_info[] = {
}, },
}; };
static unsigned int s626_ai_reg_to_uint(int data) static unsigned int s626_ai_reg_to_uint(unsigned int data)
{ {
unsigned int tempdata; return ((data >> 18) & 0x3fff) ^ 0x2000;
tempdata = (data >> 18);
if (tempdata & 0x2000)
tempdata &= 0x1fff;
else
tempdata += (1 << 13);
return tempdata;
} }
static int s626_dio_set_irq(struct comedi_device *dev, unsigned int chan) static int s626_dio_set_irq(struct comedi_device *dev, unsigned int chan)
@ -1545,19 +1537,19 @@ static bool s626_handle_eos_interrupt(struct comedi_device *dev)
* first uint16_t in the buffer because it contains junk data * first uint16_t in the buffer because it contains junk data
* from the final ADC of the previous poll list scan. * from the final ADC of the previous poll list scan.
*/ */
int32_t *readaddr = (int32_t *)devpriv->ana_buf.logical_base + 1; uint32_t *readaddr = (uint32_t *)devpriv->ana_buf.logical_base + 1;
bool finished = false; bool finished = false;
int i; int i;
/* get the data and hand it over to comedi */ /* get the data and hand it over to comedi */
for (i = 0; i < cmd->chanlist_len; i++) { for (i = 0; i < cmd->chanlist_len; i++) {
short tempdata; unsigned short tempdata;
/* /*
* Convert ADC data to 16-bit integer values and copy * Convert ADC data to 16-bit integer values and copy
* to application buffer. * to application buffer.
*/ */
tempdata = s626_ai_reg_to_uint((int)*readaddr); tempdata = s626_ai_reg_to_uint(*readaddr);
readaddr++; readaddr++;
/* put data into read buffer */ /* put data into read buffer */
@ -1881,7 +1873,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,
uint16_t range = CR_RANGE(insn->chanspec); uint16_t range = CR_RANGE(insn->chanspec);
uint16_t adc_spec = 0; uint16_t adc_spec = 0;
uint32_t gpio_image; uint32_t gpio_image;
int tmp; uint32_t tmp;
int n; int n;
/* /*