/*
- * 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>
* 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>
#include <fx2lafw.h>
#include <gpif-acquisition.h>
-bit gpif_acquiring;
+__bit gpif_acquiring;
static void gpif_reset_waveforms(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. */
/* 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;
}
-static void gpif_make_delay_data_state(volatile BYTE *pSTATE, uint8_t delay)
+static void gpif_make_delay_state(volatile BYTE *pSTATE, uint8_t delay, uint8_t output)
{
/*
* DELAY
/*
* OPCODE
- * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=1, DP=0
- * Collect data in this state.
+ * SGL=0, GIN=0, INCAD=0, NEXT=0, DATA=0, DP=0
*/
- pSTATE[8] = 0x02;
+ pSTATE[8] = 0;
/*
* OUTPUT
- * OE[0:3]=0, CTL[0:3]=0
+ * CTL[0:5]=output
*/
- pSTATE[16] = 0x00;
+ pSTATE[16] = output;
/*
* LOGIC FUNCTION
pSTATE[24] = 0x00;
}
-static void gpid_make_dp_state(volatile BYTE *pSTATE)
+static void gpif_make_data_dp_state(volatile BYTE *pSTATE)
{
/*
* BRANCH
/*
* 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
- * OE[0:3]=0, CTL[0:3]=0
+ * CTL[0:5]=0
*/
pSTATE[16] = 0x00;
pSTATE[24] = (6 << 3) | (6 << 0);
}
-void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
+bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
{
- xdata volatile BYTE *pSTATE;
+ 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;
}
- /* 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 delay states. */
+ if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
+ cmd->sample_delay_h >= 6)
+ return false;
+
+ 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/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);
+ } else {
+ delay_1 = delay_2 / 2;
+ delay_2 -= delay_1;
+ gpif_make_delay_state(pSTATE++, delay_1, 0x06);
+ }
+
+ /* 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++)
+ gpif_make_delay_state(pSTATE++, 0, 0x00);
- /* Populate S0 */
- gpif_make_delay_data_state(&GPIF_WAVE_DATA, cmd->sample_delay);
+ if (cmd->sample_delay_l != 0)
+ gpif_make_delay_state(pSTATE++, cmd->sample_delay_l, 0x00);
+ }
/* Populate S1 - the decision point. */
- gpid_make_dp_state(&GPIF_WAVE_DATA + 1);
+ gpif_make_data_dp_state(pSTATE++);
/* Execute the whole GPIF waveform once. */
gpif_set_tc16(1);
/* Update the status. */
gpif_acquiring = TRUE;
+
+ return true;
}
void gpif_poll(void)
projects / sigrok-firmware-fx2lafw.git / blobdiff