Steve's lpdc_enc and dec changes

git-svn-id: https://svn.code.sf.net/p/freetel/code@2912 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/ldpc_dec.c b/codec2-dev/src/ldpc_dec.c
index 6b60ee94e6ddbb455000f1d48d5b0005efe6bd0e..41c5adde80e631a5bc36be3aaaa22e8a21beae95 100644 (file)
--- a/codec2-dev/src/ldpc_dec.c
+++ b/codec2-dev/src/ldpc_dec.c
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     if (argc < 2) {\r
         fprintf(stderr, "usage: %s --test\n", argv[0]);\r
         fprintf(stderr, "  Run internal self test and print code parameters.\n\n");\r
-        fprintf(stderr, "usage: %s InOneSymbolPerDouble OutOneBitPerByte [--sdinput]\n", argv[0]);\r
+        fprintf(stderr, "usage: %s InOneSymbolPerDouble OutOneBitPerByte [--sd]\n", argv[0]);\r
         fprintf(stderr, "  InOneSymbolPerDouble is a file of double LLRs.  If the\n");\r
         fprintf(stderr, "  --sd flag is used the input file can be Soft Decision\n");\r
         fprintf(stderr, "  symbols, and LLRs will be calculated internally. Use -\n");\r
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
         sdinput = 0;\r
         printf("argc: %d\n", argc);\r
         if (argc == 4)\r
-            if (strcmp(argv[3], "--sdinput") == 0)\r
+            if (strcmp(argv[3], "--sd") == 0)\r
                 sdinput = 1;\r
 \r
         double *input_double = calloc(CodeLength, sizeof(double));\r

diff --git a/codec2-dev/src/ldpc_enc.c b/codec2-dev/src/ldpc_enc.c
index bb8d7156ee9d299813f5416c5f303b7195b830d7..ac72f2eb55dab928035d62264c18df806a2451f9 100644 (file)
--- a/codec2-dev/src/ldpc_enc.c
+++ b/codec2-dev/src/ldpc_enc.c
@@ -16,7 +16,7 @@
 
 /* generated by ldpc_fsk_lib.m:ldpc_decode() */
 
-#include "ldpc_code.h"
+#include "H2064_516_sparse.h"
 
 void encode(unsigned char ibits[], unsigned char pbits[]) {
     unsigned int p, i, tmp, par, prev=0;
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     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[2], strerror(errno));
+                argv[1], strerror(errno));
         exit(1);
     }