From: Kate J. Temkin <redacted>
Date: Thu, 22 Aug 2019 00:59:55 +0000 (-0600)
Subject: allow captures of up to 48MHz, if bus conditions permit
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.7~3
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b283ba837a113c2c5085319aa993e2a70e118734;p=sigrok-firmware-fx2lafw.git

allow captures of up to 48MHz, if bus conditions permit

We allow the FX2 Waveform to operate using only a single state
(and thus at a rate equal to the max IFCLK of 48MHz) by allowing
the decision point state to re-execute its operation.

We accordingly remove the guards preventing operation with
zero-duration wait states; allowing waveforms with no wait states
to be generated.
---

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index b526d59d..96476ccc 100644
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -161,7 +161,7 @@ static void gpif_make_data_dp_state(volatile BYTE *pSTATE)
 	 * BRANCH
 	 * Branch to IDLE if condition is true, back to S0 otherwise.
 	 */
-	pSTATE[0] = (7 << 3) | (0 << 0);
+	pSTATE[0] = (1 << 7) | (7 << 3) | (0 << 0);
 
 	/*
 	 * OPCODE
@@ -208,8 +208,7 @@ bool gpif_acquisition_prepare(const struct cmd_start_acquisition *cmd)
 	}
 
 	/* Populate delay states. */
-	if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
-	    cmd->sample_delay_h >= 6)
+	if (cmd->sample_delay_h >= 6)
 		return false;
 
 	if (cmd->flags & CMD_START_FLAGS_CLK_CTL2) {