sr: moved sigrok.h so libsigrok/libsigrok.h

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

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index bb47d2d183676d6539df9aef4e417e5f453dcf5f..5a085bb6a799ab22a6502436556647c565876878 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -18,9 +18,11 @@
  */
 
 #include <libusb.h>
+
+#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)
@@ -57,28 +59,45 @@ SR_PRIV int command_get_revid_version(libusb_device_handle *devhdl,
 }
 
 SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
-                                     uint64_t samplerate)
+                                     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;
-       } else if ((SR_MHZ(30) % samplerate) == 0) {
+               if (delay > MAX_SAMPLE_DELAY)
+                       delay = 0;
+       }
+
+       if (delay == 0 && (SR_MHZ(30) % samplerate) == 0) {
                cmd.flags = CMD_START_FLAGS_CLK_30MHZ;
                delay = SR_MHZ(30) / samplerate - 1;
        }
 
-       /* Note: sample_delay=0 is treated as sample_delay=256. */
-       if (delay <= 0 || delay > 256) {
+       sr_info("fx2lafw: 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);
                return SR_ERR;
        }
 
-       cmd.sample_delay = delay;
+       cmd.sample_delay_h = (delay >> 8) & 0xff;
+       cmd.sample_delay_l = delay & 0xff;
+
+       /* Select the sampling width */
+       cmd.flags |= samplewide ? CMD_START_FLAGS_SAMPLE_16BIT :
+               CMD_START_FLAGS_SAMPLE_8BIT;
 
        /* Send the control message. */
        ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |