From f0376c7e197d0a93659e84bf2ba14705d1f7d6f7 Mon Sep 17 00:00:00 2001
From: "mohamed.said" <mohamed.said.fci@gmail.com>
Date: Tue, 15 Aug 2017 13:31:14 +0200
Subject: [PATCH] updated fdd_DownlinkSubframe in enb_config.c , do_SIB1 and
 rrc_message_types.h

---
 openair2/COMMON/rrc_messages_types.h  |    2 +-
 openair2/ENB_APP/enb_config.c         | 6848 +++++++++++++------------
 openair2/RRC/LITE/MESSAGES/asn1_msg.c |   43 +-
 3 files changed, 3458 insertions(+), 3435 deletions(-)

diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index aedf9bfa19..35db0b40a0 100755
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -205,7 +205,7 @@ typedef struct RrcConfigurationReq_s {
 
   long			  si_WindowLength_BR_r13                    [MAX_NUM_CCs];
   long			  si_RepetitionPattern_r13                  [MAX_NUM_CCs];
-  BOOLEAN_t		  fdd_DownlinkOrTddSubframeBitmapBR_r13     [MAX_NUM_CCs];
+  BOOLEAN_t		 * fdd_DownlinkOrTddSubframeBitmapBR_r13     [MAX_NUM_CCs];
   uint64_t		  fdd_DownlinkOrTddSubframeBitmapBR_val_r13 [MAX_NUM_CCs];
   uint16_t		  fdd_UplinkSubframeBitmapBR_r13            [MAX_NUM_CCs];
   long			  startSymbolBR_r13                         [MAX_NUM_CCs];
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index a5996d8a9a..afd5ec690e 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -20,12 +20,12 @@
  */
 
 /*
-  enb_config.c
-  -------------------
-  AUTHOR  : Lionel GAUTHIER, navid nikaein, Laurent Winckel
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr, navid.nikaein@eurecom.fr
-*/
+   enb_config.c
+   -------------------
+AUTHOR  : Lionel GAUTHIER, navid nikaein, Laurent Winckel
+COMPANY : EURECOM
+EMAIL   : Lionel.Gauthier@eurecom.fr, navid.nikaein@eurecom.fr
+ */
 
 #include <string.h>
 #include <libconfig.h>
@@ -411,11 +411,11 @@ static const eutra_band_t eutra_bands[] = {
 
 
 static int enb_check_band_frequencies(char* lib_config_file_name_pP,
-                                      int ind,
-                                      int16_t band,
-                                      uint32_t downlink_frequency,
-                                      int32_t uplink_frequency_offset,
-                                      lte_frame_type_t frame_type)
+    int ind,
+    int16_t band,
+    uint32_t downlink_frequency,
+    int32_t uplink_frequency_offset,
+    lte_frame_type_t frame_type)
 {
   int errors = 0;
 
@@ -427,22 +427,22 @@ static int enb_check_band_frequencies(char* lib_config_file_name_pP,
         uint32_t uplink_frequency = downlink_frequency + uplink_frequency_offset;
 
         AssertError (eutra_bands[band_index].dl_min < downlink_frequency, errors ++,
-                     "Failed to parse eNB configuration file %s, enb %d downlink frequency %u too low (%u) for band %d!",
-                     lib_config_file_name_pP, ind, downlink_frequency, eutra_bands[band_index].dl_min, band);
+            "Failed to parse eNB configuration file %s, enb %d downlink frequency %u too low (%u) for band %d!",
+            lib_config_file_name_pP, ind, downlink_frequency, eutra_bands[band_index].dl_min, band);
         AssertError (downlink_frequency < eutra_bands[band_index].dl_max, errors ++,
-                     "Failed to parse eNB configuration file %s, enb %d downlink frequency %u too high (%u) for band %d!",
-                     lib_config_file_name_pP, ind, downlink_frequency, eutra_bands[band_index].dl_max, band);
+            "Failed to parse eNB configuration file %s, enb %d downlink frequency %u too high (%u) for band %d!",
+            lib_config_file_name_pP, ind, downlink_frequency, eutra_bands[band_index].dl_max, band);
 
         AssertError (eutra_bands[band_index].ul_min < uplink_frequency, errors ++,
-                     "Failed to parse eNB configuration file %s, enb %d uplink frequency %u too low (%u) for band %d!",
-                     lib_config_file_name_pP, ind, uplink_frequency, eutra_bands[band_index].ul_min, band);
+            "Failed to parse eNB configuration file %s, enb %d uplink frequency %u too low (%u) for band %d!",
+            lib_config_file_name_pP, ind, uplink_frequency, eutra_bands[band_index].ul_min, band);
         AssertError (uplink_frequency < eutra_bands[band_index].ul_max, errors ++,
-                     "Failed to parse eNB configuration file %s, enb %d uplink frequency %u too high (%u) for band %d!",
-                     lib_config_file_name_pP, ind, uplink_frequency, eutra_bands[band_index].ul_max, band);
+            "Failed to parse eNB configuration file %s, enb %d uplink frequency %u too high (%u) for band %d!",
+            lib_config_file_name_pP, ind, uplink_frequency, eutra_bands[band_index].ul_max, band);
 
         AssertError (eutra_bands[band_index].frame_type == frame_type, errors ++,
-                     "Failed to parse eNB configuration file %s, enb %d invalid frame type (%d/%d) for band %d!",
-                     lib_config_file_name_pP, ind, eutra_bands[band_index].frame_type, frame_type, band);
+            "Failed to parse eNB configuration file %s, enb %d invalid frame type (%d/%d) for band %d!",
+            lib_config_file_name_pP, ind, eutra_bands[band_index].frame_type, frame_type, band);
       }
     }
   }
@@ -549,89 +549,89 @@ void RCconfig_RU() {
 
 
       if (  !(
-	      config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_IF_NAME,(const char **)&if_name)
-	      )
-	    ) {
-	fronthaul_flag = CONFIG_FALSE;
+            config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_IF_NAME,(const char **)&if_name)
+            )
+         ) {
+        fronthaul_flag = CONFIG_FALSE;
       }
 
       if (  !(
-              config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_RF,(const char **)&local_rf)
-              )
-            ) {
+            config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_RF,(const char **)&local_rf)
+            )
+         ) {
         local_rf_flag = CONFIG_FALSE;
       }			  
-      
+
       if (local_rf_flag == CONFIG_TRUE) { // eNB or RRU
-	
 
-	if (  !(
-                config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_MAX_RS_EPRE, &max_pdschReferenceSignalPower) &&
-                config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_MAX_RXGAIN, &max_rxgain)
-               )
-              ) {
+
+        if (  !(
+              config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_MAX_RS_EPRE, &max_pdschReferenceSignalPower) &&
+              config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_MAX_RXGAIN, &max_rxgain)
+              )
+           ) {
           AssertFatal (0,
-                       "Failed to parse configuration file %s, RU %d config !\n",
-                       RC.config_file_name, j);
+              "Failed to parse configuration file %s, RU %d config !\n",
+              RC.config_file_name, j);
           continue;
         }
 
-	AssertFatal((setting_band = config_setting_get_member(setting_ru, CONFIG_STRING_RU_BAND_LIST))!=NULL,"No allowable LTE bands\n");
+        AssertFatal((setting_band = config_setting_get_member(setting_ru, CONFIG_STRING_RU_BAND_LIST))!=NULL,"No allowable LTE bands\n");
 
-	if (setting_band != NULL) num_bands    = config_setting_length(setting_band);
-	else num_bands=0;
+        if (setting_band != NULL) num_bands    = config_setting_length(setting_band);
+        else num_bands=0;
 
-	for (i=0;i<num_bands;i++) {
-	  setting_band_elem = config_setting_get_elem(setting_band,i);
-	  band[i] = config_setting_get_int(setting_band_elem);
-	  printf("RU %d: band %d\n",j,band[i]);
-	}
+        for (i=0;i<num_bands;i++) {
+          setting_band_elem = config_setting_get_elem(setting_band,i);
+          band[i] = config_setting_get_int(setting_band_elem);
+          printf("RU %d: band %d\n",j,band[i]);
+        }
       } // fronthaul_flag == CONFIG_FALSE
-      
+
       if (fronthaul_flag == CONFIG_TRUE) { // fronthaul_flag == CONFIG_TRUE
-	if (  !(
-		config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_ADDRESS,        (const char **)&ipv4)
-		&& config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_REMOTE_ADDRESS,       (const char **)&ipv4_remote)
-		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTC,          &local_portc)
-		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTC,         &remote_portc)
-		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTD,          &local_portd)
-		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTD,         &remote_portd)
-		&& config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_TRANSPORT_PREFERENCE, (const char **)&tr_preference)
-		)
-	      ) {
-	  AssertFatal (0,
-		       "Failed to parse configuration file %s, RU %d config !\n",
-		       RC.config_file_name, j);
-	  continue;
-	}
+        if (  !(
+              config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_ADDRESS,        (const char **)&ipv4)
+              && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_REMOTE_ADDRESS,       (const char **)&ipv4_remote)
+              && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTC,          &local_portc)
+              && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTC,         &remote_portc)
+              && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTD,          &local_portd)
+              && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTD,         &remote_portd)
+              && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_TRANSPORT_PREFERENCE, (const char **)&tr_preference)
+              )
+           ) {
+          AssertFatal (0,
+              "Failed to parse configuration file %s, RU %d config !\n",
+              RC.config_file_name, j);
+          continue;
+        }
 
       }
 
       if (RC.nb_L1_inst>0) {
-	AssertFatal((setting_eNB_list = config_setting_get_member(setting_ru, CONFIG_STRING_RU_ENB_LIST))!=NULL,"No RU<->eNB mappings\n");
-      
-	if (setting_eNB_list != NULL) num_eNB4RU    = config_setting_length(setting_eNB_list);
-	else num_eNB4RU=0;
-	AssertFatal(num_eNB4RU>0,"Number of eNBs is zero\n");
-	
-	for (i=0;i<num_eNB4RU;i++) {
-	  setting_eNB_list_elem = config_setting_get_elem(setting_eNB_list,i);
-	  eNB_list[i] = config_setting_get_int(setting_eNB_list_elem);
-	  printf("RU %d: eNB %d\n",j,eNB_list[i]);
-	}
+        AssertFatal((setting_eNB_list = config_setting_get_member(setting_ru, CONFIG_STRING_RU_ENB_LIST))!=NULL,"No RU<->eNB mappings\n");
+
+        if (setting_eNB_list != NULL) num_eNB4RU    = config_setting_length(setting_eNB_list);
+        else num_eNB4RU=0;
+        AssertFatal(num_eNB4RU>0,"Number of eNBs is zero\n");
+
+        for (i=0;i<num_eNB4RU;i++) {
+          setting_eNB_list_elem = config_setting_get_elem(setting_eNB_list,i);
+          eNB_list[i] = config_setting_get_int(setting_eNB_list_elem);
+          printf("RU %d: eNB %d\n",j,eNB_list[i]);
+        }
       }
 
       config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_TX, &att_tx);
       config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_RX, &att_rx);
 
       if ( !(
-	               config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_TX,  &nb_tx)
-		    && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_RX,  &nb_rx)
-		    )) {
-	AssertFatal (0,
-		     "Failed to parse configuration file %s, RU %d config !\n",
-		     RC.config_file_name, j);
-	continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+            config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_TX,  &nb_tx)
+            && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_RX,  &nb_rx)
+            )) {
+        AssertFatal (0,
+            "Failed to parse configuration file %s, RU %d config !\n",
+            RC.config_file_name, j);
+        continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
       }
 
       RC.ru[j]                                    = (RU_t*)malloc(sizeof(RU_t));
@@ -643,86 +643,86 @@ void RCconfig_RU() {
       RC.ru[j]->num_eNB                             = num_eNB4RU;
 
       for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
-      
+
       if (strcmp(local_rf, "yes") == 0) {
-	if (fronthaul_flag == CONFIG_FALSE) {
-	  RC.ru[j]->if_south                        = LOCAL_RF;
-	  RC.ru[j]->function                        = eNodeB_3GPP;
-	  printf("Setting function for RU %d to eNodeB_3GPP\n",j);
+        if (fronthaul_flag == CONFIG_FALSE) {
+          RC.ru[j]->if_south                        = LOCAL_RF;
+          RC.ru[j]->function                        = eNodeB_3GPP;
+          printf("Setting function for RU %d to eNodeB_3GPP\n",j);
         }
         else { 
-	  RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
-	  RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
-	  RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
-	  RC.ru[j]->eth_params.my_portc                 = local_portc;
-	  RC.ru[j]->eth_params.remote_portc             = remote_portc;
-	  RC.ru[j]->eth_params.my_portd                 = local_portd;
-	  RC.ru[j]->eth_params.remote_portd             = remote_portd;
-
-	  if (strcmp(tr_preference, "udp") == 0) {
-	    RC.ru[j]->if_south                        = LOCAL_RF;
-	    RC.ru[j]->function                        = NGFI_RRU_IF5;
-	    RC.ru[j]->eth_params.transp_preference    = ETH_UDP_MODE;
-	    printf("Setting function for RU %d to NGFI_RRU_IF5 (udp)\n",j);
-	  } else if (strcmp(tr_preference, "raw") == 0) {
-	    RC.ru[j]->if_south                        = LOCAL_RF;
-	    RC.ru[j]->function                        = NGFI_RRU_IF5;
-	    RC.ru[j]->eth_params.transp_preference    = ETH_RAW_MODE;
-	    printf("Setting function for RU %d to NGFI_RRU_IF5 (raw)\n",j);
-	  } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
-	    RC.ru[j]->if_south                        = LOCAL_RF;
-	    RC.ru[j]->function                        = NGFI_RRU_IF4p5;
-	    RC.ru[j]->eth_params.transp_preference    = ETH_UDP_IF4p5_MODE;
-	    printf("Setting function for RU %d to NGFI_RRU_IF4p5 (udp)\n",j);
-	  } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
-	    RC.ru[j]->if_south                        = LOCAL_RF;
-	    RC.ru[j]->function                        = NGFI_RRU_IF4p5;
-	    RC.ru[j]->eth_params.transp_preference    = ETH_RAW_IF4p5_MODE;
-	    printf("Setting function for RU %d to NGFI_RRU_IF4p5 (raw)\n",j);
-	  }
-	}
-
-	RC.ru[j]->max_pdschReferenceSignalPower     = max_pdschReferenceSignalPower;
-	RC.ru[j]->max_rxgain                        = max_rxgain;
-	RC.ru[j]->num_bands                         = num_bands;
-	for (i=0;i<num_bands;i++) RC.ru[j]->band[i] = band[i];
+          RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
+          RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
+          RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
+          RC.ru[j]->eth_params.my_portc                 = local_portc;
+          RC.ru[j]->eth_params.remote_portc             = remote_portc;
+          RC.ru[j]->eth_params.my_portd                 = local_portd;
+          RC.ru[j]->eth_params.remote_portd             = remote_portd;
+
+          if (strcmp(tr_preference, "udp") == 0) {
+            RC.ru[j]->if_south                        = LOCAL_RF;
+            RC.ru[j]->function                        = NGFI_RRU_IF5;
+            RC.ru[j]->eth_params.transp_preference    = ETH_UDP_MODE;
+            printf("Setting function for RU %d to NGFI_RRU_IF5 (udp)\n",j);
+          } else if (strcmp(tr_preference, "raw") == 0) {
+            RC.ru[j]->if_south                        = LOCAL_RF;
+            RC.ru[j]->function                        = NGFI_RRU_IF5;
+            RC.ru[j]->eth_params.transp_preference    = ETH_RAW_MODE;
+            printf("Setting function for RU %d to NGFI_RRU_IF5 (raw)\n",j);
+          } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
+            RC.ru[j]->if_south                        = LOCAL_RF;
+            RC.ru[j]->function                        = NGFI_RRU_IF4p5;
+            RC.ru[j]->eth_params.transp_preference    = ETH_UDP_IF4p5_MODE;
+            printf("Setting function for RU %d to NGFI_RRU_IF4p5 (udp)\n",j);
+          } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
+            RC.ru[j]->if_south                        = LOCAL_RF;
+            RC.ru[j]->function                        = NGFI_RRU_IF4p5;
+            RC.ru[j]->eth_params.transp_preference    = ETH_RAW_IF4p5_MODE;
+            printf("Setting function for RU %d to NGFI_RRU_IF4p5 (raw)\n",j);
+          }
+        }
+
+        RC.ru[j]->max_pdschReferenceSignalPower     = max_pdschReferenceSignalPower;
+        RC.ru[j]->max_rxgain                        = max_rxgain;
+        RC.ru[j]->num_bands                         = num_bands;
+        for (i=0;i<num_bands;i++) RC.ru[j]->band[i] = band[i];
       }
       else {
-	printf("RU %d: Transport %s\n",j,tr_preference);
-
-	RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
-	RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
-	RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
-	RC.ru[j]->eth_params.my_portc                 = local_portc;
-	RC.ru[j]->eth_params.remote_portc             = remote_portc;
-	RC.ru[j]->eth_params.my_portd                 = local_portd;
-	RC.ru[j]->eth_params.remote_portd             = remote_portd;
-	for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
-
-	if (strcmp(tr_preference, "udp") == 0) {
-	  RC.ru[j]->if_south                     = REMOTE_IF5;
-	  RC.ru[j]->function                     = NGFI_RAU_IF5;
-	  RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
-	} else if (strcmp(tr_preference, "raw") == 0) {
-	  RC.ru[j]->if_south                     = REMOTE_IF5;
-	  RC.ru[j]->function                     = NGFI_RAU_IF5;
-	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
-	} else if (strcmp(tr_preference, "udp_if4p5") == 0) {
-	  RC.ru[j]->if_south                     = REMOTE_IF4p5;
-	  RC.ru[j]->function                     = NGFI_RAU_IF4p5;
-	  RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
-	} else if (strcmp(tr_preference, "raw_if4p5") == 0) {
-	  RC.ru[j]->if_south                     = REMOTE_IF4p5;
-	  RC.ru[j]->function                     = NGFI_RAU_IF4p5;
-	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
-	} else if (strcmp(tr_preference, "raw_if5_mobipass") == 0) {
-	  RC.ru[j]->if_south                     = REMOTE_IF5;
-	  RC.ru[j]->function                     = NGFI_RAU_IF5;
-	  RC.ru[j]->if_timing                    = synch_to_other;
-	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
-	}
-	RC.ru[j]->att_tx                         = att_tx;
-	RC.ru[j]->att_rx                         = att_rx;
+        printf("RU %d: Transport %s\n",j,tr_preference);
+
+        RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
+        RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
+        RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
+        RC.ru[j]->eth_params.my_portc                 = local_portc;
+        RC.ru[j]->eth_params.remote_portc             = remote_portc;
+        RC.ru[j]->eth_params.my_portd                 = local_portd;
+        RC.ru[j]->eth_params.remote_portd             = remote_portd;
+        for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
+
+        if (strcmp(tr_preference, "udp") == 0) {
+          RC.ru[j]->if_south                     = REMOTE_IF5;
+          RC.ru[j]->function                     = NGFI_RAU_IF5;
+          RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
+        } else if (strcmp(tr_preference, "raw") == 0) {
+          RC.ru[j]->if_south                     = REMOTE_IF5;
+          RC.ru[j]->function                     = NGFI_RAU_IF5;
+          RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
+        } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
+          RC.ru[j]->if_south                     = REMOTE_IF4p5;
+          RC.ru[j]->function                     = NGFI_RAU_IF4p5;
+          RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
+        } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
+          RC.ru[j]->if_south                     = REMOTE_IF4p5;
+          RC.ru[j]->function                     = NGFI_RAU_IF4p5;
+          RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
+        } else if (strcmp(tr_preference, "raw_if5_mobipass") == 0) {
+          RC.ru[j]->if_south                     = REMOTE_IF5;
+          RC.ru[j]->function                     = NGFI_RAU_IF5;
+          RC.ru[j]->if_timing                    = synch_to_other;
+          RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
+        }
+        RC.ru[j]->att_tx                         = att_tx;
+        RC.ru[j]->att_rx                         = att_rx;
       }
 
       RC.ru[j]->nb_tx                             = nb_tx;
@@ -772,25 +772,25 @@ void RCconfig_L1() {
 
       setting_l1 = config_setting_get_elem(setting, j);
       if (!config_setting_lookup_int   (setting_l1,CONFIG_STRING_L1_CC,&RC.nb_L1_CC[j]))
-	AssertFatal (0,
-		     "Failed to parse configuration file %s, L1 %d config !\n",
-		     RC.config_file_name, j);
+        AssertFatal (0,
+            "Failed to parse configuration file %s, L1 %d config !\n",
+            RC.config_file_name, j);
 
       if (RC.eNB[j] == NULL) {
-	RC.eNB[j]                       = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB**));
-	LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]);
-	memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB***));
+        RC.eNB[j]                       = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB**));
+        LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]);
+        memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB***));
       }
 
 
       for (i=0;i<RC.nb_L1_CC[j];i++) {
-	if (RC.eNB[j][i] == NULL) {
-	  RC.eNB[j][i] = (PHY_VARS_eNB *)malloc(sizeof(PHY_VARS_eNB));
-	  memset((void*)RC.eNB[j][i],0,sizeof(PHY_VARS_eNB));
-	  LOG_I(PHY,"RC.eNB[%d][%d] = %p\n",j,i,RC.eNB[j][i]);
-	  RC.eNB[j][i]->Mod_id  = j;
-	  RC.eNB[j][i]->CC_id   = i;
-	}
+        if (RC.eNB[j][i] == NULL) {
+          RC.eNB[j][i] = (PHY_VARS_eNB *)malloc(sizeof(PHY_VARS_eNB));
+          memset((void*)RC.eNB[j][i],0,sizeof(PHY_VARS_eNB));
+          LOG_I(PHY,"RC.eNB[%d][%d] = %p\n",j,i,RC.eNB[j][i]);
+          RC.eNB[j][i]->Mod_id  = j;
+          RC.eNB[j][i]->CC_id   = i;
+        }
       }
 
 
