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

Cleanup Part 2

1 files changed, 110 insertions, 110 deletions

diff --git a/unittest/tfreedv_800XA_rawdata.c b/unittest/tfreedv_800XA_rawdata.c
index 2cf9bb7..2b34c41 100644
--- a/unittest/tfreedv_800XA_rawdata.c
+++ b/unittest/tfreedv_800XA_rawdata.c
@@ -27,121 +27,121 @@
 */
 
 #include <stdio.h>
-#include "freedv_api.h"
+
 #include "assert.h"
+#include "freedv_api.h"
 
-int main(int argc, char **argv)
-{
-    struct freedv *f;
-    int i;
-
-    printf("freedv_api tests for mode 800XA\n");
-
-    printf("freedv_open(FREEDV_MODE_800XA) ");
-    f = freedv_open(FREEDV_MODE_800XA);
-    assert(f != NULL);
-    printf("Passed\n");
-
-    printf("freedv_get_mode() ");
-    int mode = freedv_get_mode(f);
-    assert(mode == FREEDV_MODE_800XA);
-    printf("Passed\n");
-
-    printf("freedv_get_n_max_modem_samples() ");
-    int max_samples = freedv_get_n_max_modem_samples(f);
-    assert(max_samples == 660);
-    printf("%d Passed\n", max_samples);
-
-    printf("freedv_get_n_nom_modem_samples() ");
-    int nom_samples = freedv_get_n_nom_modem_samples(f);
-    assert(nom_samples == 640);
-    printf("%d Passed\n", nom_samples);
-
-    printf("freedv_get_n_speech_samples() ");
-    int speech_samples = freedv_get_n_speech_samples(f);
-    assert(speech_samples == 640);
-    printf("%d Passed\n", speech_samples);
-
-    printf("freedv_get_n_bits_per_codec_frame() ");
-    int codec_bits = freedv_get_bits_per_codec_frame(f);
-    assert(codec_bits == 28);
-    printf("%d Passed\n", codec_bits);
-
-    printf("freedv_get_n_bits_per_modem_frame() ");
-    int frame_bits = freedv_get_bits_per_modem_frame(f);
-    assert(frame_bits == 56);
-    printf("%d Passed\n", frame_bits);
-
-    /* Note: A codec frame is only 3.5 bytes!
-       so the fourth and eight bytes will be half empty!
-    */
-    unsigned char payload[8] = { 0x12, 0x34, 0x56, 0x70, 0x89, 0xab, 0xcd, 0xe0 };
-    unsigned char payload_tx[7] = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde };
-
-    printf("freedv_codec_frames_from_rawdata() ");
-    unsigned char codec_frames[8] = { 0 };
-    freedv_codec_frames_from_rawdata(f, codec_frames, payload_tx);
-    int fails = 0;
-    for (i = 0; i < 8; i++) {
-	if (codec_frames[i] != payload[i]) {
-	    printf("byte %d: 0x%02x does not match expected 0x%02x\n", i, codec_frames[i], payload[i]);
-	    fails++;
-	}    
+int main(int argc, char **argv) {
+  struct freedv *f;
+  int i;
+
+  printf("freedv_api tests for mode 800XA\n");
+
+  printf("freedv_open(FREEDV_MODE_800XA) ");
+  f = freedv_open(FREEDV_MODE_800XA);
+  assert(f != NULL);
+  printf("Passed\n");
+
+  printf("freedv_get_mode() ");
+  int mode = freedv_get_mode(f);
+  assert(mode == FREEDV_MODE_800XA);
+  printf("Passed\n");
+
+  printf("freedv_get_n_max_modem_samples() ");
+  int max_samples = freedv_get_n_max_modem_samples(f);
+  assert(max_samples == 660);
+  printf("%d Passed\n", max_samples);
+
+  printf("freedv_get_n_nom_modem_samples() ");
+  int nom_samples = freedv_get_n_nom_modem_samples(f);
+  assert(nom_samples == 640);
+  printf("%d Passed\n", nom_samples);
+
+  printf("freedv_get_n_speech_samples() ");
+  int speech_samples = freedv_get_n_speech_samples(f);
+  assert(speech_samples == 640);
+  printf("%d Passed\n", speech_samples);
+
+  printf("freedv_get_n_bits_per_codec_frame() ");
+  int codec_bits = freedv_get_bits_per_codec_frame(f);
+  assert(codec_bits == 28);
+  printf("%d Passed\n", codec_bits);
+
+  printf("freedv_get_n_bits_per_modem_frame() ");
+  int frame_bits = freedv_get_bits_per_modem_frame(f);
+  assert(frame_bits == 56);
+  printf("%d Passed\n", frame_bits);
+
+  /* Note: A codec frame is only 3.5 bytes!
+     so the fourth and eight bytes will be half empty!
+  */
+  unsigned char payload[8] = {0x12, 0x34, 0x56, 0x70, 0x89, 0xab, 0xcd, 0xe0};
+  unsigned char payload_tx[7] = {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde};
+
+  printf("freedv_codec_frames_from_rawdata() ");
+  unsigned char codec_frames[8] = {0};
+  freedv_codec_frames_from_rawdata(f, codec_frames, payload_tx);
+  int fails = 0;
+  for (i = 0; i < 8; i++) {
+    if (codec_frames[i] != payload[i]) {
+      printf("byte %d: 0x%02x does not match expected 0x%02x\n", i,
+             codec_frames[i], payload[i]);
+      fails++;
     }
-    if (fails)
-    	goto fail;
-    printf("Passed\n");
-    
-    printf("freedv_rawdata_from_codec_frames() ");
-    unsigned char rawdata[7] = { 0 };
-    freedv_rawdata_from_codec_frames(f, rawdata, payload);
-    fails = 0;
-    for (i = 0; i < 7; i++) {
-	if (rawdata[i] != payload_tx[i]) {
-	    printf("byte %d: 0x%02x does not match expected 0x%02x\n", i, rawdata[i], payload_tx[i]);
-	    fails++;
-	}
+  }
+  if (fails) goto fail;
+  printf("Passed\n");
+
+  printf("freedv_rawdata_from_codec_frames() ");
+  unsigned char rawdata[7] = {0};
+  freedv_rawdata_from_codec_frames(f, rawdata, payload);
+  fails = 0;
+  for (i = 0; i < 7; i++) {
+    if (rawdata[i] != payload_tx[i]) {
+      printf("byte %d: 0x%02x does not match expected 0x%02x\n", i, rawdata[i],
+             payload_tx[i]);
+      fails++;
     }
-    if (fails)
-    	goto fail;
-    printf("Passed\n");
-
-    printf("freedv_rawdatatx()/freedv_rawdatarx() ");
-    int frames = 0;
-    fails = 0;
-    {
-        short mod[nom_samples * 10];
-        for (i = 0; i < 10; i ++) {
-	    freedv_rawdatatx(f, mod + i * nom_samples, payload_tx);
-        }
-        int nin = 0;
-        for (i = 0; i < nom_samples * 9; i += nin) {
-            nin = freedv_nin(f);
-	    unsigned char payload_rx[8] = {0};
-            int r = freedv_rawdatarx(f, payload_rx, mod + i);
-            if (r == 7) {
-	        int b;
-                for (b = 0; b < 7; b++) {
-	    	    if (payload_tx[b] != payload_rx[b]) {
-		        printf("Received codec bits 0x%02x do not match expected 0x%02x\n", payload_rx[b], payload_tx[b]);
-		        fails++;
-                    }
-                }
-	        frames++;
-	    }
-        }
+  }
+  if (fails) goto fail;
+  printf("Passed\n");
+
+  printf("freedv_rawdatatx()/freedv_rawdatarx() ");
+  int frames = 0;
+  fails = 0;
+  {
+    short mod[nom_samples * 10];
+    for (i = 0; i < 10; i++) {
+      freedv_rawdatatx(f, mod + i * nom_samples, payload_tx);
     }
-    if (!frames) {
-    	printf("Did not decode any frames successfully\n");
-	goto fail;
+    int nin = 0;
+    for (i = 0; i < nom_samples * 9; i += nin) {
+      nin = freedv_nin(f);
+      unsigned char payload_rx[8] = {0};
+      int r = freedv_rawdatarx(f, payload_rx, mod + i);
+      if (r == 7) {
+        int b;
+        for (b = 0; b < 7; b++) {
+          if (payload_tx[b] != payload_rx[b]) {
+            printf("Received codec bits 0x%02x do not match expected 0x%02x\n",
+                   payload_rx[b], payload_tx[b]);
+            fails++;
+          }
+        }
+        frames++;
+      }
     }
-    if (fails)
-    	goto fail;
-    printf("Passed\n");
-
-    printf("Tests passed\n");
-    return 0;
+  }
+  if (!frames) {
+    printf("Did not decode any frames successfully\n");
+    goto fail;
+  }
+  if (fails) goto fail;
+  printf("Passed\n");
+
+  printf("Tests passed\n");
+  return 0;
 fail:
-    printf("Test failed\n");
-    return 1;
+  printf("Test failed\n");
+  return 1;
 }