if-deffed out code not rqd for stm32 build

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

diff --git a/codec2-dev/src/codec2.c b/codec2-dev/src/codec2.c
index fe7d80f0c3013add9f215dd40c0fd0f499a85302..2edbdbe7ea779592b25387993b69190df81a5626 100644 (file)
--- a/codec2-dev/src/codec2.c
+++ b/codec2-dev/src/codec2.c
@@ -163,6 +163,7 @@ struct CODEC2 * codec2_create(int mode)
 
     c2->softdec = NULL;
 
+#ifndef CORTEX_M4
     /* newamp1 initialisation */
 
     if (c2->mode == CODEC2_MODE_700C) {
@@ -176,6 +177,7 @@ struct CODEC2 * codec2_create(int mode)
         c2->phase_fft_fwd_cfg = codec2_fft_alloc(NEWAMP1_PHASE_NFFT, 0, NULL, NULL);
         c2->phase_fft_inv_cfg = codec2_fft_alloc(NEWAMP1_PHASE_NFFT, 1, NULL, NULL);
     }
+#endif
 
     return c2;
 }
@@ -1903,7 +1905,6 @@ float codec2_energy_700c(struct CODEC2 *c2, const unsigned char * bits)
     return powf(10.0, mean/10.0);
 }
 
-#endif
 
 /*---------------------------------------------------------------------------*\
 
@@ -1982,6 +1983,7 @@ float codec2_get_energy(struct CODEC2 *c2, const unsigned char *bits)
     return e;
 }
 
+#endif
 
 /*---------------------------------------------------------------------------*\
 

diff --git a/codec2-dev/src/freedv_api.c b/codec2-dev/src/freedv_api.c
index 8afb8461c140ec51f71874fdb00b7599d44be1af..f0aafcfad1f1365e28176a643cc3b154968cc8b9 100644 (file)
--- a/codec2-dev/src/freedv_api.c
+++ b/codec2-dev/src/freedv_api.c
@@ -614,6 +614,7 @@ static void freedv_comptx_fdmdv_1600(struct freedv *f, COMP mod_out[]) {
     for(i=0; i<f->n_nom_modem_samples; i++)
         mod_out[i] = fcmult(FDMDV_SCALE, tx_fdm[i]);
 }
+
 #ifndef CORTEX_M4
 static void freedv_comptx_fdmdv_700(struct freedv *f, COMP mod_out[]) {
     int    bit, byte, i, j, k;
@@ -1563,10 +1564,12 @@ void freedv_set_callback_error_pattern    (struct freedv *f, freedv_calback_erro
     f->error_pattern_callback_state = state;
 }
 
+#ifndef CORTEX_M4
 void freedv_set_carrier_ampl(struct freedv *freedv, int c, float ampl) {
     assert(freedv->mode == FREEDV_MODE_700C);
     cohpsk_set_carrier_ampl(freedv->cohpsk, c, ampl);
 }
+#endif
 
 /*---------------------------------------------------------------------------*\