add minimum config logging in L2 and L3 for disable log option

openair2/LAYER2/MAC/config.c

@@ -131,7 +131,11 @@ rrc_mac_config_req(
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
 
   if (eNB_flagP==0) {
+#if DISABLE_LOG_X
+    printf("MAC,[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",Mod_idP,eNB_index);
+#else
     LOG_I(MAC,"[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",Mod_idP,eNB_index);
+#endif
 
     if (tdd_Config != NULL) {
       UE_mac_inst[Mod_idP].tdd_Config = tdd_Config;
@@ -174,7 +178,11 @@ rrc_mac_config_req(
   // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
   if (logicalChannelConfig!= NULL) {
     if (eNB_flagP==0) {
+#if DISABLE_LOG_X
+      printf("MAC,[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",Mod_idP,eNB_index);
+#else
       LOG_I(MAC,"[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",Mod_idP,eNB_index);
+#endif
       UE_mac_inst[Mod_idP].logicalChannelConfig[logicalChannelIdentity]=logicalChannelConfig;
       UE_mac_inst[Mod_idP].scheduling_info.Bj[logicalChannelIdentity]=0; // initilize the bucket for this lcid
 
@@ -208,7 +216,11 @@ rrc_mac_config_req(
 
   if (mac_MainConfig != NULL) {
     if (eNB_flagP==0) {
+#if DISABLE_LOG_X
+      printf("MAC,[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",Mod_idP,eNB_index);
+#else
       LOG_I(MAC,"[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",Mod_idP,eNB_index);
+#endif
       UE_mac_inst[Mod_idP].macConfig=mac_MainConfig;
       UE_mac_inst[Mod_idP].measGapConfig=measGapConfig;
 
@@ -427,7 +439,11 @@ rrc_mac_config_req(
       // store the previous rnti in case of failure, and set thenew rnti
       UE_mac_inst[Mod_idP].crnti_before_ho = UE_mac_inst[Mod_idP].crnti;
       UE_mac_inst[Mod_idP].crnti = ((mobilityControlInfo->newUE_Identity.buf[0])|(mobilityControlInfo->newUE_Identity.buf[1]<<8));
+#if DISABLE_LOG_X
+      printf("MAC,[UE %d] Received new identity %x from %d\n", Mod_idP, UE_mac_inst[Mod_idP].crnti, eNB_index);
+#else
       LOG_I(MAC,"[UE %d] Received new identity %x from %d\n", Mod_idP, UE_mac_inst[Mod_idP].crnti, eNB_index);
+#endif
       UE_mac_inst[Mod_idP].rach_ConfigDedicated = malloc(sizeof(*mobilityControlInfo->rach_ConfigDedicated));
 
       if (mobilityControlInfo->rach_ConfigDedicated) {

openair2/LAYER2/MAC/rar_tools.c

@@ -170,7 +170,11 @@ ue_process_rar(
 		}
 
 		if (rarh->E == 0) {
+#if DISABLE_LOG_X
+		  printf("PHY,No RAR found with the intended RAPID. The closest RAPID in all RARs is %d\n", best_rx_rapid);
+#else
           LOG_I(PHY, "No RAR found with the intended RAPID. The closest RAPID in all RARs is %d\n", best_rx_rapid);
+#endif
 			break;
 		} else {
 			rarh++;

openair2/LAYER2/MAC/ue_procedures.c

@@ -91,7 +91,11 @@ void ue_init_mac(module_id_t module_idP)
 {
   int i;
   // default values as deined in 36.331 sec 9.2.2
+#if DISABLE_LOG_X
+  printf("MAC,[UE%d] Applying default macMainConfig\n",module_idP);
+#else
   LOG_I(MAC,"[UE%d] Applying default macMainConfig\n",module_idP);
+#endif
   //UE_mac_inst[module_idP].scheduling_info.macConfig=NULL;
   UE_mac_inst[module_idP].numerology_index = 0;
   UE_mac_inst[module_idP].ttis_per_subframe = 1;
@@ -321,8 +325,11 @@ uint32_t ue_get_SR(module_id_t module_idP,int CC_id,frame_t frameP,uint8_t eNB_i
           UE_mac_inst[module_idP].physicalConfigDedicated = NULL;
           UE_mac_inst[module_idP].ul_active=0;
           UE_mac_inst[module_idP].BSR_reporting_active=BSR_TRIGGER_NONE;
-
+#if DISABLE_LOG_X
+          printf("MAC,[UE %d] Release all SRs \n", module_idP);
+#else
           LOG_I(MAC,"[UE %d] Release all SRs \n", module_idP);
+#endif
       }
     UE_mac_inst[module_idP].scheduling_info.SR_pending=0;
     UE_mac_inst[module_idP].scheduling_info.SR_COUNTER=0;
@@ -385,12 +392,20 @@ ue_send_sdu(
     //    printf("ce %d : %d\n",i,rx_ces[i]);
     switch (rx_ces[i]) {
     case UE_CONT_RES:
-
+#if DISABLE_LOG_X
+      printf("MAC,[UE %d][RAPROC] Frame %d : received contention resolution msg: %x.%x.%x.%x.%x.%x, Terminating RA procedure\n",
+            module_idP,frameP,payload_ptr[0],payload_ptr[1],payload_ptr[2],payload_ptr[3],payload_ptr[4],payload_ptr[5]);
+#else
       LOG_I(MAC,"[UE %d][RAPROC] Frame %d : received contention resolution msg: %x.%x.%x.%x.%x.%x, Terminating RA procedure\n",
             module_idP,frameP,payload_ptr[0],payload_ptr[1],payload_ptr[2],payload_ptr[3],payload_ptr[4],payload_ptr[5]);
+#endif
 
       if (UE_mac_inst[module_idP].RA_active == 1) {
+#if DISABLE_LOG_X
+        printf("MAC,[UE %d][RAPROC] Frame %d : Clearing RA_active flag\n", module_idP, frameP);
+#else
         LOG_I(MAC,"[UE %d][RAPROC] Frame %d : Clearing RA_active flag\n", module_idP, frameP);
+#endif
         UE_mac_inst[module_idP].RA_active=0;
         // check if RA procedure has finished completely (no contention)
         tx_sdu = &UE_mac_inst[module_idP].CCCH_pdu.payload[3];
@@ -405,8 +420,11 @@ ue_send_sdu(
             VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SEND_SDU, VCD_FUNCTION_OUT);
             return;
           }
-
+#if DISABLE_LOG_X
+        printf("MAC,[UE %d][RAPROC] Frame %d : Clearing contention resolution timer\n", module_idP, frameP);
+#else
         LOG_I(MAC,"[UE %d][RAPROC] Frame %d : Clearing contention resolution timer\n", module_idP, frameP);
+#endif
         UE_mac_inst[module_idP].RA_contention_resolution_timer_active = 0;
         mac_xface->ra_succeeded(module_idP,CC_id,eNB_index);
       }
@@ -1961,7 +1979,11 @@ ue_scheduler(
     break;
 
   case RRC_HO_STARTED:
+#if DISABLE_LOG_X
+        printf("MAC,RRC handover, Instruct PHY to start the contention-free PRACH and synchronization\n");
+#else
     LOG_I(MAC,"RRC handover, Instruct PHY to start the contention-free PRACH and synchronization\n");
+#endif
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SCHEDULER, VCD_FUNCTION_OUT);
 #if UE_TIMING_TRACE
     stop_meas(&UE_mac_inst[module_idP].ue_scheduler);
@@ -1994,8 +2016,13 @@ ue_scheduler(
   if (isNewTxSubframe)
 //#endif
    {
+#if DISABLE_LOG_X
+    printf("MAC,Frame %d: Contention resolution timer %d/%ld\n",txFrameP,UE_mac_inst[module_idP].RA_contention_resolution_cnt,
+          ((1+rach_ConfigCommon->ra_SupervisionInfo.mac_ContentionResolutionTimer)<<3));
+#else
     LOG_I(MAC,"Frame %d: Contention resolution timer %d/%ld\n",txFrameP,UE_mac_inst[module_idP].RA_contention_resolution_cnt,
           ((1+rach_ConfigCommon->ra_SupervisionInfo.mac_ContentionResolutionTimer)<<3));
+#endif
 
     UE_mac_inst[module_idP].RA_contention_resolution_cnt++;
 
@@ -2422,8 +2449,13 @@ boolean_t  update_bsr(module_id_t module_idP, frame_t frameP, sub_frame_t subfra
 		  bsr_regular_triggered = TRUE;
 
 		  if ((UE_mac_inst[module_idP].BSR_reporting_active & BSR_TRIGGER_REGULAR) == 0) {
+#if DISABLE_LOG_X
+		        printf("MAC,[UE %d] PDCCH Tick : MAC BSR Triggered ReTxBSR Timer expiry at frame %d subframe %d\n",
+                                  module_idP, frameP, subframeP);
+#else
 		        LOG_I(MAC,"[UE %d] PDCCH Tick : MAC BSR Triggered ReTxBSR Timer expiry at frame %d subframe %d\n",
 		                          module_idP, frameP, subframeP);
+#endif
 		  }
 
 	  }

openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c

@@ -169,7 +169,11 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
     LOG_I(PDCP, "Received sequence number successfuly marked\n");
 #endif
   } else {
+#if DISABLE_LOG_X
+    printf("PDCP,Cannot mark received sequence number on the bitmap!\n");
+#else
     LOG_W(PDCP, "Cannot mark received sequence number on the bitmap!\n");
+#endif
   }
 
   /*

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_init.c

@@ -200,6 +200,9 @@ rlc_am_configure(
   const uint32_t                t_status_prohibitP)
 {
   if (rlc_pP->configured == TRUE) {
+#if DISABLE_LOG_X
+          printf("RLC,[RECONFIGURE] AM Id%d Isdata%d\n",rlc_pP->rb_id, (int)rlc_pP->is_data_plane);
+#else
     LOG_I(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[RECONFIGURE] max_retx_threshold %d poll_pdu %d poll_byte %d t_poll_retransmit %d t_reordering %d t_status_prohibit %d\n",
           PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
           max_retx_thresholdP,
@@ -208,6 +211,7 @@ rlc_am_configure(
           t_poll_retransmitP,
           t_reorderingP,
           t_status_prohibitP);
+#endif
 
     rlc_pP->max_retx_threshold = max_retx_thresholdP;
     rlc_pP->poll_pdu           = poll_pduP;
@@ -218,6 +222,9 @@ rlc_am_configure(
     rlc_pP->t_status_prohibit.ms_duration   = t_status_prohibitP;
 
   } else {
+#if DISABLE_LOG_X
+          printf("RLC,[CONFIGURE] AM Id%d Isdata%d\n",rlc_pP->rb_id, (int)rlc_pP->is_data_plane);
+#else
     LOG_I(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[CONFIGURE] max_retx_threshold %d poll_pdu %d poll_byte %d t_poll_retransmit %d t_reordering %d t_status_prohibit %d\n",
           PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
           max_retx_thresholdP,
@@ -226,6 +233,7 @@ rlc_am_configure(
           t_poll_retransmitP,
           t_reorderingP,
           t_status_prohibitP);
+#endif
 
     rlc_pP->max_retx_threshold = max_retx_thresholdP;
     rlc_pP->poll_pdu           = poll_pduP;

openair2/LAYER2/RLC/rlc_rrc.c

@@ -195,7 +195,11 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP
 
         case SRB_ToAddMod__rlc_Config_PR_defaultValue:
 //#warning TO DO SRB_ToAddMod__rlc_Config_PR_defaultValue
+#if DISABLE_LOG_X
+          printf("RRC,RLC SRB1 is default value !!\n");
+#else
           LOG_I(RRC, "RLC SRB1 is default value !!\n");
+#endif
           struct RLC_Config__am  *  config_am_pP = &srb_toaddmod_p->rlc_Config->choice.explicitValue.choice.am;
           config_am_pP->dl_AM_RLC.t_Reordering     = T_Reordering_ms35;
           config_am_pP->dl_AM_RLC.t_StatusProhibit = T_StatusProhibit_ms0;
@@ -670,12 +674,21 @@ rlc_union_t* rrc_rlc_add_rlc   (
       rlc_union_p->mode = rlc_modeP;
       return rlc_union_p;
     } else {
+#if DISABLE_LOG_X
+      printf(PROTOCOL_CTXT_FMT"[%s %u] rrc_rlc_add_rlc FAILED %s (add by RB_id=%d; add by LC_id=%d)\n",
+              PROTOCOL_CTXT_ARGS(ctxt_pP),
+              (srb_flagP) ? "SRB" : "DRB",
+              rb_idP,
+              (srb_flagP) ? "SRB" : "DRB",
+              h_rc, h_lcid_rc);
+#else
       LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] rrc_rlc_add_rlc FAILED %s (add by RB_id=%d; add by LC_id=%d)\n",
             PROTOCOL_CTXT_ARGS(ctxt_pP),
             (srb_flagP) ? "SRB" : "DRB",
             rb_idP,
             (srb_flagP) ? "SRB" : "DRB",
             h_rc, h_lcid_rc);
+#endif
       free(rlc_union_p);
       rlc_union_p = NULL;
       return NULL;

openair2/RRC/LITE/L2_interface.c

@@ -674,12 +674,21 @@ void rrc_out_of_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index
 {
   //-------------------------------------------------------------------------------------------//
   if (UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt>10)
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
+            Mod_idP,frameP,eNB_index,
+            UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active,
+            UE_rrc_inst[Mod_idP].Info[eNB_index].T310_cnt,
+            UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt,
+            UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt);
+#else
     LOG_I(RRC,"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
 	  Mod_idP,frameP,eNB_index,
 	  UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active,
 	  UE_rrc_inst[Mod_idP].Info[eNB_index].T310_cnt,
 	  UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt,
 	  UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt);
+#endif
   
 #if defined(ENABLE_ITTI)
   {

openair2/RRC/LITE/rrc_UE.c

@@ -387,8 +387,13 @@ void rrc_ue_generate_RRCConnectionRequest( const protocol_ctxt_t* const ctxt_pP,
         (uint8_t*)UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.Payload,
         rv);
 
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d] : Frame %d, Logical Channel UL-CCCH (SRB0), Generating RRCConnectionRequest (bytes %d, eNB %d)\n",
+          ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.payload_size, eNB_index);
+#else
     LOG_I(RRC,"[UE %d] : Frame %d, Logical Channel UL-CCCH (SRB0), Generating RRCConnectionRequest (bytes %d, eNB %d)\n",
           ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.payload_size, eNB_index);
+#endif
 
     for (i=0; i<UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.payload_size; i++) {
       LOG_T(RRC,"%x.",UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.Payload[i]);
@@ -455,8 +460,13 @@ static void rrc_ue_generate_RRCConnectionSetupComplete( const protocol_ctxt_t* c
 
   size = do_RRCConnectionSetupComplete(ctxt_pP->module_id, buffer, Transaction_id, nas_msg_length, nas_msg);
 
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionSetupComplete (bytes%d, eNB %d)\n",
+        ctxt_pP->module_id,ctxt_pP->frame, size, eNB_index);
+#else
   LOG_I(RRC,"[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionSetupComplete (bytes%d, eNB %d)\n",
         ctxt_pP->module_id,ctxt_pP->frame, size, eNB_index);
+#endif
   LOG_D(RLC,
         "[FRAME %05d][RRC_UE][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (RRCConnectionSetupComplete to eNB %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
         ctxt_pP->frame, ctxt_pP->module_id+NB_eNB_INST, size, eNB_index, rrc_mui, ctxt_pP->module_id+NB_eNB_INST, DCCH);
@@ -476,8 +486,13 @@ static void rrc_ue_generate_RRCConnectionReconfigurationComplete( const protocol
 
   uint8_t buffer[32], size;
   size = do_RRCConnectionReconfigurationComplete(ctxt_pP, buffer, Transaction_id);
+#if DISABLE_LOG_X
+    printf("RRC,Logical Channel UL-DCCH (SRB1), Generating RRCConnectionReconfigurationComplete (bytes %d, eNB_index %d)\n",
+        size, eNB_index);
+#else
   LOG_I(RRC,PROTOCOL_RRC_CTXT_UE_FMT" Logical Channel UL-DCCH (SRB1), Generating RRCConnectionReconfigurationComplete (bytes %d, eNB_index %d)\n",
         PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), size, eNB_index);
+#endif
   LOG_D(RLC,
         "[FRAME %05d][RRC_UE][INST %02d][][--- PDCP_DATA_REQ/%d Bytes (RRCConnectionReconfigurationComplete to eNB %d MUI %d) --->][PDCP][INST %02d][RB %02d]\n",
         ctxt_pP->frame,
@@ -653,8 +668,11 @@ rrc_ue_establish_srb1(
   //  memcpy(&UE_rrc_inst[ue_mod_idP].Srb1[eNB_index].Srb_info.Lchan_desc[0],&DCCH_LCHAN_DESC,LCHAN_DESC_SIZE);
   //  memcpy(&UE_rrc_inst[ue_mod_idP].Srb1[eNB_index].Srb_info.Lchan_desc[1],&DCCH_LCHAN_DESC,LCHAN_DESC_SIZE);
 
-
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d], CONFIG_SRB1 %d corresponding to eNB_index %d\n", ue_mod_idP,lchan_id,eNB_index);
+#else
   LOG_I(RRC,"[UE %d], CONFIG_SRB1 %d corresponding to eNB_index %d\n", ue_mod_idP,lchan_id,eNB_index);
+#endif
 
   //rrc_pdcp_config_req (ue_mod_idP+NB_eNB_INST, frameP, 0, CONFIG_ACTION_ADD, lchan_id,UNDEF_SECURITY_MODE);
   //  rrc_rlc_config_req(ue_mod_idP+NB_eNB_INST,frameP,0,CONFIG_ACTION_ADD,lchan_id,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
@@ -687,8 +705,11 @@ rrc_ue_establish_srb2(
   //  memcpy(&UE_rrc_inst[ue_mod_idP].Srb2[eNB_index].Srb_info.Lchan_desc[0],&DCCH_LCHAN_DESC,LCHAN_DESC_SIZE);
   //  memcpy(&UE_rrc_inst[ue_mod_idP].Srb2[eNB_index].Srb_info.Lchan_desc[1],&DCCH_LCHAN_DESC,LCHAN_DESC_SIZE);
 
-
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d], CONFIG_SRB2 %d corresponding to eNB_index %d\n",ue_mod_idP,lchan_id,eNB_index);
+#else
   LOG_I(RRC,"[UE %d], CONFIG_SRB2 %d corresponding to eNB_index %d\n",ue_mod_idP,lchan_id,eNB_index);
+#endif
 
   //rrc_pdcp_config_req (ue_mod_idP+NB_eNB_INST, frameP, 0, CONFIG_ACTION_ADD, lchan_id, UNDEF_SECURITY_MODE);
   //  rrc_rlc_config_req(ue_mod_idP+NB_eNB_INST,frameP,0,CONFIG_ACTION_ADD,lchan_id,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
@@ -717,9 +738,13 @@ rrc_ue_establish_drb(
   (void)ip_addr_offset3;
   (void)ip_addr_offset4;
 #endif
-
+#if DISABLE_LOG_X
+    printf("RRC,[UE %d] Frame %d: processing RRCConnectionReconfiguration: reconfiguring DRB %ld/LCID %d\n",
+        ue_mod_idP, frameP, DRB_config->drb_Identity, (int)*DRB_config->logicalChannelIdentity);
+#else
   LOG_I(RRC,"[UE %d] Frame %d: processing RRCConnectionReconfiguration: reconfiguring DRB %ld/LCID %d\n",
         ue_mod_idP, frameP, DRB_config->drb_Identity, (int)*DRB_config->logicalChannelIdentity);
+#endif
   /*
   rrc_pdcp_config_req (ue_mod_idP+NB_eNB_INST, frameP, 0, CONFIG_ACTION_ADD,
                              (eNB_index * NB_RB_MAX) + *DRB_config->logicalChannelIdentity, UNDEF_SECURITY_MODE);
@@ -1330,9 +1355,13 @@ rrc_ue_process_radioResourceConfigDedicated(
           } else {
             SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
           }
-
+#if DISABLE_LOG_X
+          printf("RRC,[FRAME %05d][RRC_UE][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 eNB %d) --->][MAC_UE][MOD %02d][]\n",
+                ctxt_pP->frame, ctxt_pP->module_id, eNB_index, ctxt_pP->module_id);
+#else
           LOG_I(RRC, "[FRAME %05d][RRC_UE][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 eNB %d) --->][MAC_UE][MOD %02d][]\n",
                 ctxt_pP->frame, ctxt_pP->module_id, eNB_index, ctxt_pP->module_id);
+#endif
           rrc_mac_config_req(ctxt_pP->module_id,0,ENB_FLAG_NO,0,eNB_index,
                              (RadioResourceConfigCommonSIB_t *)NULL,
                              UE_rrc_inst[ctxt_pP->module_id].physicalConfigDedicated[eNB_index],
@@ -1567,9 +1596,13 @@ rrc_ue_process_securityModeCommand(
   // SecurityModeCommand_t SecurityModeCommand;
   uint8_t buffer[200];
   int i, securityMode;
-
+#if DISABLE_LOG_X
+  printf("RRC,[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing securityModeCommand (eNB %d)\n",
+        ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#else
   LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing securityModeCommand (eNB %d)\n",
         ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#endif
 
   switch (securityModeCommand->criticalExtensions.choice.c1.choice.securityModeCommand_r8.securityConfigSMC.securityAlgorithmConfig.cipheringAlgorithm) {
   case CipheringAlgorithm_r12_eea0:
@@ -1693,9 +1726,13 @@ rrc_ue_process_securityModeCommand(
       ul_dcch_msg.message.choice.c1.choice.securityModeComplete.rrc_TransactionIdentifier = securityModeCommand->rrc_TransactionIdentifier;
       ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.present = SecurityModeCommand__criticalExtensions_PR_c1;
       ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.choice.securityModeComplete_r8.nonCriticalExtension =NULL;
-
+#if DISABLE_LOG_X
+      printf("RRC,[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), encoding securityModeComplete (eNB %d)\n",
+            ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#else
       LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), encoding securityModeComplete (eNB %d)\n",
             ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#endif
 
       enc_rval = uper_encode_to_buffer(&asn_DEF_UL_DCCH_Message,
                                        (void*)&ul_dcch_msg,
@@ -1768,10 +1805,17 @@ rrc_ue_process_ueCapabilityEnquiry(
   uint8_t buffer[200];
   int i;
 
+#if DISABLE_LOG_X
+      printf("RRC,[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing UECapabilityEnquiry (eNB %d)\n",
+        ctxt_pP->module_id,
+        ctxt_pP->frame,
+        eNB_index);
+#else
   LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing UECapabilityEnquiry (eNB %d)\n",
         ctxt_pP->module_id,
         ctxt_pP->frame,
         eNB_index);
+#endif
 
 
   memset((void *)&ul_dcch_msg,0,sizeof(UL_DCCH_Message_t));
@@ -1866,8 +1910,13 @@ rrc_ue_process_rrcConnectionReconfiguration(
 //-----------------------------------------------------------------------------
 {
 
+#if DISABLE_LOG_X
+      printf("RRC,[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing RRCConnectionReconfiguration (eNB %d)\n",
+        ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#else
   LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing RRCConnectionReconfiguration (eNB %d)\n",
         ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+#endif
 
   if (rrcConnectionReconfiguration->criticalExtensions.present == RRCConnectionReconfiguration__criticalExtensions_PR_c1) {
     if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.present ==
@@ -2412,8 +2461,13 @@ rrc_ue_decode_dcch(
         break;
 
       case DL_DCCH_MessageType__c1_PR_securityModeCommand:
+#if DISABLE_LOG_X
+      printf("RRC,[UE %d] Received securityModeCommand (eNB %d)\n",
+              ctxt_pP->module_id, eNB_indexP);
+#else
         LOG_I(RRC, "[UE %d] Received securityModeCommand (eNB %d)\n",
               ctxt_pP->module_id, eNB_indexP);
+#endif
         rrc_ue_process_securityModeCommand(
           ctxt_pP,
           &dl_dcch_msg->message.choice.c1.choice.securityModeCommand,
@@ -2421,9 +2475,15 @@ rrc_ue_decode_dcch(
         break;
 
       case DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry:
+#if DISABLE_LOG_X
+      printf("RRC,[UE %d] Received Capability Enquiry (eNB %d)\n",
+              ctxt_pP->module_id,
+              eNB_indexP);
+#else
         LOG_I(RRC, "[UE %d] Received Capability Enquiry (eNB %d)\n",
               ctxt_pP->module_id,
               eNB_indexP);
+#endif
         rrc_ue_process_ueCapabilityEnquiry(
           ctxt_pP,
           &dl_dcch_msg->message.choice.c1.choice.ueCapabilityEnquiry,

openair2/RRC/LITE/rrc_common.c

@@ -442,7 +442,11 @@ rrc_rx_tx(
     if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].SIStatus&2)>0) {
       if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt
           == N310[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.n310]) {
+#if DISABLE_LOG_X
+    printf("RRC,Activating T310\n");
+#else
 	LOG_I(RRC,"Activating T310\n");
+#endif
         UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 1;
       }
     } else { // in case we have not received SIB2 yet
@@ -469,7 +473,11 @@ rrc_rx_tx(
         UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 0;
         rrc_t310_expiration (ctxt_pP, enb_indexP);
         VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+#if DISABLE_LOG_X
+    printf("RRC,Returning RRC_PHY_RESYNCH: T310 expired\n");
+#else
 	LOG_I(RRC,"Returning RRC_PHY_RESYNCH: T310 expired\n"); 
+#endif
         return RRC_PHY_RESYNCH;
       }