added config file + bug fixing

openair2/COMMON/rrc_messages_types.h

@@ -180,11 +180,11 @@ typedef struct RrcConfigurationReq_s {
 
 
   RadioResourceConfig     radioresourceconfig[MAX_NUM_CCs];
-
+  RadioResourceConfig     radioresourceconfig_BR[MAX_NUM_CCs];
    
 #ifdef Rel14
 
-  RadioResourceConfig     radioresourceconfig_BR[MAX_NUM_CCs];
+
   //MIB
   long	 		  schedulingInfoSIB1_BR_r13[MAX_NUM_CCs];
   //SIB1 BR options

openair2/ENB_APP/enb_config.c

@@ -964,9 +964,9 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
   libconfig_int     pucch_delta_shift             = 0;
   libconfig_int     pucch_nRB_CQI                 = 0;
   libconfig_int     pucch_nCS_AN                  = 0;
-#if !defined(Rel10) && !defined(Rel14)
+
   libconfig_int     pucch_n1_AN                   = 0;
-#endif
+
   libconfig_int     pdsch_referenceSignalPower    = 0;
   libconfig_int     pdsch_p_b                     = 0;
   libconfig_int     pusch_n_SB                    = 0;
@@ -2486,8 +2486,12 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
         break;
           }
 #ifdef Rel14
-	      setting_br13 = config_setting_get_member(setting_enb, ENB_CONFIG_STRING_BR);
-	      
+          setting_br13 = config_setting_get_member(component_carrier, ENB_CONFIG_STRING_BR);
+          if (setting_br13 == NULL) {
+              puts("setting BR is NULL");
+          } else {
+              puts("setting BR is NOT NULL");
+          }
           if (setting_br13 != NULL)  {
 
         // Rel8 RadioResourceConfigCommon Parameters
@@ -2533,7 +2537,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
               && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
               && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
               && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &bcch_modificationPeriodCoeff)
               && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
               && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
               && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
@@ -2550,6 +2553,59 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
                    RC.config_file_name, nb_cc++);
               continue; // FIXME this prevents segfaults below, not sure what happens after function exit
             }
