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

# Conflicts: # openair1/PHY/INIT/nr_init_ue.c # openair2/GNB_APP/gnb_config.c # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/MESSAGES/asn1_msg.h # targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf # targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf # targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
parent 139a33d644 5a3eeac5e4
commit c83df1b677
90 changed files with 1672 additions and 1764 deletions
@@ -63,7 +63,7 @@

 #include "PHY/phy_extern.h"

-#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
+#include "common/ran_context.h"
 #include "RRC/LTE/rrc_extern.h"
 #include "PHY_INTERFACE/phy_interface.h"
 #include "common/utils/LOG/log_extern.h"
@@ -75,7 +75,6 @@
 #include "enb_config.h"
 #include "gnb_paramdef.h"

-
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <executables/softmodem-common.h>
@@ -518,7 +517,8 @@ void init_eNB_afterRU(void) {
    RC.nb_nr_inst = 1;
  for (inst=0; inst<RC.nb_nr_inst; inst++) {
    LOG_I(PHY,"RC.nb_nr_CC[inst:%d]:%p\n", inst, RC.gNB[inst]);
-    gNB                                  =  RC.gNB[inst];
+    gNB = RC.gNB[inst];
+
    phy_init_nr_gNB(gNB,0,0);

    // map antennas and PRACH signals to gNB RX