Added support for 100kHz and 50kHz sampling

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

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index 07825b425804959ad1482d280ec4e79d5a22e81e..d8092c7d3727dbd4a1429a36f431ef246c85eaa3 100644 (file)
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -132,7 +132,7 @@ void gpif_init_la(void)
        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)
 {
        /*
         * DELAY
@@ -142,10 +142,10 @@ static void gpif_make_delay_data_state(volatile BYTE *pSTATE, uint8_t 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
@@ -160,7 +160,7 @@ static void gpif_make_delay_data_state(volatile BYTE *pSTATE, uint8_t delay)
        pSTATE[24] = 0x00;
 }
 
-static void gpid_make_dp_state(volatile BYTE *pSTATE)
+static void gpid_make_data_dp_state(volatile BYTE *pSTATE)
 {
        /*
         * BRANCH
@@ -170,9 +170,9 @@ static void gpid_make_dp_state(volatile BYTE *pSTATE)
 
        /*
         * 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
@@ -188,9 +188,10 @@ static void gpid_make_dp_state(volatile BYTE *pSTATE)
        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));
@@ -204,29 +205,19 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
                           bmGSTATE | bmIFGPIF;
        }
 
-       /* GPIF terminology: DP = decision point, NDP = non-decision-point */
+       /* Populate delay states */
+       if((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
+               cmd->sample_delay_h >= 6)
+               return false;
 
-       /*
-        * 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.
-        */
+       for(i = 0; i < cmd->sample_delay_h; i++)
+               gpif_make_delay_state(pSTATE++, 0);
 
-       /* 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);
 
        /* Populate S1 - the decision point. */
-       gpid_make_dp_state(&GPIF_WAVE_DATA + 1);
+       gpid_make_data_dp_state(pSTATE++);
 
        /* Execute the whole GPIF waveform once. */
        gpif_set_tc16(1);
@@ -236,6 +227,8 @@ void gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
 
        /* Update the status. */
        gpif_acquiring = TRUE;
+
+       return true;
 }
 
 void gpif_poll(void)