staging: comedi: comedi_test: make samples unsigned
authorIan Abbott <abbotti@mev.co.uk>
Fri, 4 Jan 2013 11:33:24 +0000 (11:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2013 22:37:12 +0000 (14:37 -0800)
Represent the fake samples as unsigned shorts instead of signed shorts,
as this is the usual Comedi convention.  There is no change to the
actual binary representation, although the `cfc_write_to_buffer()` call
currently expects a signed short for some bizarre reason.

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

index 48255b37bf2782fdbc4e864cf549485025473712..ce13fbc52ef92990039b843ef47e1846c12d7b4e 100644 (file)
@@ -85,8 +85,9 @@ static const struct comedi_lrange waveform_ai_ranges = {
         }
 };
 
-static short fake_sawtooth(struct comedi_device *dev, unsigned int range_index,
-                          unsigned long current_time)
+static unsigned short fake_sawtooth(struct comedi_device *dev,
+                                   unsigned int range_index,
+                                   unsigned long current_time)
 {
        struct waveform_private *devpriv = dev->private;
        struct comedi_subdevice *s = dev->read_subdev;
@@ -109,9 +110,9 @@ static short fake_sawtooth(struct comedi_device *dev, unsigned int range_index,
        return offset + value;
 }
 
-static short fake_squarewave(struct comedi_device *dev,
-                            unsigned int range_index,
-                            unsigned long current_time)
+static unsigned short fake_squarewave(struct comedi_device *dev,
+                                     unsigned int range_index,
+                                     unsigned long current_time)
 {
        struct waveform_private *devpriv = dev->private;
        struct comedi_subdevice *s = dev->read_subdev;
@@ -131,15 +132,17 @@ static short fake_squarewave(struct comedi_device *dev,
        return offset + value;
 }
 
-static short fake_flatline(struct comedi_device *dev, unsigned int range_index,
-                          unsigned long current_time)
+static unsigned short fake_flatline(struct comedi_device *dev,
+                                   unsigned int range_index,
+                                   unsigned long current_time)
 {
        return dev->read_subdev->maxdata / 2;
 }
 
 /* generates a different waveform depending on what channel is read */
-static short fake_waveform(struct comedi_device *dev, unsigned int channel,
-                          unsigned int range, unsigned long current_time)
+static unsigned short fake_waveform(struct comedi_device *dev,
+                                   unsigned int channel, unsigned int range,
+                                   unsigned long current_time)
 {
        enum {
                SAWTOOTH_CHAN,