@@ -800,38 +800,38 @@ void RCconfig_L1() {
 
       printf("RU %d: Transport %s\n",j,tr_n_preference);
       if (!(config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, (const char **)&tr_n_preference))) {
-	AssertFatal (0,
-		     "Failed to parse configuration file %s, L1 %d config !\n",
-		     RC.config_file_name, j);
+        AssertFatal (0,
+            "Failed to parse configuration file %s, L1 %d config !\n",
+            RC.config_file_name, j);
       }
 
       if (strcmp(tr_n_preference, "local_mac") == 0) {
 
       }
       else if (strcmp(tr_n_preference, "nfapi") == 0) {
-	if (  !(
-		config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
-		&& config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
-		&& config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
-		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTC,          &local_n_portc)
-		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTC,         &remote_n_portc)
-		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTD,          &local_n_portd)
-		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTD,         &remote_n_portd)
-		)
-	      ) {
-	  AssertFatal (0,
-		       "Failed to parse configuration file %s, L1 %d config !\n",
-		       RC.config_file_name, j);
-	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-	}
-	RC.eNB[j][0]->eth_params_n.local_if_name            = strdup(if_name_n);
-	RC.eNB[j][0]->eth_params_n.my_addr                  = strdup(ipv4_n);
-	RC.eNB[j][0]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
-	RC.eNB[j][0]->eth_params_n.my_portc                 = local_n_portc;
-	RC.eNB[j][0]->eth_params_n.remote_portc             = remote_n_portc;
-	RC.eNB[j][0]->eth_params_n.my_portd                 = local_n_portd;
-	RC.eNB[j][0]->eth_params_n.remote_portd             = remote_n_portd;
-	RC.eNB[j][0]->eth_params_n.transp_preference          = ETH_UDP_MODE;
+        if (  !(
+              config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
+              && config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
+              && config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
+              && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTC,          &local_n_portc)
+              && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTC,         &remote_n_portc)
+              && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTD,          &local_n_portd)
+              && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTD,         &remote_n_portd)
+              )
+           ) {
+          AssertFatal (0,
+              "Failed to parse configuration file %s, L1 %d config !\n",
+              RC.config_file_name, j);
+          continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+        }
+        RC.eNB[j][0]->eth_params_n.local_if_name            = strdup(if_name_n);
+        RC.eNB[j][0]->eth_params_n.my_addr                  = strdup(ipv4_n);
+        RC.eNB[j][0]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
+        RC.eNB[j][0]->eth_params_n.my_portc                 = local_n_portc;
+        RC.eNB[j][0]->eth_params_n.remote_portc             = remote_n_portc;
+        RC.eNB[j][0]->eth_params_n.my_portd                 = local_n_portd;
+        RC.eNB[j][0]->eth_params_n.remote_portd             = remote_n_portd;
+        RC.eNB[j][0]->eth_params_n.transp_preference          = ETH_UDP_MODE;
       }
 
       else { // other midhaul
@@ -886,52 +886,52 @@ void RCconfig_macrlc() {
       printf("macrlc %d/%d \n",j,RC.nb_macrlc_inst);
 
       if (!(config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, (const char **)&tr_n_preference))) {
-	AssertFatal (0,
-		     "Failed to parse configuration file %s, L1 %d config !\n",
-		     RC.config_file_name, j);
+        AssertFatal (0,
+            "Failed to parse configuration file %s, L1 %d config !\n",
+            RC.config_file_name, j);
       }
 
       printf("MACRLC %d: Northbound Transport %s\n",j,tr_n_preference);
 
       if (strcmp(tr_n_preference, "local_RRC") == 0) {
-	// check number of instances is same as RRC/PDCP
+        // check number of instances is same as RRC/PDCP
 
       }
       else if (strcmp(tr_n_preference, "cudu") == 0) {
-	if (  !(
-		config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
-		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
-		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTC,          &local_n_portc)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTC,         &remote_n_portc)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTD,          &local_n_portd)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTD,         &remote_n_portd)
-		)
-	      ) {
-	  AssertFatal (0,
-		       "Failed to parse configuration file %s, L1 %d config !\n",
-		       RC.config_file_name, j);
-	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-	}
-	RC.mac[j]->eth_params_n.local_if_name            = strdup(if_name_n);
-	RC.mac[j]->eth_params_n.my_addr                  = strdup(ipv4_n);
-	RC.mac[j]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
-	RC.mac[j]->eth_params_n.my_portc                 = local_n_portc;
-	RC.mac[j]->eth_params_n.remote_portc             = remote_n_portc;
-	RC.mac[j]->eth_params_n.my_portd                 = local_n_portd;
-	RC.mac[j]->eth_params_n.remote_portd             = remote_n_portd;
-	RC.mac[j]->eth_params_n.transp_preference        = ETH_UDP_MODE;
+        if (  !(
+              config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
+              && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
+              && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTC,          &local_n_portc)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTC,         &remote_n_portc)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTD,          &local_n_portd)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTD,         &remote_n_portd)
+              )
+           ) {
+          AssertFatal (0,
+              "Failed to parse configuration file %s, L1 %d config !\n",
+              RC.config_file_name, j);
+          continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+        }
+        RC.mac[j]->eth_params_n.local_if_name            = strdup(if_name_n);
+        RC.mac[j]->eth_params_n.my_addr                  = strdup(ipv4_n);
+        RC.mac[j]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
+        RC.mac[j]->eth_params_n.my_portc                 = local_n_portc;
+        RC.mac[j]->eth_params_n.remote_portc             = remote_n_portc;
+        RC.mac[j]->eth_params_n.my_portd                 = local_n_portd;
+        RC.mac[j]->eth_params_n.remote_portd             = remote_n_portd;
+        RC.mac[j]->eth_params_n.transp_preference        = ETH_UDP_MODE;
       }
 
       else { // other midhaul
-	AssertFatal(1==0,"MACRLC %d: unknown northbound midhaul\n",j);
+        AssertFatal(1==0,"MACRLC %d: unknown northbound midhaul\n",j);
       }
 
       if (!(config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference))) {
-	AssertFatal (0,
-		     "Failed to parse configuration file %s, L1 %d config !\n",
-		     RC.config_file_name, j);
-	continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+        AssertFatal (0,
+            "Failed to parse configuration file %s, L1 %d config !\n",
+            RC.config_file_name, j);
+        continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
       }
 
       printf("MACRLC %d: Southbound Transport %s\n",j,tr_s_preference);
@@ -941,33 +941,33 @@ void RCconfig_macrlc() {
 
       }
       else if (strcmp(tr_s_preference, "nfapi") == 0) {
-	if (  !(
-		config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
-		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
-		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTC,          &local_s_portc)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTC,         &remote_s_portc)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTD,          &local_s_portd)
-		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTD,         &remote_s_portd)
-		)){
-	  AssertFatal (0,
-		       "Failed to parse configuration file %s, L1 %d config !\n",
-		       RC.config_file_name, j);
-	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-	}
-
-	RC.mac[j]->eth_params_s.local_if_name            = strdup(if_name_s);
-	RC.mac[j]->eth_params_s.my_addr                  = strdup(ipv4_s);
-	RC.mac[j]->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
-	RC.mac[j]->eth_params_s.my_portc                 = local_s_portc;
-	RC.mac[j]->eth_params_s.remote_portc             = remote_s_portc;
-	RC.mac[j]->eth_params_s.my_portd                 = local_s_portd;
-	RC.mac[j]->eth_params_s.remote_portd             = remote_s_portd;
-	RC.mac[j]->eth_params_s.transp_preference        = ETH_UDP_MODE;
+        if (  !(
+              config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
+              && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
+              && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTC,          &local_s_portc)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTC,         &remote_s_portc)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTD,          &local_s_portd)
+              && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTD,         &remote_s_portd)
+              )){
+          AssertFatal (0,
+              "Failed to parse configuration file %s, L1 %d config !\n",
+              RC.config_file_name, j);
+          continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+        }
+
+        RC.mac[j]->eth_params_s.local_if_name            = strdup(if_name_s);
+        RC.mac[j]->eth_params_s.my_addr                  = strdup(ipv4_s);
+        RC.mac[j]->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
+        RC.mac[j]->eth_params_s.my_portc                 = local_s_portc;
+        RC.mac[j]->eth_params_s.remote_portc             = remote_s_portc;
+        RC.mac[j]->eth_params_s.my_portd                 = local_s_portd;
+        RC.mac[j]->eth_params_s.remote_portd             = remote_s_portd;
+        RC.mac[j]->eth_params_s.transp_preference        = ETH_UDP_MODE;
       }
 
       else { // other midhaul
-	AssertFatal(1==0,"MACRLC %d: unknown southbound midhaul\n",j);
+        AssertFatal(1==0,"MACRLC %d: unknown southbound midhaul\n",j);
       }
     }// j=0..num_inst
   }
@@ -1218,19 +1218,19 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
       asn1_xer_print = 0;
     }
   }
-  
+
 #endif
-  
+
   // Get list of active eNBs, (only these will be configured)
   setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
-  
+
   if (setting != NULL) {
     num_enbs = config_setting_length(setting);
     setting_enb   = config_setting_get_elem(setting, i);
     active_enb[i] = config_setting_get_string (setting_enb);
     AssertFatal (active_enb[i] != NULL,
-		 "Failed to parse config file %s, %uth attribute %s \n",
-		 RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
+        "Failed to parse config file %s, %uth attribute %s \n",
+        RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
     active_enb[i] = strdup(active_enb[i]);
   }
 
@@ -1246,28 +1246,28 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
       setting_enb = config_setting_get_elem(setting, i);
 
       if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
-	// Calculate a default eNB ID
+        // Calculate a default eNB ID
 # if defined(ENABLE_USE_MME)
-	uint32_t hash;
+        uint32_t hash;
 
-	hash = s1ap_generate_eNB_id ();
-	enb_id = i + (hash & 0xFFFF8);
+        hash = s1ap_generate_eNB_id ();
+        enb_id = i + (hash & 0xFFFF8);
 # else
-	enb_id = i;
+        enb_id = i;
 # endif
       }
 
       if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
-		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
-		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
-		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
-		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
-		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference)
-		     )
-	    ) {
-	AssertFatal (0,
-		     "Failed to parse eNB configuration file %s, %u th enb\n",
-		     RC.config_file_name, i);
+            && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
+            && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
+            && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
+            && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
+            && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference)
+            )
+         ) {
+        AssertFatal (0,
+            "Failed to parse eNB configuration file %s, %u th enb\n",
+            RC.config_file_name, i);
       }
 
       printf("RRC %d: Southbound Transport %s\n",j,tr_s_preference);
@@ -1277,3365 +1277,3379 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
 
       }
       else if (strcmp(tr_s_preference, "cudu") == 0) {
-	if (  !(config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
-		&& config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
-		&& config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
-		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTC,          &local_s_portc)
-		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTC,         &remote_s_portc)
-		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTD,          &local_s_portd)
-		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTD,         &remote_s_portd)
-		)
-	      ) {
-	  AssertFatal (0,
-		       "Failed to parse eNB configuration file %s, %u th enb\n",
-		       RC.config_file_name, i);
-	}
-	rrc->eth_params_s.local_if_name            = strdup(if_name_s);
-	rrc->eth_params_s.my_addr                  = strdup(ipv4_s);
-	rrc->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
-	rrc->eth_params_s.my_portc                 = local_s_portc;
-	rrc->eth_params_s.remote_portc             = remote_s_portc;
-	rrc->eth_params_s.my_portd                 = local_s_portd;
-	rrc->eth_params_s.remote_portd             = remote_s_portd;
-	rrc->eth_params_s.transp_preference        = ETH_UDP_MODE;
+        if (  !(config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
+              && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
+              && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
+              && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTC,          &local_s_portc)
+              && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTC,         &remote_s_portc)
+              && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTD,          &local_s_portd)
+              && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTD,         &remote_s_portd)
+              )
+           ) {
+          AssertFatal (0,
+              "Failed to parse eNB configuration file %s, %u th enb\n",
+              RC.config_file_name, i);
+        }
+        rrc->eth_params_s.local_if_name            = strdup(if_name_s);
+        rrc->eth_params_s.my_addr                  = strdup(ipv4_s);
+        rrc->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
+        rrc->eth_params_s.my_portc                 = local_s_portc;
+        rrc->eth_params_s.remote_portc             = remote_s_portc;
+        rrc->eth_params_s.my_portd                 = local_s_portd;
+        rrc->eth_params_s.remote_portd             = remote_s_portd;
+        rrc->eth_params_s.transp_preference        = ETH_UDP_MODE;
       }
-      
+
       else { // other midhaul
       }
 
       // search if in active list
 
       for (j=0; j < num_enbs; j++) {
-	if (strcmp(active_enb[j], enb_name) == 0) {
-
-	  RRC_CONFIGURATION_REQ (msg_p).cell_identity = enb_id;
-	  RRC_CONFIGURATION_REQ (msg_p).tac              = (uint16_t)atoi(tac);
-	  RRC_CONFIGURATION_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
-	  RRC_CONFIGURATION_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
-	  RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length = strlen(mnc);
-	  AssertFatal((RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 2) ||
-		      (RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 3),
-		      "BAD MNC DIGIT LENGTH %d",
-		      RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length);
-
-	  LOG_I(RRC,"RRC config (%s,%s,%s)\n",mcc,mnc,tac);
-	  // Parse optional physical parameters
-
-
-	  setting_component_carriers = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
-	  nb_cc = 0;
-
-	  if (setting_component_carriers != NULL) {
-
-	    num_component_carriers     = config_setting_length(setting_component_carriers);
-	    LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
-
-	    //enb_properties_loc.properties[enb_properties_loc_index]->nb_cc = num_component_carriers;
-	    for (j = 0; j < num_component_carriers ;j++) { // && j < MAX_NUM_CCs; j++) {
-	      component_carrier = config_setting_get_elem(setting_component_carriers, j);
-
-	      //printf("Component carrier %d\n",component_carrier);
-	      if (!(config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG, &tdd_config)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG_S, &tdd_config_s)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PREFIX_TYPE, &prefix_type)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PBCH_REPETITION, &pbch_repetition)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_EUTRA_BAND, &eutra_band)
-		    && config_setting_lookup_int64(component_carrier, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NID_CELL, &Nid_cell)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_N_RB_DL, &N_RB_DL)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_CELL_MBSFN, &Nid_cell_mbsfn)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NB_ANT_PORTS, &nb_antenna_ports)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
+        if (strcmp(active_enb[j], enb_name) == 0) {
+
+          RRC_CONFIGURATION_REQ (msg_p).cell_identity = enb_id;
+          RRC_CONFIGURATION_REQ (msg_p).tac              = (uint16_t)atoi(tac);
+          RRC_CONFIGURATION_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
+          RRC_CONFIGURATION_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
+          RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length = strlen(mnc);
+          AssertFatal((RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 2) ||
+              (RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 3),
+              "BAD MNC DIGIT LENGTH %d",
+              RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length);
+
+          LOG_I(RRC,"RRC config (%s,%s,%s)\n",mcc,mnc,tac);
+          // Parse optional physical parameters
+
+
+          setting_component_carriers = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
+          nb_cc = 0;
+
+          if (setting_component_carriers != NULL) {
+
+            num_component_carriers     = config_setting_length(setting_component_carriers);
+            LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
+
+            //enb_properties_loc.properties[enb_properties_loc_index]->nb_cc = num_component_carriers;
+            for (j = 0; j < num_component_carriers ;j++) { // && j < MAX_NUM_CCs; j++) {
+              component_carrier = config_setting_get_elem(setting_component_carriers, j);
+
+              //printf("Component carrier %d\n",component_carrier);
+              if (!(config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG, &tdd_config)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG_S, &tdd_config_s)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PREFIX_TYPE, &prefix_type)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PBCH_REPETITION, &pbch_repetition)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_EUTRA_BAND, &eutra_band)
+                    && config_setting_lookup_int64(component_carrier, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NID_CELL, &Nid_cell)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_N_RB_DL, &N_RB_DL)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_CELL_MBSFN, &Nid_cell_mbsfn)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NB_ANT_PORTS, &nb_antenna_ports)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
 #if !defined(Rel10) && !defined(Rel14)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
 #endif
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &bcch_modificationPeriodCoeff)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
-		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
-		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &bcch_modificationPeriodCoeff)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
+                    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
+                    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
 
 #if defined(Rel10) || defined(Rel14)
 
 
 #endif
-		    )) {
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
-			     RC.config_file_name, nb_cc++);
-		continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-	      }
-
-	      nb_cc++;
-	      RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
-
-	      AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
-			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
-			   RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
-
-	      RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
-	      AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
-			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
-			   RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
-
-	      if (!prefix_type)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
-	      else if (strcmp(prefix_type, "NORMAL") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
-	      }
-	      else  if (strcmp(prefix_type, "EXTENDED") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
-	      }
-	      else {
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
-			    RC.config_file_name, i, prefix_type);
-	      }
+                    )) {
+                      AssertFatal (0,
+                          "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
+                          RC.config_file_name, nb_cc++);
+                      continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+                    }
+
+              nb_cc++;
+              RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
+
+              AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
+                  "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
+                  RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
+
+              RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
+              AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
+                  "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
+                  RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
+
+              if (!prefix_type)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
+              else if (strcmp(prefix_type, "NORMAL") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
+              }
+              else  if (strcmp(prefix_type, "EXTENDED") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
+              }
+              else {
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
+                    RC.config_file_name, i, prefix_type);
+              }
 #ifdef Rel14
-	      if (!pbch_repetition)
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n",
-			    RC.config_file_name, i, ENB_CONFIG_STRING_PBCH_REPETITION);
-	      else if (strcmp(pbch_repetition, "TRUE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 1;
-	      }
-	      else  if (strcmp(pbch_repetition, "FALSE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 0;
-	      }
-	      else {
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n",
-			    RC.config_file_name, i, pbch_repetition);
-	      }
+              if (!pbch_repetition)
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PBCH_REPETITION);
+              else if (strcmp(pbch_repetition, "TRUE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 1;
+              }
+              else  if (strcmp(pbch_repetition, "FALSE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 0;
+              }
+              else {
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n",
+                    RC.config_file_name, i, pbch_repetition);
+              }
 #endif
 
-	      RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
-	      RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
-	      RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
-	      RRC_CONFIGURATION_REQ (msg_p).Nid_cell[j]= Nid_cell;
+              RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
+              RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
+              RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
+              RRC_CONFIGURATION_REQ (msg_p).Nid_cell[j]= Nid_cell;
 
-	      if (Nid_cell>503) {
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for Nid_cell choice: 0...503 !\n",
-			     RC.config_file_name, i, Nid_cell);
-	      }
+              if (Nid_cell>503) {
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for Nid_cell choice: 0...503 !\n",
+                    RC.config_file_name, i, Nid_cell);
+              }
 
-	      RRC_CONFIGURATION_REQ (msg_p).N_RB_DL[j]= N_RB_DL;
+              RRC_CONFIGURATION_REQ (msg_p).N_RB_DL[j]= N_RB_DL;
 
-	      if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for N_RB_DL choice: 6,15,25,50,75,100 !\n",
-			     RC.config_file_name, i, N_RB_DL);
-	      }
-
-	      if (strcmp(frame_type, "FDD") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD;
-	      }
-	      else  if (strcmp(frame_type, "TDD") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = TDD;
-	      }
-	      else {
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for frame_type choice: FDD or TDD !\n",
-			    RC.config_file_name, i, frame_type);
-	      }
+              if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for N_RB_DL choice: 6,15,25,50,75,100 !\n",
+                    RC.config_file_name, i, N_RB_DL);
+              }
+
+              if (strcmp(frame_type, "FDD") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD;
+              }
+              else  if (strcmp(frame_type, "TDD") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = TDD;
+              }
+              else {
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for frame_type choice: FDD or TDD !\n",
+                    RC.config_file_name, i, frame_type);
+              }
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
-	      AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
-			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
-			   RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
+              RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
+              AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
+                  "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
+                  RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
-	      AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
-			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
-			   RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
+              RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
+              AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
+                  "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
+                  RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
 
 
 
-	      if (!prefix_type)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
-	      else if (strcmp(prefix_type, "NORMAL") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
-	      }
-	      else  if (strcmp(prefix_type, "EXTENDED") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
-	      }
-	      else {
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
-			    RC.config_file_name, i, prefix_type);
-	      }
+              if (!prefix_type)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
+              else if (strcmp(prefix_type, "NORMAL") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
+              }
+              else  if (strcmp(prefix_type, "EXTENDED") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
+              }
+              else {
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
+                    RC.config_file_name, i, prefix_type);
+              }
 
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
-	      // printf( "\teutra band:\t%d\n",RRC_CONFIGURATION_REQ (msg_p).eutra_band);
+              RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
+              // printf( "\teutra band:\t%d\n",RRC_CONFIGURATION_REQ (msg_p).eutra_band);
 
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
-	      //printf( "\tdownlink freq:\t%u\n",RRC_CONFIGURATION_REQ (msg_p).downlink_frequency);
+              RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
+              //printf( "\tdownlink freq:\t%u\n",RRC_CONFIGURATION_REQ (msg_p).downlink_frequency);
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
+              RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
 
-	      if (enb_check_band_frequencies(RC.config_file_name,
-					     j,
-					     RRC_CONFIGURATION_REQ (msg_p).eutra_band[j],
-					     RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j],
-					     RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j],
-					     RRC_CONFIGURATION_REQ (msg_p).frame_type[j])) {
-		AssertFatal(0, "error calling enb_check_band_frequencies\n");
-	      }
+              if (enb_check_band_frequencies(RC.config_file_name,
+                    j,
+                    RRC_CONFIGURATION_REQ (msg_p).eutra_band[j],
+                    RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j],
+                    RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j],
+                    RRC_CONFIGURATION_REQ (msg_p).frame_type[j])) {
+                AssertFatal(0, "error calling enb_check_band_frequencies\n");
+              }
 
