@@ -250,11 +250,9 @@ int nr_init_frame_parms(nfapi_nr_config_request_scf_t* cfg,
...
@@ -250,11 +250,9 @@ int nr_init_frame_parms(nfapi_nr_config_request_scf_t* cfg,
intNcp=NFAPI_CP_NORMAL;
intNcp=NFAPI_CP_NORMAL;
intmu=cfg->ssb_config.scs_common.value;
intmu=cfg->ssb_config.scs_common.value;
#if PHYSIM
printf("Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu,fp->N_RB_DL,Ncp);
#else
LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu,fp->N_RB_DL,Ncp);
LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu,fp->N_RB_DL,Ncp);
#endif
if(Ncp==NFAPI_CP_EXTENDED)
if(Ncp==NFAPI_CP_EXTENDED)
AssertFatal(mu==NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n",Ncp,mu);
AssertFatal(mu==NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n",Ncp,mu);
...
@@ -343,11 +341,8 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
...
@@ -343,11 +341,8 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
AssertFatal(fp->ul_CarrierFreq==(fp->dl_CarrierFreq+uplink_frequency_offset),"Disagreement in uplink frequency for band %d: ul_CarrierFreq = %lu Hz vs expected %lu Hz\n",fp->nr_band,fp->ul_CarrierFreq,fp->dl_CarrierFreq+uplink_frequency_offset);
AssertFatal(fp->ul_CarrierFreq==(fp->dl_CarrierFreq+uplink_frequency_offset),"Disagreement in uplink frequency for band %d: ul_CarrierFreq = %lu Hz vs expected %lu Hz\n",fp->nr_band,fp->ul_CarrierFreq,fp->dl_CarrierFreq+uplink_frequency_offset);
#if PHYSIM
printf("Initializing UE frame parms for mu %d, N_RB %d, Ncp %d\n",fp->numerology_index,fp->N_RB_DL,Ncp);
#else
LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",fp->numerology_index,fp->N_RB_DL,Ncp);
LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",fp->numerology_index,fp->N_RB_DL,Ncp);
#endif
if(Ncp==NFAPI_CP_EXTENDED)
if(Ncp==NFAPI_CP_EXTENDED)
AssertFatal(fp->numerology_index==NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n",Ncp,fp->numerology_index);
AssertFatal(fp->numerology_index==NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n",Ncp,fp->numerology_index);