Fix develop merge conflicts in the RA-Msg3

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -515,7 +515,7 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
 
   uint8_t sdu_lcids[NB_RB_MAX] = {0};
   uint16_t sdu_lengths[NB_RB_MAX] = {0};
-  int num_sdus, offset = 0, preambleTransMax;
+  int num_sdus, offset = 0;
 
   // Delay init RA procedure to allow the convergence of the IIR filter on PRACH noise measurements at gNB side
   if (!prach_resources->init_msg1) {
@@ -590,9 +590,9 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
         LOG_D(MAC,"(%i): %i\n", k, prach_resources->Msg3[k]);
       }
 
-      // Msg3 was initialized with TBS_max bytes because the mac->RA_Msg3_size will only be known after
+      // Msg3 was initialized with TBS_max bytes because the RA_Msg3_size will only be known after
       // receiving Msg2 (which contains the Msg3 resource reserve).
-      // Msg3 will be transmitted with mac->RA_Msg3_size bytes, removing unnecessary 0s.
+      // Msg3 will be transmitted with RA_Msg3_size bytes, removing unnecessary 0s.
       mac->ulsch_pdu.Pdu_size = TBS_max;
       memcpy(mac->ulsch_pdu.payload, prach_resources->Msg3, TBS_max);
 

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -889,6 +889,15 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
 
           uint16_t TBS_bytes = ulcfg_pdu->pusch_config_pdu.pusch_data.tb_size;
 
+          if (ra->ra_state == WAIT_RAR){
+            memcpy(ulsch_input_buffer, mac->ulsch_pdu.payload, TBS_bytes);
+            printf("\n");
+            LOG_I(MAC,"[RAPROC] Msg3 to be transmitted:\n");
+            for (int k = 0; k < TBS_bytes; k++) {
+              LOG_I(MAC,"(%i): 0x%x\n",k,mac->ulsch_pdu.payload[k]);
+            }
+            printf("\n");
+          } else {
             if (IS_SOFTMODEM_NOS1){
               // Getting IP traffic to be transmitted
               data_existing = nr_ue_get_sdu(mod_id,
@@ -914,7 +923,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
 
               for (int i = 1; i < TBS_bytes; i++) {
                 ulsch_input_buffer[i] = (unsigned char) rand();
-              //printf(" input encoder a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
+              }
             }
           }