Import fx2lib into fx2lafw directly.

[sigrok-firmware-fx2lafw.git] / gpif-acquisition.c

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index d8092c7d3727dbd4a1429a36f431ef246c85eaa3..3d80280abf0549616bba924c645d6fb1ce23ad05 100644 (file)
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -196,6 +196,14 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
        /* 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 |
@@ -205,15 +213,15 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
                           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. */