Merge branch 'NR_RRCConfiguration' of...

Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface4g into NR_RRCConfiguration

openair1/PHY/NR_TRANSPORT/nr_dci.c

@@ -36,8 +36,8 @@
 #include "PHY/MODULATION/nr_modulation.h"
 
 //#define DEBUG_PDCCH_DMRS
-#define DEBUG_DCI
-#define DEBUG_CHANNEL_CODING
+//#define DEBUG_DCI
+//#define DEBUG_CHANNEL_CODING
 
 
 uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -210,6 +210,8 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
   if (scc != NULL ) {
     AssertFatal(scc->ssb_PositionsInBurst->present == NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap, "SSB Bitmap is not 8-bits!\n");
 
+    LOG_I(MAC,"Configuring common parameters from NR ServingCellConfig\n");
+
     config_common(Mod_idP, 
 		  scc);
     LOG_E(MAC, "%s() %s:%d RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req:%p\n", __FUNCTION__, __FILE__, __LINE__, RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req);
@@ -238,10 +240,12 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
     if (add_ue == 1) {
       int UE_id = add_new_nr_ue(Mod_idP,rnti);
       UE_list->secondaryCellGroup[UE_id] = secondaryCellGroup;
+      LOG_I(PHY,"Added new UE_id %d/%x with initial secondaryCellGroup\n",UE_id,rnti);
     }
     else { // secondaryCellGroup has been updated
-      int UE_id = find_nr_UE_id(rnti);
+      int UE_id = find_nr_UE_id(Mod_idP,rnti);
       UE_list->secondaryCellGroup[UE_id] = secondaryCellGroup;
+      LOG_I(PHY,"Modified UE_id %d/%x with secondaryCellGroup\n",UE_id,rnti);
     }
   }
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -626,7 +626,7 @@ int add_new_nr_ue(module_id_t mod_idP,
         rntiP,
         UE_list->avail,
         UE_list->num_UEs);
-  dump_ue_list(UE_list, 0);
+  dump_nr_ue_list(UE_list, 0);
 
   for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
     if (UE_list->active[i] == TRUE)

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -148,10 +148,12 @@ void mac_top_init_gNB(void)
     for (list_el = 0; list_el < MAX_MOBILES_PER_ENB - 1; list_el++) {
       UE_list->next[list_el] = list_el + 1;
       UE_list->next_ul[list_el] = list_el + 1;
+      UE_list->active[list_el] = FALSE;
     }
 
     UE_list->next[list_el] = -1;
     UE_list->next_ul[list_el] = -1;
+    UE_list->active[list_el] = FALSE;
   }
 
 }

openair2/RRC/NR_UE/rrc_UE.c

@@ -218,7 +218,7 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
   switch (nsa_message_type) {
     case nr_SecondaryCellGroupConfig_r15:
       {
-	NR_RRCReconfiguration_t *RRCReconfiguration;
+	NR_RRCReconfiguration_t *RRCReconfiguration=NULL;
 	asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
 							&asn_DEF_NR_RRCReconfiguration,
 							(void **)&RRCReconfiguration,
@@ -236,7 +236,7 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
       break;
     case nr_RadioBearerConfigX_r15:
       {
-	NR_RadioBearerConfig_t *RadioBearerConfig;
+	NR_RadioBearerConfig_t *RadioBearerConfig=NULL;
 	asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
 							&asn_DEF_NR_RadioBearerConfig,
 							(void **)&RadioBearerConfig,