fx2lafw: Allow higher speeds for FX3

Author: zeldin

src/hardware/fx2lafw/api.c

@@ -164,8 +164,14 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(8),
 	SR_MHZ(12),
 	SR_MHZ(16),
-	SR_MHZ(32),
 	SR_MHZ(24),
+	/* FX3 only rates below here */
+	SR_MHZ(32),
+	SR_MHZ(48),
+	SR_MHZ(64),
+	SR_MHZ(96),
+	SR_MHZ(192),
+#define NUM_FX3_RATES 5
 };
 
 static gboolean is_plausible(const struct libusb_device_descriptor *des)
@@ -345,6 +351,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		devc->samplerates = samplerates;
 		devc->num_samplerates = ARRAY_SIZE(samplerates);
+		if (!(prof->dev_caps & DEV_CAPS_FX3))
+			devc->num_samplerates -= NUM_FX3_RATES;
 		has_firmware = usb_match_manuf_prod(devlist[i],
 				"sigrok", "fx2lafw");
 

src/hardware/fx2lafw/protocol.c

@@ -123,7 +123,11 @@ static int command_start_acquisition(const struct sr_dev_inst *sdi)
 	       (cmd.flags & CMD_START_FLAGS_CLK_192MHZ? "192" :
 		(cmd.flags & CMD_START_FLAGS_CLK_48MHZ) ? "48" : "30"));
 
-	if (delay < 0 || delay > MAX_SAMPLE_DELAY) {
+	if (delay == 0 && samplerate == SR_MHZ(192) &&
+	    (cmd.flags & CMD_START_FLAGS_CLK_192MHZ)) {
+		/* Delay == 0 is ok in this case... */
+	}
+	else if (delay < 0 || delay > MAX_SAMPLE_DELAY) {
 		sr_err("Unable to sample at %" PRIu64 "Hz.", samplerate);
 		return SR_ERR;
 	}