Fixed compiler warnings on cohpsk.c and freedv_api.c

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

diff --git a/codec2-dev/src/cohpsk.c b/codec2-dev/src/cohpsk.c
index 8269157dc047773b8a7acf5d9c4cfd60b18aaecc..ac2452c36a3d8f4d81da5ba657d7a8bfdef98a7a 100644 (file)
--- a/codec2-dev/src/cohpsk.c
+++ b/codec2-dev/src/cohpsk.c
@@ -432,7 +432,6 @@ void tx_filter_and_upconvert_coh(COMP tx_fdm[], int Nc,const COMP tx_symbols[],
 {
     int     c;
     int     i,j,k;
-    float   acc;
     COMP    gain;
     COMP    tx_baseband;
     COMP  two = {2.0, 0.0};
@@ -460,7 +459,7 @@ void tx_filter_and_upconvert_coh(COMP tx_fdm[], int Nc,const COMP tx_symbols[],
 
                for(i=0; i<COHPSK_M; i++) {
 
-                       const COMP * tx_filter_memory_cn = &tx_filter_memory[c];
+                       const COMP * tx_filter_memory_cn = (COMP*) &tx_filter_memory[c];
                        /* filter sample of symbol for carrier c */
                        tx_baseband.real = 0;
                        tx_baseband.imag = 0;

diff --git a/codec2-dev/src/freedv_api.c b/codec2-dev/src/freedv_api.c
index f2ae1e99b787df09c38bd78ddade99f5ae2e0e70..a9aa3ca2769506d31531290012193d15ffadc35c 100644 (file)
--- a/codec2-dev/src/freedv_api.c
+++ b/codec2-dev/src/freedv_api.c
@@ -763,12 +763,10 @@ static void freedv_comptx_fdmdv_700(struct freedv *f, COMP mod_out[]) {
 
 void freedv_comptx(struct freedv *f, COMP mod_out[], short speech_in[]) {
     assert(f != NULL);
-    int    i;
 #ifndef CORTEX_M4
     int    j;  
     int    bits_per_codec_frame;
 #endif
-    short  tx_real[f->n_nom_modem_samples];
 
     assert((f->mode == FREEDV_MODE_1600) || (f->mode == FREEDV_MODE_700) || 
            (f->mode == FREEDV_MODE_700B) || (f->mode == FREEDV_MODE_700C) ||