Merge pull request #3 from drowe67/dr-cleanup21.2.0

Cleanup Part 2

1 files changed, 101 insertions, 96 deletions

diff --git a/src/fdmdv_mod.c b/src/fdmdv_mod.c
index a87958f..2ad2237 100644
--- a/src/fdmdv_mod.c
+++ b/src/fdmdv_mod.c
@@ -11,7 +11,6 @@
 
 \*---------------------------------------------------------------------------*/
 
-
 /*
   Copyright (C) 2012 David Rowe
 
@@ -30,129 +29,135 @@
 */
 
 #include <assert.h>
+#include <errno.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <errno.h>
 
 #include "codec2_fdmdv.h"
 
-int main(int argc, char *argv[])
-{
-    FILE         *fin, *fout;
-    struct FDMDV *fdmdv;
-    char          *packed_bits;
-    int           *tx_bits;
-    COMP          tx_fdm[2*FDMDV_NOM_SAMPLES_PER_FRAME];
-    short         tx_fdm_scaled[2*FDMDV_NOM_SAMPLES_PER_FRAME];
-    int           i, bit, byte;
-    int           sync_bit;
-    int           bits_per_fdmdv_frame;
-    int           bits_per_codec_frame;
-    int           bytes_per_codec_frame;
-    int           Nc;
+int main(int argc, char *argv[]) {
+  FILE *fin, *fout;
+  struct FDMDV *fdmdv;
+  char *packed_bits;
+  int *tx_bits;
+  COMP tx_fdm[2 * FDMDV_NOM_SAMPLES_PER_FRAME];
+  short tx_fdm_scaled[2 * FDMDV_NOM_SAMPLES_PER_FRAME];
+  int i, bit, byte;
+  int sync_bit;
+  int bits_per_fdmdv_frame;
+  int bits_per_codec_frame;
+  int bytes_per_codec_frame;
+  int Nc;
 #ifdef CHANNEL_SIM
-    COMP          foff_phase_rect;
-    float         foff;
+  COMP foff_phase_rect;
+  float foff;
 #endif
 
-    if (argc < 3) {
-	printf("usage: %s InputBitFile OutputModemRawFile [Nc]\n", argv[0]);
-	printf("e.g    %s hts1a.c2 hts1a_fdmdv.raw\n", argv[0]);
-	exit(1);
-    }
-
-    if (strcmp(argv[1], "-")  == 0) fin = stdin;
-    else if ( (fin = fopen(argv[1],"rb")) == NULL ) {
-	fprintf(stderr, "Error opening input bit file: %s: %s.\n",
-         argv[1], strerror(errno));
-	exit(1);
-    }
-
-    if (strcmp(argv[2], "-") == 0) fout = stdout;
-    else if ( (fout = fopen(argv[2],"wb")) == NULL ) {
-	fprintf(stderr, "Error opening output modem sample file: %s: %s.\n",
-         argv[2], strerror(errno));
-	exit(1);
+  if (argc < 3) {
+    printf("usage: %s InputBitFile OutputModemRawFile [Nc]\n", argv[0]);
+    printf("e.g    %s hts1a.c2 hts1a_fdmdv.raw\n", argv[0]);
+    exit(1);
+  }
+
+  if (strcmp(argv[1], "-") == 0)
+    fin = stdin;
+  else if ((fin = fopen(argv[1], "rb")) == NULL) {
+    fprintf(stderr, "Error opening input bit file: %s: %s.\n", argv[1],
+            strerror(errno));
+    exit(1);
+  }
+
+  if (strcmp(argv[2], "-") == 0)
+    fout = stdout;
+  else if ((fout = fopen(argv[2], "wb")) == NULL) {
+    fprintf(stderr, "Error opening output modem sample file: %s: %s.\n",
+            argv[2], strerror(errno));
+    exit(1);
+  }
+
+  if (argc == 4) {
+    Nc = atoi(argv[3]);
+
+    if ((Nc < 2) || (Nc > FDMDV_NC_MAX)) {
+      fprintf(stderr, "Error number of carriers must be between 2 and %d\n",
+              FDMDV_NC_MAX);
+      exit(1);
     }
+  } else
+    Nc = FDMDV_NC;
 
-    if (argc == 4) {
-        Nc = atoi(argv[3]);
+  fdmdv = fdmdv_create(Nc);
 
-        if ((Nc < 2) || (Nc > FDMDV_NC_MAX) ) {
-            fprintf(stderr, "Error number of carriers must be between 2 and %d\n",  FDMDV_NC_MAX);
-            exit(1);
-        }
-   }
-    else
-        Nc = FDMDV_NC;
+  bits_per_fdmdv_frame = fdmdv_bits_per_frame(fdmdv);
+  bits_per_codec_frame = 2 * fdmdv_bits_per_frame(fdmdv);
+  bytes_per_codec_frame = (bits_per_codec_frame + 7) / 8;
 
-    fdmdv = fdmdv_create(Nc);
-
-    bits_per_fdmdv_frame = fdmdv_bits_per_frame(fdmdv);
-    bits_per_codec_frame = 2*fdmdv_bits_per_frame(fdmdv);
-    bytes_per_codec_frame = (bits_per_codec_frame+7)/8;
-
-    packed_bits = (char*)malloc(bytes_per_codec_frame);
-    assert(packed_bits != NULL);
-    tx_bits = (int*)malloc(sizeof(int)*bits_per_codec_frame);
-    assert(tx_bits != NULL);
+  packed_bits = (char *)malloc(bytes_per_codec_frame);
+  assert(packed_bits != NULL);
+  tx_bits = (int *)malloc(sizeof(int) * bits_per_codec_frame);
+  assert(tx_bits != NULL);
 
 #ifdef CHANNEL_SIM
-    foff = -100;
-    foff_phase_rect.real = 1.0; foff_phase_rect.imag = 0.0;
+  foff = -100;
+  foff_phase_rect.real = 1.0;
+  foff_phase_rect.imag = 0.0;
 #endif
 
-    while(fread(packed_bits, sizeof(char), bytes_per_codec_frame, fin) == bytes_per_codec_frame) {
-
-	/* unpack bits, MSB first */
-
-	bit = 7; byte = 0;
-	for(i=0; i<bits_per_codec_frame; i++) {
-	    tx_bits[i] = (packed_bits[byte] >> bit) & 0x1;
-	    bit--;
-	    if (bit < 0) {
-		bit = 7;
-		byte++;
-	    }
-	}
+  while (fread(packed_bits, sizeof(char), bytes_per_codec_frame, fin) ==
+         bytes_per_codec_frame) {
+    /* unpack bits, MSB first */
+
+    bit = 7;
+    byte = 0;
+    for (i = 0; i < bits_per_codec_frame; i++) {
+      tx_bits[i] = (packed_bits[byte] >> bit) & 0x1;
+      bit--;
+      if (bit < 0) {
+        bit = 7;
+        byte++;
+      }
+    }
 
-	/* modulate even and odd frames */
+    /* modulate even and odd frames */
 
-	fdmdv_mod(fdmdv, tx_fdm, tx_bits, &sync_bit);
-	assert(sync_bit == 1);
+    fdmdv_mod(fdmdv, tx_fdm, tx_bits, &sync_bit);
+    assert(sync_bit == 1);
 
-	fdmdv_mod(fdmdv, &tx_fdm[FDMDV_NOM_SAMPLES_PER_FRAME], &tx_bits[bits_per_fdmdv_frame], &sync_bit);
-	assert(sync_bit == 0);
+    fdmdv_mod(fdmdv, &tx_fdm[FDMDV_NOM_SAMPLES_PER_FRAME],
+              &tx_bits[bits_per_fdmdv_frame], &sync_bit);
+    assert(sync_bit == 0);
 
-        #ifdef CHANNEL_SIM
-        /* optional freq shift and channel simulation */
+#ifdef CHANNEL_SIM
+    /* optional freq shift and channel simulation */
 
-        fdmdv_freq_shift(tx_fdm, tx_fdm, foff, &foff_phase_rect, 2*FDMDV_NOM_SAMPLES_PER_FRAME);
-        fdmdv_simulate_channel(&sig_pwr_av, tx_fdm, 2*FDMDV_NOM_SAMPLES_PER_FRAME, 10.0);
-        #endif
+    fdmdv_freq_shift(tx_fdm, tx_fdm, foff, &foff_phase_rect,
+                     2 * FDMDV_NOM_SAMPLES_PER_FRAME);
+    fdmdv_simulate_channel(&sig_pwr_av, tx_fdm, 2 * FDMDV_NOM_SAMPLES_PER_FRAME,
+                           10.0);
+#endif
 
-	/* scale and save to disk as shorts */
+    /* scale and save to disk as shorts */
 
-	for(i=0; i<2*FDMDV_NOM_SAMPLES_PER_FRAME; i++)
-	    tx_fdm_scaled[i] = FDMDV_SCALE * tx_fdm[i].real;
+    for (i = 0; i < 2 * FDMDV_NOM_SAMPLES_PER_FRAME; i++)
+      tx_fdm_scaled[i] = FDMDV_SCALE * tx_fdm[i].real;
 
- 	fwrite(tx_fdm_scaled, sizeof(short), 2*FDMDV_NOM_SAMPLES_PER_FRAME, fout);
+    fwrite(tx_fdm_scaled, sizeof(short), 2 * FDMDV_NOM_SAMPLES_PER_FRAME, fout);
 
-	/* if this is in a pipeline, we probably don't want the usual
-	   buffering to occur */
+    /* if this is in a pipeline, we probably don't want the usual
+       buffering to occur */
 
-        if (fout == stdout) fflush(stdout);
-    }
+    if (fout == stdout) fflush(stdout);
+  }
 
-    //fdmdv_dump_osc_mags(fdmdv);
+  // fdmdv_dump_osc_mags(fdmdv);
 
-    free(tx_bits);
-    free(packed_bits);
-    fclose(fin);
-    fclose(fout);
-    fdmdv_destroy(fdmdv);
+  free(tx_bits);
+  free(packed_bits);
+  fclose(fin);
+  fclose(fout);
+  fdmdv_destroy(fdmdv);
 
-    return 0;
+  return 0;
 }