]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcmmio: sample types are unsigned
authorIan Abbott <abbotti@mev.co.uk>
Wed, 16 Oct 2013 13:40:32 +0000 (14:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Oct 2013 19:48:31 +0000 (12:48 -0700)
Sample values in comedi are generally represented as unsigned values.
Change `interrupt_pcmmio()` and `ai_rinsn()` in the "pcmmio" module to
use unsigned sample values for consistency.

Also, make the order in which `interrupt_pcmmio()` writes the two sample
values (each actually containing up to 16 1-bit sample values)
independent of the host byte ordering.

Note that this module is a mess, so please excuse the checkpatch
warnings.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcmmio.c

index 574443df42dab212d5083e7aee5affd3493ffcd9..14cee3ac92c52f67fadd05b4b3cec4d92efaec7a 100644 (file)
@@ -553,12 +553,11 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
                                                                                val |= (1U << n);
                                                                }
                                                                /* Write the scan to the buffer. */
-                                                               if (comedi_buf_put(s->async, ((short *)&val)[0])
+                                                               if (comedi_buf_put(s->async, val)
                                                                    &&
                                                                    comedi_buf_put
                                                                    (s->async,
-                                                                    ((short *)
-                                                                     &val)[1])) {
+                                                                    val >> 16)) {
                                                                        s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);
                                                                } else {
                                                                        /* Overflow! Stop acquisition!! */
@@ -846,7 +845,7 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                    CR_RANGE(insn->chanspec), aref = CR_AREF(insn->chanspec);
                unsigned char command_byte = 0;
                unsigned iooffset = 0;
-               short sample, adc_adjust = 0;
+               unsigned short sample, adc_adjust = 0;
 
                if (chan > 7)
                        chan -= 8, iooffset = 4;        /*