X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gpif-acquisition.c;h=b526d59db6546f4d6bcd243f2d22ecaf13d1e6db;hb=0fdc160d822b7ccb23487307a64b1ef6be2acccc;hp=dbf740366f1a31d7003984ba2adaae653eb2983a;hpb=b93872aadb4d9aa576b9ce8d56dd2d0d8f953230;p=sigrok-firmware-fx2lafw.git

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index dbf74036..b526d59d 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)
 {
@@ -46,10 +45,7 @@ static void gpif_setup_registers(void)
 	/* TODO. Value probably irrelevant, as we don't use RDY* signals? */
 	GPIFREADYCFG = 0;
 
-	/*
-	 * Set TRICTL = 0, thus CTL0-CTL5 are CMOS outputs.
-	 * TODO: Probably irrelevant, as we don't use CTL0-CTL5?
-	 */
+	/* Set TRICTL = 0, thus CTL0-CTL5 are CMOS outputs. */
 	GPIFCTLCFG = 0;
 
 	/* When GPIF is idle, tri-state the data bus. */
@@ -66,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;
@@ -129,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)
@@ -187,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;
@@ -196,11 +192,10 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	while (!(GPIFTRIG & 0x80));
 
 	/* Configure the EP2 FIFO. */
-	if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT) {
+	if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT)
 		EP2FIFOCFG = bmAUTOIN | bmWORDWIDE;
-	} else {
+	else
 		EP2FIFOCFG = bmAUTOIN;
-	}
 	SYNCDELAY();
 
 	/* Set IFCONFIG to the correct clock source. */
@@ -212,7 +207,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 			   bmGSTATE | bmIFGPIF;
 	}
 
-	/* Populate delay states */
+	/* Populate delay states. */
 	if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
 	    cmd->sample_delay_h >= 6)
 		return false;
@@ -220,8 +215,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 	if (cmd->flags & CMD_START_FLAGS_CLK_CTL2) {
 		uint8_t delay_1, delay_2 = cmd->sample_delay_l;
 
-		/* We need a pulse where the CTL1 and CTL2 pins
-		 * alternate states */
+		/* We need a pulse where the CTL1/2 pins alternate states. */
 		if (cmd->sample_delay_h) {
 			for (i = 0; i < cmd->sample_delay_h; i++)
 				gpif_make_delay_state(pSTATE++, 0, 0x06);
@@ -231,8 +225,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 			gpif_make_delay_state(pSTATE++, delay_1, 0x06);
 		}
 
-		/* cmd->sample_delay_l is always non-zero for the
-		 * supported rates */
+		/* sample_delay_l is always != 0 for the supported rates. */
 		gpif_make_delay_state(pSTATE++, delay_2, 0x00);
 	} else {
 		for (i = 0; i < cmd->sample_delay_h; i++)
@@ -245,6 +238,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);
 
@@ -252,15 +253,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();
@@ -281,6 +280,6 @@ void gpif_poll(void)
 		FIFORESET = 0x00;
 		SYNCDELAY();
 
-		gpif_acquiring = FALSE;
+		gpif_acquiring = STOPPED;
 	}
 }