X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Fcommand.c;h=ffe18da64ebf01c90ebf04aca9959ed33c5b0205;hb=13bf7eccbb08214c3d6d53da5b5b6a269a64a779;hp=b3d3b6b60cb1f9698ddbf2b154d5192a28d087ce;hpb=dba024420f934ff10f18eebbaad1f4e97c739259;p=libsigrok.git

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index b3d3b6b6..ffe18da6 100644
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -18,20 +18,35 @@
  */
 
 #include <libusb.h>
-
 #include "command.h"
 #include "sigrok.h"
 #include "sigrok-internal.h"
 
-int command_start_acquisition(libusb_device_handle *devhdl,
-	uint64_t samplerate)
+SR_PRIV int command_get_fw_version(libusb_device_handle *devhdl,
+				   struct version_info *vi)
+{
+	const int 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_start_acquisition(libusb_device_handle *devhdl,
+				      uint64_t samplerate)
 {
 	struct cmd_start_acquisition cmd;
-	int delay = 0;
+	int delay = 0, ret;
 
-	/* Compute the sample rate */
-	if((SR_MHZ(48) % samplerate) == 0)
-	{
+	/* Compute the sample rate. */
+	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) {
@@ -39,24 +54,21 @@ int command_start_acquisition(libusb_device_handle *devhdl,
 		delay = SR_MHZ(30) / samplerate - 1;
 	}
 
-	/* Note that sample_delay=0 is treated as sample_delay=256 */
+	/* 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_err("fx2lafw: Unable to sample at %" PRIu64 "Hz.",
+		       samplerate);
 		return SR_ERR;
 	}
 
 	cmd.sample_delay = delay;
 
-	/* Send the control message */
-	const int res = libusb_control_transfer(devhdl,
-				LIBUSB_REQUEST_TYPE_VENDOR |
-				LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000,
-				0x0000, (unsigned char*)&cmd,
-				sizeof(cmd), 100);
-	if (res < 0) {
-		sr_err("fx2lafw: Unable to send start command: %d",
-			res);
+	/* 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);
 		return SR_ERR;
 	}