X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=gpif-acquisition.c;h=96476ccc4185a01319efd34c16a12568125da8c4;hb=24a04d22869658abcc96067349a588845cf9a80c;hp=18cdd79eccd8239bbf2c95dbc7b72a644fac1db8;hpb=6aa5d1f472dd35faed9085f6b2b24fa218314043;p=sigrok-firmware-fx2lafw.git

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index 18cdd79e..96476ccc 100644
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <eputils.h>
@@ -27,7 +26,7 @@
 #include <fx2lafw.h>
 #include <gpif-acquisition.h>
 
-__bit gpif_acquiring;
+enum gpif_status gpif_acquiring = STOPPED;
 
 static void gpif_reset_waveforms(void)
 {
@@ -63,7 +62,7 @@ static void gpif_setup_registers(void)
 	 * GPIFWFSELECT: [7:6] = SINGLEWR index, [5:4] = SINGLERD index,
 	 *               [3:2] = FIFOWR index, [1:0] = FIFORD index
 	 */
-	GPIFWFSELECT = (0x3 << 6) | (0x2 << 4) | (0x1 << 2) | (0x0 << 0);
+	GPIFWFSELECT = (0x3u << 6) | (0x2u << 4) | (0x1u << 2) | (0x0u << 0);
 
 	/* Contains RDY* pin values. Read-only according to TRM. */
 	GPIFREADYSTAT = 0;
@@ -126,7 +125,7 @@ void gpif_init_la(void)
 	gpif_init_flowstates();
 
 	/* Reset the status. */
-	gpif_acquiring = FALSE;
+	gpif_acquiring = STOPPED;
 }
 
 static void gpif_make_delay_state(volatile BYTE *pSTATE, uint8_t delay, uint8_t output)
@@ -162,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
@@ -184,7 +183,7 @@ static void gpif_make_data_dp_state(volatile BYTE *pSTATE)
 	pSTATE[24] = (6 << 3) | (6 << 0);
 }
 
-bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
+bool gpif_acquisition_prepare(const struct cmd_start_acquisition *cmd)
 {
 	int i;
 	volatile BYTE *pSTATE = &GPIF_WAVE_DATA;
@@ -209,8 +208,7 @@ bool gpif_acquisition_start(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) {
@@ -239,6 +237,14 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	/* Populate S1 - the decision point. */
 	gpif_make_data_dp_state(pSTATE++);
 
+	/* Update the status. */
+	gpif_acquiring = PREPARED;
+
+	return true;
+}
+
+void gpif_acquisition_start(void)
+{
 	/* Execute the whole GPIF waveform once. */
 	gpif_set_tc16(1);
 
@@ -246,15 +252,13 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	gpif_fifo_read(GPIF_EP2);
 
 	/* Update the status. */
-	gpif_acquiring = TRUE;
-
-	return true;
+	gpif_acquiring = RUNNING;
 }
 
 void gpif_poll(void)
 {
 	/* Detect if acquisition has completed. */
-	if (gpif_acquiring && (GPIFTRIG & 0x80)) {
+	if ((gpif_acquiring == RUNNING) && (GPIFTRIG & 0x80)) {
 		/* Activate NAK-ALL to avoid race conditions. */
 		FIFORESET = 0x80;
 		SYNCDELAY();
@@ -275,6 +279,6 @@ void gpif_poll(void)
 		FIFORESET = 0x00;
 		SYNCDELAY();
 
-		gpif_acquiring = FALSE;
+		gpif_acquiring = STOPPED;
 	}
 }