From edfe8c55cf20b5137c7a484d8df1f3431ee6dd9f Mon Sep 17 00:00:00 2001 From: Rakesh Mundlamuri Date: Tue, 25 Jan 2022 13:40:38 +0100 Subject: [PATCH] bugfix --- openair1/SCHED_NR/phy_procedures_nr_gNB.c | 10 +++++----- openair1/SCHED_NR/sched_nr.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c index 20a4672caf..d55f2ae38b 100644 --- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c +++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c @@ -106,7 +106,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_ prs_data.PRSResourceSetPeriod[1]=0; // resource slot offset prs_data.SymbolStart=7; prs_data.NumPRSSymbols=6; - prs_data.NumRB=273; + prs_data.NumRB=fp->N_RB_DL; prs_data.RBOffset=0; prs_data.CombSize=4; prs_data.REOffset=0; @@ -145,8 +145,8 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, int frame,int slot, - int do_meas, - nfapi_nr_dl_tti_ssb_pdu ssb_pdu) { + int do_meas + ) { int aa; NR_DL_FRAME_PARMS *fp=&gNB->frame_parms; nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config; @@ -230,7 +230,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, } } - //TODO: nr_generate_prs + /*//TODO: nr_generate_prs // check if we have prs to transmit in this frame and slot prs_data_t prs_data; prs_data.PRSResourceSetPeriod[0]=40; // PRS resource slot period @@ -249,7 +249,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, // tbc nr_generate_prs(gNB->nr_gold_prs[slot],&txdataF[0][txdataF_offset], AMP, &prs_data, cfg, fp); - + */ if (do_meas==1) stop_meas(&gNB->phy_proc_tx); diff --git a/openair1/SCHED_NR/sched_nr.h b/openair1/SCHED_NR/sched_nr.h index 0002eb8d50..5e31c08d38 100644 --- a/openair1/SCHED_NR/sched_nr.h +++ b/openair1/SCHED_NR/sched_nr.h @@ -36,7 +36,7 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx); void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_scf_t *cfg, NR_DL_FRAME_PARMS *fp); -void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, int frame_tx, int slot_tx, int do_meas,nfapi_nr_dl_tti_ssb_pdu ssb_pdu); +void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, int frame_tx, int slot_tx, int do_meas); void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx); int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx); void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot);