sr: fix initialization for output from driverless devices

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

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index 5346408d72660570643a2580282bb10b37face95..5a085bb6a799ab22a6502436556647c565876878 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -21,8 +21,8 @@
 
 #include "fx2lafw.h"
 #include "command.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 SR_PRIV int command_get_fw_version(libusb_device_handle *devhdl,
                                   struct version_info *vi)
@@ -59,13 +59,18 @@ SR_PRIV int command_get_revid_version(libusb_device_handle *devhdl,
 }
 
 SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
-                                     uint64_t samplerate,
-                                     bool samplewide)
+                                     uint64_t samplerate, gboolean samplewide)
 {
        struct cmd_start_acquisition cmd;
        int delay = 0, ret;
 
        /* Compute the sample rate. */
+       if (samplewide && samplerate > MAX_16BIT_SAMPLE_RATE) {
+               sr_err("fx2lafw: Unable to sample at %" PRIu64 "Hz "
+                      "when collecting 16-bit samples.", samplerate);
+               return SR_ERR;
+       }
+
        if ((SR_MHZ(48) % samplerate) == 0) {
                cmd.flags = CMD_START_FLAGS_CLK_48MHZ;
                delay = SR_MHZ(48) / samplerate - 1;