From 80941b0c311905954c8f6818017df277cbbe537c Mon Sep 17 00:00:00 2001
From: rmagueta <rmagueta@allbesmart.pt>
Date: Mon, 29 Mar 2021 16:43:55 +0100
Subject: [PATCH] Minor LOG improvements

---
 openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c  | 29 +++++++++----------
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c |  3 +-
 .../LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c   |  8 ++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index a0ed18e135..f647a8585b 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -2372,7 +2372,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
       rnti = mac->crnti;
     }
 
-    // FIXME: To be removed
+#ifdef DEBUG_RAR
     LOG_I(NR_MAC, "rarh->E = 0x%x\n", rarh->E);
     LOG_I(NR_MAC, "rarh->T = 0x%x\n", rarh->T);
     LOG_I(NR_MAC, "rarh->RAPID = 0x%x (%i)\n", rarh->RAPID, rarh->RAPID);
@@ -2390,20 +2390,19 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
     LOG_I(NR_MAC, "rar->TCRNTI_1 = 0x%x\n", rar->TCRNTI_1);
     LOG_I(NR_MAC, "rar->TCRNTI_2 = 0x%x\n", rar->TCRNTI_2);
 
-  //#ifdef DEBUG_RAR
-  LOG_I(NR_MAC, "In %s:[%d.%d]: [UE %d] Received RAR with t_alloc %d f_alloc %d ta_command %d mcs %d freq_hopping %d tpc_command %d t_crnti %x \n",
-    __FUNCTION__,
-    frame,
-    slot,
-    mod_id,
-    rar_grant.Msg3_t_alloc,
-    rar_grant.Msg3_f_alloc,
-    ul_time_alignment->ta_command,
-    rar_grant.mcs,
-    rar_grant.freq_hopping,
-    tpc_command,
-    ra->t_crnti);
-  //#endif
+    LOG_I(NR_MAC, "In %s:[%d.%d]: [UE %d] Received RAR with t_alloc %d f_alloc %d ta_command %d mcs %d freq_hopping %d tpc_command %d t_crnti %x \n",
+      __FUNCTION__,
+      frame,
+      slot,
+      mod_id,
+      rar_grant.Msg3_t_alloc,
+      rar_grant.Msg3_f_alloc,
+      ul_time_alignment->ta_command,
+      rar_grant.mcs,
+      rar_grant.freq_hopping,
+      tpc_command,
+      ra->t_crnti);
+#endif
 
     // Schedule Msg3
     ret = nr_ue_pusch_scheduler(mac, is_Msg3, frame, slot, &frame_tx, &slot_tx, rar_grant.Msg3_t_alloc);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 73919447f5..629a644ebc 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1519,7 +1519,7 @@ void nr_fill_rar(uint8_t Mod_idP,
   rar->UL_GRANT_3 = (uint8_t) (ul_grant >> 8) & 0xff;
   rar->UL_GRANT_4 = (uint8_t) ul_grant & 0xff;
 
-  // FIXME: To be removed
+#ifdef DEBUG_RAR
   //LOG_I(NR_MAC, "rarbi->E = 0x%x\n", rarbi->E);
   //LOG_I(NR_MAC, "rarbi->T = 0x%x\n", rarbi->T);
   //LOG_I(NR_MAC, "rarbi->R = 0x%x\n", rarbi->R);
@@ -1541,6 +1541,7 @@ void nr_fill_rar(uint8_t Mod_idP,
 
   LOG_I(NR_MAC, "rar->TCRNTI_1 = 0x%x\n", rar->TCRNTI_1);
   LOG_I(NR_MAC, "rar->TCRNTI_2 = 0x%x\n", rar->TCRNTI_2);
+#endif
 
   int mcs = (unsigned char) (rar->UL_GRANT_4 >> 4);
   // time alloc
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 98a14e34c8..a69f63365e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -249,7 +249,7 @@ void nr_process_mac_pdu(
 
             // Check if it is a valid CCCH1 message, we get all 00's messages very often
             if (pdu_len != 9) {
-              //LOG_E(MAC, "%s() Invalid CCCH1 message!, pdu_len: %d\n", __func__, pdu_len);
+              LOG_D(NR_MAC, "%s() Invalid CCCH1 message!, pdu_len: %d\n", __func__, pdu_len);
               return;
             }
           } else {
@@ -517,7 +517,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
         // random access pusch with TC-RNTI
         if (ra->rnti != current_rnti) {
           LOG_W(NR_MAC,
-                "expected TC-RNTI %04x to match current RNTI %04x\n",
+                "expected TC_RNTI %04x to match current RNTI %04x\n",
                 ra->rnti,
                 current_rnti);
           continue;
@@ -554,7 +554,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
           LOG_I(NR_MAC,"[RAPROC] RA-Msg3 received (sdu_lenP %d)\n",sdu_lenP);
           LOG_D(NR_MAC,"[RAPROC] Received Msg3:\n");
           for (int k = 0; k < sdu_lenP; k++) {
-            LOG_I(NR_MAC,"(%i): 0x%x\n",k,sduP[k]);
+            LOG_D(NR_MAC,"(%i): 0x%x\n",k,sduP[k]);
           }
 
           // UE Contention Resolution Identity
@@ -567,7 +567,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
           ra->state = Msg4;
           ra->Msg4_frame = ( frameP +2 ) % 1024;
           ra->Msg4_slot = 1;
-          LOG_I(MAC, "Scheduling RA-Msg4 for TC-RNTI %04x (state %d, frame %d, slot %d)\n", ra->rnti, ra->state, ra->Msg4_frame, ra->Msg4_slot);
+          LOG_I(NR_MAC, "Scheduling RA-Msg4 for TC_RNTI %04x (state %d, frame %d, slot %d)\n", ra->rnti, ra->state, ra->Msg4_frame, ra->Msg4_slot);
 
         }
         return;