Merge remote-tracking branch 'origin/develop' into nr_prs

openair1/PHY/INIT/nr_init.c

@@ -631,7 +631,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
   }
   nr_init_prs(gNB);
 
-
   for (int id=0; id<NUMBER_OF_NR_SRS_MAX; id++) {
     gNB->nr_srs_info[id] = (nr_srs_info_t *)malloc16_clear(sizeof(nr_srs_info_t));
   }

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -587,6 +587,9 @@ void peak_estimator(int32_t *buffer, int32_t buf_len, int32_t *peak_idx, int32_t
   *peak_idx = max_idx;
 }
 
+#define CH_INTERP 0
+#define NO_INTERP 1
+
 int nr_pbch_dmrs_correlation(PHY_VARS_NR_UE *ue,
                              UE_nr_rxtx_proc_t *proc,
                              uint8_t gNB_id,