From 58eae03b480e9ff1c8960e7b7ceb5971846c921c Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <kaltenbe@eurecom.fr>
Date: Fri, 9 Aug 2019 15:31:54 +0200
Subject: [PATCH] 1. NR RU was using wrong config file descriptor. It should be
the same as for the LTE RU and we should remove the NR RU config file
descriptor (todo) 2. NR RU was calling feptx_prec from LTE RU procedures,
which it should not. In the older versions this function didn't do anything
anyway as there was a check on num_eNB, which is 0 for gNB. Now NR RU is not
calling this function at all, but we have to write such a function for NR RU
(todo)
---
executables/nr-ru.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index f47110545c4..c73b2fa2779 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -88,11 +88,11 @@ unsigned short config_frames[4] = {2,9,11,13};
#endif
/* these variables have to be defined before including ENB_APP/enb_paramdef.h and GNB_APP/gnb_paramdef.h */
-//static int DEFBANDS[] = {7};
-//static int DEFENBS[] = {0};
+static int DEFBANDS[] = {7};
+static int DEFENBS[] = {0};
-static int DEFNRBANDS[] = {7};
-static int DEFGNBS[] = {0};
+//static int DEFNRBANDS[] = {7};
+//static int DEFGNBS[] = {0};
#include "ENB_APP/enb_paramdef.h"
#include "GNB_APP/gnb_paramdef.h"
@@ -2006,7 +2006,7 @@ void set_function_spec_param(RU_t *ru) {
ru->do_prach = 0; // no prach processing in RU
ru->feprx = (get_nprocs()<=2) ? fep_full : ru_fep_full_2thread; // RX DFTs
ru->feptx_ofdm = (get_nprocs()<=2) ? nr_feptx_ofdm : nr_feptx_ofdm_2thread; // this is fep with idft and precoding
- ru->feptx_prec = feptx_prec; // this is fep with idft and precoding
+ ru->feptx_prec = NULL; // this is fep with idft and precoding
ru->fh_north_in = NULL; // no incoming fronthaul from north
ru->fh_north_out = NULL; // no outgoing fronthaul to north
ru->nr_start_if = NULL; // no if interface
@@ -2185,7 +2185,7 @@ void stop_RU(int nb_ru)
void RCconfig_RU(void)
{
int i = 0, j = 0;
- paramdef_t RUParams[] = GNBRUPARAMS_DESC;
+ paramdef_t RUParams[] = RUPARAMS_DESC;
paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
config_getlist( &RUParamList, RUParams, sizeof(RUParams)/sizeof(paramdef_t), NULL);
--
GitLab