#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)
}
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;
- if(delay > MAX_SAMPLE_DELAY)
+ if (delay > MAX_SAMPLE_DELAY)
delay = 0;
}
delay = SR_MHZ(30) / samplerate - 1;
}
+ 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_h = (delay >> 8) & 0x00FF;
- cmd.sample_delay_l = delay & 0x00FF;
+ 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 |