-	      if ((nb_antenna_ports <1) || (nb_antenna_ports > 2))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for nb_antenna_ports choice: 1..2 !\n",
-			     RC.config_file_name, i, nb_antenna_ports);
+              if ((nb_antenna_ports <1) || (nb_antenna_ports > 2))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for nb_antenna_ports choice: 1..2 !\n",
+                    RC.config_file_name, i, nb_antenna_ports);
 
-	      RRC_CONFIGURATION_REQ (msg_p).nb_antenna_ports[j] = nb_antenna_ports;
+              RRC_CONFIGURATION_REQ (msg_p).nb_antenna_ports[j] = nb_antenna_ports;
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_root =  prach_root;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_root =  prach_root;
 
-	      if ((prach_root <0) || (prach_root > 1023))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
-			     RC.config_file_name, i, prach_root);
+              if ((prach_root <0) || (prach_root > 1023))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
+                    RC.config_file_name, i, prach_root);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_config_index = prach_config_index;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_config_index = prach_config_index;
 
-	      if ((prach_config_index <0) || (prach_config_index > 63))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
-			     RC.config_file_name, i, prach_config_index);
+              if ((prach_config_index <0) || (prach_config_index > 63))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
+                    RC.config_file_name, i, prach_config_index);
 
-	      if (!prach_high_speed)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
-	      else if (strcmp(prach_high_speed, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = TRUE;
-	      }
-	      else if (strcmp(prach_high_speed, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
-			    RC.config_file_name, i, prach_high_speed);
+              if (!prach_high_speed)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
+              else if (strcmp(prach_high_speed, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = TRUE;
+              }
+              else if (strcmp(prach_high_speed, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
+                    RC.config_file_name, i, prach_high_speed);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_zero_correlation =prach_zero_correlation;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_zero_correlation =prach_zero_correlation;
 
-	      if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
-			     RC.config_file_name, i, prach_zero_correlation);
+              if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
+                    RC.config_file_name, i, prach_zero_correlation);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_freq_offset = prach_freq_offset;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_freq_offset = prach_freq_offset;
 
-	      if ((prach_freq_offset <0) || (prach_freq_offset > 94))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
-			     RC.config_file_name, i, prach_freq_offset);
+              if ((prach_freq_offset <0) || (prach_freq_offset > 94))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
+                    RC.config_file_name, i, prach_freq_offset);
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_delta_shift = pucch_delta_shift-1;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_delta_shift = pucch_delta_shift-1;
 
-	      if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
-			     RC.config_file_name, i, pucch_delta_shift);
+              if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
+                    RC.config_file_name, i, pucch_delta_shift);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nRB_CQI = pucch_nRB_CQI;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nRB_CQI = pucch_nRB_CQI;
 
-	      if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
-			     RC.config_file_name, i, pucch_nRB_CQI);
+              if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
+                    RC.config_file_name, i, pucch_nRB_CQI);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nCS_AN = pucch_nCS_AN;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nCS_AN = pucch_nCS_AN;
 
-	      if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
-			     RC.config_file_name, i, pucch_nCS_AN);
+              if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
+                    RC.config_file_name, i, pucch_nCS_AN);
 
 #if !defined(Rel10) && !defined(Rel14)
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN;
 
-	      if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
-			     RC.config_file_name, i, pucch_n1_AN);
+              if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
+                    RC.config_file_name, i, pucch_n1_AN);
 
 #endif
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
-
-	      if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
-			     RC.config_file_name, i, pdsch_referenceSignalPower);
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_p_b = pdsch_p_b;
-
-	      if ((pdsch_p_b <0) || (pdsch_p_b > 3))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
-			     RC.config_file_name, i, pdsch_p_b);
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_n_SB = pusch_n_SB;
-
-	      if ((pusch_n_SB <1) || (pusch_n_SB > 4))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
-			     RC.config_file_name, i, pusch_n_SB);
-
-	      if (!pusch_hoppingMode)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
-	      else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
-	      }
-	      else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
-			    RC.config_file_name, i, pusch_hoppingMode);
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_hoppingOffset = pusch_hoppingOffset;
-
-	      if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
-			     RC.config_file_name, i, pusch_hoppingMode);
-
-	      if (!pusch_enable64QAM)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
-	      else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = TRUE;
-	      }
-	      else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
-			    RC.config_file_name, i, pusch_enable64QAM);
-
-	      if (!pusch_groupHoppingEnabled)
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
-	      else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = TRUE;
-	      }
-	      else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
-			    RC.config_file_name, i, pusch_groupHoppingEnabled);
-
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_groupAssignment = pusch_groupAssignment;
-
-	      if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
-			     RC.config_file_name, i, pusch_groupAssignment);
-
-	      if (!pusch_sequenceHoppingEnabled)
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
-	      else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = TRUE;
-	      }
-	      else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
-			    RC.config_file_name, i, pusch_sequenceHoppingEnabled);
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
-
-	      if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
-			     RC.config_file_name, i, pusch_nDMRS1);
-
-	      if (strcmp(phich_duration, "NORMAL") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_normal;
-	      }
-	      else if (strcmp(phich_duration, "EXTENDED") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_extended;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
-			    RC.config_file_name, i, phich_duration);
-
-	      if (strcmp(phich_resource, "ONESIXTH") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
-	      }
-	      else if (strcmp(phich_resource, "HALF") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_half;
-	      }
-	      else if (strcmp(phich_resource, "ONE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_one;
-	      }
-	      else if (strcmp(phich_resource, "TWO") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_two;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
-			    RC.config_file_name, i, phich_resource);
-
-	      printf("phich.resource %d (%s), phich.duration %d (%s)\n",
-		     (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource, phich_resource,
-		     (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration, phich_duration);
-
-	      if (strcmp(srs_enable, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = TRUE;
-	      }
-	      else if (strcmp(srs_enable, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-			    RC.config_file_name, i, srs_enable);
-
-	      if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_enable == TRUE) {
-		if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
-		      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
-		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
-		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
-		      ))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
-			      RC.config_file_name, i);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_BandwidthConfig = srs_BandwidthConfig;
-
-		if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
-		  AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
-			       RC.config_file_name, i, srs_BandwidthConfig);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_SubframeConfig = srs_SubframeConfig;
-
-		if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
-			       RC.config_file_name, i, srs_SubframeConfig);
-
-		if (strcmp(srs_ackNackST, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = TRUE;
-		}
-		else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-			      RC.config_file_name, i, srs_ackNackST);
-
-		if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = TRUE;
-		}
-		else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
-			      RC.config_file_name, i, srs_MaxUpPts);
-	      }
-
-	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_p0_Nominal = pusch_p0_Nominal;
-
-	      if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
-			    RC.config_file_name, i, pusch_p0_Nominal);
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
+
+              if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
+                    RC.config_file_name, i, pdsch_referenceSignalPower);
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_p_b = pdsch_p_b;
+
+              if ((pdsch_p_b <0) || (pdsch_p_b > 3))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
+                    RC.config_file_name, i, pdsch_p_b);
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_n_SB = pusch_n_SB;
+
+              if ((pusch_n_SB <1) || (pusch_n_SB > 4))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
+                    RC.config_file_name, i, pusch_n_SB);
+
+              if (!pusch_hoppingMode)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
+              else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
+              }
+              else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
+                    RC.config_file_name, i, pusch_hoppingMode);
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_hoppingOffset = pusch_hoppingOffset;
+
+              if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
+                    RC.config_file_name, i, pusch_hoppingMode);
+
+              if (!pusch_enable64QAM)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
+              else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = TRUE;
+              }
+              else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, pusch_enable64QAM);
+
+              if (!pusch_groupHoppingEnabled)
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
+              else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = TRUE;
+              }
+              else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, pusch_groupHoppingEnabled);
+
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_groupAssignment = pusch_groupAssignment;
+
+              if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
+                    RC.config_file_name, i, pusch_groupAssignment);
+
+              if (!pusch_sequenceHoppingEnabled)
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
+              else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = TRUE;
+              }
+              else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
+                    RC.config_file_name, i, pusch_sequenceHoppingEnabled);
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
+
+              if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
+                    RC.config_file_name, i, pusch_nDMRS1);
+
+              if (strcmp(phich_duration, "NORMAL") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_normal;
+              }
+              else if (strcmp(phich_duration, "EXTENDED") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_extended;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
+                    RC.config_file_name, i, phich_duration);
+
+              if (strcmp(phich_resource, "ONESIXTH") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
+              }
+              else if (strcmp(phich_resource, "HALF") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_half;
+              }
+              else if (strcmp(phich_resource, "ONE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_one;
+              }
+              else if (strcmp(phich_resource, "TWO") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_two;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
+                    RC.config_file_name, i, phich_resource);
+
+              printf("phich.resource %d (%s), phich.duration %d (%s)\n",
+                  (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource, phich_resource,
+                  (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration, phich_duration);
+
+              if (strcmp(srs_enable, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = TRUE;
+              }
+              else if (strcmp(srs_enable, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+                    RC.config_file_name, i, srs_enable);
+
+              if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_enable == TRUE) {
+                if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
+                      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
+                      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
+                      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
+                     ))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
+                      RC.config_file_name, i);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_BandwidthConfig = srs_BandwidthConfig;
+
+                if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
+                  AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
+                      RC.config_file_name, i, srs_BandwidthConfig);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_SubframeConfig = srs_SubframeConfig;
+
+                if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
+                      RC.config_file_name, i, srs_SubframeConfig);
+
+                if (strcmp(srs_ackNackST, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = TRUE;
+                }
+                else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+                      RC.config_file_name, i, srs_ackNackST);
+
+                if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = TRUE;
+                }
+                else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
+                      RC.config_file_name, i, srs_MaxUpPts);
+              }
+
+              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_p0_Nominal = pusch_p0_Nominal;
+
+              if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
+                    RC.config_file_name, i, pusch_p0_Nominal);
 
 #ifndef Rel14
-	      if (strcmp(pusch_alpha, "AL0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
-	      }
-	      else if (strcmp(pusch_alpha, "AL04") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
-	      }
-	      else if (strcmp(pusch_alpha, "AL05") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
-	      }
-	      else if (strcmp(pusch_alpha, "AL06") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
-	      }
-	      else if (strcmp(pusch_alpha, "AL07") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
-	      }
-	      else if (strcmp(pusch_alpha, "AL08") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
-	      }
-	      else if (strcmp(pusch_alpha, "AL09") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
-	      }
-	      else if (strcmp(pusch_alpha, "AL1") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
-	      }
+              if (strcmp(pusch_alpha, "AL0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
+              }
+              else if (strcmp(pusch_alpha, "AL04") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
+              }
+              else if (strcmp(pusch_alpha, "AL05") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
+              }
+              else if (strcmp(pusch_alpha, "AL06") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
+              }
+              else if (strcmp(pusch_alpha, "AL07") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
+              }
+              else if (strcmp(pusch_alpha, "AL08") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
+              }
+              else if (strcmp(pusch_alpha, "AL09") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
+              }
+              else if (strcmp(pusch_alpha, "AL1") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
+              }
 #else
-	      if (strcmp(pusch_alpha, "AL0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0;
-	      }
-	      else if (strcmp(pusch_alpha, "AL04") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al04;
-	      }
-	      else if (strcmp(pusch_alpha, "AL05") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al05;
-	      }
-	      else if (strcmp(pusch_alpha, "AL06") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al06;
-	      }
-	      else if (strcmp(pusch_alpha, "AL07") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al07;
-	      }
-	      else if (strcmp(pusch_alpha, "AL08") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al08;
-	      }
-	      else if (strcmp(pusch_alpha, "AL09") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al09;
-	      }
-	      else if (strcmp(pusch_alpha, "AL1") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1;
-	      }
+              if (strcmp(pusch_alpha, "AL0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0;
+              }
+              else if (strcmp(pusch_alpha, "AL04") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al04;
+              }
+              else if (strcmp(pusch_alpha, "AL05") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al05;
+              }
+              else if (strcmp(pusch_alpha, "AL06") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al06;
+              }
+              else if (strcmp(pusch_alpha, "AL07") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al07;
+              }
+              else if (strcmp(pusch_alpha, "AL08") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al08;
+              }
+              else if (strcmp(pusch_alpha, "AL09") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al09;
+              }
+              else if (strcmp(pusch_alpha, "AL1") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1;
+              }
 #endif
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
-			    RC.config_file_name, i, pusch_alpha);
-
-	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_p0_Nominal = pucch_p0_Nominal;
-
-	      if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
-			    RC.config_file_name, i, pucch_p0_Nominal);
-
-	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].msg3_delta_Preamble = msg3_delta_Preamble;
-
-	      if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
-			    RC.config_file_name, i, msg3_delta_Preamble);
-
-
-	      if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
-	      }
-	      else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
-	      }
-	      else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
-			    RC.config_file_name, i, pucch_deltaF_Format1);
-
-	      if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
-	      }
-	      else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
-	      }
-	      else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
-			    RC.config_file_name, i, pucch_deltaF_Format1b);
-
-
-	      if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
-			    RC.config_file_name, i, pucch_deltaF_Format2);
-
-	      if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
-			    RC.config_file_name, i, pucch_deltaF_Format2a);
-
-	      if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
-	      }
-	      else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
-			    RC.config_file_name, i, pucch_deltaF_Format2b);
-
-
-
-
-	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
-
-	      if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
-			    RC.config_file_name, i, rach_numberOfRA_Preambles);
-
-	      if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= TRUE;
-
-		if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
-		      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
-		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
-			       RC.config_file_name, i);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
-
-		if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
-			       RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
-
-
-		switch (rach_messageSizeGroupA) {
-		case 56:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
-		  break;
-
-		case 144:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
-		  break;
-
-		case 208:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
-		  break;
-
-		case 256:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
-			       RC.config_file_name, i, rach_messageSizeGroupA);
-		  break;
-		}
-
-		if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
-		}
-
-		else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
-			      RC.config_file_name, i, rach_messagePowerOffsetGroupB);
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
+                    RC.config_file_name, i, pusch_alpha);
+
+              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_p0_Nominal = pucch_p0_Nominal;
+
+              if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
+                    RC.config_file_name, i, pucch_p0_Nominal);
+
+              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].msg3_delta_Preamble = msg3_delta_Preamble;
+
+              if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
+                    RC.config_file_name, i, msg3_delta_Preamble);
+
+
+              if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
+              }
+              else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
+              }
+              else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
+                    RC.config_file_name, i, pucch_deltaF_Format1);
+
+              if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
+              }
+              else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
+              }
+              else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
+                    RC.config_file_name, i, pucch_deltaF_Format1b);
+
+
+              if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
+              }
+              else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
+              }
+              else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
+              }
+              else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
+                    RC.config_file_name, i, pucch_deltaF_Format2);
+
+              if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
+              }
+              else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
+              }
+              else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
+                    RC.config_file_name, i, pucch_deltaF_Format2a);
+
+              if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
+              }
+              else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
+              }
+              else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
+                    RC.config_file_name, i, pucch_deltaF_Format2b);
+
+
+
+
+              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
+
+              if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
+                    RC.config_file_name, i, rach_numberOfRA_Preambles);
+
+              if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= TRUE;
+
+                if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
+                      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
+                      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
+                      RC.config_file_name, i);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
+
+                if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
+                      RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
+
+
+                switch (rach_messageSizeGroupA) {
+                  case 56:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
+                    break;
+
+                  case 144:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
+                    break;
+
+                  case 208:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
+                    break;
+
+                  case 256:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
+                        RC.config_file_name, i, rach_messageSizeGroupA);
+                    break;
+                }
+
+                if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
+                }
+
+                else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
+                      RC.config_file_name, i, rach_messagePowerOffsetGroupB);
 
-	      }
-	      else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= FALSE;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
-			    RC.config_file_name, i, rach_preamblesGroupAConfig);
+              }
+              else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= FALSE;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
+                    RC.config_file_name, i, rach_preamblesGroupAConfig);
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
 
-	      if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
-			     RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
+              if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
+                    RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
 
 
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_powerRampingStep= rach_powerRampingStep/2;
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_powerRampingStep= rach_powerRampingStep/2;
 
-	      if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
-			     RC.config_file_name, i, rach_powerRampingStep);
+              if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
+                    RC.config_file_name, i, rach_powerRampingStep);
 
 
 
-	      switch (rach_preambleTransMax) {
+              switch (rach_preambleTransMax) {
 #ifndef Rel14
-		_	      case 3:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
-		break;
+                _	      case 3:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
+                break;
 
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
-		break;
+                case 4:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
+                break;
 
-	      case 5:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
-		break;
+                case 5:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
+                break;
 
-	      case 6:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
-		break;
+                case 6:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
+                break;
 
-	      case 7:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
-		break;
+                case 7:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
+                break;
 
-	      case 8:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
-		break;
+                case 8:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
+                break;
 
-	      case 10:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
-		break;
+                case 10:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
+                break;
 
-	      case 20:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
-		break;
+                case 20:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
+                break;
 
-	      case 50:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
-		break;
+                case 50:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
+                break;
 
-	      case 100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
-		break;
+                case 100:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
+                break;
 
-	      case 200:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
-		break;
+                case 200:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
+                break;
 
 #else
 
-	      case 3:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n3;
-		break;
+                case 3:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n3;
+                break;
 
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n4;
-		break;
+                case 4:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n4;
+                break;
 
-	      case 5:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n5;
-		break;
+                case 5:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n5;
+                break;
 
-	      case 6:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n6;
-		break;
+                case 6:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n6;
+                break;
 
-	      case 7:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n7;
-		break;
+                case 7:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n7;
+                break;
 
-	      case 8:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n8;
-		break;
+                case 8:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n8;
+                break;
 
-	      case 10:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n10;
-		break;
+                case 10:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n10;
+                break;
 
-	      case 20:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n20;
-		break;
+                case 20:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n20;
+                break;
 
-	      case 50:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n50;
-		break;
+                case 50:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n50;
+                break;
 
-	      case 100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n100;
-		break;
+                case 100:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n100;
+                break;
 
-	      case 200:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n200;
-		break;
+                case 200:
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n200;
+                break;
 #endif
 
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
-			     RC.config_file_name, i, rach_preambleTransMax);
-		break;
-	      }
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
-
-	      if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
-			     RC.config_file_name, i, rach_preambleTransMax);
-
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
-
-	      if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
-			     RC.config_file_name, i, rach_preambleTransMax);
-
-	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
-
-	      if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
-			     RC.config_file_name, i, rach_preambleTransMax);
-
-
-	      switch (pcch_defaultPagingCycle) {
-	      case 32:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
-		break;
-
-	      case 64:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
-		break;
-
-	      case 128:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
-		break;
-
-	      case 256:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
-			     RC.config_file_name, i, pcch_defaultPagingCycle);
-		break;
-	      }
-
-	      if (strcmp(pcch_nB, "fourT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_fourT;
-	      }
-	      else if (strcmp(pcch_nB, "twoT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_twoT;
-	      }
-	      else if (strcmp(pcch_nB, "oneT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneT;
-	      }
-	      else if (strcmp(pcch_nB, "halfT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_halfT;
-	      }
-	      else if (strcmp(pcch_nB, "quarterT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_quarterT;
-	      }
-	      else if (strcmp(pcch_nB, "oneEighthT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneEighthT;
-	      }
-	      else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneSixteenthT;
-	      }
-	      else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneThirtySecondT;
-	      }
-	      else
-		AssertFatal(0,
-			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
-			    RC.config_file_name, i, pcch_defaultPagingCycle);
-
-
-	    
-	      switch (bcch_modificationPeriodCoeff) {
-	      case 2:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
-		break;
-
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
-		break;
-
-	      case 8:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
-		break;
-
-	      case 16:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff= BCCH_Config__modificationPeriodCoeff_n16;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
-			     RC.config_file_name, i, bcch_modificationPeriodCoeff);
-
-		break;
-	      }
-
-
-	      switch (ue_TimersAndConstants_t300) {
-	      case 100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms100;
-		break;
-
-	      case 200:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms200;
-		break;
-
-	      case 300:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms300;
-		break;
-
-	      case 400:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms400;
-		break;
-
-	      case 600:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms600;
-		break;
-
-	      case 1000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1000;
-		break;
-
-	      case 1500:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1500;
-		break;
-
-	      case 2000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms2000;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
-			     RC.config_file_name, i, ue_TimersAndConstants_t300);
-		break;
-
-	      }
-
-	      switch (ue_TimersAndConstants_t301) {
-	      case 100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms100;
-		break;
-
-	      case 200:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms200;
-		break;
-
-	      case 300:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
-		break;
-
-	      case 400:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
-		break;
-
-	      case 600:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
-		break;
-
-	      case 1000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
-		break;
-
-	      case 1500:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
-		break;
+                default:
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
+                    RC.config_file_name, i, rach_preambleTransMax);
+                break;
+              }
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
+
+              if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
+                    RC.config_file_name, i, rach_preambleTransMax);
+
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
+
+              if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
+                    RC.config_file_name, i, rach_preambleTransMax);
+
+              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
+
+              if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
+                    RC.config_file_name, i, rach_preambleTransMax);
+
+
+              switch (pcch_defaultPagingCycle) {
+                case 32:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
+                  break;
+
+                case 64:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
+                  break;
+
+                case 128:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
+                  break;
+
+                case 256:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
+                      RC.config_file_name, i, pcch_defaultPagingCycle);
+                  break;
+              }
+
+              if (strcmp(pcch_nB, "fourT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_fourT;
+              }
+              else if (strcmp(pcch_nB, "twoT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_twoT;
+              }
+              else if (strcmp(pcch_nB, "oneT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneT;
+              }
+              else if (strcmp(pcch_nB, "halfT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_halfT;
+              }
+              else if (strcmp(pcch_nB, "quarterT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_quarterT;
+              }
+              else if (strcmp(pcch_nB, "oneEighthT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneEighthT;
+              }
+              else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneSixteenthT;
+              }
+              else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneThirtySecondT;
+              }
+              else
+                AssertFatal(0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
+                    RC.config_file_name, i, pcch_defaultPagingCycle);
+
+
+
+              switch (bcch_modificationPeriodCoeff) {
+                case 2:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
+                  break;
+
+                case 4:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
+                  break;
+
+                case 8:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
+                  break;
+
+                case 16:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff= BCCH_Config__modificationPeriodCoeff_n16;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
+                      RC.config_file_name, i, bcch_modificationPeriodCoeff);
+
+                  break;
+              }
+
+
+              switch (ue_TimersAndConstants_t300) {
+                case 100:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms100;
+                  break;
+
+                case 200:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms200;
+                  break;
+
+                case 300:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms300;
+                  break;
+
+                case 400:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms400;
+                  break;
+
+                case 600:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms600;
+                  break;
+
+                case 1000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1000;
+                  break;
+
+                case 1500:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1500;
+                  break;
+
+                case 2000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms2000;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
+                      RC.config_file_name, i, ue_TimersAndConstants_t300);
+                  break;
+
+              }
+
+              switch (ue_TimersAndConstants_t301) {
+                case 100:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms100;
+                  break;
+
+                case 200:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms200;
+                  break;
+
+                case 300:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
+                  break;
+
+                case 400:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
+                  break;
+
+                case 600:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
+                  break;
+
+                case 1000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
+                  break;
+
+                case 1500:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
+                  break;
 
-	      case 2000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
-			     RC.config_file_name, i, ue_TimersAndConstants_t301);
-		break;
-
-	      }
+                case 2000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
+                  break;
 
-	      switch (ue_TimersAndConstants_t310) {
-	      case 0:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
-		break;
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
+                      RC.config_file_name, i, ue_TimersAndConstants_t301);
+                  break;
+
+              }
 
