fixing bugs intoduced after fapi implementation

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -356,7 +356,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
 
   G = nr_get_G(nb_rb, number_symbols, nb_re_dmrs, length_dmrs, Qm, n_layers);
 
-  LOG_D(PHY,"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_symb_sch %d nb_rb %d\n",harq_pid,A,G, mcs, n_layers, nb_symb_sch,nb_rb);
+  LOG_D(PHY,"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_symb_sch %d nb_rb %d, nb_re_dmrs %d, Qm %d, n_layers %d\n",harq_pid,A,G, mcs, n_layers, nb_symb_sch,nb_rb, nb_re_dmrs, Qm, n_layers);
 
   if (harq_process->round == 0) {
 

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c

@@ -247,7 +247,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN);
 
-  LOG_D(PHY,"ulsch coding nb_rb %d nb_symb_sch %d nb_re_dmrs %d, length_dmrs %d\n", nb_rb,nb_symb_sch, nb_re_dmrs,length_dmrs);
+  LOG_D(PHY,"ulsch coding nb_rb %d nb_symb_sch %d nb_re_dmrs %d, length_dmrs %d, harq_process->Nl = %d\n", nb_rb,nb_symb_sch, nb_re_dmrs,length_dmrs, harq_process->Nl);
 
 
   G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,mod_order,harq_process->Nl);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -231,7 +231,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
   int Nid_cell = 0; // [hna] shouldn't be a local variable (should be signaled)
 
   mapping_type = gNB->pusch_config.pusch_TimeDomainResourceAllocation[0]->mappingType;
-  gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->nb_re_dmrs = 0;
+  gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs = 0;
 
   for (l = 0; l < NR_SYMBOLS_PER_SLOT; l++)
       number_dmrs_symbols += is_dmrs_symbol(l,
@@ -245,15 +245,16 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
                                             mapping_type,
                                             frame_parms->ofdm_symbol_size);
 
-  gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->nb_re_dmrs = ((gNB->dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)?6:4)*number_dmrs_symbols;
+  gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs = ((gNB->dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)?6:4)*number_dmrs_symbols;
 
   G = nr_get_G(nfapi_ulsch_pdu_rel15->number_rbs,
                nfapi_ulsch_pdu_rel15->number_symbols,
-               gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->nb_re_dmrs,
+               gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs,
                nfapi_ulsch_pdu_rel15->length_dmrs,
                nfapi_ulsch_pdu_rel15->Qm,
                nfapi_ulsch_pdu_rel15->n_layers);
 
+
   //----------------------------------------------------------
   //------------------- ULSCH unscrambling -------------------
   //----------------------------------------------------------
@@ -389,7 +390,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 	LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_UL_CONFIG_PUSCH_PDU_TYPE\n",frame_rx,slot_rx);
 
 	nfapi_nr_pusch_pdu_t  *pusch_pdu = &UL_tti_req->pdus_list[0].pusch_pdu;
-	nr_fill_ulsch(gNB,frame_rx,slot_rx,pusch_pdu);      
+	nr_fill_ulsch(gNB,frame_rx,slot_rx,pusch_pdu);
 	
 	uint8_t UE_id =  find_nr_ulsch(pusch_pdu->rnti,gNB,SEARCH_EXIST);
 	uint8_t harq_pid = pusch_pdu->pusch_data.harq_process_id;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -526,8 +526,8 @@ void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
     //pusch_pdu->tx_direct_current_location;//The uplink Tx Direct Current location for the carrier. Only values in the value range of this field between 0 and 3299, which indicate the subcarrier index within the carrier corresponding 1o the numerology of the corresponding uplink BWP and value 3300, which indicates "Outside the carrier" and value 3301, which indicates "Undetermined position within the carrier" are used. [TS38.331, UplinkTxDirectCurrentBWP IE]
     pusch_pdu->uplink_frequency_shift_7p5khz = 0;
     //Resource Allocation in time domain
-    pusch_pdu->start_symbol_index = 2;
-    pusch_pdu->nr_of_symbols = 12;
+    pusch_pdu->start_symbol_index = 0;
+    pusch_pdu->nr_of_symbols = 14;
     //Optional Data only included if indicated in pduBitmap
     pusch_pdu->pusch_data.rv_index = 0;
     pusch_pdu->pusch_data.harq_process_id = 0;