diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c index 22aa50b9c3..4206cfd585 100644 --- a/executables/nr-gnb.c +++ b/executables/nr-gnb.c @@ -354,9 +354,6 @@ void init_gNB_Tpool(int inst) { // ULSCH decoder result FIFO initNotifiedFIFO(&gNB->respPuschSymb); initNotifiedFIFO(&gNB->respDecode); - // PUSCH channel estimation result FIFO - initNotifiedFIFO(&gNB->respPuschAarx); - // L1 RX result FIFO initNotifiedFIFO(&gNB->resp_L1); diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c index a1ff7edc12..acdd291343 100644 --- a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c +++ b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c @@ -499,6 +499,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, delay_arr[i] = *delay; } + notifiedFIFO_t respPuschAarx; + initNotifiedFIFO(&respPuschAarx); start_meas(&gNB->pusch_channel_estimation_antenna_processing_stats); int numAntennas = gNB->dmrs_num_antennas_per_thread; for (int aarx = 0; aarx < gNB->frame_parms.nb_antennas_rx; aarx += numAntennas) { @@ -506,7 +508,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, id.p = 1 + aarx; notifiedFIFO_elt_t *req = newNotifiedFIFO_elt(sizeof(puschAntennaProc_t), id.p, - &gNB->respPuschAarx, + &respPuschAarx, &nr_pusch_antenna_processing); // create a job for Tpool puschAntennaProc_t *rdata = (puschAntennaProc_t *)NotifiedFifoData(req); // data for the job @@ -537,7 +539,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, } // Antenna Loop while (nbAarx > 0) { - notifiedFIFO_elt_t *req = pullTpool(&gNB->respPuschAarx, &gNB->threadPool); + notifiedFIFO_elt_t *req = pullTpool(&respPuschAarx, &gNB->threadPool); nbAarx--; delNotifiedFIFO_elt(req); } diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index f4c21388cc..14c71bdf17 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -554,7 +554,6 @@ typedef struct PHY_VARS_gNB_s { time_stats_t srs_beam_report_stats; time_stats_t srs_iq_matrix_stats; - notifiedFIFO_t respPuschAarx; notifiedFIFO_t respPuschSymb; notifiedFIFO_t respDecode; notifiedFIFO_t resp_L1; diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c index 84fdb18e3c..b9fac5fe5e 100644 --- a/openair1/SIMULATION/NR_PHY/ulsim.c +++ b/openair1/SIMULATION/NR_PHY/ulsim.c @@ -573,7 +573,6 @@ int main(int argc, char *argv[]) initNotifiedFIFO(&gNB->respDecode); initNotifiedFIFO(&gNB->respPuschSymb); - initNotifiedFIFO(&gNB->respPuschAarx); initNotifiedFIFO(&gNB->L1_tx_free); initNotifiedFIFO(&gNB->L1_tx_filled); initNotifiedFIFO(&gNB->L1_tx_out);