Use NCP not NC in appropriate places

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

diff --git a/codec2-dev/src/ofdm.c b/codec2-dev/src/ofdm.c
index 5a7aaa61fb1740536922faa05da455a97634f007..4771c9c1336b772499164eb4eb9c775a2030d500 100644 (file)
--- a/codec2-dev/src/ofdm.c
+++ b/codec2-dev/src/ofdm.c
@@ -232,7 +232,7 @@ struct OFDM *ofdm_create() {
 
     /* create the OFDM waveform */
 
-    complex float temp[OFDM_NC + OFDM_M];
+    complex float temp[OFDM_M + OFDM_NCP];
 
     matrix_vector_multiply(ofdm, temp, ofdm->pilots);
 
@@ -241,9 +241,9 @@ struct OFDM *ofdm_create() {
      * Thus resulting in 16 + 128 + 16 = 160
      */
 
-    /* first copy the last Ncp values */
+    /* first copy the last Cyclic Prefix (CP) values */
 
-    for (i = 0, j = (OFDM_M - OFDM_NC); i < OFDM_NC; i++, j++) {
+    for (i = 0, j = (OFDM_M - OFDM_NCP); i < OFDM_NCP; i++, j++) {
         ofdm->rate_fs_pilot_samples[i] = temp[j];
     }
 

diff --git a/codec2-dev/src/ofdm_internal.h b/codec2-dev/src/ofdm_internal.h
index 9e82fcc7805fa9adf172dc75fe847a60579ce85a..dd413d8e2330648803d707182d7494b46bb3dfdc 100644 (file)
--- a/codec2-dev/src/ofdm_internal.h
+++ b/codec2-dev/src/ofdm_internal.h
@@ -86,7 +86,7 @@ struct OFDM {
     bool foff_est_en;
     bool phase_est_en;
 
-    complex float rate_fs_pilot_samples[OFDM_M + OFDM_NC];
+    complex float rate_fs_pilot_samples[OFDM_M + OFDM_NCP];
     complex float W[OFDM_M][OFDM_NC + 2];
     complex float rxbuf[OFDM_RXBUF];
     complex float pilots[OFDM_NC + 2];