-	      case 50:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
-		break;
+              switch (ue_TimersAndConstants_t310) {
+                case 0:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
+                  break;
 
-	      case 100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
-		break;
+                case 50:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
+                  break;
 
-	      case 200:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
-		break;
+                case 100:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
+                  break;
+
+                case 200:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
+                  break;
+
+                case 500:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
+                  break;
+
+                case 1000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
+                  break;
+
+                case 2000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
+                      RC.config_file_name, i, ue_TimersAndConstants_t310);
+                  break;
+
+              }
+
+              switch (ue_TimersAndConstants_t311) {
+                case 1000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
+                  break;
+
+                case 3110:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
+                  break;
+
+                case 5000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
+                  break;
+
+                case 10000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
+                  break;
+
+                case 15000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
+                  break;
+
+                case 20000:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
+                  break;
+
+                case 31100:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
+                      RC.config_file_name, i, ue_TimersAndConstants_t311);
+                  break;
+
+              }
+
+              switch (ue_TimersAndConstants_n310) {
+                case 1:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
+                  break;
+
+                case 2:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
+                  break;
+
+                case 3:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
+                  break;
+
+                case 4:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
+                  break;
+
+                case 6:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
+                  break;
+
+                case 8:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
+                  break;
+
+                case 10:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
+                  break;
+
+                case 20:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
+                      RC.config_file_name, i, ue_TimersAndConstants_n311);
+                  break;
+
+              }
+
+              switch (ue_TimersAndConstants_n311) {
+                case 1:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
+                  break;
+
+                case 2:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
+                  break;
+
+                case 3:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
+                  break;
+
+                case 4:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
+                  break;
+
+                case 5:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
+                  break;
+
+                case 6:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
+                  break;
+
+                case 8:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
+                  break;
+
+                case 10:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
+                  break;
+
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
+                      RC.config_file_name, i, ue_TimersAndConstants_t311);
+                  break;
+
+              }
+
+              switch (ue_TransmissionMode) {
+                case 1:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
+                  break;
+                case 2:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
+                  break;
+                case 3:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
+                  break;
+                case 4:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
+                  break;
+                case 5:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
+                  break;
+                case 6:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
+                  break;
+                case 7:
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
+                  break;
+                default:
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
+                      RC.config_file_name, i, ue_TransmissionMode);
+                  break;
+              }
 
-	      case 500:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
-		break;
-
-	      case 1000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
-		break;
-
-	      case 2000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
-			     RC.config_file_name, i, ue_TimersAndConstants_t310);
-		break;
-
-	      }
-
-	      switch (ue_TimersAndConstants_t311) {
-	      case 1000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
-		break;
-
-	      case 3110:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
-		break;
-
-	      case 5000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
-		break;
-
-	      case 10000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
-		break;
-
-	      case 15000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
-		break;
-
-	      case 20000:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
-		break;
-
-	      case 31100:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
-			     RC.config_file_name, i, ue_TimersAndConstants_t311);
-		break;
-
-	      }
-
-	      switch (ue_TimersAndConstants_n310) {
-	      case 1:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
-		break;
-
-	      case 2:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
-		break;
-
-	      case 3:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
-		break;
-
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
-		break;
-
-	      case 6:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
-		break;
-
-	      case 8:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
-		break;
-
-	      case 10:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
-		break;
-
-	      case 20:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
-			     RC.config_file_name, i, ue_TimersAndConstants_n311);
-		break;
-
-	      }
-
-	      switch (ue_TimersAndConstants_n311) {
-	      case 1:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
-		break;
-
-	      case 2:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
-		break;
-
-	      case 3:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
-		break;
-
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
-		break;
-
-	      case 5:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
-		break;
-
-	      case 6:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
-		break;
-
-	      case 8:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
-		break;
-
-	      case 10:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
-		break;
-
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
-			     RC.config_file_name, i, ue_TimersAndConstants_t311);
-		break;
-
-	      }
-
-	      switch (ue_TransmissionMode) {
-	      case 1:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
-		break;
-	      case 2:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
-		break;
-	      case 3:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
-		break;
-	      case 4:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
-		break;
-	      case 5:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
-		break;
-	      case 6:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
-		break;
-	      case 7:
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
-		break;
-	      default:
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
-			     RC.config_file_name, i, ue_TransmissionMode);
-		break;
-	      }
-	    
 #ifdef Rel14
-	      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) {
-
-		scheduling_info_br_list       = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SCHEDULING_INFO_LIST);
-		int num_scheduling_info       = config_setting_length(scheduling_info_br_list);
-		RRC_CONFIGURATION_REQ (msg_p).scheduling_info_br_size[j] = num_scheduling_info;
-		
-		for (sched_info_idx = 0; sched_info_idx < num_scheduling_info; ++sched_info_idx)
-		  {
-		    scheduling_info_br = config_setting_get_elem(scheduling_info_br_list, sched_info_idx);
-		    if (!( 
-			     config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_NARROWBAND_R13, &si_Narrowband_r13)
-			  && config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_TBS_R13, &si_TBS_r13)
-			   )
-			){
-		      AssertFatal (0, "Failed to parse eNB configuration file %s, scheduking info br %d!\n", RC.config_file_name, nb_cc++);
-		    }
-		    RRC_CONFIGURATION_REQ (msg_p).si_Narrowband_r13[j][sched_info_idx] = si_Narrowband_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).si_TBS_r13[j][sched_info_idx] = si_TBS_r13;
-		  }
-
-		system_info_value_tag_SI_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST);
-		int num_system_info = config_setting_length(system_info_value_tag_SI_list);
-		RRC_CONFIGURATION_REQ (msg_p).system_info_value_tag_SI_size[j] = num_system_info;
-
-		for (sys_info_idx = 0; sys_info_idx < num_system_info; ++sys_info_idx)
-		  {
-		    system_info_value_tag_SI = config_setting_get_elem(system_info_value_tag_SI_list, sys_info_idx);
-		    if ( !(config_setting_lookup_int(system_info_value_tag_SI, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_SI_R13, &systemInfoValueTagSi_r13)) )
-		      {
-			AssertFatal (0, "Failed to parse eNB configuration file %s, system info value tag %d!\n", RC.config_file_name, nb_cc++);
-		      }
-		    RRC_CONFIGURATION_REQ (msg_p).systemInfoValueTagSi_r13[j][sys_info_idx] = systemInfoValueTagSi_r13;
-		  }
-
-
-		rach_ce_level_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RACH_CE_LEVEL_INFO_LIST);
-		int num_rach_ce_level_info_list = config_setting_length(rach_ce_level_info_r13_list);
-		RRC_CONFIGURATION_REQ (msg_p).rach_CE_LevelInfoList_r13_size[j] = num_rach_ce_level_info_list;
-		int rach_info_level_idx;
-		for (rach_info_level_idx = 0; rach_info_level_idx < num_rach_ce_level_info_list; ++rach_info_level_idx)
-		  {
-		    rach_ce_level_info_r13 = config_setting_get_elem(rach_ce_level_info_r13_list, rach_info_level_idx);
-		    if (!     (config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_FIRST_PREAMBLE,                   &firstPreamble_r13)
-			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_LAST_PREAMBLE,                    &lastPreamble_r13)
-			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13,      &ra_ResponseWindowSize_r13)
-			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_MAC_CONTENT_RESOLUTION_TIMER_R13, &mac_ContentionResolutionTimer_r13)
-			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13,           &rar_HoppingConfig_r13) )
-			)
-		      {
-			AssertFatal (0,
-				     "Failed to parse eNB configuration file %s, rach_ce_level_info_r13 %d!\n",
-				     RC.config_file_name, nb_cc++);
-		      }
-
-		    RRC_CONFIGURATION_REQ (msg_p).firstPreamble_r13[j][rach_info_level_idx]                 = firstPreamble_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).lastPreamble_r13[j][rach_info_level_idx]                  = lastPreamble_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).ra_ResponseWindowSize_r13[j][rach_info_level_idx]         = ra_ResponseWindowSize_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).mac_ContentionResolutionTimer_r13[j][rach_info_level_idx] = mac_ContentionResolutionTimer_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).rar_HoppingConfig_r13[j][rach_info_level_idx]             = rar_HoppingConfig_r13;
-
-		  }
-
-		rsrp_range_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RSRP_RANGE_LIST);
-		int num_rsrp_list = config_setting_length(rsrp_range_list);
-		RRC_CONFIGURATION_REQ (msg_p).rsrp_range_list_size[j] = num_rsrp_list;
-		int rsrp_range_idx;
-		for (rsrp_range_idx = 0; rsrp_range_idx < num_rsrp_list; ++rsrp_range_idx)
-		  {
-		    rsrp_range_member = config_setting_get_elem(rsrp_range_list, rsrp_range_idx);
-		    if (!(config_setting_lookup_int(rsrp_range_member, ENB_CONFIG_STRING_RSRP_RANGE_BR, &rsrp_range_br)))
-		      {
-			AssertFatal (0,
-				     "Failed to parse eNB configuration file %s, rsrp_range %d!\n",
-				     RC.config_file_name, nb_cc++);
-		      }
-		    RRC_CONFIGURATION_REQ (msg_p).rsrp_range[j][rsrp_range_idx] = rsrp_range_br;
-		  }
-		
-		prach_parameters_ce_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13);
-		int num_prach_parameters_ce_r13 = config_setting_length(prach_parameters_ce_r13_list);
-		RRC_CONFIGURATION_REQ (msg_p).prach_parameters_list_size[j] = num_prach_parameters_ce_r13;
-		int prach_parameters_index;
-		for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce_r13; ++prach_parameters_index)
-		  {
-		    prach_parameters_ce_r13 = config_setting_get_elem(prach_parameters_ce_r13_list, prach_parameters_index);
-		    if (!     (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, &prach_config_index_br)
-			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, &prach_freq_offset_br)
-			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_NUM_REPETITION_PREAMBLE_ATTEMPT_R13, &numRepetitionPerPreambleAttempt_r13)
-			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, &mpdcch_NumRepetition_RA_r13)
-			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, &prach_HoppingConfig_r13) )
-			)
-		      {
-			AssertFatal (0,
-				     "Failed to parse eNB configuration file %s, prach_parameters_ce_r13_list %d!\n",
-				     RC.config_file_name, nb_cc++);
-		      }
-
-		    RRC_CONFIGURATION_REQ (msg_p).prach_config_index[j][prach_parameters_index]                  = prach_config_index_br;
-		    RRC_CONFIGURATION_REQ (msg_p).prach_freq_offset[j][prach_parameters_index]                   = prach_freq_offset_br;
-		    RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index]          = prach_StartingSubframe_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index]         = maxNumPreambleAttemptCE_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).numRepetitionPerPreambleAttempt_r13[j][prach_parameters_index] = numRepetitionPerPreambleAttempt_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).mpdcch_NumRepetition_RA_r13[j][prach_parameters_index]         = mpdcch_NumRepetition_RA_r13;
-		    RRC_CONFIGURATION_REQ (msg_p).prach_HoppingConfig_r13[j][prach_parameters_index]             = prach_HoppingConfig_r13;
-
-		    if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, &prach_StartingSubframe_r13))
-		      {
-			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
-			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = prach_StartingSubframe_r13;
-		      }
-		    else
-		      {
-			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = NULL;
-		      }
-
-		    if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_NUM_PREAMBLE_ATTEMPT_CE_R13, &maxNumPreambleAttemptCE_r13))
-		      {
-			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
-			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = maxNumPreambleAttemptCE_r13;
-		      }
-		    else
-		      {
-			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = NULL;
-		      }
-
-		  }
-
-
-		// TODO
-		//              max_available_narrow_band = config_setting_get_member(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_AVAILABLE_NARROW_BAND);
-
-
-		n1_pucch_AN_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_N1_PUCCH_AN_INFO_LIST);
-
-		int num_pucch_an_info = config_setting_length(n1_pucch_AN_info_r13_list);
-		RRC_CONFIGURATION_REQ (msg_p).pucch_info_value_size[j] = num_pucch_an_info;
-		int pucch_info_idx;
-		for (pucch_info_idx = 0; pucch_info_idx < num_pucch_an_info; ++pucch_info_idx)
-		  {
-		    n1_pucch_AN_info_r13 = config_setting_get_elem(n1_pucch_AN_info_r13_list, pucch_info_idx);
-		    if (! (config_setting_lookup_int(n1_pucch_AN_info_r13, ENB_CONFIG_STRING_PUCCH_INFO_VALUE, &pucch_info_value)) )
-		      {
-			AssertFatal (0,
-				     "Failed to parse eNB configuration file %s, n1_pucch_AN_info_list_r13_list %d!\n",
-				     RC.config_file_name, nb_cc++);
-		      }
-
-		    RRC_CONFIGURATION_REQ (msg_p).pucch_info_value[j][pucch_info_idx] = pucch_info_value;
-		  }
-
-		// Rel8 RadioResourceConfigCommon Parameters
-		if (!(config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
-
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
-		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
-		      && 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_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)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
-		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
-		      )) {
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
-			       RC.config_file_name, nb_cc++);
-		  continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-		}
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_root =  prach_root;
-
-		if ((prach_root <0) || (prach_root > 1023))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
-			       RC.config_file_name, i, prach_root);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_config_index = prach_config_index;
-
-		if ((prach_config_index <0) || (prach_config_index > 63))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
-			       RC.config_file_name, i, prach_config_index);
-
-		if (!prach_high_speed)
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			       RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
-		else if (strcmp(prach_high_speed, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = TRUE;
-		}
-		else if (strcmp(prach_high_speed, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
-			      RC.config_file_name, i, prach_high_speed);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_zero_correlation =prach_zero_correlation;
-
-		if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
-			       RC.config_file_name, i, prach_zero_correlation);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_freq_offset = prach_freq_offset;
-
-		if ((prach_freq_offset <0) || (prach_freq_offset > 94))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
-			       RC.config_file_name, i, prach_freq_offset);
-
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_delta_shift = pucch_delta_shift-1;
-
-		if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
-			       RC.config_file_name, i, pucch_delta_shift);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nRB_CQI = pucch_nRB_CQI;
-
-		if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
-			       RC.config_file_name, i, pucch_nRB_CQI);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nCS_AN = pucch_nCS_AN;
-
-		if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
-			       RC.config_file_name, i, pucch_nCS_AN);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
-
-		if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
-			       RC.config_file_name, i, pdsch_referenceSignalPower);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_p_b = pdsch_p_b;
-
-		if ((pdsch_p_b <0) || (pdsch_p_b > 3))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
-			       RC.config_file_name, i, pdsch_p_b);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_n_SB = pusch_n_SB;
-
-		if ((pusch_n_SB <1) || (pusch_n_SB > 4))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
-			       RC.config_file_name, i, pusch_n_SB);
-
-		if (!pusch_hoppingMode)
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
-			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
-		else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
-		}
-		else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
-			      RC.config_file_name, i, pusch_hoppingMode);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_hoppingOffset = pusch_hoppingOffset;
-
-		if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
-			       RC.config_file_name, i, pusch_hoppingMode);
-
-		if (!pusch_enable64QAM)
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
-		else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = TRUE;
-		}
-		else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
-			      RC.config_file_name, i, pusch_enable64QAM);
-
-		if (!pusch_groupHoppingEnabled)
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
-		else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = TRUE;
-		}
-		else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
-			      RC.config_file_name, i, pusch_groupHoppingEnabled);
-
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_groupAssignment = pusch_groupAssignment;
-
-		if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
-			       RC.config_file_name, i, pusch_groupAssignment);
-
-		if (!pusch_sequenceHoppingEnabled)
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
-		else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = TRUE;
-		}
-		else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
-			      RC.config_file_name, i, pusch_sequenceHoppingEnabled);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
-
-		if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
-			       RC.config_file_name, i, pusch_nDMRS1);
-
-		if (strcmp(phich_duration, "NORMAL") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_normal;
-		}
-		else if (strcmp(phich_duration, "EXTENDED") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_extended;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
-			      RC.config_file_name, i, phich_duration);
-
-		if (strcmp(phich_resource, "ONESIXTH") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
-		}
-		else if (strcmp(phich_resource, "HALF") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_half;
-		}
-		else if (strcmp(phich_resource, "ONE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_one;
-		}
-		else if (strcmp(phich_resource, "TWO") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_two;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
-			      RC.config_file_name, i, phich_resource);
-
-		printf("phich.resource %d (%s), phich.duration %d (%s)\n",
-		       RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource, phich_resource,
-		       RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration, phich_duration);
-
-		if (strcmp(srs_enable, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = TRUE;
-		}
-		else if (strcmp(srs_enable, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-			      RC.config_file_name, i, srs_enable);
-
-		if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_enable == TRUE) {
-		  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
-			&& config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
-			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
-			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
-			))
-		    AssertFatal(0,
-				"Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
-				RC.config_file_name, i);
-
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_BandwidthConfig = srs_BandwidthConfig;
-
-		  if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
-		    AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
-				 RC.config_file_name, i, srs_BandwidthConfig);
-
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_SubframeConfig = srs_SubframeConfig;
-
-		  if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
-		    AssertFatal (0,
-				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
-				 RC.config_file_name, i, srs_SubframeConfig);
-
-		  if (strcmp(srs_ackNackST, "ENABLE") == 0) {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = TRUE;
-		  }
-		  else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = FALSE;
-		  }
-		  else
-		    AssertFatal(0,
-				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-				RC.config_file_name, i, srs_ackNackST);
-
-		  if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = TRUE;
-		  }
-		  else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = FALSE;
-		  }
-		  else
-		    AssertFatal(0,
-				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
-				RC.config_file_name, i, srs_MaxUpPts);
-		}
-
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_p0_Nominal = pusch_p0_Nominal;
-
-		if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
-			      RC.config_file_name, i, pusch_p0_Nominal);
-
-		if (strcmp(pusch_alpha, "AL0") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al0;
-		}
-		else if (strcmp(pusch_alpha, "AL04") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al04;
-		}
-		else if (strcmp(pusch_alpha, "AL05") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al05;
-		}
-		else if (strcmp(pusch_alpha, "AL06") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al06;
-		}
-		else if (strcmp(pusch_alpha, "AL07") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al07;
-		}
-		else if (strcmp(pusch_alpha, "AL08") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al08;
-		}
-		else if (strcmp(pusch_alpha, "AL09") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al09;
-		}
-		else if (strcmp(pusch_alpha, "AL1") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al1;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
-			      RC.config_file_name, i, pusch_alpha);
-
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_p0_Nominal = pucch_p0_Nominal;
-
-		if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
-			      RC.config_file_name, i, pucch_p0_Nominal);
-
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].msg3_delta_Preamble = msg3_delta_Preamble;
-
-		if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
-			      RC.config_file_name, i, msg3_delta_Preamble);
-
-
-		if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
-		}
-		else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
-		}
-		else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
-			      RC.config_file_name, i, pucch_deltaF_Format1);
-
-		if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
-		}
-		else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
-		}
-		else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
-			      RC.config_file_name, i, pucch_deltaF_Format1b);
-
-
-		if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
-		}
-		else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
-		}
-		else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
-		}
-		else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
-			      RC.config_file_name, i, pucch_deltaF_Format2);
-
-		if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
-		}
-		else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
-		}
-		else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
-			      RC.config_file_name, i, pucch_deltaF_Format2a);
-
-		if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
-		}
-		else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
-		}
-		else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
-			      RC.config_file_name, i, pucch_deltaF_Format2b);
-
-
-
-
-		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
-
-
-		if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
-			      RC.config_file_name, i, rach_numberOfRA_Preambles);
-
-		if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= TRUE;
-
-		  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
-			&& config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
-			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
-		    AssertFatal (0,
-				 "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
-				 RC.config_file_name, i);
-
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
-
-		  if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
-		    AssertFatal (0,
-				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
-				 RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
-
-
-		  switch (rach_messageSizeGroupA) {
-		  case 56:
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
-		    break;
-
-		  case 144:
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
-		    break;
-
-		  case 208:
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
-		    break;
-
-		  case 256:
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
-		    break;
-
-		  default:
-		    AssertFatal (0,
-				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
-				 RC.config_file_name, i, rach_messageSizeGroupA);
-		    break;
-		  }
-
-		  if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
-		  }
-
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
-		  }
-
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
-		  }
-
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
-		  }
-
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
-		  }
-
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
-		  }
+              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) {
+
+                scheduling_info_br_list       = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SCHEDULING_INFO_LIST);
+                int num_scheduling_info       = config_setting_length(scheduling_info_br_list);
+                RRC_CONFIGURATION_REQ (msg_p).scheduling_info_br_size[j] = num_scheduling_info;
+
+                for (sched_info_idx = 0; sched_info_idx < num_scheduling_info; ++sched_info_idx)
+                {
+                  scheduling_info_br = config_setting_get_elem(scheduling_info_br_list, sched_info_idx);
+                  if (!( 
+                        config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_NARROWBAND_R13, &si_Narrowband_r13)
+                        && config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_TBS_R13, &si_TBS_r13)
+                       )
+                     ){
+                    AssertFatal (0, "Failed to parse eNB configuration file %s, scheduking info br %d!\n", RC.config_file_name, nb_cc++);
+                  }
+                  RRC_CONFIGURATION_REQ (msg_p).si_Narrowband_r13[j][sched_info_idx] = si_Narrowband_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).si_TBS_r13[j][sched_info_idx] = si_TBS_r13;
+                }
+
+                system_info_value_tag_SI_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST);
+                int num_system_info = config_setting_length(system_info_value_tag_SI_list);
+                RRC_CONFIGURATION_REQ (msg_p).system_info_value_tag_SI_size[j] = num_system_info;
+
+                for (sys_info_idx = 0; sys_info_idx < num_system_info; ++sys_info_idx)
+                {
+                  system_info_value_tag_SI = config_setting_get_elem(system_info_value_tag_SI_list, sys_info_idx);
+                  if ( !(config_setting_lookup_int(system_info_value_tag_SI, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_SI_R13, &systemInfoValueTagSi_r13)) )
+                  {
+                    AssertFatal (0, "Failed to parse eNB configuration file %s, system info value tag %d!\n", RC.config_file_name, nb_cc++);
+                  }
+                  RRC_CONFIGURATION_REQ (msg_p).systemInfoValueTagSi_r13[j][sys_info_idx] = systemInfoValueTagSi_r13;
+                }
+
+
+                rach_ce_level_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RACH_CE_LEVEL_INFO_LIST);
+                int num_rach_ce_level_info_list = config_setting_length(rach_ce_level_info_r13_list);
+                RRC_CONFIGURATION_REQ (msg_p).rach_CE_LevelInfoList_r13_size[j] = num_rach_ce_level_info_list;
+                int rach_info_level_idx;
+                for (rach_info_level_idx = 0; rach_info_level_idx < num_rach_ce_level_info_list; ++rach_info_level_idx)
+                {
+                  rach_ce_level_info_r13 = config_setting_get_elem(rach_ce_level_info_r13_list, rach_info_level_idx);
+                  if (!     (config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_FIRST_PREAMBLE,                   &firstPreamble_r13)
+                        && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_LAST_PREAMBLE,                    &lastPreamble_r13)
+                        && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13,      &ra_ResponseWindowSize_r13)
+                        && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_MAC_CONTENT_RESOLUTION_TIMER_R13, &mac_ContentionResolutionTimer_r13)
+                        && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13,           &rar_HoppingConfig_r13) )
+                     )
+                  {
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, rach_ce_level_info_r13 %d!\n",
+                        RC.config_file_name, nb_cc++);
+                  }
+
+                  RRC_CONFIGURATION_REQ (msg_p).firstPreamble_r13[j][rach_info_level_idx]                 = firstPreamble_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).lastPreamble_r13[j][rach_info_level_idx]                  = lastPreamble_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).ra_ResponseWindowSize_r13[j][rach_info_level_idx]         = ra_ResponseWindowSize_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).mac_ContentionResolutionTimer_r13[j][rach_info_level_idx] = mac_ContentionResolutionTimer_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).rar_HoppingConfig_r13[j][rach_info_level_idx]             = rar_HoppingConfig_r13;
+
+                }
+
+                rsrp_range_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RSRP_RANGE_LIST);
+                int num_rsrp_list = config_setting_length(rsrp_range_list);
+                RRC_CONFIGURATION_REQ (msg_p).rsrp_range_list_size[j] = num_rsrp_list;
+                int rsrp_range_idx;
+                for (rsrp_range_idx = 0; rsrp_range_idx < num_rsrp_list; ++rsrp_range_idx)
+                {
+                  rsrp_range_member = config_setting_get_elem(rsrp_range_list, rsrp_range_idx);
+                  if (!(config_setting_lookup_int(rsrp_range_member, ENB_CONFIG_STRING_RSRP_RANGE_BR, &rsrp_range_br)))
+                  {
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, rsrp_range %d!\n",
+                        RC.config_file_name, nb_cc++);
+                  }
+                  RRC_CONFIGURATION_REQ (msg_p).rsrp_range[j][rsrp_range_idx] = rsrp_range_br;
+                }
+
+                prach_parameters_ce_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13);
+                int num_prach_parameters_ce_r13 = config_setting_length(prach_parameters_ce_r13_list);
+                RRC_CONFIGURATION_REQ (msg_p).prach_parameters_list_size[j] = num_prach_parameters_ce_r13;
+                int prach_parameters_index;
+                for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce_r13; ++prach_parameters_index)
+                {
+                  prach_parameters_ce_r13 = config_setting_get_elem(prach_parameters_ce_r13_list, prach_parameters_index);
+                  if (!     (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, &prach_config_index_br)
+                        && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, &prach_freq_offset_br)
+                        && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_NUM_REPETITION_PREAMBLE_ATTEMPT_R13, &numRepetitionPerPreambleAttempt_r13)
+                        && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, &mpdcch_NumRepetition_RA_r13)
+                        && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, &prach_HoppingConfig_r13) )
+                     )
+                  {
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, prach_parameters_ce_r13_list %d!\n",
+                        RC.config_file_name, nb_cc++);
+                  }
+
+                  RRC_CONFIGURATION_REQ (msg_p).prach_config_index[j][prach_parameters_index]                  = prach_config_index_br;
+                  RRC_CONFIGURATION_REQ (msg_p).prach_freq_offset[j][prach_parameters_index]                   = prach_freq_offset_br;
+                  RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index]          = prach_StartingSubframe_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index]         = maxNumPreambleAttemptCE_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).numRepetitionPerPreambleAttempt_r13[j][prach_parameters_index] = numRepetitionPerPreambleAttempt_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).mpdcch_NumRepetition_RA_r13[j][prach_parameters_index]         = mpdcch_NumRepetition_RA_r13;
+                  RRC_CONFIGURATION_REQ (msg_p).prach_HoppingConfig_r13[j][prach_parameters_index]             = prach_HoppingConfig_r13;
+
+                  if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, &prach_StartingSubframe_r13))
+                  {
+                    RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
+                    RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = prach_StartingSubframe_r13;
+                  }
+                  else
+                  {
+                    RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = NULL;
+                  }
+
+                  if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_NUM_PREAMBLE_ATTEMPT_CE_R13, &maxNumPreambleAttemptCE_r13))
+                  {
+                    RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
+                    RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = maxNumPreambleAttemptCE_r13;
+                  }
+                  else
+                  {
+                    RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = NULL;
+                  }
+
+                }
+
+
+                // TODO
+                //              max_available_narrow_band = config_setting_get_member(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_AVAILABLE_NARROW_BAND);
+
+
+                n1_pucch_AN_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_N1_PUCCH_AN_INFO_LIST);
+
+                int num_pucch_an_info = config_setting_length(n1_pucch_AN_info_r13_list);
+                RRC_CONFIGURATION_REQ (msg_p).pucch_info_value_size[j] = num_pucch_an_info;
+                int pucch_info_idx;
+                for (pucch_info_idx = 0; pucch_info_idx < num_pucch_an_info; ++pucch_info_idx)
+                {
+                  n1_pucch_AN_info_r13 = config_setting_get_elem(n1_pucch_AN_info_r13_list, pucch_info_idx);
+                  if (! (config_setting_lookup_int(n1_pucch_AN_info_r13, ENB_CONFIG_STRING_PUCCH_INFO_VALUE, &pucch_info_value)) )
+                  {
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, n1_pucch_AN_info_list_r13_list %d!\n",
+                        RC.config_file_name, nb_cc++);
+                  }
+
+                  RRC_CONFIGURATION_REQ (msg_p).pucch_info_value[j][pucch_info_idx] = pucch_info_value;
+                }
+
+                // Rel8 RadioResourceConfigCommon Parameters
+                if (!(config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
+
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
+                      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
+                      && 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_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)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
+                      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
+                      )) {
+                        AssertFatal (0,
+                            "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
+                            RC.config_file_name, nb_cc++);
+                        continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+                      }
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_root =  prach_root;
+
+                if ((prach_root <0) || (prach_root > 1023))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
+                      RC.config_file_name, i, prach_root);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_config_index = prach_config_index;
+
+                if ((prach_config_index <0) || (prach_config_index > 63))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
+                      RC.config_file_name, i, prach_config_index);
+
+                if (!prach_high_speed)
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
+                else if (strcmp(prach_high_speed, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = TRUE;
+                }
+                else if (strcmp(prach_high_speed, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
+                      RC.config_file_name, i, prach_high_speed);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_zero_correlation =prach_zero_correlation;
+
+                if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
+                      RC.config_file_name, i, prach_zero_correlation);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_freq_offset = prach_freq_offset;
+
+                if ((prach_freq_offset <0) || (prach_freq_offset > 94))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
+                      RC.config_file_name, i, prach_freq_offset);
+
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_delta_shift = pucch_delta_shift-1;
+
+                if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
+                      RC.config_file_name, i, pucch_delta_shift);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nRB_CQI = pucch_nRB_CQI;
+
+                if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
+                      RC.config_file_name, i, pucch_nRB_CQI);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nCS_AN = pucch_nCS_AN;
+
+                if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
+                      RC.config_file_name, i, pucch_nCS_AN);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
+
+                if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
+                      RC.config_file_name, i, pdsch_referenceSignalPower);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_p_b = pdsch_p_b;
+
+                if ((pdsch_p_b <0) || (pdsch_p_b > 3))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
+                      RC.config_file_name, i, pdsch_p_b);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_n_SB = pusch_n_SB;
+
+                if ((pusch_n_SB <1) || (pusch_n_SB > 4))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
+                      RC.config_file_name, i, pusch_n_SB);
+
+                if (!pusch_hoppingMode)
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
+                      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
+                else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
+                }
+                else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
+                      RC.config_file_name, i, pusch_hoppingMode);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_hoppingOffset = pusch_hoppingOffset;
+
+                if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
+                      RC.config_file_name, i, pusch_hoppingMode);
+
+                if (!pusch_enable64QAM)
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
+                else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = TRUE;
+                }
+                else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, pusch_enable64QAM);
+
+                if (!pusch_groupHoppingEnabled)
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
+                else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = TRUE;
+                }
+                else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, pusch_groupHoppingEnabled);
+
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_groupAssignment = pusch_groupAssignment;
+
+                if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
+                      RC.config_file_name, i, pusch_groupAssignment);
+
+                if (!pusch_sequenceHoppingEnabled)
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
+                else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = TRUE;
+                }
+                else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
+                      RC.config_file_name, i, pusch_sequenceHoppingEnabled);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
+
+                if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
+                      RC.config_file_name, i, pusch_nDMRS1);
+
+                if (strcmp(phich_duration, "NORMAL") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_normal;
+                }
+                else if (strcmp(phich_duration, "EXTENDED") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_extended;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
+                      RC.config_file_name, i, phich_duration);
+
+                if (strcmp(phich_resource, "ONESIXTH") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
+                }
+                else if (strcmp(phich_resource, "HALF") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_half;
+                }
+                else if (strcmp(phich_resource, "ONE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_one;
+                }
+                else if (strcmp(phich_resource, "TWO") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_two;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
+                      RC.config_file_name, i, phich_resource);
+
+                printf("phich.resource %d (%s), phich.duration %d (%s)\n",
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource, phich_resource,
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration, phich_duration);
+
+                if (strcmp(srs_enable, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = TRUE;
+                }
+                else if (strcmp(srs_enable, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+                      RC.config_file_name, i, srs_enable);
+
+                if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_enable == TRUE) {
+                  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
+                        && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
+                        && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
+                        && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
+                       ))
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
+                        RC.config_file_name, i);
+
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_BandwidthConfig = srs_BandwidthConfig;
+
+                  if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
+                    AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
+                        RC.config_file_name, i, srs_BandwidthConfig);
+
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_SubframeConfig = srs_SubframeConfig;
+
+                  if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
+                        RC.config_file_name, i, srs_SubframeConfig);
+
+                  if (strcmp(srs_ackNackST, "ENABLE") == 0) {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = TRUE;
+                  }
+                  else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = FALSE;
+                  }
+                  else
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+                        RC.config_file_name, i, srs_ackNackST);
+
+                  if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = TRUE;
+                  }
+                  else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = FALSE;
+                  }
+                  else
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
+                        RC.config_file_name, i, srs_MaxUpPts);
+                }
+
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_p0_Nominal = pusch_p0_Nominal;
+
+                if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
+                      RC.config_file_name, i, pusch_p0_Nominal);
+
+                if (strcmp(pusch_alpha, "AL0") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al0;
+                }
+                else if (strcmp(pusch_alpha, "AL04") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al04;
+                }
+                else if (strcmp(pusch_alpha, "AL05") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al05;
+                }
+                else if (strcmp(pusch_alpha, "AL06") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al06;
+                }
+                else if (strcmp(pusch_alpha, "AL07") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al07;
+                }
+                else if (strcmp(pusch_alpha, "AL08") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al08;
+                }
+                else if (strcmp(pusch_alpha, "AL09") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al09;
+                }
+                else if (strcmp(pusch_alpha, "AL1") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al1;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
+                      RC.config_file_name, i, pusch_alpha);
+
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_p0_Nominal = pucch_p0_Nominal;
+
+                if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
+                      RC.config_file_name, i, pucch_p0_Nominal);
+
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].msg3_delta_Preamble = msg3_delta_Preamble;
+
+                if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
+                      RC.config_file_name, i, msg3_delta_Preamble);
+
+
+                if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
+                }
+                else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
+                }
+                else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
+                      RC.config_file_name, i, pucch_deltaF_Format1);
+
+                if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
+                }
+                else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
+                }
+                else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
+                      RC.config_file_name, i, pucch_deltaF_Format1b);
+
+
+                if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
+                }
+                else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
+                }
+                else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
+                }
+                else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
+                      RC.config_file_name, i, pucch_deltaF_Format2);
+
+                if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
+                }
+                else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
+                }
+                else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
+                      RC.config_file_name, i, pucch_deltaF_Format2a);
+
+                if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
+                }
+                else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
+                }
+                else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
+                      RC.config_file_name, i, pucch_deltaF_Format2b);
+
+
+
+
+                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
+
+
+                if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
+                      RC.config_file_name, i, rach_numberOfRA_Preambles);
+
+                if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= TRUE;
+
+                  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
+                        && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
+                        && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
+                        RC.config_file_name, i);
+
+                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
+
+                  if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
+                        RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
+
+
+                  switch (rach_messageSizeGroupA) {
+                    case 56:
+                      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
+                      break;
+
+                    case 144:
+                      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
+                      break;
+
+                    case 208:
+                      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
+                      break;
+
+                    case 256:
+                      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
+                      break;
+
+                    default:
+                      AssertFatal (0,
+                          "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
+                          RC.config_file_name, i, rach_messageSizeGroupA);
+                      break;
+                  }
+
+                  if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
+                  }
+
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
+                  }
 
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
-		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
-		  }
+                  else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
+                  }
+                  else
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
+                        RC.config_file_name, i, rach_messagePowerOffsetGroupB);
 
