Reverting log changes for MR

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2607,8 +2607,7 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
     N_RB_UL = NRRIV2BW(mac->scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
   }
 
-  LOG_D(MAC,"nr_extract_dci_info : dci_pdu %lx, size %d, rnti_type %d, dci_format %d\n",
-        *dci_pdu, dci_size, rnti_type, dci_format);
+  LOG_D(MAC,"nr_extract_dci_info : dci_pdu %lx, size %d\n",*dci_pdu,dci_size);
   switch(dci_format) {
 
   case NR_DL_DCI_FORMAT_1_0:
@@ -2664,7 +2663,7 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
         dci_pdu_rel15 = &mac->def_dci_pdu_rel15[NR_UL_DCI_FORMAT_0_0];
         return 2+nr_extract_dci_info(mac, NR_UL_DCI_FORMAT_0_0, dci_size, rnti, dci_pdu, dci_pdu_rel15);
       }
-#if 1
+#ifdef DEBUG_EXTRACT_DCI
       LOG_D(MAC,"Format indicator %d (%d bits) N_RB_BWP %d => %d (0x%lx)\n",dci_pdu_rel15->format_indicator,1,N_RB,dci_size-pos,*dci_pdu);
 #endif
 
@@ -3803,11 +3802,6 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
 
   LOG_D(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index);
 
-  if (get_softmodem_params()->nsa && mac->crnti == ra->t_crnti)
-  {
-    LOG_D(MAC, "Discarding the received RAR.\n");
-    return -1;
-  }
   while (1) {
     n_subheaders++;
     if (rarh->T == 1) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

@@ -398,9 +398,8 @@ uint32_t schedule_control_sib1(module_id_t module_id,
                          rbSize, nrOfSymbols, N_PRB_DMRS * dmrs_length,0, 0,1) >> 3;
   } while (TBS < gNB_mac->sched_ctrlCommon->num_total_bytes);
 
-  AssertFatal(TBS>=gNB_mac->sched_ctrlCommon->num_total_bytes,
-             "Couldn't allocate (TBS = %d) enough resources for %d bytes in SIB1 PDSCH\n",
-             TBS, gNB_mac->sched_ctrlCommon->num_total_bytes);
+  AssertFatal(TBS>=gNB_mac->sched_ctrlCommon->num_total_bytes,"Couldn't allocate enough resources for %d bytes in SIB1 PDSCH\n",
+              gNB_mac->sched_ctrlCommon->num_total_bytes);
 
   gNB_mac->sched_ctrlCommon->sched_pdsch.rbSize = rbSize;
   gNB_mac->sched_ctrlCommon->sched_pdsch.rbStart = 0;