*/
#include <libusb.h>
+
+#include "fx2lafw.h"
#include "command.h"
#include "sigrok.h"
#include "sigrok-internal.h"
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;
/* Send the control message. */
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |