From d8e9a80f511909d94a9ac0d1d6342a30fbfdfc5e Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Sat, 29 Sep 2018 11:23:40 +0200 Subject: [PATCH 1/3] initialization of 7.5 kHz tables moved to RU initialization so that IF4p5 RRU doesn't crash anymore. --- openair1/PHY/INIT/init_top.c | 2 +- openair1/PHY/INIT/lte_init_ru.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openair1/PHY/INIT/init_top.c b/openair1/PHY/INIT/init_top.c index 25898d0b8c..1bb36bd2e5 100644 --- a/openair1/PHY/INIT/init_top.c +++ b/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(); } diff --git a/openair1/PHY/INIT/lte_init_ru.c b/openair1/PHY/INIT/lte_init_ru.c index 1ceed40f8b..e8846d7433 100644 --- a/openair1/PHY/INIT/lte_init_ru.c +++ b/openair1/PHY/INIT/lte_init_ru.c @@ -31,6 +31,8 @@ #include "assertions.h" #include +void init_7_5KHz(); + 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;inb_rx;i++) { From ecd180be471e9debc8a4facc9459c2ec8989bf90 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 1 Oct 2018 10:56:36 +0200 Subject: [PATCH 2/3] Fixing compilation warning in function declaration Signed-off-by: Raphael Defosseux --- openair1/PHY/INIT/lte_init_ru.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair1/PHY/INIT/lte_init_ru.c b/openair1/PHY/INIT/lte_init_ru.c index e8846d7433..3a1364620e 100644 --- a/openair1/PHY/INIT/lte_init_ru.c +++ b/openair1/PHY/INIT/lte_init_ru.c @@ -31,7 +31,7 @@ #include "assertions.h" #include -void init_7_5KHz(); +void init_7_5KHz(void); int phy_init_RU(RU_t *ru) { From 1132bbab3da4095c0d271b4f36f847ae7c90a7e9 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Tue, 2 Oct 2018 11:36:40 +0200 Subject: [PATCH 3/3] Fixing 7.5 kHz tables init for UE Signed-off-by: Raphael Defosseux --- openair1/PHY/INIT/lte_init_ue.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openair1/PHY/INIT/lte_init_ue.c b/openair1/PHY/INIT/lte_init_ue.c index 1ed9e20d60..bcdd782073 100644 --- a/openair1/PHY/INIT/lte_init_ue.c +++ b/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);