sr: fx2lafw: Add (C) line from old saleae driver it's based on.

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

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index 91a286ce7ba1b09aadbe3e7b7527cb7c51eeb5d3..0b89f88ca0f3550332a4454487f5442c1be20635 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -18,10 +18,46 @@
  */
 
 #include <libusb.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)
+{
+       int ret;
+
+       ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
+               LIBUSB_ENDPOINT_IN, CMD_GET_FW_VERSION, 0x0000, 0x0000,
+               (unsigned char *)vi, sizeof(struct version_info), 100);
+
+       if (ret < 0) {
+               sr_err("fx2lafw: Unable to get version info: %d.", ret);
+               return SR_ERR;
+       }
+
+       return SR_OK;
+}
+
+SR_PRIV int command_get_revid_version(libusb_device_handle *devhdl,
+                                     uint8_t *revid)
+{
+       int ret;
+
+       ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
+               LIBUSB_ENDPOINT_IN, CMD_GET_REVID_VERSION, 0x0000, 0x0000,
+               revid, 1, 100);
+
+       if (ret < 0) {
+               sr_err("fx2lafw: Unable to get REVID: %d.", ret);
+               return SR_ERR;
+       }
+
+       return SR_OK;
+}
+
 SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
                                      uint64_t samplerate)
 {
@@ -29,28 +65,36 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
        int delay = 0, ret;
 
        /* Compute the sample rate. */
-       if((SR_MHZ(48) % samplerate) == 0) {
+       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_err("fx2lafw: Unable to sample at %dHz", samplerate);
+       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;
 
        /* Send the control message. */
        ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
                        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("fx2lafw: Unable to send start command: %d.", ret);
                return SR_ERR;
        }