Revert some temporary changes and add comment.

openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c

@@ -1353,18 +1353,6 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
 #else
     int off = 0;
 #endif
-    // TODO this is temporary change to get message5 should revert.
-    double p_shift=0.00476190476190476;
-    short * IQ_temp = (short*)&gNB->pusch_vars[ulsch_id]->rxdataF_comp[0][rel15_ul->start_symbol_index * (off + rel15_ul->rb_size * NR_NB_SC_PER_RB)];
-    double ttt[2];
-    if(rel15_ul->num_dmrs_cdm_grps_no_data==1){
-      for(int pp=0; pp< rel15_ul->nr_of_symbols * rel15_ul->rb_size * NR_NB_SC_PER_RB;pp++){
-        ttt[0]=(double)IQ_temp[pp*2]*cos(pp*p_shift) - (double)IQ_temp[pp*2+1]*sin(pp*p_shift);
-        ttt[1]=(double)IQ_temp[pp*2]*sin(pp*p_shift) + (double)IQ_temp[pp*2+1]*cos(pp*p_shift);
-        IQ_temp[pp*2]=(short)ttt[0];
-        IQ_temp[pp*2+1]=(short)ttt[1];
-      }
-    }
     uint32_t rxdataF_ext_offset = 0;
     for(uint8_t i =rel15_ul->start_symbol_index; i< (rel15_ul->start_symbol_index + rel15_ul->nr_of_symbols);i++) {
       start_meas(&gNB->ulsch_llr_stats);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -668,8 +668,6 @@ void pf_ul(module_id_t module_id,
     NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
     if(sched_ctrl->ra_state==1) continue;
     int rbStart = NRRIV2PRBOFFSET(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
-    // TODO this is temporary change to get message5 should revert.
-    rbStart+=27;
     const uint16_t bwpSize = NRRIV2BW(sched_ctrl->active_ubwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
 
     /* Calculate throughput */
@@ -739,7 +737,7 @@ void pf_ul(module_id_t module_id,
 
     /* Calculate TBS from MCS */
     NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
-    const int mcs = 4; // TODO This is temporary change to get message5 stable. should revert.
+    const int mcs = 9;
     sched_pusch->mcs = mcs;
     sched_pusch->R = nr_get_code_rate_ul(mcs, ps->mcs_table);
     sched_pusch->Qm = nr_get_Qm_ul(mcs, ps->mcs_table);

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c

@@ -50,6 +50,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
     return;
   }
 
+  /* Check D/C bit inly DRBs */
   if ((entity->type == NR_PDCP_DRB_AM || entity->type == NR_PDCP_DRB_UM) && !(buffer[0] & 0x80)) {
     LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
     exit(1);