+
+            printf("[DEBUGGING][KOGO] frame type %s\n", frame_type);
+            printf("[DEBUGGING][KOGO] prach_root %d\n", prach_root);
+            printf("[DEBUGGING][KOGO] prach_config_index %d\n", prach_config_index);
+            printf("[DEBUGGING][KOGO] prach_high_speed %s\n", prach_high_speed);
+            printf("[DEBUGGING][KOGO] prach_zero_correlation %d\n", prach_zero_correlation);
+            printf("[DEBUGGING][KOGO] prach_freq_offset %d\n", prach_freq_offset);
+            printf("[DEBUGGING][KOGO] pucch_delta_shift %d\n", pucch_delta_shift);
+            printf("[DEBUGGING][KOGO] pucch_nRB_CQI %d\n", pucch_nRB_CQI);
+            printf("[DEBUGGING][KOGO] pucch_nCS_AN %d\n", pucch_nCS_AN);
+            printf("[DEBUGGING][KOGO] pucch_n1_AN %d\n", pucch_n1_AN);
+            printf("[DEBUGGING][KOGO] pdsch_referenceSignalPower %d\n", pdsch_referenceSignalPower);
+            printf("[DEBUGGING][KOGO] pdsch_p_b %d\n", pdsch_p_b);
+            printf("[DEBUGGING][KOGO] pusch_n_SB %d\n", pusch_n_SB);
+            printf("[DEBUGGING][KOGO] pusch_hoppingMode %s\n", pusch_hoppingMode);
+            printf("[DEBUGGING][KOGO] pusch_hoppingOffset %d\n", pusch_hoppingOffset);
+            printf("[DEBUGGING][KOGO] pusch_enable64QAM %s\n", pusch_enable64QAM);
+            printf("[DEBUGGING][KOGO] pusch_groupHoppingEnabled %s\n", pusch_groupHoppingEnabled);
+            printf("[DEBUGGING][KOGO] pusch_groupAssignment %d\n", pusch_groupAssignment);
+            printf("[DEBUGGING][KOGO] pusch_sequenceHoppingEnabled %s\n", pusch_sequenceHoppingEnabled);
+            printf("[DEBUGGING][KOGO] pusch_nDMRS1 %d\n", pusch_nDMRS1);
+            printf("[DEBUGGING][KOGO] phich_duration %s\n", phich_duration);
+            printf("[DEBUGGING][KOGO] phich_resource %s\n", phich_resource);
+            printf("[DEBUGGING][KOGO] srs_enable %s\n", srs_enable);
+            printf("[DEBUGGING][KOGO] pusch_p0_Nominal %d\n", pusch_p0_Nominal);
+            printf("[DEBUGGING][KOGO] pusch_alpha %s\n", pusch_alpha);
+            printf("[DEBUGGING][KOGO] pucch_p0_Nominal %d\n", pucch_p0_Nominal);
+            printf("[DEBUGGING][KOGO] msg3_delta_Preamble %d\n", msg3_delta_Preamble);
+            printf("[DEBUGGING][KOGO] pucch_deltaF_Format1 %s\n", pucch_deltaF_Format1);
+            printf("[DEBUGGING][KOGO] pucch_deltaF_Format1b %s\n", pucch_deltaF_Format1b);
+            printf("[DEBUGGING][KOGO] pucch_deltaF_Format2 %s\n", pucch_deltaF_Format2);
+            printf("[DEBUGGING][KOGO] pucch_deltaF_Format2a %s\n", pucch_deltaF_Format2a);
+            printf("[DEBUGGING][KOGO] pucch_deltaF_Format2b %s\n", pucch_deltaF_Format2b);
+            printf("[DEBUGGING][KOGO] rach_numberOfRA_Preambles %d\n", rach_numberOfRA_Preambles);
+            printf("[DEBUGGING][KOGO] rach_preamblesGroupAConfig %s\n", rach_preamblesGroupAConfig);
+            printf("[DEBUGGING][KOGO] rach_powerRampingStep %d\n", rach_powerRampingStep);
+            printf("[DEBUGGING][KOGO] rach_preambleInitialReceivedTargetPower %d\n", rach_preambleInitialReceivedTargetPower);
+            printf("[DEBUGGING][KOGO] rach_preambleTransMax %d\n", rach_preambleTransMax);
+            printf("[DEBUGGING][KOGO] rach_raResponseWindowSize %d\n", rach_raResponseWindowSize);
+            printf("[DEBUGGING][KOGO] rach_macContentionResolutionTimer %d\n", rach_macContentionResolutionTimer);
+            printf("[DEBUGGING][KOGO] rach_maxHARQ_Msg3Tx %d\n", rach_maxHARQ_Msg3Tx);
+            printf("[DEBUGGING][KOGO] pcch_default_PagingCycle %d\n", pcch_defaultPagingCycle);
+            printf("[DEBUGGING][KOGO] pcch_nB %s\n", pcch_nB);
+            printf("[DEBUGGING][KOGO] bcch_modificationPeriodCoeff %d\n", bcch_modificationPeriodCoeff);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_t300 %d\n", ue_TimersAndConstants_t300);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_t301 %d\n", ue_TimersAndConstants_t301);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_t310 %d\n", ue_TimersAndConstants_t310);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_t311 %d\n", ue_TimersAndConstants_t311);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_n310 %d\n", ue_TimersAndConstants_n310);
+            printf("[DEBUGGING][KOGO] ue_TimersAndConstants_n311 %d\n", ue_TimersAndConstants_n311);
+            printf("[DEBUGGING][KOGO] ue_TransmissionMode %d\n", ue_TransmissionMode);
+
+
             RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_root =  prach_root;
 
             if ((prach_root <0) || (prach_root > 1023))
@@ -2972,6 +3028,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
 
 
             RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
+            printf("[KOGO][DEBUGGING] check value here: value: %ld -- index %d\n", RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles, j);
 
             if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
               AssertFatal(0,

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -852,11 +852,13 @@ uint8_t do_SIB23(uint8_t Mod_id,
   uint8_t                       *buffer;
   SystemInformationBlockType2_t **sib2;
   RadioResourceConfig           *rrconfig;
+
 #ifdef Rel14
   if (brOption) {
     buffer   = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR;
     sib2     = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR;
     rrconfig = &configuration->radioresourceconfig_BR[CC_id];
+
   }
   else
 #endif
@@ -956,7 +958,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
   (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1 = calloc(1, sizeof(struct RACH_ConfigCommon__ext1));
   memset((*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1, 0, sizeof(struct RACH_ConfigCommon__ext1));
 
-
   if (rrconfig->rach_maxHARQ_Msg3Tx)
     {
       (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t));

openair2/RRC/LITE/rrc_eNB.c

@@ -214,11 +214,14 @@ init_SI(
     AssertFatal(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SIB23_BR!=NULL,"cannot allocate memory for SIB");
     RC.rrc[ctxt_pP->module_id]->carrier[CC_id].sizeof_SIB23_BR = do_SIB23(
 									  ctxt_pP->module_id,
-									  CC_id,
+                                      CC_id
+#ifdef Rel14
+                                      ,TRUE
+#endif
 #if defined(ENABLE_ITTI)
-									  configuration,
+                                      ,configuration
+                );
 #endif
-									  0);
   }
 #endif