some files missed on the first pass

5 files changed, 27 insertions, 27 deletions

diff --git a/src/cohpsk_defs.h b/src/cohpsk_defs.h
index a03bfe7..968dfa5 100644
--- a/src/cohpsk_defs.h
+++ b/src/cohpsk_defs.h
@@ -1,9 +1,11 @@
 /* Generated by write_pilot_file() Octave function */
 
-#define NSYMROW      4   /* number of data symbols on each row (i.e. each carrier) */
-#define NS           4   /* number of data symbols between pilots                   */
-#define NPILOTSFRAME 2   /* number of pilot symbols on each row                     */
-#define PILOTS_NC    7   /* number of carriers                                      */
-
-#define NSYMROWPILOT 6   /* length of row after pilots inserted                     */
+#define NSYMROW 4 /* number of data symbols on each row (i.e. each carrier) */
+#define NS 4      /* number of data symbols between pilots                   */
+#define NPILOTSFRAME \
+  2 /* number of pilot symbols on each row                     */
+#define PILOTS_NC \
+  7 /* number of carriers                                      */
 
+#define NSYMROWPILOT \
+  6 /* length of row after pilots inserted                     */
diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h
index 321dede..ef6426f 100644
--- a/src/freedv_api_internal.h
+++ b/src/freedv_api_internal.h
@@ -81,17 +81,17 @@ struct freedv {
                                               // and 8000 sps for 700 .... 700C
   struct quisk_cfFilter *ptFilter8000to7500;
 
-  int n_speech_samples;  // number of speech samples we need for each
-                         // freedv_tx() call num of speech samples output by
-                         // freedv_rx() call
+  int n_speech_samples;     // number of speech samples we need for each
+                            // freedv_tx() call num of speech samples output by
+                            // freedv_rx() call
   int n_nom_modem_samples;  // size of tx modem sample buffers
   int n_max_modem_samples;  // make your rx modem sample buffers this big
   int n_nat_modem_samples;  // tx modem sample block length as used by the modem
                             // before interpolation to output usually the same
                             // as n_nom_modem_samples, except for 700C
-  int modem_sample_rate;   // Caller is responsible for meeting this
-  int modem_symbol_rate;   // Useful for ext_vco operation on 2400A and 800XA
-  int speech_sample_rate;  // 8 kHz or 16 kHz (high fidelity)
+  int modem_sample_rate;    // Caller is responsible for meeting this
+  int modem_symbol_rate;    // Useful for ext_vco operation on 2400A and 800XA
+  int speech_sample_rate;   // 8 kHz or 16 kHz (high fidelity)
 
   int bits_per_codec_frame;
   int bits_per_modem_frame;  // number of modem payload bits in each modem frame
diff --git a/src/interp.c b/src/interp.c
index 188e3d8..08a9518 100644
--- a/src/interp.c
+++ b/src/interp.c
@@ -150,14 +150,14 @@ float sample_log_amp(MODEL *model, float w) {
 \*---------------------------------------------------------------------------*/
 
 void interpolate_lsp(codec2_fft_cfg fft_fwd_cfg,
-                     MODEL *interp,      /* interpolated model params      */
-                     MODEL *prev,        /* previous frames model params        */
-                     MODEL *next,        /* next frames model params        */
-                     float *prev_lsps,   /* previous frames LSPs   */
-                     float prev_e,       /* previous frames LPC energy       */
-                     float *next_lsps,   /* next frames LSPs   */
-                     float next_e,       /* next frames LPC energy       */
-                     float *ak_interp,   /* interpolated aks for this frame   */
+                     MODEL *interp,    /* interpolated model params      */
+                     MODEL *prev,      /* previous frames model params        */
+                     MODEL *next,      /* next frames model params        */
+                     float *prev_lsps, /* previous frames LSPs   */
+                     float prev_e,     /* previous frames LPC energy       */
+                     float *next_lsps, /* next frames LSPs   */
+                     float next_e,     /* next frames LPC energy       */
+                     float *ak_interp, /* interpolated aks for this frame   */
                      float *lsps_interp, /* interpolated lsps for this frame */
                      float Wo_min) {
   int i;
diff --git a/src/newamp2.h b/src/newamp2.h
index 079d07f..6a4d6a4 100644
--- a/src/newamp2.h
+++ b/src/newamp2.h
@@ -35,9 +35,8 @@ David Rowe
 #define NEWAMP2_N_INDEXES \
   4 /* Number of indexes to pack: vq1, vq2, energy, Wo */
 #define NEWAMP2_PHASE_NFFT \
-  128 /* size of FFT used for phase synthesis            */
-#define NEWAMP2_K \
-  29 /* rate K vector length */
+  128                /* size of FFT used for phase synthesis            */
+#define NEWAMP2_K 29 /* rate K vector length */
 #define NEWAMP2_16K_K \
   40 /* rate K vector length	for 16k Mode			   */
 
diff --git a/src/pilots_coh.h b/src/pilots_coh.h
index 9271195..b905879 100644
--- a/src/pilots_coh.h
+++ b/src/pilots_coh.h
@@ -1,6 +1,5 @@
 /* Generated by write_pilot_file() Octave function */
 
-float pilots_coh[][PILOTS_NC]={
-  {  1.000000,  -1.000000,  1.000000,  -1.000000,  1.000000,  -1.000000,  -1.000000},
-  {  -1.000000,  1.000000,  1.000000,  -1.000000,  1.000000,  1.000000,  1.000000}
-};
\ No newline at end of file
+float pilots_coh[][PILOTS_NC] = {
+    {1.000000, -1.000000, 1.000000, -1.000000, 1.000000, -1.000000, -1.000000},
+    {-1.000000, 1.000000, 1.000000, -1.000000, 1.000000, 1.000000, 1.000000}};
\ No newline at end of file