bugfix in ul estimation and other minor changes

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -34,6 +34,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
                                 unsigned char Ns,
                                 unsigned short p,
                                 unsigned char symbol,
+                                int ul_id,
                                 unsigned short bwp_start_subcarrier,
                                 nfapi_nr_pusch_pdu_t *pusch_pdu) {
 
@@ -43,8 +44,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
   unsigned int pilot_cnt,re_cnt;
   int16_t ch[2],ch_r[2],ch_l[2],*pil,*rxF,*ul_ch;
   int16_t *fl,*fm,*fr,*fml,*fmr,*fmm,*fdcl,*fdcr,*fdclh,*fdcrh;
-  int ch_offset,symbol_offset, UE_id = 0;
-  int32_t **ul_ch_estimates_time =  gNB->pusch_vars[UE_id]->ul_ch_estimates_time;
+  int ch_offset,symbol_offset ;
+  int32_t **ul_ch_estimates_time =  gNB->pusch_vars[ul_id]->ul_ch_estimates_time;
   __m128i *ul_ch_128;
 
 #ifdef DEBUG_CH
@@ -55,7 +56,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
   //uint16_t Nid_cell = (eNB_offset == 0) ? gNB->frame_parms.Nid_cell : gNB->measurements.adj_cell_id[eNB_offset-1];
 
   uint8_t nushift;
-  int **ul_ch_estimates  = gNB->pusch_vars[UE_id]->ul_ch_estimates;
+  int **ul_ch_estimates  = gNB->pusch_vars[ul_id]->ul_ch_estimates;
   int **rxdataF = gNB->common_vars.rxdataF;
 
   nushift = (p>>1)&1;

openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h

@@ -43,6 +43,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
                                 unsigned char Ns,
                                 unsigned short p,
                                 unsigned char symbol,
+                                int ul_id,
                                 unsigned short bwp_start_subcarrier,
                                 nfapi_nr_pusch_pdu_t *pusch_pdu);
 

openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c

@@ -1082,6 +1082,7 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
                                 nr_tti_rx,
                                 0, // p
                                 symbol,
+                                ulsch_id,
                                 bwp_start_subcarrier,
                                 rel15_ul);
   stop_meas(&gNB->ulsch_channel_estimation_stats);

targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf

@@ -235,7 +235,7 @@ MACRLCs = (
 
 THREAD_STRUCT = (
   {
-    parallel_config = "PARALLEL_RU_L1_TRX_SPLITaaaaaa";
+    parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
     worker_config = "ENABLE";
   }
 );