attempt to fix stm32 build issues

2 files changed, 506 insertions, 490 deletions

diff --git a/stm32/unittest/src/tst_ofdm_demod.c b/stm32/unittest/src/tst_ofdm_demod.c
index 54cc027..3be96c4 100644
--- a/stm32/unittest/src/tst_ofdm_demod.c
+++ b/stm32/unittest/src/tst_ofdm_demod.c
@@ -25,7 +25,6 @@
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-
 /* This is a unit test implementation of the OFDM Demod function.
  * It is used for several tests:
  *
@@ -45,40 +44,39 @@
  *    ofdm_get_test_bits - 10 | * ofdm_mod - - | \
  *        cohpsk_ch - stm_in.raw -20 -Fs 8000 -f -5
  *
- * Reference data can be created by running the same input through the x86 
+ * Reference data can be created by running the same input through the x86
  * ofdm_demod tool.
  *
- *    ofdm_demod stm_in.raw ref_demod_out.raw -o ofdm_demod_ref_log.txt --testframes
+ *    ofdm_demod stm_in.raw ref_demod_out.raw -o ofdm_demod_ref_log.txt
+ * --testframes
  *
- * Comparison of the results to the reference will depend on the test conditions.
- * Some small differences are expected due to differences in implementation.
+ * Comparison of the results to the reference will depend on the test
+ * conditions. Some small differences are expected due to differences in
+ * implementation.
  *
  */
 
-
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <unistd.h>
 
-#include "semihosting.h"
 #include "codec2_ofdm.h"
-#include "ofdm_internal.h"
-#include "mpdecode_core.h"
-#include "ldpc_codes.h"
-#include "interldpc.h"
-#include "gp_interleaver.h"
-#include "test_bits_ofdm.h"
-
 #include "debug_alloc.h"
-
-#include "stm32f4xx_conf.h"
-#include "stm32f4xx.h"
+#include "gp_interleaver.h"
+#include "interldpc.h"
+#include "ldpc_codes.h"
 #include "machdep.h"
+#include "mpdecode_core.h"
+#include "ofdm_internal.h"
+#include "semihosting.h"
+#include "stm32f4xx.h"
+#include "stm32f4xx_conf.h"
+#include "test_bits_ofdm.h"
 
 #define NDISCARD 20
 
@@ -92,347 +90,361 @@ static int ofdm_rowsperframe;
 static int ofdm_nuwbits;
 static int ofdm_ntxtbits;
 static int ofdm_nin;
-static char fout_buffer[4*4096];
-static __attribute__ ((section (".ccm"))) char fdiag_buffer[4*8192];
-static __attribute__ ((section (".ccm"))) char fin_buffer[4096*8];
+static char fout_buffer[4 * 4096];
+static __attribute__((section(".ccm"))) char fdiag_buffer[4 * 8192];
+static __attribute__((section(".ccm"))) char fin_buffer[4096 * 8];
 