-		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
-		  }
-		  else
-		    AssertFatal(0,
-				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
-				RC.config_file_name, i, rach_messagePowerOffsetGroupB);
+                }
+                else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= FALSE;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
+                      RC.config_file_name, i, rach_preamblesGroupAConfig);
 
-		}
-		else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= FALSE;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
-			      RC.config_file_name, i, rach_preamblesGroupAConfig);
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
 
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
+                if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
+                      RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
 
-		if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
-			       RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
 
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_powerRampingStep= rach_powerRampingStep/2;
 
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_powerRampingStep= rach_powerRampingStep/2;
+                if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
+                      RC.config_file_name, i, rach_powerRampingStep);
 
-		if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
-			       RC.config_file_name, i, rach_powerRampingStep);
 
 
+                switch (rach_preambleTransMax) {
 
-		switch (rach_preambleTransMax) {
+                  case 3:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n3;
+                    break;
 
-		case 3:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n3;
-		  break;
+                  case 4:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n4;
+                    break;
 
-		case 4:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n4;
-		  break;
+                  case 5:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n5;
+                    break;
+
+                  case 6:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n6;
+                    break;
+
+                  case 7:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n7;
+                    break;
+
+                  case 8:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n8;
+                    break;
+
+                  case 10:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n10;
+                    break;
+
+                  case 20:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n20;
+                    break;
+
+                  case 50:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n50;
+                    break;
+
+                  case 100:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n100;
+                    break;
+
+                  case 200:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n200;
+                    break;
+
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
+                        RC.config_file_name, i, rach_preambleTransMax);
+                    break;
+                }
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
+
+                if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
+                      RC.config_file_name, i, rach_preambleTransMax);
+
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
+
+                if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
+                      RC.config_file_name, i, rach_preambleTransMax);
+
+                RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
+
+                if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
+                      RC.config_file_name, i, rach_preambleTransMax);
+
+
+                switch (pcch_defaultPagingCycle) {
+                  case 32:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
+                    break;
 
-		case 5:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n5;
-		  break;
-
-		case 6:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n6;
-		  break;
-
-		case 7:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n7;
-		  break;
-
-		case 8:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n8;
-		  break;
-
-		case 10:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n10;
-		  break;
-
-		case 20:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n20;
-		  break;
-
-		case 50:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n50;
-		  break;
-
-		case 100:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n100;
-		  break;
-
-		case 200:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n200;
-		  break;
-
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
-			       RC.config_file_name, i, rach_preambleTransMax);
-		  break;
-		}
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
-
-		if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
-			       RC.config_file_name, i, rach_preambleTransMax);
-
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
-
-		if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
-			       RC.config_file_name, i, rach_preambleTransMax);
-
-		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
-
-		if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
-			       RC.config_file_name, i, rach_preambleTransMax);
-
-
-		switch (pcch_defaultPagingCycle) {
-		case 32:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
-		  break;
+                  case 64:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
+                    break;
+
+                  case 128:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
+                    break;
 
-		case 64:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
-		  break;
-
-		case 128:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
-		  break;
+                  case 256:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
+                        RC.config_file_name, i, pcch_defaultPagingCycle);
+                    break;
+                }
+
+                if (strcmp(pcch_nB, "fourT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_fourT;
+                }
+                else if (strcmp(pcch_nB, "twoT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_twoT;
+                }
+                else if (strcmp(pcch_nB, "oneT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneT;
+                }
+                else if (strcmp(pcch_nB, "halfT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_halfT;
+                }
+                else if (strcmp(pcch_nB, "quarterT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_quarterT;
+                }
+                else if (strcmp(pcch_nB, "oneEighthT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneEighthT;
+                }
+                else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneSixteenthT;
+                }
+                else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneThirtySecondT;
+                }
+                else
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
+                      RC.config_file_name, i, pcch_defaultPagingCycle);
+
+
+
+                switch (bcch_modificationPeriodCoeff) {
+                  case 2:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
+                    break;
+
+                  case 4:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
+                    break;
+
+                  case 8:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
+                    break;
+
+                  case 16:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n16;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
+                        RC.config_file_name, i, bcch_modificationPeriodCoeff);
+
+                    break;
+                }
+
+
+                switch (ue_TimersAndConstants_t300) {
+                  case 100:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms100;
+                    break;
+
+                  case 200:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms200;
+                    break;
+
+                  case 300:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms300;
+                    break;
+
+                  case 400:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms400;
+                    break;
+
+                  case 600:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms600;
+                    break;
+
+                  case 1000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1000;
+                    break;
+
+                  case 1500:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1500;
+                    break;
+
+                  case 2000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms2000;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
+                        RC.config_file_name, i, ue_TimersAndConstants_t300);
+                    break;
+
+                }
+
+                switch (ue_TimersAndConstants_t301) {
+                  case 100:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms100;
+                    break;
+
+                  case 200:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms200;
+                    break;
+
+                  case 300:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
+                    break;
+
+                  case 400:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
+                    break;
+
+                  case 600:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
+                    break;
+
+                  case 1000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
+                    break;
 
-		case 256:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
-			       RC.config_file_name, i, pcch_defaultPagingCycle);
-		  break;
-		}
-
-		if (strcmp(pcch_nB, "fourT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_fourT;
-		}
-		else if (strcmp(pcch_nB, "twoT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_twoT;
-		}
-		else if (strcmp(pcch_nB, "oneT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneT;
-		}
-		else if (strcmp(pcch_nB, "halfT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_halfT;
-		}
-		else if (strcmp(pcch_nB, "quarterT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_quarterT;
-		}
-		else if (strcmp(pcch_nB, "oneEighthT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneEighthT;
-		}
-		else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneSixteenthT;
-		}
-		else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneThirtySecondT;
-		}
-		else
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
-			      RC.config_file_name, i, pcch_defaultPagingCycle);
-
-
-
-		switch (bcch_modificationPeriodCoeff) {
-		case 2:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
-		  break;
-
-		case 4:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
-		  break;
-
-		case 8:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
-		  break;
-
-		case 16:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n16;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
-			       RC.config_file_name, i, bcch_modificationPeriodCoeff);
-
-		  break;
-		}
-
-
-		switch (ue_TimersAndConstants_t300) {
-		case 100:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms100;
-		  break;
-
-		case 200:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms200;
-		  break;
-
-		case 300:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms300;
-		  break;
-
-		case 400:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms400;
-		  break;
-
-		case 600:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms600;
-		  break;
-
-		case 1000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1000;
-		  break;
-
-		case 1500:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1500;
-		  break;
-
-		case 2000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms2000;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
-			       RC.config_file_name, i, ue_TimersAndConstants_t300);
-		  break;
-
-		}
-
-		switch (ue_TimersAndConstants_t301) {
-		case 100:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms100;
-		  break;
-
-		case 200:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms200;
-		  break;
-
-		case 300:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
-		  break;
-
-		case 400:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
-		  break;
-
-		case 600:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
-		  break;
-
-		case 1000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
-		  break;
+                  case 1500:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
+                    break;
 
-		case 1500:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
-		  break;
+                  case 2000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
+                    break;
 
-		case 2000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
-		  break;
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
+                        RC.config_file_name, i, ue_TimersAndConstants_t301);
+                    break;
+
+                }
 
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
-			       RC.config_file_name, i, ue_TimersAndConstants_t301);
-		  break;
-
-		}
+                switch (ue_TimersAndConstants_t310) {
+                  case 0:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
+                    break;
 
-		switch (ue_TimersAndConstants_t310) {
-		case 0:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
-		  break;
+                  case 50:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
+                    break;
 
-		case 50:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
-		  break;
+                  case 100:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
+                    break;
 
-		case 100:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
-		  break;
+                  case 200:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
+                    break;
+
+                  case 500:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
+                    break;
+
+                  case 1000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
+                    break;
+
+                  case 2000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
+                        RC.config_file_name, i, ue_TimersAndConstants_t310);
+                    break;
+
+                }
+
+                switch (ue_TimersAndConstants_t311) {
+                  case 1000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
+                    break;
+
+                  case 3110:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
+                    break;
+
+                  case 5000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
+                    break;
+
+                  case 10000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
+                    break;
+
+                  case 15000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
+                    break;
+
+                  case 20000:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
+                    break;
+
+                  case 31100:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
+                        RC.config_file_name, i, ue_TimersAndConstants_t311);
+                    break;
+
+                }
+
+                switch (ue_TimersAndConstants_n310) {
+                  case 1:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
+                    break;
+
+                  case 2:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
+                    break;
+
+                  case 3:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
+                    break;
+
+                  case 4:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
+                    break;
+
+                  case 6:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
+                    break;
+
+                  case 8:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
+                    break;
+
+                  case 10:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
+                    break;
+
+                  case 20:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
+                        RC.config_file_name, i, ue_TimersAndConstants_n311);
+                    break;
+
+                }
+
+                switch (ue_TimersAndConstants_n311) {
+                  case 1:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
+                    break;
+
+                  case 2:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
+                    break;
+
+                  case 3:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
+                    break;
+
+                  case 4:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
+                    break;
+
+                  case 5:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
+                    break;
+
+                  case 6:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
+                    break;
+
+                  case 8:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
+                    break;
+
+                  case 10:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
+                    break;
+
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
+                        RC.config_file_name, i, ue_TimersAndConstants_t311);
+                    break;
+
+                }
+
+                switch (ue_TransmissionMode) {
+                  case 1:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
+                    break;
+                  case 2:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
+                    break;
+                  case 3:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
+                    break;
+                  case 4:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
+                    break;
+                  case 5:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
+                    break;
+                  case 6:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
+                    break;
+                  case 7:
+                    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
+                    break;
+                  default:
+                    AssertFatal (0,
+                        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
+                        RC.config_file_name, i, ue_TransmissionMode);
+                    break;
+                }
+
+                int hyperSFN_r13;
+                int eDRX_Allowed_r13;
+                int q_RxLevMinCE_r13;
+                int q_QualMinRSRQ_CE_r13;
+                int si_WindowLength_BR_r13;
+                int si_RepetitionPattern_r13;
+                uint64_t fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
+                int startSymbolBR_r13;
+                int si_HoppingConfigCommon_r13;
+                int si_ValidityTime_r13;
+                int mpdcch_pdsch_HoppingNB_r13;
+                int interval_DLHoppingConfigCommonModeA_r13_val;
+                int interval_DLHoppingConfigCommonModeB_r13_val;
+                int mpdcch_pdsch_HoppingOffset_r13;
+                int preambleTransMax_CE_r13;
+                int mpdcch_startSF_CSS_RA_r13_val;
+                int prach_HoppingOffset_r13;
+                int schedulingInfoSIB1_BR_r13;
+                char* cellSelectionInfoCE_r13 = NULL;
+                char* bandwidthReducedAccessRelatedInfo_r13 = NULL;
+                char* fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
+                char* fdd_UplinkSubframeBitmapBR_r13 = NULL;
+                char* freqHoppingParametersDL_r13 = NULL;
+                char* interval_DLHoppingConfigCommonModeA_r13 = NULL;
+                char* interval_DLHoppingConfigCommonModeB_r13 = NULL;
+                char* prach_ConfigCommon_v1310 = NULL;
+                char* mpdcch_startSF_CSS_RA_r13;
+
+
+                if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_schedulingInfoSIB1, &schedulingInfoSIB1_BR_r13))
+                  AssertFatal(0,
+                      "Failed to parse eNB configuration file %s, enb %d  schedulingInfoSIB1_BR_r13!\n",
+                      RC.config_file_name, i);
+                RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j]= schedulingInfoSIB1_BR_r13;
+
+
+                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_HYPERSFN, &hyperSFN_r13))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= calloc(1, sizeof(uint16_t));
+                  *RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= (uint16_t)hyperSFN_r13;
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= NULL;
+
+                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_EDRX_ALLOWED, &eDRX_Allowed_r13))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= calloc(1, sizeof(long));
+                  *RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= eDRX_Allowed_r13;
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= NULL;
+
+                if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_CELLSELECTIONINFOCE, &cellSelectionInfoCE_r13) && !strcmp(cellSelectionInfoCE_r13, "ENABLE"))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= TRUE;
+                  if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_RXLEVMINCE, &q_RxLevMinCE_r13))
+                  {
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d  q_RxLevMinCE_r13!\n",
+                        RC.config_file_name, i);
+
+                  }
+                  RRC_CONFIGURATION_REQ(msg_p).q_RxLevMinCE_r13[j]= q_RxLevMinCE_r13;
+
+                  if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &q_QualMinRSRQ_CE_r13))
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= calloc(1, sizeof(long));
+                    *RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= q_QualMinRSRQ_CE_r13;
+
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= NULL;
+
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= FALSE;
+
+                if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_BRAccessRelatedInfo, &bandwidthReducedAccessRelatedInfo_r13) && !strcmp(bandwidthReducedAccessRelatedInfo_r13, "ENABLE"))
+                {
+                  printf("Enabling BR access SI scheduling parameters\n");
+                  RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = TRUE;
+                  if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_WINDOWLENGTH_BR, &si_WindowLength_BR_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_REPETITIONPATTERN, &si_RepetitionPattern_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_FDD_ULSUBFRAMEBITMAPBR, &fdd_UplinkSubframeBitmapBR_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_STARTSYMBOLBR, &startSymbolBR_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_HOPPINGCONFIGCOMMON, &si_HoppingConfigCommon_r13))
+                  {
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
+                        RC.config_file_name, i);
+
+                  }
+
+                  bool fdd_downlink_exist = config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDD_SFB_BR, &fdd_DownlinkOrTddSubframeBitmapBR_r13);
+                  if (fdd_downlink_exist)
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = CALLOC(1, sizeof(BOOLEAN_t));
+                    if (!strcmp(fdd_DownlinkOrTddSubframeBitmapBR_r13, "subframePattern40-r13"))
+                      *RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
+                    else
+                      *RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
+                    
+                    config_setting_lookup_int64(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDDSFB_BR_VAL, &fdd_DownlinkOrTddSubframeBitmapBR_val_r13);
+                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_val_r13[j] = fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
+ 
+                  }
+                  else
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = NULL;
+                  }
+
+
+                    RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
+                  RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
+                 
+                  RRC_CONFIGURATION_REQ(msg_p).fdd_UplinkSubframeBitmapBR_r13[j] = fdd_UplinkSubframeBitmapBR_r13;
+                  RRC_CONFIGURATION_REQ(msg_p).si_HoppingConfigCommon_r13[j] = si_HoppingConfigCommon_r13;
+                  RRC_CONFIGURATION_REQ(msg_p).startSymbolBR_r13[j] = startSymbolBR_r13;
+
+                  if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &si_ValidityTime_r13))
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = calloc(1, sizeof(long));
+                    *RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = si_ValidityTime_r13;
+
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = NULL;
+
+                }
+
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = FALSE;
+
+                if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FREQHOPPINGPARAMETERSDL, &freqHoppingParametersDL_r13) && !strcmp(freqHoppingParametersDL_r13, "ENABLE"))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = TRUE;
+                  if (!config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeA_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeA_r13_val) ||
+                      !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeB_r13) ||
+                      !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeB_r13_val))
+                  {
+                    AssertFatal(0,
+                        "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
+                        RC.config_file_name, i);
+
+                  }
+                  if (!strcmp(interval_DLHoppingConfigCommonModeA_r13, "interval-TDD-r13"))
+                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = FALSE;
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = TRUE;
+                  RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13_val[j] = interval_DLHoppingConfigCommonModeA_r13_val;
+
+                  if (!strcmp(interval_DLHoppingConfigCommonModeB_r13, "interval-TDD-r13"))
+                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = FALSE;
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = TRUE;
+                  RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13_val[j] = interval_DLHoppingConfigCommonModeB_r13_val;
+
+
+
+
+                  if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGNB, &mpdcch_pdsch_HoppingNB_r13))
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = calloc(1, sizeof(long));
+                    *RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = mpdcch_pdsch_HoppingNB_r13;
+
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = NULL;
+
+                  if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGOFFSET, &mpdcch_pdsch_HoppingOffset_r13))
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = calloc(1, sizeof(long));
+                    *RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = mpdcch_pdsch_HoppingOffset_r13;
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = NULL;
+
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = FALSE;
+
+                /////SIB2 Parameters
+
+                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PREAMBLETRANSMAX_CE_R13, &preambleTransMax_CE_r13))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = calloc(1, sizeof(long));
+                  *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = preambleTransMax_CE_r13;
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = NULL;
+
+                if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIGCOMMON_V1310, &prach_ConfigCommon_v1310) && !strcmp(prach_ConfigCommon_v1310, "ENABLE"))
+                {
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
+
+                  if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13, &mpdcch_startSF_CSS_RA_r13))
+                  {
+                    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13_VAL, &mpdcch_startSF_CSS_RA_r13_val))
+                    {
+                      AssertFatal(0,
+                          "Failed to parse eNB configuration file %s, enb %d mpdcch_startSF_CSS_RA_r13_val!\n",
+                          RC.config_file_name, i);
+
+                    }
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = calloc(1, sizeof(BOOLEAN_t));
+                    if (!strcmp(mpdcch_startSF_CSS_RA_r13, "tdd-r13"))
+                      *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = FALSE;
+                    else
+                      *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = TRUE;
+
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13_val = mpdcch_startSF_CSS_RA_r13_val;
+
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = NULL;
+
+                  if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_HOPPINGOFFSET_R13, &prach_HoppingOffset_r13))
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = calloc(1, sizeof(long));
+                    *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = prach_HoppingOffset_r13;
+
+                  }
+                  else
+                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = NULL;
+
+                }
+                else
+                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = FALSE;
+              }
+              else
+                RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j] = 0;
 
