Merge remote-tracking branch 'origin/rru-hotfix' into develop_integration_2018_w40

openair1/PHY/INIT/init_top.c

@@ -76,7 +76,7 @@ void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms) {
   init_unscrambling_lut();
   init_scrambling_lut();
   //set_taus_seed(1328);
-  init_7_5KHz();
+//  init_7_5KHz();
   init_sss();
 }
 

openair1/PHY/INIT/lte_init_ru.c

@@ -31,6 +31,8 @@
 #include "assertions.h"
 #include <math.h>
 
+void init_7_5KHz(void);
+
 int phy_init_RU(RU_t *ru) {
 
   LTE_DL_FRAME_PARMS *fp = &ru->frame_parms;
@@ -65,6 +67,7 @@ int phy_init_RU(RU_t *ru) {
 
   }
   if (ru->function != NGFI_RRU_IF5) { // we need to do RX/TX RU processing
+    init_7_5KHz();
     LOG_I(PHY,"nb_tx %d\n",ru->nb_tx);
     ru->common.rxdata_7_5kHz = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
     for (i=0;i<ru->nb_rx;i++) {

openair1/PHY/INIT/lte_init_ue.c

@@ -34,6 +34,8 @@
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
+void init_7_5KHz(void);
+
 uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
 extern uint8_t nfapi_mode;
 
@@ -662,6 +664,7 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
 
   init_frame_parms(&ue->frame_parms,1);
   init_lte_top(&ue->frame_parms);
+  init_7_5KHz();
   init_ul_hopping(&ue->frame_parms);