X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=gpif-acquisition.c;h=8734abefe8693f7bea3cff45df4908fa2558d4d3;hb=6398a5191b3fb474238a1cbeef661e950dd68f55;hp=0f9cfbe137197c7eae6b2cf6c308b3dd45989bd0;hpb=cd29817daca53a88fd252198a90d7e806553d4d3;p=sigrok-firmware-fx2lafw.git

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index 0f9cfbe1..8734abef 100644
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the fx2lafw project.
+ * This file is part of the sigrok-firmware-fx2lafw project.
  *
  * Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -27,7 +27,7 @@
 #include <fx2lafw.h>
 #include <gpif-acquisition.h>
 
-bit gpif_acquiring;
+__bit gpif_acquiring;
 
 static void gpif_reset_waveforms(void)
 {
@@ -54,7 +54,7 @@ static void gpif_setup_registers(void)
 
 	/* When GPIF is idle, tri-state the data bus. */
 	/* Bit 7: DONE, bit 0: IDLEDRV. TODO: Set/clear DONE bit? */
-	GPIFIDLECS = (1 << 0);
+	GPIFIDLECS = (0 << 0);
 
 	/* When GPIF is idle, set CTL0-CTL5 to 0. */
 	GPIFIDLECTL = 0;
@@ -71,7 +71,7 @@ static void gpif_setup_registers(void)
 	/* Contains RDY* pin values. Read-only according to TRM. */
 	GPIFREADYSTAT = 0;
 
-	/* Make GPIF stop on transcation count not flag */
+	/* Make GPIF stop on transaction count not flag. */
 	EP2GPIFPFSTOP = (0 << 0);
 }
 
@@ -128,59 +128,24 @@ void gpif_init_la(void)
 	/* Initialize flowstate registers (not used by us). */
 	gpif_init_flowstates();
 
-	/* Reset the status */
+	/* Reset the status. */
 	gpif_acquiring = FALSE;
 }
 
-void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
+static void gpif_make_delay_state(volatile BYTE *pSTATE, uint8_t delay)
 {
-	xdata volatile BYTE *pSTATE;
-
-	/* Ensure GPIF is idle before reconfiguration. */
-	while (!(GPIFTRIG & 0x80));
-
-	/* Set IFCONFIG to the correct clock source. */
-	if (cmd->flags & CMD_START_FLAGS_CLK_48MHZ) {
-		IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmASYNC |
-			   bmGSTATE | bmIFGPIF;
-	} else {
-		IFCONFIG = bmIFCLKSRC | bmIFCLKOE | bmASYNC |
-			   bmGSTATE | bmIFGPIF;
-	}
-
-	/* GPIF terminology: DP = decision point, NDP = non-decision-point */
-
-	/*
-	 * Populate WAVEDATA.
-	 *
-	 * This is the basic algorithm implemented in our GPIF state machine:
-	 *
-	 * State 0: NDP: Sample the FIFO data bus.
-	 * State 1: DP: If EP2 is full, go to state 7 (the IDLE state), i.e.,
-	 *          end the current waveform. Otherwise, go to state 0 again,
-	 *          i.e., sample data until EP2 is full.
-	 * State 2: Unused.
-	 * State 3: Unused.
-	 * State 4: Unused.
-	 * State 5: Unused.
-	 * State 6: Unused.
-	 */
-
-	/* Populate S0. */
-	pSTATE = &GPIF_WAVE_DATA;
-
 	/*
 	 * DELAY
 	 * Delay cmd->sample_delay clocks.
 	 */
-	pSTATE[0] = cmd->sample_delay;
+	pSTATE[0] = delay;
 
 	/*
 	 * OPCODE
-	 * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=1, DP=0
+	 * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=0, DP=0
 	 * Collect data in this state.
 	 */
-	pSTATE[8] = 0x02;
+	pSTATE[8] = 0x00;
 
 	/*
 	 * OUTPUT
@@ -193,10 +158,10 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	 * Not used.
 	 */
 	pSTATE[24] = 0x00;
+}
 
-	/* Populate S1 - the decision point. */
-	pSTATE = &GPIF_WAVE_DATA + 1;
-
+static void gpid_make_data_dp_state(volatile BYTE *pSTATE)
+{
 	/*
 	 * BRANCH
 	 * Branch to IDLE if condition is true, back to S0 otherwise.
@@ -205,9 +170,9 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 
 	/*
 	 * OPCODE
-	 * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=0, DP=1
+	 * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=1, DP=1
 	 */
-	pSTATE[8] = (1 << 0);
+	pSTATE[8] = (1 << 1) | (1 << 0);
 
 	/*
 	 * OUTPUT
@@ -221,6 +186,46 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	 * LFUNC=0 (AND), TERMA=6 (FIFO Flag), TERMB=6 (FIFO Flag)
 	 */
 	pSTATE[24] = (6 << 3) | (6 << 0);
+}
+
+bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
+{
+	int i;
+	volatile BYTE *pSTATE = &GPIF_WAVE_DATA;
+
+	/* Ensure GPIF is idle before reconfiguration. */
+	while (!(GPIFTRIG & 0x80));
+
+	/* Configure the EP2 FIFO. */
+	if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT) {
+		EP2FIFOCFG = bmAUTOIN | bmWORDWIDE;
+	} else {
+		EP2FIFOCFG = bmAUTOIN;
+	}
+	SYNCDELAY();
+
+	/* Set IFCONFIG to the correct clock source. */
+	if (cmd->flags & CMD_START_FLAGS_CLK_48MHZ) {
+		IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmASYNC |
+			   bmGSTATE | bmIFGPIF;
+	} else {
+		IFCONFIG = bmIFCLKSRC | bmIFCLKOE | bmASYNC |
+			   bmGSTATE | bmIFGPIF;
+	}
+
+	/* Populate delay states. */
+	if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
+	    cmd->sample_delay_h >= 6)
+		return false;
+
+	for (i = 0; i < cmd->sample_delay_h; i++)
+		gpif_make_delay_state(pSTATE++, 0);
+
+	if (cmd->sample_delay_l != 0)
+		gpif_make_delay_state(pSTATE++, cmd->sample_delay_l);
+
+	/* Populate S1 - the decision point. */
+	gpid_make_data_dp_state(pSTATE++);
 
 	/* Execute the whole GPIF waveform once. */
 	gpif_set_tc16(1);
@@ -230,6 +235,8 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 
 	/* Update the status. */
 	gpif_acquiring = TRUE;
+
+	return true;
 }
 
 void gpif_poll(void)