agilent-dmm: Fix SEGV during incomplete reply from meter.

[libsigrok.git] / hardware / fx2lafw / command.c

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index 9bd634b51a283e63a0cac8e36b7976bc01d9f5d1..e68b4f04ed599b38c97261b57f3b061ea468a0b2 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -18,11 +18,10 @@
  */
 
 #include <libusb.h>
-
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "fx2lafw.h"
 #include "command.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
 
 SR_PRIV int command_get_fw_version(libusb_device_handle *devhdl,
                                   struct version_info *vi)
@@ -34,7 +33,8 @@ SR_PRIV int command_get_fw_version(libusb_device_handle *devhdl,
                (unsigned char *)vi, sizeof(struct version_info), 100);
 
        if (ret < 0) {
-               sr_err("fx2lafw: Unable to get version info: %d.", ret);
+               sr_err("Unable to get version info: %s.",
+                      libusb_error_name(ret));
                return SR_ERR;
        }
 
@@ -51,7 +51,7 @@ SR_PRIV int command_get_revid_version(libusb_device_handle *devhdl,
                revid, 1, 100);
 
        if (ret < 0) {
-               sr_err("fx2lafw: Unable to get REVID: %d.", ret);
+               sr_err("Unable to get REVID: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
 
@@ -66,7 +66,7 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
 
        /* Compute the sample rate. */
        if (samplewide && samplerate > MAX_16BIT_SAMPLE_RATE) {
-               sr_err("fx2lafw: Unable to sample at %" PRIu64 "Hz "
+               sr_err("Unable to sample at %" PRIu64 "Hz "
                       "when collecting 16-bit samples.", samplerate);
                return SR_ERR;
        }
@@ -83,19 +83,18 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
                delay = SR_MHZ(30) / samplerate - 1;
        }
 
-       sr_info("fx2lafw: GPIF delay = %d, clocksource = %sMHz", delay,
+       sr_info("GPIF delay = %d, clocksource = %sMHz.", delay,
                (cmd.flags & CMD_START_FLAGS_CLK_48MHZ) ? "48" : "30");
 
        if (delay <= 0 || delay > MAX_SAMPLE_DELAY) {
-               sr_err("fx2lafw: Unable to sample at %" PRIu64 "Hz.",
-                      samplerate);
+               sr_err("Unable to sample at %" PRIu64 "Hz.", samplerate);
                return SR_ERR;
        }
 
        cmd.sample_delay_h = (delay >> 8) & 0xff;
        cmd.sample_delay_l = delay & 0xff;
 
-       /* Select the sampling width */
+       /* Select the sampling width. */
        cmd.flags |= samplewide ? CMD_START_FLAGS_SAMPLE_16BIT :
                CMD_START_FLAGS_SAMPLE_8BIT;
 
@@ -104,7 +103,8 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
                        LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000, 0x0000,
                        (unsigned char *)&cmd, sizeof(cmd), 100);
        if (ret < 0) {
-               sr_err("fx2lafw: Unable to send start command: %d.", ret);
+               sr_err("Unable to send start command: %s.",
+                      libusb_error_name(ret));
                return SR_ERR;
        }