-		case 200:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
-		  break;
 
-		case 500:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
-		  break;
-
-		case 1000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
-		  break;
-
-		case 2000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
-			       RC.config_file_name, i, ue_TimersAndConstants_t310);
-		  break;
-
-		}
-
-		switch (ue_TimersAndConstants_t311) {
-		case 1000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
-		  break;
-
-		case 3110:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
-		  break;
-
-		case 5000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
-		  break;
-
-		case 10000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
-		  break;
-
-		case 15000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
-		  break;
-
-		case 20000:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
-		  break;
-
-		case 31100:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
-			       RC.config_file_name, i, ue_TimersAndConstants_t311);
-		  break;
-
-		}
-
-		switch (ue_TimersAndConstants_n310) {
-		case 1:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
-		  break;
-
-		case 2:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
-		  break;
-
-		case 3:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
-		  break;
-
-		case 4:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
-		  break;
-
-		case 6:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
-		  break;
-
-		case 8:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
-		  break;
-
-		case 10:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
-		  break;
-
-		case 20:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
-			       RC.config_file_name, i, ue_TimersAndConstants_n311);
-		  break;
-
-		}
-
-		switch (ue_TimersAndConstants_n311) {
-		case 1:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
-		  break;
-
-		case 2:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
-		  break;
-
-		case 3:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
-		  break;
-
-		case 4:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
-		  break;
-
-		case 5:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
-		  break;
-
-		case 6:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
-		  break;
-
-		case 8:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
-		  break;
-
-		case 10:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
-		  break;
-
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
-			       RC.config_file_name, i, ue_TimersAndConstants_t311);
-		  break;
-
-		}
-
-		switch (ue_TransmissionMode) {
-		case 1:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
-		  break;
-		case 2:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
-		  break;
-		case 3:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
-		  break;
-		case 4:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
-		  break;
-		case 5:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
-		  break;
-		case 6:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
-		  break;
-		case 7:
-		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
-		  break;
-		default:
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
-			       RC.config_file_name, i, ue_TransmissionMode);
-		  break;
-		}
-	      	      	      
-		int hyperSFN_r13;
-		int eDRX_Allowed_r13;
-		int q_RxLevMinCE_r13;
-		int q_QualMinRSRQ_CE_r13;
-		int si_WindowLength_BR_r13;
-		int si_RepetitionPattern_r13;
-		uint64_t fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
-		int startSymbolBR_r13;
-		int si_HoppingConfigCommon_r13;
-		int si_ValidityTime_r13;
-		int mpdcch_pdsch_HoppingNB_r13;
-		int interval_DLHoppingConfigCommonModeA_r13_val;
-		int interval_DLHoppingConfigCommonModeB_r13_val;
-		int mpdcch_pdsch_HoppingOffset_r13;
-		int preambleTransMax_CE_r13;
-		int mpdcch_startSF_CSS_RA_r13_val;
-		int prach_HoppingOffset_r13;
-		int schedulingInfoSIB1_BR_r13;
-		char* cellSelectionInfoCE_r13 = NULL;
-		char* bandwidthReducedAccessRelatedInfo_r13 = NULL;
-		char* fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
-		char* fdd_UplinkSubframeBitmapBR_r13 = NULL;
-		char* freqHoppingParametersDL_r13 = NULL;
-		char* interval_DLHoppingConfigCommonModeA_r13 = NULL;
-		char* interval_DLHoppingConfigCommonModeB_r13 = NULL;
-		char* prach_ConfigCommon_v1310 = NULL;
-		char* mpdcch_startSF_CSS_RA_r13;
-
-
-		if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_schedulingInfoSIB1, &schedulingInfoSIB1_BR_r13))
-		  AssertFatal(0,
-			      "Failed to parse eNB configuration file %s, enb %d  schedulingInfoSIB1_BR_r13!\n",
-			      RC.config_file_name, i);
-		RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j]= schedulingInfoSIB1_BR_r13;
-
-
-		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_HYPERSFN, &hyperSFN_r13))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= calloc(1, sizeof(uint16_t));
-		    *RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= (uint16_t)hyperSFN_r13;
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= NULL;
-
-		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_EDRX_ALLOWED, &eDRX_Allowed_r13))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= calloc(1, sizeof(long));
-		    *RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= eDRX_Allowed_r13;
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= NULL;
-
-		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_CELLSELECTIONINFOCE, &cellSelectionInfoCE_r13) && !strcmp(cellSelectionInfoCE_r13, "ENABLE"))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= TRUE;
-		    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_RXLEVMINCE, &q_RxLevMinCE_r13))
-		      {
-			AssertFatal(0,
-				    "Failed to parse eNB configuration file %s, enb %d  q_RxLevMinCE_r13!\n",
-				    RC.config_file_name, i);
-
-		      }
-		    RRC_CONFIGURATION_REQ(msg_p).q_RxLevMinCE_r13[j]= q_RxLevMinCE_r13;
-
-		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &q_QualMinRSRQ_CE_r13))
-		      {
-			RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= calloc(1, sizeof(long));
-			*RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= q_QualMinRSRQ_CE_r13;
-
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= NULL;
-
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= FALSE;
-
-		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_BRAccessRelatedInfo, &bandwidthReducedAccessRelatedInfo_r13) && !strcmp(bandwidthReducedAccessRelatedInfo_r13, "ENABLE"))
-		  {
-		    printf("Enabling BR access SI scheduling parameters\n");
-		    RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = TRUE;
-		    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_WINDOWLENGTH_BR, &si_WindowLength_BR_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_REPETITIONPATTERN, &si_RepetitionPattern_r13) ||
-                        !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDD_SFB_BR, &fdd_DownlinkOrTddSubframeBitmapBR_r13) ||
-                        !config_setting_lookup_int64(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDDSFB_BR_VAL, &fdd_DownlinkOrTddSubframeBitmapBR_val_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_FDD_ULSUBFRAMEBITMAPBR, &fdd_UplinkSubframeBitmapBR_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_STARTSYMBOLBR, &startSymbolBR_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_HOPPINGCONFIGCOMMON, &si_HoppingConfigCommon_r13))
-		      {
-			AssertFatal(0,
-				    "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
-				    RC.config_file_name, i);
-
-		      }
-		    RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
-		    RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
-		    if (!strcmp(fdd_DownlinkOrTddSubframeBitmapBR_r13, "subframePattern40-r13"))
-		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
-		    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_val_r13[j] = fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
-		    RRC_CONFIGURATION_REQ(msg_p).fdd_UplinkSubframeBitmapBR_r13[j] = fdd_UplinkSubframeBitmapBR_r13;
-		    RRC_CONFIGURATION_REQ(msg_p).si_HoppingConfigCommon_r13[j] = si_HoppingConfigCommon_r13;
-		    RRC_CONFIGURATION_REQ(msg_p).startSymbolBR_r13[j] = startSymbolBR_r13;
-
-		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &si_ValidityTime_r13))
-		      {
-			RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = calloc(1, sizeof(long));
-			*RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = si_ValidityTime_r13;
-
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = NULL;
-		    
-		  }
-	      
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = FALSE;
-	      
-		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FREQHOPPINGPARAMETERSDL, &freqHoppingParametersDL_r13) && !strcmp(freqHoppingParametersDL_r13, "ENABLE"))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = TRUE;
-		    if (!config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeA_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeA_r13_val) ||
-                        !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeB_r13) ||
-                        !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeB_r13_val))
-		      {
-			AssertFatal(0,
-				    "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
-				    RC.config_file_name, i);
-
-		      }
-		    if (!strcmp(interval_DLHoppingConfigCommonModeA_r13, "interval-TDD-r13"))
-		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = FALSE;
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = TRUE;
-		    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13_val[j] = interval_DLHoppingConfigCommonModeA_r13_val;
-
-		    if (!strcmp(interval_DLHoppingConfigCommonModeB_r13, "interval-TDD-r13"))
-		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = FALSE;
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = TRUE;
-		    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13_val[j] = interval_DLHoppingConfigCommonModeB_r13_val;
-
-
-
-
-		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGNB, &mpdcch_pdsch_HoppingNB_r13))
-		      {
-			RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = calloc(1, sizeof(long));
-			*RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = mpdcch_pdsch_HoppingNB_r13;
-
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = NULL;
-
-		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGOFFSET, &mpdcch_pdsch_HoppingOffset_r13))
-		      {
-			RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = calloc(1, sizeof(long));
-			*RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = mpdcch_pdsch_HoppingOffset_r13;
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = NULL;
-
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = FALSE;
-	      
-		/////SIB2 Parameters
-
-		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PREAMBLETRANSMAX_CE_R13, &preambleTransMax_CE_r13))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = calloc(1, sizeof(long));
-		    *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = preambleTransMax_CE_r13;
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = NULL;
-		
-		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIGCOMMON_V1310, &prach_ConfigCommon_v1310) && !strcmp(prach_ConfigCommon_v1310, "ENABLE"))
-		  {
-		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
-
-		    if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13, &mpdcch_startSF_CSS_RA_r13))
-		      {
-			if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13_VAL, &mpdcch_startSF_CSS_RA_r13_val))
-			  {
-			    AssertFatal(0,
-					"Failed to parse eNB configuration file %s, enb %d mpdcch_startSF_CSS_RA_r13_val!\n",
-					RC.config_file_name, i);
-
-			  }
-			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = calloc(1, sizeof(BOOLEAN_t));
-			if (!strcmp(mpdcch_startSF_CSS_RA_r13, "tdd-r13"))
-			  *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = FALSE;
-			else
-			  *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = TRUE;
-
-			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13_val = mpdcch_startSF_CSS_RA_r13_val;
-
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = NULL;
-
-		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_HOPPINGOFFSET_R13, &prach_HoppingOffset_r13))
-		      {
-			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = calloc(1, sizeof(long));
-			*RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = prach_HoppingOffset_r13;
-
-		      }
-		    else
-		      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = NULL;
-
-		  }
-		else
-		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = FALSE;
-	      }
-	      else
-		RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j] = 0;
-	    
-	  
 #endif
