Use makebin if objcopy is not available.

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

diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index b0d302b6261872853b2d32ea97c8e0985677f32d..39e62e582deb997939dd652cdf1763ce76dc4b14 100644 (file)
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -27,7 +27,7 @@
 #include <fx2lafw.h>
 #include <gpif-acquisition.h>
 
-bit gpif_acquiring;
+__bit gpif_acquiring;
 
 static void gpif_reset_waveforms(void)
 {
@@ -71,7 +71,7 @@ static void gpif_setup_registers(void)
        /* 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);
 }
 
@@ -128,7 +128,7 @@ void gpif_init_la(void)
        /* Initialize flowstate registers (not used by us). */
        gpif_init_flowstates();
 
-       /* Reset the status */
+       /* Reset the status. */
        gpif_acquiring = FALSE;
 }
 
@@ -196,8 +196,8 @@ 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) {
+       /* Configure the EP2 FIFO. */
+       if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT) {
                EP2FIFOCFG = bmAUTOIN | bmWORDWIDE;
        } else {
                EP2FIFOCFG = bmAUTOIN;
@@ -213,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. */