Merge pull request #4 from etherkit/dev

Fix macro define A0 in KA9Q lib

Author: NT7S

encode_rs_int.cpp

@@ -38,8 +38,8 @@ void JTEncode::encode_rs_int(void *p, data_t *data, data_t *parity)
 {
   struct rs *rs = (struct rs *)p;
 
-  #undef A0
-  #define A0 (NN) /* Special reserved value encoding zero in index form */
+  #undef A_0
+  #define A_0 (NN) /* Special reserved value encoding zero in index form */
 
   {
     int i, j;
@@ -49,7 +49,7 @@ void JTEncode::encode_rs_int(void *p, data_t *data, data_t *parity)
 
     for(i=0;i<NN-NROOTS-PAD;i++){
       feedback = INDEX_OF[data[i] ^ parity[0]];
-      if(feedback != A0){      /* feedback term is non-zero */
+      if(feedback != A_0){      /* feedback term is non-zero */
   #ifdef UNNORMALIZED
         /* This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
          * always be for the polynomials constructed by init_rs()
@@ -61,7 +61,7 @@ void JTEncode::encode_rs_int(void *p, data_t *data, data_t *parity)
       }
       /* Shift */
       memmove(&parity[0],&parity[1],sizeof(data_t)*(NROOTS-1));
-      if(feedback != A0)
+      if(feedback != A_0)
         parity[NROOTS-1] = ALPHA_TO[MODNN(feedback + GENPOLY[0])];
       else
         parity[NROOTS-1] = 0;

init_rs_int.cpp

@@ -66,8 +66,8 @@ void * JTEncode::init_rs_int(int symsize, int gfpoly, int fcr, int prim,
   }
 
   /* Generate Galois field lookup tables */
-  rs->index_of[0] = A0; /* log(zero) = -inf */
-  rs->alpha_to[A0] = 0; /* alpha**-inf = 0 */
+  rs->index_of[0] = A_0; /* log(zero) = -inf */
+  rs->alpha_to[A_0] = 0; /* alpha**-inf = 0 */
   sr = 1;
   for(i=0;i<rs->nn;i++){
     rs->index_of[sr] = i;

int.h

@@ -3,23 +3,22 @@
  * Copyright 2003, Phil Karn, KA9Q
  * May be used under the terms of the GNU Lesser General Public License (LGPL)
  */
- #ifndef INT_H_
- #define INT_H_
+#ifndef INT_H_
+#define INT_H_
 
 typedef unsigned int data_t;
 
-#define MODNN(x) modnn(rs,x)
-
-#define MM (rs->mm)
-#define NN (rs->nn)
-#define ALPHA_TO (rs->alpha_to)
-#define INDEX_OF (rs->index_of)
-#define GENPOLY (rs->genpoly)
-#define NROOTS (rs->nroots)
-#define FCR (rs->fcr)
-#define PRIM (rs->prim)
-#define IPRIM (rs->iprim)
-#define PAD (rs->pad)
-#define A0 (NN)
+#define MODNN(x)		modnn(rs,x)
+#define MM					(rs->mm)
+#define NN					(rs->nn)
+#define ALPHA_TO		(rs->alpha_to)
+#define INDEX_OF		(rs->index_of)
+#define GENPOLY			(rs->genpoly)
+#define NROOTS			(rs->nroots)
+#define FCR					(rs->fcr)
+#define PRIM				(rs->prim)
+#define IPRIM				(rs->iprim)
+#define PAD					(rs->pad)
+#define A_0					(NN)
 
 #endif