/*
- * 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>
#include <fx2lafw.h>
#include <gpif-acquisition.h>
-bit gpif_acquiring;
+__bit gpif_acquiring;
static void gpif_reset_waveforms(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;
/* 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);
}
/* Initialize flowstate registers (not used by us). */
gpif_init_flowstates();
- /* Reset the status */
+ /* Reset the status. */
gpif_acquiring = FALSE;
}
/* 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;
}
- /* Populate delay states */
- if((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
- cmd->sample_delay_h >= 6)
+ /* 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++)
+ for (i = 0; i < cmd->sample_delay_h; i++)
gpif_make_delay_state(pSTATE++, 0);
- if(cmd->sample_delay_l != 0)
+ if (cmd->sample_delay_l != 0)
gpif_make_delay_state(pSTATE++, cmd->sample_delay_l);
/* Populate S1 - the decision point. */