Build: Include <config.h> first in all source files

[libsigrok.git] / src / hardware / colead-slm / protocol.c

diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index 6b89ea14f512aeb9202e74f8f5e5a424801c0c7b..9bf9eb211861a3b2c8cb037bd3d4c36dd2b326ca 100644 (file)
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <string.h>
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
-#include <errno.h>
-#include <string.h>
 
 static void process_packet(const struct sr_dev_inst *sdi)
 {
@@ -92,80 +92,79 @@ static void process_packet(const struct sr_dev_inst *sdi)
         * weighting. */
        mode = devc->buf[2] & 0x0f;
        switch (mode) {
-               case 0x0:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0x1:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0x2:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0x3:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0x4:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0x5:
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0x6:
-                       analog.mqflags |= SR_MQFLAG_SPL_PCT_OVER_ALARM \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0x7:
-                       analog.mqflags |= SR_MQFLAG_SPL_PCT_OVER_ALARM \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0x8:
-                       /* 10-second mean, but we don't have MQ flags to express it. */
-                       analog.mqflags |= SR_MQFLAG_SPL_LAT \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0x9:
-                       /* Mean over a time period between 11 seconds and 24 hours.
-                        * Which is so silly that there's no point in expressing
-                        * either this or the previous case.  */
-                       analog.mqflags |= SR_MQFLAG_SPL_LAT \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_F;
-                       break;
-               case 0xa:
-                       /* 10-second mean. */
-                       analog.mqflags |= SR_MQFLAG_SPL_LAT \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0xb:
-                       /* Mean over a time period between 11 seconds and 24 hours. */
-                       analog.mqflags |= SR_MQFLAG_SPL_LAT \
-                                       | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
-                                       | SR_MQFLAG_SPL_TIME_WEIGHT_S;
-                       break;
-               case 0xc:
-                       /* Internal calibration on 1kHz sine at 94dB, not useful
-                        * to anything but the device. */
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT;
-                       break;
-               case 0xd:
-                       /* Internal calibration on 1kHz sine at 94dB, not useful
-                        * to anything but the device. */
-                       analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT;
-                       break;
-               default:
-                       sr_dbg("unknown configuration 0x%.2x", mode);
-                       return;
-                       break;
+       case 0x0:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0x1:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0x2:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0x3:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0x4:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0x5:
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0x6:
+               analog.mqflags |= SR_MQFLAG_SPL_PCT_OVER_ALARM \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0x7:
+               analog.mqflags |= SR_MQFLAG_SPL_PCT_OVER_ALARM \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0x8:
+               /* 10-second mean, but we don't have MQ flags to express it. */
+               analog.mqflags |= SR_MQFLAG_SPL_LAT \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0x9:
+               /* Mean over a time period between 11 seconds and 24 hours.
+                * Which is so silly that there's no point in expressing
+                * either this or the previous case.  */
+               analog.mqflags |= SR_MQFLAG_SPL_LAT \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_F;
+               break;
+       case 0xa:
+               /* 10-second mean. */
+               analog.mqflags |= SR_MQFLAG_SPL_LAT \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0xb:
+               /* Mean over a time period between 11 seconds and 24 hours. */
+               analog.mqflags |= SR_MQFLAG_SPL_LAT \
+                               | SR_MQFLAG_SPL_FREQ_WEIGHT_A \
+                               | SR_MQFLAG_SPL_TIME_WEIGHT_S;
+               break;
+       case 0xc:
+               /* Internal calibration on 1kHz sine at 94dB, not useful
+                * to anything but the device. */
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT;
+               break;
+       case 0xd:
+               /* Internal calibration on 1kHz sine at 94dB, not useful
+                * to anything but the device. */
+               analog.mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT;
+               break;
+       default:
+               sr_dbg("unknown configuration 0x%.2x", mode);
+               return;
        }
 
        packet.type = SR_DF_ANALOG;
@@ -184,7 +183,7 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
        const struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       int len;
+       int delay_ms, len;
        char buf[128];
 
        (void)fd;
@@ -207,8 +206,9 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
                         * we don't want it. */
                        return TRUE;
                /* Got 0x10, "measurement ready". */
-               if (serial_write_blocking(serial, "\x20", 1) == -1)
-                       sr_err("unable to send command: %s", strerror(errno));
+               delay_ms = serial_timeout(serial, 1);
+               if (serial_write_blocking(serial, "\x20", 1, delay_ms) < 1)
+                       sr_err("unable to send command");
                else {
                        devc->state = COMMAND_SENT;
                        devc->buflen = 0;