-	    
-
-
-	      setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1);
-
-	      if (setting_srb1 != NULL) {
-		if (!(config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_POLL_RETRANSMIT, &srb1_timer_poll_retransmit)
-		      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_REORDERING,      &srb1_timer_reordering)
-		      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_STATUS_PROHIBIT, &srb1_timer_status_prohibit)
-		      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_MAX_RETX_THRESHOLD,    &srb1_max_retx_threshold)
-		      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_PDU,              &srb1_poll_pdu)
-		      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_BYTE,             &srb1_poll_byte)))
-		  AssertFatal (0,
-			       "Failed to parse eNB configuration file %s, enb %d  timer_poll_retransmit, timer_reordering, "
-			       "timer_status_prohibit, poll_pdu, poll_byte, max_retx_threshold !\n",
-			       RC.config_file_name, i);
-		
-		switch (srb1_max_retx_threshold) {
-		case 1:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t1;
-		  break;
-		  
-		case 2:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t2;
-		  break;
-		  
-		case 3:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t3;
-		  break;
-		  
-		case 4:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t4;
-		  break;
-		  
-		case 6:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t6;
-		  break;
-		  
-		case 8:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t8;
-		  break;
-		  
-		case 16:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t16;
-		  break;
-		  
-		case 32:
-		  rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t32;
-		  break;
-		  
-		default:
-		  AssertFatal (0,
-			       "Bad config value when parsing eNB configuration file %s, enb %d  srb1_max_retx_threshold %u!\n",
-			       RC.config_file_name, i, srb1_max_retx_threshold);
-		}
-		
-		
-		switch (srb1_poll_pdu) {
-		case 4:
-		  rrc->srb1_poll_pdu = PollPDU_p4;
-		  break;
-		  
-		case 8:
-		  rrc->srb1_poll_pdu = PollPDU_p8;
-		  break;
-		  
-		case 16:
-		  rrc->srb1_poll_pdu = PollPDU_p16;
-		  break;
-		  
-		case 32:
-		  rrc->srb1_poll_pdu = PollPDU_p32;
-		  break;
-		  
-		case 64:
-		  rrc->srb1_poll_pdu = PollPDU_p64;
-		  break;
-		  
-		case 128:
-		  rrc->srb1_poll_pdu = PollPDU_p128;
-		  break;
-		  
-		case 256:
-		  rrc->srb1_poll_pdu = PollPDU_p256;
-		  break;
-		  
-		default:
-		  if (srb1_poll_pdu >= 10000)
-		    rrc->srb1_poll_pdu = PollPDU_pInfinity;
-		  else
-		    AssertFatal (0,
-				 "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_pdu %u!\n",
-				 RC.config_file_name, i, srb1_poll_pdu);
-		}
-		
-		rrc->srb1_poll_byte             = srb1_poll_byte;
-		
-		switch (srb1_poll_byte) {
-		case 25:
-		  rrc->srb1_poll_byte = PollByte_kB25;
-		  break;
-		  
-		case 50:
-		  rrc->srb1_poll_byte = PollByte_kB50;
-		  break;
-		  
-		case 75:
-		  rrc->srb1_poll_byte = PollByte_kB75;
-		  break;
-		  
-		case 100:
-		  rrc->srb1_poll_byte = PollByte_kB100;
-		  break;
-		  
-		case 125:
-		  rrc->srb1_poll_byte = PollByte_kB125;
-		  break;
-		  
-		case 250:
-		  rrc->srb1_poll_byte = PollByte_kB250;
-		  break;
-		  
-		case 375:
-		  rrc->srb1_poll_byte = PollByte_kB375;
-		  break;
-		  
-		case 500:
-		  rrc->srb1_poll_byte = PollByte_kB500;
-		  break;
-		  
-		case 750:
-		  rrc->srb1_poll_byte = PollByte_kB750;
-		  break;
-		  
-		case 1000:
-		  rrc->srb1_poll_byte = PollByte_kB1000;
-		  break;
-		  
-		case 1250:
-		  rrc->srb1_poll_byte = PollByte_kB1250;
-		  break;
-		  
-		case 1500:
-		  rrc->srb1_poll_byte = PollByte_kB1500;
-		  break;
-		  
-		case 2000:
-		  rrc->srb1_poll_byte = PollByte_kB2000;
-		  break;
-		  
-		case 3000:
-		  rrc->srb1_poll_byte = PollByte_kB3000;
-		  break;
-		  
-		default:
-		  if (srb1_poll_byte >= 10000)
-		    rrc->srb1_poll_byte = PollByte_kBinfinity;
-		  else
-		    AssertFatal (0,
-				 "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_byte %u!\n",
-				 RC.config_file_name, i, srb1_poll_byte);
-		}
-		
-		if (srb1_timer_poll_retransmit <= 250) {
-		  rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 5) / 5;
-		}
-		else if (srb1_timer_poll_retransmit <= 500) {
-		  rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 300) / 50 + 50;
-		}
-		else {
-		  AssertFatal(0,
-			      "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_poll_retransmit %u!\n",
-			      RC.config_file_name, i, srb1_timer_poll_retransmit);
-		}
-		
-		if (srb1_timer_status_prohibit <= 250) {
-		  rrc->srb1_timer_status_prohibit = srb1_timer_status_prohibit / 5;
-		}
-		else if ((srb1_timer_poll_retransmit >= 300) && (srb1_timer_poll_retransmit <= 500)) {
-		  rrc->srb1_timer_status_prohibit = (srb1_timer_status_prohibit - 300) / 50 + 51;
-		}
-		else {
-		  AssertFatal(0,
-			      "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_status_prohibit %u!\n",
-			      RC.config_file_name, i, srb1_timer_status_prohibit);
-		}
-		
-		switch (srb1_timer_reordering) {
-		case 0:
-		  rrc->srb1_timer_reordering = T_Reordering_ms0;
-		  break;
-		  
-		case 5:
-		  rrc->srb1_timer_reordering = T_Reordering_ms5;
-		  break;
-		  
-		case 10:
-		  rrc->srb1_timer_reordering = T_Reordering_ms10;
-		  break;
-		  
-		case 15:
-		  rrc->srb1_timer_reordering = T_Reordering_ms15;
-		  break;
-		  
-		case 20:
-		  rrc->srb1_timer_reordering = T_Reordering_ms20;
-		  break;
-		  
-		case 25:
-		  rrc->srb1_timer_reordering = T_Reordering_ms25;
-		  break;
-		  
-		case 30:
-		  rrc->srb1_timer_reordering = T_Reordering_ms30;
-		  break;
-		  
-		case 35:
-		  rrc->srb1_timer_reordering = T_Reordering_ms35;
-		  break;
-		  
-		case 40:
-		  rrc->srb1_timer_reordering = T_Reordering_ms40;
-		  break;
-		  
-		case 45:
-		  rrc->srb1_timer_reordering = T_Reordering_ms45;
-		  break;
-		  
-		case 50:
-		  rrc->srb1_timer_reordering = T_Reordering_ms50;
-		  break;
-		  
-		case 55:
-		  rrc->srb1_timer_reordering = T_Reordering_ms55;
-		  break;
-		  
-		case 60:
-		  rrc->srb1_timer_reordering = T_Reordering_ms60;
-		  break;
-		  
-		case 65:
-		  rrc->srb1_timer_reordering = T_Reordering_ms65;
-		  break;
-		  
-		case 70:
-		  rrc->srb1_timer_reordering = T_Reordering_ms70;
-		  break;
-		  
-		case 75:
-		  rrc->srb1_timer_reordering = T_Reordering_ms75;
-		  break;
-		  
-		case 80:
-		  rrc->srb1_timer_reordering = T_Reordering_ms80;
-		  break;
-		  
-		case 85:
-		  rrc->srb1_timer_reordering = T_Reordering_ms85;
-		  break;
-		  
-		case 90:
-		  rrc->srb1_timer_reordering = T_Reordering_ms90;
-		  break;
-		  
-		case 95:
-		  rrc->srb1_timer_reordering = T_Reordering_ms95;
-		  break;
-		  
-		case 100:
-		  rrc->srb1_timer_reordering = T_Reordering_ms100;
-		  break;
-		  
-		case 110:
-		  rrc->srb1_timer_reordering = T_Reordering_ms110;
-		  break;
-		  
-		case 120:
-		  rrc->srb1_timer_reordering = T_Reordering_ms120;
-		  break;
-		  
-		case 130:
-		  rrc->srb1_timer_reordering = T_Reordering_ms130;
-		  break;
-		  
-		case 140:
-		  rrc->srb1_timer_reordering = T_Reordering_ms140;
-		  break;
-		  
-		case 150:
-		  rrc->srb1_timer_reordering = T_Reordering_ms150;
-		  break;
-		  
-		case 160:
-		  rrc->srb1_timer_reordering = T_Reordering_ms160;
-		  break;
-		  
-		case 170:
-		  rrc->srb1_timer_reordering = T_Reordering_ms170;
-		  break;
-		  
-		case 180:
-		  rrc->srb1_timer_reordering = T_Reordering_ms180;
-		  break;
-		  
-		case 190:
-		  rrc->srb1_timer_reordering = T_Reordering_ms190;
-		  break;
-		  
-		case 200:
-		  rrc->srb1_timer_reordering = T_Reordering_ms200;
-		  break;
-		  
-		default:
-		  AssertFatal (0,
-			       "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_reordering %u!\n",
-			       RC.config_file_name, i, srb1_timer_reordering);
-		}
-		
-		break;
-	      }
-
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-int RCconfig_gtpu() {
-  config_t          cfg;
-  config_setting_t *setting                       = NULL;
-  config_setting_t *subsetting                    = NULL;
-  config_setting_t *setting_enb                   = NULL;
-  int               num_enbs                      = 0;
-  libconfig_int     enb_id                        = 0;
 
 
 
-  char*             enb_interface_name_for_S1U    = NULL;
-  char*             enb_ipv4_address_for_S1U      = NULL;
-  libconfig_int     enb_port_for_S1U              = 0;
-  char             *address                       = NULL;
-  char             *cidr                          = NULL;
-  char             *astring                       = NULL;
+              setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1);
+
+              if (setting_srb1 != NULL) {
+                if (!(config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_POLL_RETRANSMIT, &srb1_timer_poll_retransmit)
+                      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_REORDERING,      &srb1_timer_reordering)
+                      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_STATUS_PROHIBIT, &srb1_timer_status_prohibit)
+                      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_MAX_RETX_THRESHOLD,    &srb1_max_retx_threshold)
+                      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_PDU,              &srb1_poll_pdu)
+                      && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_BYTE,             &srb1_poll_byte)))
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, enb %d  timer_poll_retransmit, timer_reordering, "
+                      "timer_status_prohibit, poll_pdu, poll_byte, max_retx_threshold !\n",
+                      RC.config_file_name, i);
+
+                switch (srb1_max_retx_threshold) {
+                  case 1:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t1;
+                    break;
 
-  // for no gcc warnings
-  (void)astring;
+                  case 2:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t2;
+                    break;
 
+                  case 3:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t3;
+                    break;
 
-  LOG_I(GTPU,"Configuring GTPu\n");
+                  case 4:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t4;
+                    break;
 
-  config_init(&cfg);
+                  case 6:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t6;
+                    break;
 
-  if (RC.config_file_name != NULL) {
-    // Read the file. If there is an error, report it and exit.
-    if (! config_read_file(&cfg, RC.config_file_name)) {
-      config_destroy(&cfg);
-      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
-    }
-  } else {
-    config_destroy(&cfg);
-    AssertFatal (0, "No eNB configuration file provided!\n");
-  }
+                  case 8:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t8;
+                    break;
 
-  // Get list of active eNBs, (only these will be configured)
-  setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+                  case 16:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t16;
+                    break;
 
-  if (setting != NULL) {
-    num_enbs = config_setting_length(setting);
-    setting_enb   = config_setting_get_elem(setting, 0);
-  }
+                  case 32:
+                    rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t32;
+                    break;
 
-  if (num_enbs>0) {
-    // Output a list of all eNBs.
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
+                  default:
+                    AssertFatal (0,
+                        "Bad config value when parsing eNB configuration file %s, enb %d  srb1_max_retx_threshold %u!\n",
+                        RC.config_file_name, i, srb1_max_retx_threshold);
+                }
+
+
+                switch (srb1_poll_pdu) {
+                  case 4:
+                    rrc->srb1_poll_pdu = PollPDU_p4;
+                    break;
+
+                  case 8:
+                    rrc->srb1_poll_pdu = PollPDU_p8;
+                    break;
+
+                  case 16:
+                    rrc->srb1_poll_pdu = PollPDU_p16;
+                    break;
+
+                  case 32:
+                    rrc->srb1_poll_pdu = PollPDU_p32;
+                    break;
+
+                  case 64:
+                    rrc->srb1_poll_pdu = PollPDU_p64;
+                    break;
+
+                  case 128:
+                    rrc->srb1_poll_pdu = PollPDU_p128;
+                    break;
+
+                  case 256:
+                    rrc->srb1_poll_pdu = PollPDU_p256;
+                    break;
+
+                  default:
+                    if (srb1_poll_pdu >= 10000)
+                      rrc->srb1_poll_pdu = PollPDU_pInfinity;
+                    else
+                      AssertFatal (0,
+                          "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_pdu %u!\n",
+                          RC.config_file_name, i, srb1_poll_pdu);
+                }
+
+                rrc->srb1_poll_byte             = srb1_poll_byte;
+
+                switch (srb1_poll_byte) {
+                  case 25:
+                    rrc->srb1_poll_byte = PollByte_kB25;
+                    break;
+
+                  case 50:
+                    rrc->srb1_poll_byte = PollByte_kB50;
+                    break;
+
+                  case 75:
+                    rrc->srb1_poll_byte = PollByte_kB75;
+                    break;
+
+                  case 100:
+                    rrc->srb1_poll_byte = PollByte_kB100;
+                    break;
+
+                  case 125:
+                    rrc->srb1_poll_byte = PollByte_kB125;
+                    break;
+
+                  case 250:
+                    rrc->srb1_poll_byte = PollByte_kB250;
+                    break;
+
+                  case 375:
+                    rrc->srb1_poll_byte = PollByte_kB375;
+                    break;
+
+                  case 500:
+                    rrc->srb1_poll_byte = PollByte_kB500;
+                    break;
+
+                  case 750:
+                    rrc->srb1_poll_byte = PollByte_kB750;
+                    break;
+
+                  case 1000:
+                    rrc->srb1_poll_byte = PollByte_kB1000;
+                    break;
+
+                  case 1250:
+                    rrc->srb1_poll_byte = PollByte_kB1250;
+                    break;
+
+                  case 1500:
+                    rrc->srb1_poll_byte = PollByte_kB1500;
+                    break;
+
+                  case 2000:
+                    rrc->srb1_poll_byte = PollByte_kB2000;
+                    break;
+
+                  case 3000:
+                    rrc->srb1_poll_byte = PollByte_kB3000;
+                    break;
+
+                  default:
+                    if (srb1_poll_byte >= 10000)
+                      rrc->srb1_poll_byte = PollByte_kBinfinity;
+                    else
+                      AssertFatal (0,
+                          "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_byte %u!\n",
+                          RC.config_file_name, i, srb1_poll_byte);
+                }
+
+                if (srb1_timer_poll_retransmit <= 250) {
+                  rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 5) / 5;
+                }
+                else if (srb1_timer_poll_retransmit <= 500) {
+                  rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 300) / 50 + 50;
+                }
+                else {
+                  AssertFatal(0,
+                      "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_poll_retransmit %u!\n",
+                      RC.config_file_name, i, srb1_timer_poll_retransmit);
+                }
+
+                if (srb1_timer_status_prohibit <= 250) {
+                  rrc->srb1_timer_status_prohibit = srb1_timer_status_prohibit / 5;
+                }
+                else if ((srb1_timer_poll_retransmit >= 300) && (srb1_timer_poll_retransmit <= 500)) {
+                  rrc->srb1_timer_status_prohibit = (srb1_timer_status_prohibit - 300) / 50 + 51;
+                }
+                else {
+                  AssertFatal(0,
+                      "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_status_prohibit %u!\n",
+                      RC.config_file_name, i, srb1_timer_status_prohibit);
+                }
+
+                switch (srb1_timer_reordering) {
+                  case 0:
+                    rrc->srb1_timer_reordering = T_Reordering_ms0;
+                    break;
+
+                  case 5:
+                    rrc->srb1_timer_reordering = T_Reordering_ms5;
+                    break;
+
+                  case 10:
+                    rrc->srb1_timer_reordering = T_Reordering_ms10;
+                    break;
+
+                  case 15:
+                    rrc->srb1_timer_reordering = T_Reordering_ms15;
+                    break;
+
+                  case 20:
+                    rrc->srb1_timer_reordering = T_Reordering_ms20;
+                    break;
+
+                  case 25:
+                    rrc->srb1_timer_reordering = T_Reordering_ms25;
+                    break;
+
+                  case 30:
+                    rrc->srb1_timer_reordering = T_Reordering_ms30;
+                    break;
+
+                  case 35:
+                    rrc->srb1_timer_reordering = T_Reordering_ms35;
+                    break;
+
+                  case 40:
+                    rrc->srb1_timer_reordering = T_Reordering_ms40;
+                    break;
+
+                  case 45:
+                    rrc->srb1_timer_reordering = T_Reordering_ms45;
+                    break;
+
+                  case 50:
+                    rrc->srb1_timer_reordering = T_Reordering_ms50;
+                    break;
+
+                  case 55:
+                    rrc->srb1_timer_reordering = T_Reordering_ms55;
+                    break;
+
+                  case 60:
+                    rrc->srb1_timer_reordering = T_Reordering_ms60;
+                    break;
+
+                  case 65:
+                    rrc->srb1_timer_reordering = T_Reordering_ms65;
+                    break;
+
+                  case 70:
+                    rrc->srb1_timer_reordering = T_Reordering_ms70;
+                    break;
+
+                  case 75:
+                    rrc->srb1_timer_reordering = T_Reordering_ms75;
+                    break;
+
+                  case 80:
+                    rrc->srb1_timer_reordering = T_Reordering_ms80;
+                    break;
+
+                  case 85:
+                    rrc->srb1_timer_reordering = T_Reordering_ms85;
+                    break;
+
+                  case 90:
+                    rrc->srb1_timer_reordering = T_Reordering_ms90;
+                    break;
+
+                  case 95:
+                    rrc->srb1_timer_reordering = T_Reordering_ms95;
+                    break;
+
+                  case 100:
+                    rrc->srb1_timer_reordering = T_Reordering_ms100;
+                    break;
+
+                  case 110:
+                    rrc->srb1_timer_reordering = T_Reordering_ms110;
+                    break;
+
+                  case 120:
+                    rrc->srb1_timer_reordering = T_Reordering_ms120;
+                    break;
+
+                  case 130:
+                    rrc->srb1_timer_reordering = T_Reordering_ms130;
+                    break;
+
+                  case 140:
+                    rrc->srb1_timer_reordering = T_Reordering_ms140;
+                    break;
+
+                  case 150:
+                    rrc->srb1_timer_reordering = T_Reordering_ms150;
+                    break;
 
-    if (setting != NULL) {
+                  case 160:
+                    rrc->srb1_timer_reordering = T_Reordering_ms160;
+                    break;
+
+                  case 170:
+                    rrc->srb1_timer_reordering = T_Reordering_ms170;
+                    break;
 
+                  case 180:
+                    rrc->srb1_timer_reordering = T_Reordering_ms180;
+                    break;
 
-      setting_enb = config_setting_get_elem(setting, 0);
-      subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
+                  case 190:
+                    rrc->srb1_timer_reordering = T_Reordering_ms190;
+                    break;
 
-      if (subsetting != NULL) {
-	if (  (config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
-					     (const char **)&enb_interface_name_for_S1U)
-	       && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
-						(const char **)&enb_ipv4_address_for_S1U)
-	       && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
-					    &enb_port_for_S1U)
-	       )
-	      ) {
+                  case 200:
+                    rrc->srb1_timer_reordering = T_Reordering_ms200;
+                    break;
 
-	  cidr = enb_ipv4_address_for_S1U;
-	  address = strtok(cidr, "/");
+                  default:
+                    AssertFatal (0,
+                        "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_reordering %u!\n",
+                        RC.config_file_name, i, srb1_timer_reordering);
+                }
+
+                break;
+              }
+
+            }
+            }
+          }
+        }
+      }
+    }
+  }
+  int RCconfig_gtpu() {
+    config_t          cfg;
+    config_setting_t *setting                       = NULL;
+    config_setting_t *subsetting                    = NULL;
+    config_setting_t *setting_enb                   = NULL;
+    int               num_enbs                      = 0;
+    libconfig_int     enb_id                        = 0;
 
-	  if (address) {
-	    IPV4_STR_ADDR_TO_INT_NWBO ( address, RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
 
-	    LOG_I(GTPU,"Configuring GTPu address : %s -> %x\n",address,RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up);
 
-	  }
+    char*             enb_interface_name_for_S1U    = NULL;
+    char*             enb_ipv4_address_for_S1U      = NULL;
+    libconfig_int     enb_port_for_S1U              = 0;
+    char             *address                       = NULL;
+    char             *cidr                          = NULL;
+    char             *astring                       = NULL;
 
-	  RC.gtpv1u_data_g->enb_port_for_S1u_S12_S4_up = enb_port_for_S1U;
+    // for no gcc warnings
+    (void)astring;
 
-	}
+
+    LOG_I(GTPU,"Configuring GTPu\n");
+
+    config_init(&cfg);
+
+    if (RC.config_file_name != NULL) {
+      // Read the file. If there is an error, report it and exit.
+      if (! config_read_file(&cfg, RC.config_file_name)) {
+        config_destroy(&cfg);
+        AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
       }
+    } else {
+      config_destroy(&cfg);
+      AssertFatal (0, "No eNB configuration file provided!\n");
     }
-  }
-}
 
+    // Get list of active eNBs, (only these will be configured)
+    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
 
-int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
-  config_t          cfg;
-  config_setting_t *setting                       = NULL;
-  config_setting_t *subsetting                    = NULL;
-  config_setting_t *setting_mme_addresses         = NULL;
-  config_setting_t *setting_mme_address           = NULL;
-  config_setting_t *setting_enb                   = NULL;
-  config_setting_t *setting_otg                   = NULL;
-  config_setting_t *subsetting_otg                = NULL;
-  int               parse_errors                  = 0;
-  int               num_enbs                      = 0;
-  int               num_mme_address               = 0;
-  int               num_otg_elements              = 0;
-  int               num_component_carriers        = 0;
-  int               j                             = 0;
-  libconfig_int     enb_id                        = 0;
+    if (setting != NULL) {
+      num_enbs = config_setting_length(setting);
+      setting_enb   = config_setting_get_elem(setting, 0);
+    }
 
