Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into...

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts

# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1992,9 +1992,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
   // TO DO: Multiplex in the order defined by the logical channel prioritization
   for (lcid = UL_SCH_LCID_SRB1;
        lcid < MAX_LCID; lcid++) {
+    lcid_buffer_occupancy_new = mac_rlc_get_buffer_occupancy_ind(module_idP, mac->crnti, eNB_index, frameP, subframe, ENB_FLAG_NO, lcid);
 
-      if( mac_rlc_get_buffer_occupancy_ind(module_idP, mac->crnti, eNB_index, frameP, subframe, ENB_FLAG_NO, lcid) ) {
-
+    if(lcid_buffer_occupancy_new) {
         buflen_remain =
           buflen - (total_rlc_pdu_header_len + sdu_length_total + MAX_RLC_SDU_SUBHEADER_SIZE);
         LOG_D(NR_MAC,
@@ -2031,12 +2031,13 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
           num_sdus++;
         }
 
+        /* Get updated BO after multiplexing this PDU */
+        lcid_buffer_occupancy_new = mac_rlc_get_buffer_occupancy_ind(module_idP,mac->crnti,eNB_index,frameP, subframe, ENB_FLAG_NO, lcid);
         buflen_remain =
                   buflen - (total_rlc_pdu_header_len + sdu_length_total + MAX_RLC_SDU_SUBHEADER_SIZE);
       }
     }
-
-}
+  }
 
   // Generate ULSCH PDU
   if (num_sdus>0) {
@@ -2052,9 +2053,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
                                          0, // long_bsr
                                          0, // post_padding 
                                          buflen);  // TBS in bytes
-  }
-  else
+  } else {
     return 0;
+  }
 
   // Padding: fill remainder of ULSCH with 0
   if (buflen - payload_offset > 0){

openair2/RRC/NR/rrc_gNB.c

@@ -2238,7 +2238,10 @@ rrc_gNB_decode_dcch(
                   sdu_sizeP,
                   0,
                   0);
+
+  //if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_NR_UL_DCCH_Message, (void *)ul_dcch_msg);
+  //}
 
   {
     for (i = 0; i < sdu_sizeP; i++) {