-static char *statemode[] = {
-    "search",
-    "trial",
-    "synced"
-};
+static char *statemode[] = {"search", "trial", "synced"};
 
 static FILE *fout, *fdiag;
 void flush_all(void) {
-    fflush(fout);
-    fflush(fdiag);
-    fflush(stdout);
-    fflush(stderr);
-    }
+  fflush(fout);
+  fflush(fdiag);
+  fflush(stdout);
+  fflush(stderr);
+}
 
 int main(int argc, char *argv[]) {
-    struct OFDM *ofdm;
-    FILE        *fcfg;
-    int          nin_frame;
-    struct LDPC  ldpc;
-
-    // Test configuration, read from stm_cfg.txt
-    int          config_verbose; 
-    int          config_testframes; 
-    int          config_ldpc_en; 
-    int          config_log_payload_syms;
-    int          config_profile;
-
-    int          i;
-    int          Nerrs, Terrs, Tbits, Terrs2, Tbits2, frame_count;
-    int          Tbits_coded, Terrs_coded;
-
-    semihosting_init();
-
-    fprintf(stdout, "OFDM Demod test\n");
-
-    // Read configuration - a file of '0' or '1' characters
-    char config[8];
-    fcfg = fopen("stm_cfg.txt", "r");
-    if (fcfg == NULL) {
-        fprintf(stderr, "Error opening config file\n");
-        exit(1);
-    }
-    if (fread(&config[0], 1, 8, fcfg) != 8) {
-        fprintf(stderr, "Error reading config file\n");
-        exit(1);
+  struct OFDM *ofdm;
+  FILE *fcfg;
+  int nin_frame;
+  struct LDPC ldpc;
+
+  // Test configuration, read from stm_cfg.txt
+  int config_verbose;
+  int config_testframes;
+  int config_ldpc_en;
+  int config_log_payload_syms;
+  int config_profile;
+
+  int i;
+  int Nerrs, Terrs, Tbits, Terrs2, Tbits2, frame_count;
+  int Tbits_coded, Terrs_coded;
+
+  semihosting_init();
+
+  fprintf(stdout, "OFDM Demod test\n");
+
+  // Read configuration - a file of '0' or '1' characters
+  char config[8];
+  fcfg = fopen("stm_cfg.txt", "r");
+  if (fcfg == NULL) {
+    fprintf(stderr, "Error opening config file\n");
+    exit(1);
+  }
+  if (fread(&config[0], 1, 8, fcfg) != 8) {
+    fprintf(stderr, "Error reading config file\n");
+    exit(1);
+  }
+  config_verbose = config[0] - '0';
+  config_testframes = config[1] - '0';
+  config_ldpc_en = config[2] - '0';
+  config_log_payload_syms = config[3] - '0';
+  config_profile = config[4] - '0';
+  fclose(fcfg);
+
+  int Nerrs_raw = 0;
+  int Nerrs_coded = 0;
+  int iter = 0;
+  int parityCheckCount = 0;
+
+  PROFILE_VAR(ofdm_demod_start, ofdm_demod_sync_search, ofdm_demod_demod,
+              ofdm_demod_diss, ofdm_demod_snr);
+  ofdm_demod_start = 0;
+  ofdm_demod_sync_search = 0;
+  ofdm_demod_demod = 0;
+  ofdm_demod_diss = 0;
+  ofdm_demod_snr = 0;
+  if (config_profile) machdep_profile_init();
+
+  ofdm = ofdm_create(NULL);
+  assert(ofdm != NULL);
+
+  /* Get a copy of the actual modem config */
+  ofdm_config = ofdm_get_config_param(ofdm);
+
+  ldpc_codes_setup(&ldpc, "HRA_112_112");
+
+  ofdm_bitsperframe = ofdm_get_bits_per_frame(ofdm);
+  ofdm_rowsperframe = ofdm_bitsperframe / (ofdm_config->nc * ofdm_config->bps);
+  ofdm_nuwbits =
+      (ofdm_config->ns - 1) * ofdm_config->bps - ofdm_config->txtbits;
+  ofdm_ntxtbits = ofdm_config->txtbits;
+  ofdm_nin = ofdm_get_nin(ofdm);
+
+  ofdm_set_verbose(ofdm, config_verbose);
+
+  int Nmaxsamperframe = ofdm_get_max_samples_per_frame(ofdm);
+
+  int data_bits_per_frame = ldpc.data_bits_per_frame;
+  int coded_bits_per_frame = ldpc.coded_bits_per_frame;
+  int coded_syms_per_frame = ldpc.coded_bits_per_frame / ofdm->bps;
+
+  short rx_scaled[Nmaxsamperframe];
+  int rx_bits[ofdm_bitsperframe];
+  char rx_bits_char[ofdm_bitsperframe];
+  uint8_t rx_uw[ofdm_nuwbits];
+  short txt_bits[ofdm_ntxtbits];
+  int f = 0;
+  Nerrs = Terrs = Tbits = Terrs2 = Tbits2 = Terrs_coded = Tbits_coded =
+      frame_count = 0;
+
+  float snr_est_smoothed_dB = 0.0;
+
+  float EsNo = 3.0f;  // Constant from ofdm_demod.c
+
+  COMP payload_syms[coded_syms_per_frame];
+  float payload_amps[coded_syms_per_frame];
+  COMP codeword_symbols[coded_syms_per_frame];
+  float codeword_amps[coded_syms_per_frame];
+
+  FILE *fin = fopen("stm_in.raw", "rb");
+  if (fin == NULL) {
+    fprintf(stderr, "Error opening input file\n");
+    exit(1);
+  }
+  setvbuf(fin, fin_buffer, _IOFBF, sizeof(fin_buffer));
+
+  fout = fopen("stm_out.raw", "wb");
+  if (fout == NULL) {
+    fprintf(stderr, "Error opening output file\n");
+    exit(1);
+  }
+  setvbuf(fout, fout_buffer, _IOFBF, sizeof(fout_buffer));
+
+  fdiag = fopen("stm_diag.raw", "wb");
+  if (fdiag == NULL) {
+    fprintf(stderr, "Error opening diag file\n");
+    exit(1);
+  }
+  setvbuf(fdiag, fdiag_buffer, _IOFBF, sizeof(fdiag_buffer));
+
+  nin_frame = ofdm_get_nin(ofdm);
+  int num_read;
+
+  while ((num_read = fread(rx_scaled, sizeof(short), nin_frame, fin)) ==
+         nin_frame) {
+    int log_payload_syms_flag = 0;
+
+    if (config_profile) PROFILE_SAMPLE(ofdm_demod_start);
+
+    /* demod */
+
+    if (config_profile)
+      PROFILE_SAMPLE_AND_LOG2(ofdm_demod_start, "  ofdm_demod_start");
+
+    if (ofdm->sync_state == search) {
+      if (config_profile) PROFILE_SAMPLE(ofdm_demod_sync_search);
+      ofdm_sync_search_shorts(ofdm, rx_scaled, (OFDM_PEAK / 2));
+      if (config_profile)
+        PROFILE_SAMPLE_AND_LOG2(ofdm_demod_sync_search,
+                                "  ofdm_demod_sync_search");
     }
-    config_verbose = config[0] - '0';
-    config_testframes = config[1] - '0';
-    config_ldpc_en = config[2] - '0';
-    config_log_payload_syms = config[3] - '0';
-    config_profile = config[4] - '0';
-    fclose(fcfg);
-
-    int Nerrs_raw = 0;
-    int Nerrs_coded = 0;
-    int iter = 0;
-    int parityCheckCount = 0;
-
-    PROFILE_VAR(ofdm_demod_start, ofdm_demod_sync_search,
-                ofdm_demod_demod, ofdm_demod_diss, ofdm_demod_snr);
-    ofdm_demod_start = 0;
-    ofdm_demod_sync_search = 0;
-    ofdm_demod_demod = 0;
-    ofdm_demod_diss = 0;
-    ofdm_demod_snr = 0;
-    if (config_profile) machdep_profile_init();
-
-    ofdm = ofdm_create(NULL);
-    assert(ofdm != NULL);
-
-    /* Get a copy of the actual modem config */
-    ofdm_config = ofdm_get_config_param(ofdm);
-
-    ldpc_codes_setup(&ldpc, "HRA_112_112");
-
-    ofdm_bitsperframe = ofdm_get_bits_per_frame(ofdm);
-    ofdm_rowsperframe = ofdm_bitsperframe / (ofdm_config->nc * ofdm_config->bps);
-    ofdm_nuwbits = (ofdm_config->ns - 1) * ofdm_config->bps - ofdm_config->txtbits;
-    ofdm_ntxtbits = ofdm_config->txtbits;
-    ofdm_nin = ofdm_get_nin(ofdm);
-
-    ofdm_set_verbose(ofdm, config_verbose);
-
-    int Nmaxsamperframe = ofdm_get_max_samples_per_frame(ofdm);
-
-    int data_bits_per_frame = ldpc.data_bits_per_frame;
-    int coded_bits_per_frame = ldpc.coded_bits_per_frame;
-    int coded_syms_per_frame = ldpc.coded_bits_per_frame/ofdm->bps;
-
-    short   rx_scaled[Nmaxsamperframe];
-    int     rx_bits[ofdm_bitsperframe];
-    char    rx_bits_char[ofdm_bitsperframe];
-    uint8_t rx_uw[ofdm_nuwbits];
-    short   txt_bits[ofdm_ntxtbits];
-    int f = 0;
-    Nerrs = Terrs = Tbits = Terrs2 = Tbits2 = Terrs_coded = Tbits_coded = frame_count = 0;
-
-    float snr_est_smoothed_dB = 0.0;
-
-    float EsNo = 3.0f;  // Constant from ofdm_demod.c
-
-    COMP  payload_syms[coded_syms_per_frame];
-    float payload_amps[coded_syms_per_frame];
-    COMP  codeword_symbols[coded_syms_per_frame];
-    float codeword_amps[coded_syms_per_frame];
-
-    FILE* fin = fopen("stm_in.raw", "rb");
-    if (fin == NULL) {
-        fprintf(stderr, "Error opening input file\n");
-        exit(1);
-    }
-    setvbuf(fin, fin_buffer,_IOFBF,sizeof(fin_buffer));
 
+    if ((ofdm->sync_state == synced) || (ofdm->sync_state == trial)) {
+      if (config_profile) PROFILE_SAMPLE(ofdm_demod_demod);
+      ofdm_demod_shorts(ofdm, rx_bits, rx_scaled, (OFDM_PEAK / 2));
+      if (config_profile)
+        PROFILE_SAMPLE_AND_LOG2(ofdm_demod_demod, "  ofdm_demod_demod");
+      if (config_profile) PROFILE_SAMPLE(ofdm_demod_diss);
+      ofdm_extract_uw(ofdm, ofdm->rx_np, ofdm->rx_amp, rx_uw);
+      ofdm_disassemble_psk_modem_packet(ofdm, ofdm->rx_np, ofdm->rx_amp,
+                                        payload_syms, payload_amps, txt_bits);
+      if (config_profile)
+        PROFILE_SAMPLE_AND_LOG2(ofdm_demod_diss, "  ofdm_demod_diss");
+      log_payload_syms_flag = 1;
+
+      /* SNR estimation and smoothing */
+      if (config_profile) PROFILE_SAMPLE(ofdm_demod_snr);
+      float EsNodB = ofdm_esno_est_calc((complex float *)payload_syms,
+                                        coded_syms_per_frame);
+      float snr_est_dB = ofdm_snr_from_esno(ofdm, EsNodB);
+      snr_est_smoothed_dB = 0.9f * snr_est_smoothed_dB + 0.1f * snr_est_dB;
+      if (config_profile) {
+        PROFILE_SAMPLE_AND_LOG2(ofdm_demod_snr, "  ofdm_demod_snr");
+      }
+
+      // LDPC
+      if (config_ldpc_en) {  // was llr_en in orig
+
+        /* first few symbols are used for UW and txt bits, find
+           start of (224,112) LDPC codeword and extract QPSK
+           symbols and amplitude estimates */
+        assert((ofdm_nuwbits + ofdm_ntxtbits + coded_bits_per_frame) ==
+               ofdm_bitsperframe);
+
+        /* newest symbols at end of buffer (uses final i from last loop) */
+        for (i = 0; i < coded_syms_per_frame; i++) {
+          codeword_symbols[i] = payload_syms[i];
+          codeword_amps[i] = payload_amps[i];
+        }
 
-    fout = fopen("stm_out.raw", "wb");
-    if (fout == NULL) {
-        fprintf(stderr, "Error opening output file\n");
-        exit(1);
-    }
-    setvbuf(fout, fout_buffer,_IOFBF,sizeof(fout_buffer));
+        /* run de-interleaver */
+        COMP codeword_symbols_de[coded_syms_per_frame];
+        float codeword_amps_de[coded_syms_per_frame];
 
-    fdiag = fopen("stm_diag.raw", "wb");
-    if (fdiag == NULL) {
-        fprintf(stderr, "Error opening diag file\n");
-        exit(1);
-    }
-    setvbuf(fdiag, fdiag_buffer,_IOFBF,sizeof(fdiag_buffer));
+        gp_deinterleave_comp(codeword_symbols_de, codeword_symbols,
+                             coded_syms_per_frame);
+        gp_deinterleave_float(codeword_amps_de, codeword_amps,
+                              coded_syms_per_frame);
 
-    nin_frame = ofdm_get_nin(ofdm);
-    int num_read;
-    
-    while((num_read = fread(rx_scaled, sizeof(short) , nin_frame, fin)) == nin_frame) {
+        float llr[coded_bits_per_frame];
 
-        int log_payload_syms_flag = 0;
+        if (config_ldpc_en) {
+          uint8_t out_char[coded_bits_per_frame];
+
+          if (config_testframes) {
+            Terrs += count_uncoded_errors(
+                &ldpc, ofdm_config, codeword_symbols_de, codeword_amps_de, 0);
+            Tbits += coded_bits_per_frame;
+          }
+
+          symbols_to_llrs(llr, codeword_symbols_de, codeword_amps_de, EsNo,
+                          ofdm->mean_amp, coded_syms_per_frame);
+          iter = run_ldpc_decoder(&ldpc, out_char, llr, &parityCheckCount);
+
+          // fprintf(stderr,"iter: %d pcc: %d\n", iter, parityCheckCount);
+
+          if (config_testframes) {
+            /* construct payload data bits */
+            uint8_t payload_data_bits[data_bits_per_frame];
+            ofdm_generate_payload_data_bits(payload_data_bits,
+                                            data_bits_per_frame);
+
+            Nerrs_coded =
+                count_errors(payload_data_bits, out_char, data_bits_per_frame);
+            Terrs_coded += Nerrs_coded;
+            Tbits_coded += data_bits_per_frame;
+          }
+
+          fwrite(out_char, sizeof(char), data_bits_per_frame, fout);
+        } else {
+          /* lpdc_en == 0,  external LDPC decoder, so output LLRs */
+          symbols_to_llrs(llr, codeword_symbols_de, codeword_amps_de, EsNo,
+                          ofdm->mean_amp, coded_syms_per_frame);
+          fwrite(llr, sizeof(double), coded_bits_per_frame, fout);
+        }
+      } else {  // !llrs_en (or ldpc_en)
+
+        /* simple hard decision output for uncoded testing, excluding UW and txt
+         */
+        assert(coded_syms_per_frame * ofdm_config->bps == coded_bits_per_frame);
+        for (i = 0; i < coded_syms_per_frame; i++) {
+          int bits[2];
+          complex float s = payload_syms[i].real + I * payload_syms[i].imag;
+          qpsk_demod(s, bits);
+          rx_bits_char[ofdm_config->bps * i] = bits[1];
+          rx_bits_char[ofdm_config->bps * i + 1] = bits[0];
+        }
 
-        if (config_profile) PROFILE_SAMPLE(ofdm_demod_start);
+        fwrite(rx_bits_char, sizeof(uint8_t), coded_bits_per_frame, fout);
+      }
 
-	    /* demod */
+      /* optional error counting on uncoded data in non-LDPC testframe mode */
 
-        if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_demod_start, "  ofdm_demod_start");
+      if (config_testframes && (config_ldpc_en == 0)) {
+        /* build up a test frame consisting of unique word, txt bits, and
+           psuedo-random uncoded payload bits.  The psuedo-random generator is
+           the same as Octave so it can interoperate with ofdm_tx.m/ofdm_rx.m */
 
-        if (ofdm->sync_state == search) {
-            if (config_profile) PROFILE_SAMPLE(ofdm_demod_sync_search);
-            ofdm_sync_search_shorts(ofdm, rx_scaled, (OFDM_PEAK/2));
-            if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_demod_sync_search, "  ofdm_demod_sync_search");
-        }
+        int Npayloadbits = ofdm_bitsperframe - (ofdm_nuwbits + ofdm_ntxtbits);
+        uint16_t r[Npayloadbits];
+        uint8_t payload_bits[Npayloadbits];
+        uint8_t tx_bits[Npayloadbits];
+
+        ofdm_rand(r, Npayloadbits);
 
-        if ((ofdm->sync_state == synced) || (ofdm->sync_state == trial) ) {
-            if (config_profile) PROFILE_SAMPLE(ofdm_demod_demod);
-            ofdm_demod_shorts(ofdm, rx_bits, rx_scaled, (OFDM_PEAK/2));
-            if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_demod_demod, "  ofdm_demod_demod");
-            if (config_profile) PROFILE_SAMPLE(ofdm_demod_diss);
-            ofdm_extract_uw(ofdm, ofdm->rx_np, ofdm->rx_amp, rx_uw);
-            ofdm_disassemble_qpsk_modem_packet(ofdm, ofdm->rx_np, ofdm->rx_amp, payload_syms, payload_amps, txt_bits);
-            if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_demod_diss, "  ofdm_demod_diss");
-            log_payload_syms_flag = 1;
-
-            /* SNR estimation and smoothing */
-            if (config_profile) PROFILE_SAMPLE(ofdm_demod_snr);
-            float EsNodB = ofdm_esno_est_calc((complex float*)payload_syms, coded_syms_per_frame);
-            float snr_est_dB = ofdm_snr_from_esno(ofdm, EsNodB);
-            snr_est_smoothed_dB = 0.9f * snr_est_smoothed_dB + 0.1f  *snr_est_dB;
-            if (config_profile) {
-                PROFILE_SAMPLE_AND_LOG2(ofdm_demod_snr, "  ofdm_demod_snr");
-            }
-
-            // LDPC
-            if (config_ldpc_en) {  // was llr_en in orig
-
-                /* first few symbols are used for UW and txt bits, find
-                   start of (224,112) LDPC codeword and extract QPSK
-                   symbols and amplitude estimates */
-                assert((ofdm_nuwbits + ofdm_ntxtbits + coded_bits_per_frame) 
-                        == ofdm_bitsperframe);
-
-                /* newest symbols at end of buffer (uses final i from last loop) */
-                for(i=0; i < coded_syms_per_frame; i++) {
-                    codeword_symbols[i] = payload_syms[i];
-                    codeword_amps[i]    = payload_amps[i];
-                }
-
-                /* run de-interleaver */
-                COMP  codeword_symbols_de[coded_syms_per_frame];
-                float codeword_amps_de[coded_syms_per_frame];
-
-                gp_deinterleave_comp (codeword_symbols_de, codeword_symbols, coded_syms_per_frame);
-                gp_deinterleave_float(codeword_amps_de, codeword_amps, coded_syms_per_frame);
-
-                float llr[coded_bits_per_frame];
-
-                if (config_ldpc_en) {
-                    uint8_t out_char[coded_bits_per_frame];
-
-                        if (config_testframes) {
-                            Terrs += count_uncoded_errors(&ldpc, ofdm_config, codeword_symbols_de, 0);
-                            Tbits += coded_bits_per_frame; 
-                        }
-
-                            symbols_to_llrs(llr, codeword_symbols_de, codeword_amps_de,
-                                                 EsNo, ofdm->mean_amp, coded_syms_per_frame);
-                            iter = run_ldpc_decoder(&ldpc, out_char, llr, &parityCheckCount);
-
-                            //fprintf(stderr,"iter: %d pcc: %d\n", iter, parityCheckCount);
-
-                            if (config_testframes) {
-                                /* construct payload data bits */
-                                uint8_t payload_data_bits[data_bits_per_frame];
-                                ofdm_generate_payload_data_bits(payload_data_bits, data_bits_per_frame);
-                                
-                                Nerrs_coded = count_errors(payload_data_bits, out_char, data_bits_per_frame);
-                                Terrs_coded += Nerrs_coded;
-                                Tbits_coded += data_bits_per_frame;
-                            }
-
-                            fwrite(out_char, sizeof(char), data_bits_per_frame, fout);
-                } else { 
-                    /* lpdc_en == 0,  external LDPC decoder, so output LLRs */
-                    symbols_to_llrs(llr, codeword_symbols_de, codeword_amps_de, EsNo, ofdm->mean_amp, coded_syms_per_frame);
-                    fwrite(llr, sizeof(double), coded_bits_per_frame, fout);
-                }
-            } else {    // !llrs_en (or ldpc_en)
-
-                /* simple hard decision output for uncoded testing, excluding UW and txt */
-                assert(coded_syms_per_frame*ofdm_config->bps == coded_bits_per_frame);
-                for (i = 0; i < coded_syms_per_frame; i++) {
-                    int bits[2];
-                    complex float s = payload_syms[i].real + I * payload_syms[i].imag;
-                    qpsk_demod(s, bits);
-                    rx_bits_char[ofdm_config->bps * i] = bits[1];
-                    rx_bits_char[ofdm_config->bps * i + 1] = bits[0];
-                }
-
-                fwrite(rx_bits_char, sizeof (uint8_t), coded_bits_per_frame, fout);
-            }
-
-            /* optional error counting on uncoded data in non-LDPC testframe mode */
-
-            if (config_testframes && (config_ldpc_en == 0)) {
-                /* build up a test frame consisting of unique word, txt bits, and psuedo-random
-                   uncoded payload bits.  The psuedo-random generator is the same as Octave so
-                   it can interoperate with ofdm_tx.m/ofdm_rx.m */
-
-                int Npayloadbits = ofdm_bitsperframe-(ofdm_nuwbits+ofdm_ntxtbits);
-                uint16_t r[Npayloadbits];
-                uint8_t  payload_bits[Npayloadbits];
-                uint8_t  tx_bits[Npayloadbits];
-                
-                ofdm_rand(r, Npayloadbits);
-
-                for(i=0; i<Npayloadbits; i++) {
-                    payload_bits[i] = r[i] > 16384;
-                    //fprintf(stderr,"%d %d ", r[i], tx_bits_char[i]);
-                }
-
-                uint8_t txt_bits[ofdm_ntxtbits];
-
-                for(i=0; i<ofdm_ntxtbits; i++) {
-                    txt_bits[i] = 0;
-                }
-
-                ofdm_assemble_qpsk_modem_packet(ofdm, tx_bits, payload_bits, txt_bits);
-
-                Nerrs = 0;
-                for(i=0; i<ofdm_bitsperframe; i++) {
-                    if (tx_bits[i] != rx_bits[i]) {
-                        Nerrs++;
-                    }
-                }
-
-                Terrs += Nerrs;
-                Tbits += ofdm_bitsperframe;
-
-                if (frame_count >= NDISCARD) {
-                    Terrs2 += Nerrs;
-                    Tbits2 += ofdm_bitsperframe;
-                }
-            } // config_testframes ...
-
-            frame_count++;
-        } // state "synced" or "trial"
-
-        nin_frame = ofdm_get_nin(ofdm);
-        ofdm_sync_state_machine(ofdm, rx_uw);
-
-        /* act on any events returned by state machine */
-
-        if (ofdm->sync_start) {
-            Terrs = Tbits = Terrs2 = Tbits2 = Terrs_coded = Tbits_coded = frame_count = Nerrs_raw = Nerrs_coded = 0;
+        for (i = 0; i < Npayloadbits; i++) {
+          payload_bits[i] = r[i] > 16384;
+          // fprintf(stderr,"%d %d ", r[i], tx_bits_char[i]);
         }
 
-        if (config_testframes && config_verbose) {
-            fprintf(stderr, "%3d st: %-6s", f, statemode[ofdm->last_sync_state]);
-            fprintf(stderr, " euw: %2d %1d f: %5.1f eraw: %3d ecdd: %3d iter: %3d pcc: %3d\n",
-                ofdm->uw_errors, ofdm->sync_counter,
-                (double)ofdm->foff_est_hz,
-                Nerrs, Nerrs_coded, iter, parityCheckCount);
+        uint8_t txt_bits[ofdm_ntxtbits];
+
+        for (i = 0; i < ofdm_ntxtbits; i++) {
+          txt_bits[i] = 0;
         }
 
-        if (config_log_payload_syms) {
-            if (! log_payload_syms_flag) {
-                memset(payload_syms, 0, (sizeof(COMP)*coded_syms_per_frame));
-                memset(payload_amps, 0, (sizeof(float)*coded_syms_per_frame));
-            }
-            fwrite(payload_syms, sizeof(COMP), coded_syms_per_frame, fdiag);
-            fwrite(payload_amps, sizeof(float), coded_syms_per_frame, fdiag);
-            }
-
-        f++;
-    } // while(fread(.., fin))
-
-    flush_all();    // To make sure this function is included in binary.
-    fclose(fin);
-    fclose(fout);
-    fclose(fdiag);
-
-    if (config_testframes) {
-        printf("BER......: %5.4f Tbits: %5d Terrs: %5d\n", (double)Terrs/Tbits, Tbits, Terrs);
-        if (!config_ldpc_en) {
-            printf("BER2.....: %5.4f Tbits: %5d Terrs: %5d\n", (double)Terrs2/Tbits2, Tbits2, Terrs2);
+        ofdm_assemble_psk_modem_packet(ofdm, tx_bits, payload_bits, txt_bits);
+
+        Nerrs = 0;
+        for (i = 0; i < ofdm_bitsperframe; i++) {
+          if (tx_bits[i] != rx_bits[i]) {
+            Nerrs++;
+          }
         }
-        if (config_ldpc_en) {
-            printf("Coded BER: %5.4f Tbits: %5d Terrs: %5d\n",
-                    (double)Terrs_coded/Tbits_coded, Tbits_coded, Terrs_coded);
+
+        Terrs += Nerrs;
+        Tbits += ofdm_bitsperframe;
+
+        if (frame_count >= NDISCARD) {
+          Terrs2 += Nerrs;
+          Tbits2 += ofdm_bitsperframe;
         }
+      }  // config_testframes ...
+
+      frame_count++;
+    }  // state "synced" or "trial"
+
+    nin_frame = ofdm_get_nin(ofdm);
+    ofdm_sync_state_machine(ofdm, rx_uw);
+
+    /* act on any events returned by state machine */
+
+    if (ofdm->sync_start) {
+      Terrs = Tbits = Terrs2 = Tbits2 = Terrs_coded = Tbits_coded =
+          frame_count = Nerrs_raw = Nerrs_coded = 0;
     }
 
-    if (config_profile) {
-        printf("\nStart Profile Data\n");
-        machdep_profile_print_logged_samples();
-        printf("End Profile Data\n");
-        }
+    if (config_testframes && config_verbose) {
+      fprintf(stderr, "%3d st: %-6s", f, statemode[ofdm->last_sync_state]);
+      fprintf(stderr,
+              " euw: %2d %1d f: %5.1f eraw: %3d ecdd: %3d iter: %3d pcc: %3d\n",
+              ofdm->uw_errors, ofdm->sync_counter, (double)ofdm->foff_est_hz,
+              Nerrs, Nerrs_coded, iter, parityCheckCount);
+    }
+
+    if (config_log_payload_syms) {
+      if (!log_payload_syms_flag) {
+        memset(payload_syms, 0, (sizeof(COMP) * coded_syms_per_frame));
+        memset(payload_amps, 0, (sizeof(float) * coded_syms_per_frame));
+      }
+      fwrite(payload_syms, sizeof(COMP), coded_syms_per_frame, fdiag);
+      fwrite(payload_amps, sizeof(float), coded_syms_per_frame, fdiag);
+    }
+
+    f++;
+  }  // while(fread(.., fin))
+
+  flush_all();  // To make sure this function is included in binary.
+  fclose(fin);
+  fclose(fout);
+  fclose(fdiag);
+
+  if (config_testframes) {
+    printf("BER......: %5.4f Tbits: %5d Terrs: %5d\n", (double)Terrs / Tbits,
+           Tbits, Terrs);
+    if (!config_ldpc_en) {
+      printf("BER2.....: %5.4f Tbits: %5d Terrs: %5d\n",
+             (double)Terrs2 / Tbits2, Tbits2, Terrs2);
+    }
+    if (config_ldpc_en) {
+      printf("Coded BER: %5.4f Tbits: %5d Terrs: %5d\n",
+             (double)Terrs_coded / Tbits_coded, Tbits_coded, Terrs_coded);
+    }
+  }
+
+  if (config_profile) {
+    printf("\nStart Profile Data\n");
+    machdep_profile_print_logged_samples();
+    printf("End Profile Data\n");
+  }
 
-    printf("\nEnd of Test\n");
-    fclose(stdout);
-    fclose(stderr);
+  printf("\nEnd of Test\n");
+  fclose(stdout);
+  fclose(stderr);
 
-    return 0;
+  return 0;
 }
 
 /* vi:set ts=4 et sts=4: */
diff --git a/stm32/unittest/src/tst_ofdm_mod.c b/stm32/unittest/src/tst_ofdm_mod.c
index 77b2e37..33a35a0 100644
--- a/stm32/unittest/src/tst_ofdm_mod.c
+++ b/stm32/unittest/src/tst_ofdm_mod.c
@@ -29,7 +29,7 @@
  *
  * Typical run:
 
-    ofdm_gen_test_bits stm_in.raw 6 --rand 
+    ofdm_gen_test_bits stm_in.raw 6 --rand
 
     ofdm_mod stm_in.raw ref_mod_out.raw
 
@@ -58,191 +58,195 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <unistd.h>
 
-#include "semihosting.h"
 #include "codec2_ofdm.h"
-#include "ofdm_internal.h"
-#include "ldpc_codes.h"
-#include "interldpc.h"
+#include "debug_alloc.h"
 #include "gp_interleaver.h"
-
-#include "stm32f4xx_conf.h"
-#include "stm32f4xx.h"
+#include "interldpc.h"
+#include "ldpc_codes.h"
 #include "machdep.h"
-
-#include "debug_alloc.h"
+#include "ofdm_internal.h"
+#include "semihosting.h"
+#include "stm32f4xx.h"
+#include "stm32f4xx_conf.h"
 
 int main(int argc, char *argv[]) {
-    struct OFDM *ofdm;
-    FILE        *fcfg;
-    struct LDPC  ldpc;
-
-    // Test configuration, read from stm_cfg.txt
-    int          config_verbose;
-//    int          config_testframes;
-    int          config_ldpc_en;
-//    int          config_log_payload_syms;
-    int          config_profile;
-
-    int          Nbitsperframe, Nsamperframe;
-    int          frame = 0;
-    int          i;
-
-    semihosting_init();
-
-    printf("OFDM_mod test and profile\n");
-
-    // Read configuration - a file of '0' or '1' characters
-    char config[8];
-    fcfg = fopen("stm_cfg.txt", "r");
-    if (fcfg == NULL) {
-        fprintf(stderr, "Error opening config file\n");
-        exit(1);
-    }
-    if (fread(&config[0], 1, 8, fcfg) != 8) {
-        fprintf(stderr, "Error reading config file\n");
-        exit(1);
-    }
-    config_verbose = config[0] - '0';
-//    config_testframes = config[1] - '0';
-    config_ldpc_en = config[2] - '0';
-//    config_log_payload_syms = config[3] - '0';
-    config_profile = config[4] - '0';
-    fclose(fcfg);
-
-    PROFILE_VAR(ofdm_mod_start);
-    if (config_profile) machdep_profile_init();
-
-    struct OFDM_CONFIG *ofdm_config;
+  struct OFDM *ofdm;
+  FILE *fcfg;
+  struct LDPC ldpc;
+
+  // Test configuration, read from stm_cfg.txt
+  int config_verbose;
+  //    int          config_testframes;
+  int config_ldpc_en;
+  //    int          config_log_payload_syms;
+  int config_profile;
+
+  int Nbitsperframe, Nsamperframe;
+  int frame = 0;
+  int i;
+
+  semihosting_init();
+
+  printf("OFDM_mod test and profile\n");
+
+  // Read configuration - a file of '0' or '1' characters
+  char config[8];
+  fcfg = fopen("stm_cfg.txt", "r");
+  if (fcfg == NULL) {
+    fprintf(stderr, "Error opening config file\n");
+    exit(1);
+  }
+  if (fread(&config[0], 1, 8, fcfg) != 8) {
+    fprintf(stderr, "Error reading config file\n");
+    exit(1);
+  }
+  config_verbose = config[0] - '0';
+  //    config_testframes = config[1] - '0';
+  config_ldpc_en = config[2] - '0';
+  //    config_log_payload_syms = config[3] - '0';
+  config_profile = config[4] - '0';
+  fclose(fcfg);
+
+  PROFILE_VAR(ofdm_mod_start);
+  if (config_profile) machdep_profile_init();
+
+  struct OFDM_CONFIG *ofdm_config;
+
+  ofdm = ofdm_create(NULL);
+  assert(ofdm != NULL);
+
+  /* Get a copy of the actual modem config */
+  ofdm_config = ofdm_get_config_param(ofdm);
+
+  ldpc_codes_setup(&ldpc, "HRA_112_112");
+
+  Nbitsperframe = ofdm_get_bits_per_frame(ofdm);
+  int Ndatabitsperframe;
+  if (config_ldpc_en) {
+    Ndatabitsperframe = ldpc.data_bits_per_frame;
+  } else {
+    Ndatabitsperframe =
+        ofdm_get_bits_per_frame(ofdm) - ofdm->nuwbits - ofdm->ntxtbits;
+  }
+
+  Nsamperframe = ofdm_get_samples_per_frame(ofdm);
+  //    int ofdm_nuwbits = (ofdm_config->ns - 1) * ofdm_config->bps -
+  //    ofdm_config->txtbits;
+
+  if (config_verbose) {
+    ofdm_set_verbose(ofdm, config_verbose);
+    fprintf(stderr, "Nsamperframe: %d, Nbitsperframe: %d \n", Nsamperframe,
+            Nbitsperframe);
+  }
+
+  int ofdm_ntxtbits = ofdm_config->txtbits;
+
+  uint8_t tx_bits_char[Ndatabitsperframe];
+  int16_t tx_scaled[Nsamperframe];
+  uint8_t txt_bits_char[ofdm_ntxtbits];
+
+  for (i = 0; i < ofdm_ntxtbits; i++) {
+    txt_bits_char[i] = 0;
+  }
+
+  if (config_verbose) {
+    ofdm_print_info(ofdm);
+  }
+
+  int sin = open("stm_in.raw", O_RDONLY);
+  if (sin < 0) {
+    printf("Error opening input file\n");
+    exit(1);
+  }
+
+  int sout = open("mod.raw", O_WRONLY | O_TRUNC | O_CREAT, 0666);
+  if (sout < 0) {
+    printf("Error opening output file\n");
+    exit(1);
+  }
+
+  while (read(sin, tx_bits_char, sizeof(char) * Ndatabitsperframe) ==
+         Ndatabitsperframe) {
+    fprintf(stderr, "Frame %d\n", frame);
 
-    ofdm = ofdm_create(NULL);
-    assert(ofdm != NULL);
-
-    /* Get a copy of the actual modem config */
-    ofdm_config = ofdm_get_config_param(ofdm);
-
-    ldpc_codes_setup(&ldpc, "HRA_112_112");
-
-    Nbitsperframe = ofdm_get_bits_per_frame(ofdm);
-    int Ndatabitsperframe;
-    if (config_ldpc_en) {
-        Ndatabitsperframe = ldpc.data_bits_per_frame;
-    } else {
-        Ndatabitsperframe = ofdm_get_bits_per_frame(ofdm) - ofdm->nuwbits - ofdm->ntxtbits;
-    }
-
-    Nsamperframe = ofdm_get_samples_per_frame(ofdm);
-//    int ofdm_nuwbits = (ofdm_config->ns - 1) * ofdm_config->bps - ofdm_config->txtbits;
-
-    if (config_verbose) {
-        ofdm_set_verbose(ofdm, config_verbose);
-        fprintf(stderr, "Nsamperframe: %d, Nbitsperframe: %d \n", Nsamperframe, Nbitsperframe);
-    }
-
-    int ofdm_ntxtbits =  ofdm_config->txtbits;
-
-    uint8_t tx_bits_char[Ndatabitsperframe];
-    int16_t tx_scaled[Nsamperframe];
-    uint8_t txt_bits_char[ofdm_ntxtbits];
-
-    for(i=0; i< ofdm_ntxtbits; i++) {
-        txt_bits_char[i] = 0;
-    }    
-    
-    if (config_verbose) {
-	    ofdm_print_info(ofdm);
-    }
-
-    int sin = open("stm_in.raw", O_RDONLY);
-    if (sin < 0) {
-        printf("Error opening input file\n");
-        exit(1);
-    }
-
-    int sout = open("mod.raw", O_WRONLY|O_TRUNC|O_CREAT, 0666);
-    if (sout < 0) {
-        printf("Error opening output file\n");
-        exit(1);
+    if (config_profile) {
+      PROFILE_SAMPLE(ofdm_mod_start);
     }
 
-    while (read(sin, tx_bits_char, sizeof(char) * Ndatabitsperframe) == Ndatabitsperframe) {
-        fprintf(stderr, "Frame %d\n", frame);
-
-        if (config_profile) { PROFILE_SAMPLE(ofdm_mod_start); }
-
-            if (config_ldpc_en) {
-
-                complex float tx_sams[Nsamperframe];
-                ofdm_ldpc_interleave_tx(ofdm, &ldpc, tx_sams, tx_bits_char, txt_bits_char);
+    if (config_ldpc_en) {
+      complex float tx_sams[Nsamperframe];
+      ofdm_ldpc_interleave_tx(ofdm, &ldpc, tx_sams, tx_bits_char,
+                              txt_bits_char);
 
-                for(i=0; i<Nsamperframe; i++) {
-                    tx_scaled[i] = crealf(tx_sams[i]);
-                }
+      for (i = 0; i < Nsamperframe; i++) {
+        tx_scaled[i] = crealf(tx_sams[i]);
+      }
 
-             } else { // !config_ldpc_en
+    } else {  // !config_ldpc_en
 
-                uint8_t tx_frame[Nbitsperframe];
-                ofdm_assemble_qpsk_modem_packet(ofdm, tx_frame, tx_bits_char, txt_bits_char);
+      uint8_t tx_frame[Nbitsperframe];
+      ofdm_assemble_psk_modem_packet(ofdm, tx_frame, tx_bits_char,
+                                     txt_bits_char);
 
-                int tx_bits[Nbitsperframe];
-                for(i=0; i<Nbitsperframe; i++) {
-                    tx_bits[i] = tx_frame[i];
-                }
+      int tx_bits[Nbitsperframe];
+      for (i = 0; i < Nbitsperframe; i++) {
+        tx_bits[i] = tx_frame[i];
+      }
 
-	        if (config_verbose >=3) {
-                    fprintf(stderr, "\ntx_bits:\n");
-                    for (i = 0; i < Nbitsperframe; i++) {
-                        fprintf(stderr, "  %3d %8d\n", i, tx_bits[i]);
-                    }
-                }
+      if (config_verbose >= 3) {
+        fprintf(stderr, "\ntx_bits:\n");
+        for (i = 0; i < Nbitsperframe; i++) {
+          fprintf(stderr, "  %3d %8d\n", i, tx_bits[i]);
+        }
+      }
 
-                COMP tx_sams[Nsamperframe];
-                ofdm_mod(ofdm, tx_sams, tx_bits);
+      COMP tx_sams[Nsamperframe];
+      ofdm_mod(ofdm, tx_sams, tx_bits);
 
-	        if (config_verbose >=3) {
-                    fprintf(stderr, "\ntx_sams:\n");
-                    for (i = 0; i < Nsamperframe; i++) {
-                        fprintf(stderr, "  %3d % f\n", i, (double)tx_sams[i].real);
-                    }
-                }
+      if (config_verbose >= 3) {
+        fprintf(stderr, "\ntx_sams:\n");
+        for (i = 0; i < Nsamperframe; i++) {
+          fprintf(stderr, "  %3d % f\n", i, (double)tx_sams[i].real);
+        }
+      }
 
-                for(i=0; i<Nsamperframe; i++) {
-                    tx_scaled[i] = tx_sams[i].real;
-                }
-            }
+      for (i = 0; i < Nsamperframe; i++) {
+        tx_scaled[i] = tx_sams[i].real;
+      }
+    }
 
-        if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_mod_start, "  ofdm_mod");
+    if (config_profile) PROFILE_SAMPLE_AND_LOG2(ofdm_mod_start, "  ofdm_mod");
 
-        write(sout, tx_scaled, sizeof(int16_t) * Nsamperframe);
+    write(sout, tx_scaled, sizeof(int16_t) * Nsamperframe);
 
-        frame ++;
+    frame++;
 
-    }  // while (fread(...
+  }  // while (fread(...
 
-    close(sin);
-    close(sout);
+  close(sin);
+  close(sout);
 
-    if (config_verbose)
-        printf("%d frames processed\n", frame);
+  if (config_verbose) printf("%d frames processed\n", frame);
 
-    if (config_profile) {
-        printf("\nStart Profile Data\n");
-        machdep_profile_print_logged_samples();
-        printf("End Profile Data\n");
-        }
+  if (config_profile) {
+    printf("\nStart Profile Data\n");
+    machdep_profile_print_logged_samples();
+    printf("End Profile Data\n");
+  }
 
-    printf("\nEnd of Test\n");
-    fclose(stdout);
-    fclose(stderr);
+  printf("\nEnd of Test\n");
+  fclose(stdout);
+  fclose(stderr);
 
-    return 0;
+  return 0;
 }
 
 /* vi:set ts=4 et sts=4: */