build ok after merge.

issue still with nr_ulsim (Bus Error on aarch64)

openair1/PHY/INIT/nr_init.c

@@ -696,7 +696,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
   int nb_re_pusch2 = nb_re_pusch + (nb_re_pusch&7);
   
   gNB->pusch_vars = (NR_gNB_PUSCH *)malloc16_clear(gNB->max_nb_pusch * sizeof(NR_gNB_PUSCH));
-  for (int ULSCH_id=0; ULSCH_id<gNB->number_of_nr_ulsch_max; ULSCH_id++) {
+  for (int ULSCH_id=0; ULSCH_id<gNB->max_nb_pusch; ULSCH_id++) {
     NR_gNB_PUSCH *pusch = &gNB->pusch_vars[ULSCH_id];	  
     pusch->rxdataF_ext           = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
     pusch->ul_ch_estimates       = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -206,14 +206,14 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
   }
   else l0 = nb_rb_pusch;  
 
-  LOG_D(PHY, "In %s: ch_offset %d, soffset %d, symbol_offset %d OFDM size %d, Ns = %d, k = %d symbol %d l0 %d l1 %d have_half_prb %d\n",
-        ch_offset, soffset,
+  LOG_D(PHY, "In nr_pusch_channel_estimation: pusch_pdu %p ch_offset %d, soffset %d, symbol_offset %d OFDM size %d, Ns = %d, k = %d symbol %d l0 %d l1 %d have_half_prb %d\n",
+        pusch_pdu,ch_offset, soffset,
         symbol_offset,
         symbolSize,
         Ns,
         k,
         symbol,l0,l1,have_half_prb);
-
+ 
   //------------------generate DMRS------------------//
 
   if(pusch_pdu->ul_dmrs_scrambling_id != gNB->pusch_gold_init[pusch_pdu->scid])  {

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -671,7 +671,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
     notifiedFIFO_elt_t *req = newNotifiedFIFO_elt(sizeof(ldpcDecode_t), id.p, &phy_vars_gNB->respDecode, nr_processULSegment_ptr);
     ldpcDecode_t * rdata=(ldpcDecode_t *) NotifiedFifoData(req);
 #endif
-
+    decParams.R = nr_get_R_ldpc_decoder(pusch_pdu->pusch_data.rv_index, E, decParams.BG, decParams.Z, &harq_process->llrLen, harq_process->round);
     rdata->gNB = phy_vars_gNB;
     rdata->ulsch_harq = harq_process;
     rdata->decoderParms = decParams;

openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c

@@ -325,7 +325,7 @@ void nr_idft(int32_t *z, uint32_t Msc_PUSCH)
 }
 
 
-void nr_ulsch_extract_rbs0(int32_t *rxdataF,
+void nr_ulsch_extract_rbs0(c16_t *rxdataF,
                            int32_t *chF,
 			   int32_t *rxFext,
 			   int32_t *chFext,
@@ -343,7 +343,7 @@ void nr_ulsch_extract_rbs0(int32_t *rxdataF,
   int nb_re_pusch = NR_NB_SC_PER_RB * pusch_pdu->rb_size;
 
 
-  int32_t *rxF        = &rxdataF[rxoffset];
+  int32_t *rxF        = (int32_t*)&rxdataF[rxoffset];
   int32_t *rxF_ext    = &rxFext[0];
   int32_t *ul_ch0     = &chF[choffset]; 
   int32_t *ul_ch0_ext = &chFext[0];
@@ -3181,7 +3181,7 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
   start_meas(&gNB->ulsch_channel_estimation_stats);
   int max_ch = 0;
   for(uint8_t symbol = rel15_ul->start_symbol_index; symbol < (rel15_ul->start_symbol_index + rel15_ul->nr_of_symbols); symbol++) {
-
+ 
     uint8_t dmrs_symbol_flag = (rel15_ul->ul_dmrs_symb_pos >> symbol) & 0x01;
     LOG_D(PHY, "symbol %d, dmrs_symbol_flag :%d\n", symbol, dmrs_symbol_flag);
     if (dmrs_symbol_flag == 1) {

openair1/PHY/defs_gNB.h

@@ -775,8 +775,6 @@ typedef struct PHY_VARS_gNB_s {
   int nbDecode;
   int use_pusch_tp;
   int num_pusch_symbols_per_thread;
-  int number_of_nr_dlsch_max;
-  int number_of_nr_ulsch_max;
   void *scopeData;
   /// structure for analyzing high-level RT measurements
   rt_L1_profiling_t rt_L1_profiling; 

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -399,7 +399,12 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
   nfapi_nr_pusch_pdu_t *pusch_pdu = &gNB->ulsch[ULSCH_id].harq_process->ulsch_pdu;
 
   uint16_t nb_re_dmrs;
+
+#ifndef TASK_MANAGER
+#ifndef OMP_TP
   uint8_t enable_ldpc_offload = gNB->ldpc_offload_flag;
+#endif
+#endif
   uint16_t start_symbol = pusch_pdu->start_symbol_index;
   uint16_t number_symbols = pusch_pdu->nr_of_symbols;
 
@@ -433,7 +438,8 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
         pusch_pdu->ul_dmrs_symb_pos,
 	number_dmrs_symbols, // number of dmrs symbols irrespective of single or double symbol dmrs
 	pusch_pdu->qam_mod_order,
-	pusch_pdu->nrOfLayers);
+	pusch_pdu->nrOfLayers,
+	G);
 
   if (gNB->use_pusch_tp == 0) {
     nr_ulsch_layer_demapping(gNB->pusch_vars[ULSCH_id].llr,