+    if (num_enbs>0) {
+      // Output a list of all eNBs.
+      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
 
-  const char*       cell_type                     = NULL;
-  const char*       tac                           = 0;
-  const char*       enb_name                      = NULL;
-  const char*       mcc                           = 0;
-  const char*       mnc                           = 0;
+      if (setting != NULL) {
 
-  libconfig_int     my_int;
 
+        setting_enb = config_setting_get_elem(setting, 0);
+        subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
 
-  char*             if_name                       = NULL;
-  char*             ipv4                          = NULL;
-  char*             ipv4_remote                   = NULL;
-  char*             ipv6                          = NULL;
-  char*             local_rf                      = NULL;
-  char*             preference                    = NULL;
-  char*             active                        = NULL;
+        if (subsetting != NULL) {
+          if (  (config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
+                  (const char **)&enb_interface_name_for_S1U)
+                && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
+                  (const char **)&enb_ipv4_address_for_S1U)
+                && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
+                  &enb_port_for_S1U)
+                )
+             ) {
 
-  char*             tr_preference                 = NULL;
-  libconfig_int     local_port                    = 0;
-  libconfig_int     remote_port                   = 0;
-  const char*       active_enb[MAX_ENB];
-  char*             enb_interface_name_for_S1U    = NULL;
-  char*             enb_ipv4_address_for_S1U      = NULL;
-  libconfig_int     enb_port_for_S1U              = 0;
-  char*             enb_interface_name_for_S1_MME = NULL;
-  char*             enb_ipv4_address_for_S1_MME   = NULL;
-  char             *address                       = NULL;
-  char             *cidr                          = NULL;
-  char             *astring                       = NULL;
+            cidr = enb_ipv4_address_for_S1U;
+            address = strtok(cidr, "/");
 
-  // for no gcc warnings
-  (void)astring;
-  (void)my_int;
+            if (address) {
+              IPV4_STR_ADDR_TO_INT_NWBO ( address, RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
 
-  memset((char*)active_enb,     0 , MAX_ENB * sizeof(char*));
+              LOG_I(GTPU,"Configuring GTPu address : %s -> %x\n",address,RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up);
 
-  config_init(&cfg);
+            }
 
-  if (RC.config_file_name != NULL) {
-    // Read the file. If there is an error, report it and exit.
-    if (! config_read_file(&cfg, RC.config_file_name)) {
-      config_destroy(&cfg);
-      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
+            RC.gtpv1u_data_g->enb_port_for_S1u_S12_S4_up = enb_port_for_S1U;
+
+          }
+        }
+      }
     }
-  } else {
-    config_destroy(&cfg);
-    AssertFatal (0, "No eNB configuration file provided!\n");
   }
 
-#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
 
-  if (  (config_lookup_string( &cfg, ENB_CONFIG_STRING_ASN1_VERBOSITY, (const char **)&astring) )) {
-    if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE) == 0) {
-      asn_debug      = 0;
-      asn1_xer_print = 0;
-    } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_INFO) == 0) {
-      asn_debug      = 1;
-      asn1_xer_print = 1;
-    } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING) == 0) {
-      asn_debug      = 1;
-      asn1_xer_print = 2;
+  int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
+    config_t          cfg;
+    config_setting_t *setting                       = NULL;
+    config_setting_t *subsetting                    = NULL;
+    config_setting_t *setting_mme_addresses         = NULL;
+    config_setting_t *setting_mme_address           = NULL;
+    config_setting_t *setting_enb                   = NULL;
+    config_setting_t *setting_otg                   = NULL;
+    config_setting_t *subsetting_otg                = NULL;
+    int               parse_errors                  = 0;
+    int               num_enbs                      = 0;
+    int               num_mme_address               = 0;
+    int               num_otg_elements              = 0;
+    int               num_component_carriers        = 0;
+    int               j                             = 0;
+    libconfig_int     enb_id                        = 0;
+
+
+    const char*       cell_type                     = NULL;
+    const char*       tac                           = 0;
+    const char*       enb_name                      = NULL;
+    const char*       mcc                           = 0;
+    const char*       mnc                           = 0;
+
+    libconfig_int     my_int;
+
+
+    char*             if_name                       = NULL;
+    char*             ipv4                          = NULL;
+    char*             ipv4_remote                   = NULL;
+    char*             ipv6                          = NULL;
+    char*             local_rf                      = NULL;
+    char*             preference                    = NULL;
+    char*             active                        = NULL;
+
+    char*             tr_preference                 = NULL;
+    libconfig_int     local_port                    = 0;
+    libconfig_int     remote_port                   = 0;
+    const char*       active_enb[MAX_ENB];
+    char*             enb_interface_name_for_S1U    = NULL;
+    char*             enb_ipv4_address_for_S1U      = NULL;
+    libconfig_int     enb_port_for_S1U              = 0;
+    char*             enb_interface_name_for_S1_MME = NULL;
+    char*             enb_ipv4_address_for_S1_MME   = NULL;
+    char             *address                       = NULL;
+    char             *cidr                          = NULL;
+    char             *astring                       = NULL;
+
+    // for no gcc warnings
+    (void)astring;
+    (void)my_int;
+
+    memset((char*)active_enb,     0 , MAX_ENB * sizeof(char*));
+
+    config_init(&cfg);
+
+    if (RC.config_file_name != NULL) {
+      // Read the file. If there is an error, report it and exit.
+      if (! config_read_file(&cfg, RC.config_file_name)) {
+        config_destroy(&cfg);
+        AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
+      }
     } else {
-      asn_debug      = 0;
-      asn1_xer_print = 0;
+      config_destroy(&cfg);
+      AssertFatal (0, "No eNB configuration file provided!\n");
     }
-  }
-
-#endif
 
-  // Get list of active eNBs, (only these will be configured)
-  setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
 
-  if (setting != NULL) {
-    num_enbs = config_setting_length(setting);
-    setting_enb   = config_setting_get_elem(setting, i);
-    active_enb[i] = config_setting_get_string (setting_enb);
-    AssertFatal (active_enb[i] != NULL,
-		 "Failed to parse config file %s, %uth attribute %s \n",
-		 RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
-    active_enb[i] = strdup(active_enb[i]);
-  }
+    if (  (config_lookup_string( &cfg, ENB_CONFIG_STRING_ASN1_VERBOSITY, (const char **)&astring) )) {
+      if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE) == 0) {
+        asn_debug      = 0;
+        asn1_xer_print = 0;
+      } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_INFO) == 0) {
+        asn_debug      = 1;
+        asn1_xer_print = 1;
+      } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING) == 0) {
+        asn_debug      = 1;
+        asn1_xer_print = 2;
+      } else {
+        asn_debug      = 0;
+        asn1_xer_print = 0;
+      }
+    }
 
+#endif
 
-  if (num_enbs>0) {
-    // Output a list of all eNBs.
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
+    // Get list of active eNBs, (only these will be configured)
+    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
 
     if (setting != NULL) {
       num_enbs = config_setting_length(setting);
+      setting_enb   = config_setting_get_elem(setting, i);
+      active_enb[i] = config_setting_get_string (setting_enb);
+      AssertFatal (active_enb[i] != NULL,
+          "Failed to parse config file %s, %uth attribute %s \n",
+          RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
+      active_enb[i] = strdup(active_enb[i]);
+    }
 
-      for (i = 0; i < num_enbs; i++) {
-	setting_enb = config_setting_get_elem(setting, i);
 
-	if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
-	  // Calculate a default eNB ID
+    if (num_enbs>0) {
+      // Output a list of all eNBs.
+      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
+
+      if (setting != NULL) {
+        num_enbs = config_setting_length(setting);
+
+        for (i = 0; i < num_enbs; i++) {
+          setting_enb = config_setting_get_elem(setting, i);
+
+          if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
+            // Calculate a default eNB ID
 
 # if defined(ENABLE_USE_MME)
-	  uint32_t hash;
+            uint32_t hash;
 
-	  hash = s1ap_generate_eNB_id ();
-	  enb_id = i + (hash & 0xFFFF8);
+            hash = s1ap_generate_eNB_id ();
+            enb_id = i + (hash & 0xFFFF8);
 # else
-	  enb_id = i;
+            enb_id = i;
 # endif
-	}
-
-	if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
-		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
-		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
-		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
-		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
-
-
-		       )
-	      ) {
-	  AssertFatal (0,
-		       "Failed to parse eNB configuration file %s, %u th enb\n",
-		       RC.config_file_name, i);
-	  continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-	}
-
-	// search if in active list
-	for (j=0; j < num_enbs; j++) {
-	  if (strcmp(active_enb[j], enb_name) == 0) {
-
-	    S1AP_REGISTER_ENB_REQ (msg_p).eNB_id = enb_id;
-
-	    if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
-	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
-	    } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
-	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
-	    } else {
-	      AssertFatal (0,
-			   "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
-			   RC.config_file_name, i, cell_type);
-	    }
-
-	    S1AP_REGISTER_ENB_REQ (msg_p).eNB_name         = strdup(enb_name);
-	    S1AP_REGISTER_ENB_REQ (msg_p).tac              = (uint16_t)atoi(tac);
-	    S1AP_REGISTER_ENB_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
-	    S1AP_REGISTER_ENB_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
-	    S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length = strlen(mnc);
-	    S1AP_REGISTER_ENB_REQ (msg_p).default_drx      = 0;
-	    AssertFatal((S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 2) ||
-			(S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 3),
-			"BAD MNC DIGIT LENGTH %d",
-			S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length);
-
-
-
-	    setting_mme_addresses = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_MME_IP_ADDRESS);
-	    num_mme_address     = config_setting_length(setting_mme_addresses);
-	    S1AP_REGISTER_ENB_REQ (msg_p).nb_mme = 0;
-
-	    for (j = 0; j < num_mme_address; j++) {
-	      setting_mme_address = config_setting_get_elem(setting_mme_addresses, j);
-
-	      if (  !(
-		      config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV4_ADDRESS, (const char **)&ipv4)
-		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV6_ADDRESS, (const char **)&ipv6)
-		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, (const char **)&active)
-		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, (const char **)&preference)
-		      )
-		    ) {
-		AssertFatal (0,
-			     "Failed to parse eNB configuration file %s, %u th enb %u th mme address !\n",
-			     RC.config_file_name, i, j);
-		continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-	      }
-
-	      S1AP_REGISTER_ENB_REQ (msg_p).nb_mme += 1;
-
-	      strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4_address,ipv4);
-	      strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6_address,ipv6);
-
-	      if (strcmp(active, "yes") == 0) {
+          }
+
+          if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
+                && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
+                && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
+                && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
+                && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
+
+
+                )
+             ) {
+            AssertFatal (0,
+                "Failed to parse eNB configuration file %s, %u th enb\n",
+                RC.config_file_name, i);
+            continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+          }
+
+          // search if in active list
+          for (j=0; j < num_enbs; j++) {
+            if (strcmp(active_enb[j], enb_name) == 0) {
+
+              S1AP_REGISTER_ENB_REQ (msg_p).eNB_id = enb_id;
+
+              if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
+                S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
+              } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
+                S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
+              } else {
+                AssertFatal (0,
+                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
+                    RC.config_file_name, i, cell_type);
+              }
+
+              S1AP_REGISTER_ENB_REQ (msg_p).eNB_name         = strdup(enb_name);
+              S1AP_REGISTER_ENB_REQ (msg_p).tac              = (uint16_t)atoi(tac);
+              S1AP_REGISTER_ENB_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
+              S1AP_REGISTER_ENB_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
+              S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length = strlen(mnc);
+              S1AP_REGISTER_ENB_REQ (msg_p).default_drx      = 0;
+              AssertFatal((S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 2) ||
+                  (S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 3),
+                  "BAD MNC DIGIT LENGTH %d",
+                  S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length);
+
+
+
+              setting_mme_addresses = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_MME_IP_ADDRESS);
+              num_mme_address     = config_setting_length(setting_mme_addresses);
+              S1AP_REGISTER_ENB_REQ (msg_p).nb_mme = 0;
+
+              for (j = 0; j < num_mme_address; j++) {
+                setting_mme_address = config_setting_get_elem(setting_mme_addresses, j);
+
+                if (  !(
+                      config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV4_ADDRESS, (const char **)&ipv4)
+                      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV6_ADDRESS, (const char **)&ipv6)
+                      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, (const char **)&active)
+                      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, (const char **)&preference)
+                      )
+                   ) {
+                  AssertFatal (0,
+                      "Failed to parse eNB configuration file %s, %u th enb %u th mme address !\n",
+                      RC.config_file_name, i, j);
+                  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+                }
+
+                S1AP_REGISTER_ENB_REQ (msg_p).nb_mme += 1;
+
+                strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4_address,ipv4);
+                strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6_address,ipv6);
+
+                if (strcmp(active, "yes") == 0) {
 #if defined(ENABLE_USE_MME)
-		EPC_MODE_ENABLED = 1;
+                  EPC_MODE_ENABLED = 1;
 #endif
-	      }
-	      if (strcmp(preference, "ipv4") == 0) {
-		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
-	      } else if (strcmp(preference, "ipv6") == 0) {
-		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
-	      } else if (strcmp(preference, "no") == 0) {
-		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
-		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
-	      }
-	    }
-
-
-	    // SCTP SETTING
-	    S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS;
-	    S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams  = SCTP_IN_STREAMS;
+                }
+                if (strcmp(preference, "ipv4") == 0) {
+                  S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
+                } else if (strcmp(preference, "ipv6") == 0) {
+                  S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
+                } else if (strcmp(preference, "no") == 0) {
+                  S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
+                  S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
+                }
+              }
+
+
+              // SCTP SETTING
+              S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS;
+              S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams  = SCTP_IN_STREAMS;
 # if defined(ENABLE_USE_MME)
-	    subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SCTP_CONFIG);
+              subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SCTP_CONFIG);
 
-	    if (subsetting != NULL) {
-	      if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_INSTREAMS, &my_int) )) {
-		S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = (uint16_t)my_int;
-	      }
+              if (subsetting != NULL) {
+                if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_INSTREAMS, &my_int) )) {
+                  S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = (uint16_t)my_int;
+                }
 
-	      if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_OUTSTREAMS, &my_int) )) {
-		S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = (uint16_t)my_int;
-	      }
-	    }
+                if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_OUTSTREAMS, &my_int) )) {
+                  S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = (uint16_t)my_int;
+                }
+              }
 #endif
 
-	    // NETWORK_INTERFACES
-	    subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
+              // NETWORK_INTERFACES
+              subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
 
-	    if (subsetting != NULL) {
-	      if (  (
-		     config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME,
-						   (const char **)&enb_interface_name_for_S1_MME)
-		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME,
-						      (const char **)&enb_ipv4_address_for_S1_MME)
-		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
-						      (const char **)&enb_interface_name_for_S1U)
-		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
-						      (const char **)&enb_ipv4_address_for_S1U)
-		     && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
-						  &enb_port_for_S1U)
-		     )
-		    ) {
-		//		S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U);
-		cidr = enb_ipv4_address_for_S1U;
-		address = strtok(cidr, "/");
+              if (subsetting != NULL) {
+                if (  (
+                      config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME,
+                        (const char **)&enb_interface_name_for_S1_MME)
+                      && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME,
+                        (const char **)&enb_ipv4_address_for_S1_MME)
+                      && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
+                        (const char **)&enb_interface_name_for_S1U)
+                      && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
+                        (const char **)&enb_ipv4_address_for_S1U)
+                      && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
+                        &enb_port_for_S1U)
+                      )
+                   ) {
+                  //		S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U);
+                  cidr = enb_ipv4_address_for_S1U;
+                  address = strtok(cidr, "/");
 
-		S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
-		S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4 = 1;
+                  S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
+                  S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4 = 1;
 
-		strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, address);
+                  strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, address);
 
-	      }
-	    }
+                }
+              }
 
 
 
 
-	    break;
-	  }
-	}
+              break;
+            }
+          }
+        }
       }
     }
+    return;
   }
-  return;
-}
 
-void RCConfig(const char *config_file_name) {
+  void RCConfig(const char *config_file_name) {
 
-  config_t          cfg;
-  config_setting_t *setting                       = NULL;
-  config_setting_t *setting_enb                   = NULL;
-  config_setting_t *setting_component_carriers    = NULL;
-  config_init(&cfg);
+    config_t          cfg;
+    config_setting_t *setting                       = NULL;
+    config_setting_t *setting_enb                   = NULL;
+    config_setting_t *setting_component_carriers    = NULL;
+    config_init(&cfg);
 
-  if (config_file_name != NULL) {
+    if (config_file_name != NULL) {
 
-    RC.config_file_name = config_file_name;
-    if (! config_read_file(&cfg, RC.config_file_name)) {
-      config_destroy(&cfg);
-      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
-    }
-    // Get num eNB instances
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
-
-    if (setting != NULL) RC.nb_inst = config_setting_length(setting);
-    if (RC.nb_inst > 0) {
-      printf("Number of eNB RRC instances %d\n",RC.nb_inst);
-      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
-      RC.nb_CC = (int *)malloc((1+RC.nb_inst)*sizeof(int));
-      for (int i=0;i<RC.nb_inst;i++) {
-	setting_enb                  = config_setting_get_elem(setting, i);
-	setting_component_carriers   = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
-	AssertFatal(setting_component_carriers != NULL, "No component carrier definitions in %s\n",RC.config_file_name);
-	RC.nb_CC[i]                = config_setting_length(setting_component_carriers);
-	printf("Setting nb_CC to %d for instance %d\n",RC.nb_CC[i],i);
+      RC.config_file_name = config_file_name;
+      if (! config_read_file(&cfg, RC.config_file_name)) {
+        config_destroy(&cfg);
+        AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
+      }
+      // Get num eNB instances
+      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+
+      if (setting != NULL) RC.nb_inst = config_setting_length(setting);
+      if (RC.nb_inst > 0) {
+        printf("Number of eNB RRC instances %d\n",RC.nb_inst);
+        setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
+        RC.nb_CC = (int *)malloc((1+RC.nb_inst)*sizeof(int));
+        for (int i=0;i<RC.nb_inst;i++) {
+          setting_enb                  = config_setting_get_elem(setting, i);
+          setting_component_carriers   = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
+          AssertFatal(setting_component_carriers != NULL, "No component carrier definitions in %s\n",RC.config_file_name);
+          RC.nb_CC[i]                = config_setting_length(setting_component_carriers);
+          printf("Setting nb_CC to %d for instance %d\n",RC.nb_CC[i],i);
 
+        }
       }
-    }
 
-    // Get num MACRLC instances
-    setting = config_lookup(&cfg, CONFIG_STRING_MACRLC_LIST);
-    if (setting != NULL) RC.nb_macrlc_inst = config_setting_length(setting);
+      // Get num MACRLC instances
+      setting = config_lookup(&cfg, CONFIG_STRING_MACRLC_LIST);
+      if (setting != NULL) RC.nb_macrlc_inst = config_setting_length(setting);
 
-    // Get num L1 instances
-    setting = config_lookup(&cfg, CONFIG_STRING_L1_LIST);
-    if (setting != NULL) RC.nb_L1_inst = config_setting_length(setting);
+      // Get num L1 instances
+      setting = config_lookup(&cfg, CONFIG_STRING_L1_LIST);
+      if (setting != NULL) RC.nb_L1_inst = config_setting_length(setting);
 
-    // Get num RU instances
-    setting = config_lookup(&cfg, CONFIG_STRING_RU_LIST);
-    if (setting != NULL) RC.nb_RU     = config_setting_length(setting);
-  }
-  else {
-    config_destroy(&cfg);
-    AssertFatal(0,"Configuration file is null\n");
-  }
+      // Get num RU instances
+      setting = config_lookup(&cfg, CONFIG_STRING_RU_LIST);
+      if (setting != NULL) RC.nb_RU     = config_setting_length(setting);
+    }
+    else {
+      config_destroy(&cfg);
+      AssertFatal(0,"Configuration file is null\n");
+    }
 
-  return;
-}
+    return;
+  }
diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
index 5c23f48fd7..a8d00f921b 100755
--- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
@@ -587,30 +587,39 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 	    ASN_SEQUENCE_ADD(&sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13->list, schedulinginfo_br_13);
           }
 
-          sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13
+
+          if (configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id])
+          {
+              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13
                   = calloc(1, sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
-          memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0,
+              memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0,
                  sizeof(sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13)));
 
-          if (configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id])
-          {
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
-                      = SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
+              if (*configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id])
+              {
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
+                         = SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
+
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf = calloc(2, sizeof(uint8_t));
+                  memmove(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf, &configuration->fdd_DownlinkOrTddSubframeBitmapBR_val_r13[CC_id], 2 * sizeof(uint8_t));
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.size = 2;
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.bits_unused = 6;
+              }
+              else
+              {
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
+                        = SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
+
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.buf = calloc(5, sizeof(uint8_t));
+                  memmove(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.buf, &configuration->fdd_DownlinkOrTddSubframeBitmapBR_val_r13[CC_id], 5 * sizeof(uint8_t));
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.size = 5;
+                  sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.bits_unused = 0;
+              }
 
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf = calloc(2, sizeof(uint8_t));
-              memmove(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf, &configuration->fdd_DownlinkOrTddSubframeBitmapBR_val_r13[CC_id], 2 * sizeof(uint8_t));
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.size = 2;
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.bits_unused = 6;
           }
           else
           {
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
-                      = SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
-
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.buf = calloc(5, sizeof(uint8_t));
-              memmove(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.buf, &configuration->fdd_DownlinkOrTddSubframeBitmapBR_val_r13[CC_id], 5 * sizeof(uint8_t));
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.size = 5;
-              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.bits_unused = 0;
+              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
           }
 
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_UplinkSubframeBitmapBR_r13 = calloc(1, sizeof(BIT_STRING_t));
-- 
2.26.2