diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 2d2048c99a20674c78277d4f39091a8e402e38fa..a814728ecb477aee5e63ce9a3492222aade8ae79 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -1277,6 +1277,7 @@ set(PHY_SRC_UE ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c + ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c diff --git a/openair1/PHY/NR_REFSIG/nr_gold_ue.c b/openair1/PHY/NR_REFSIG/nr_gold_ue.c index 48187714f471203a957696d3d03dbb963b611602..1386f9846b3049515ea7a622d70ca961a7f8685a 100644 --- a/openair1/PHY/NR_REFSIG/nr_gold_ue.c +++ b/openair1/PHY/NR_REFSIG/nr_gold_ue.c @@ -64,7 +64,7 @@ void nr_gold_pbch(PHY_VARS_NR_UE* ue) } -void nr_gold_pdsch(/*LTE_DL_FRAME_PARMS *frame_parms*/unsigned short lbar,unsigned int nr_gold_pdsch[2][20][2][21],unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs) +void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_pdsch[2][20][2][21],unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs) { unsigned char ns,l; @@ -73,7 +73,7 @@ void nr_gold_pdsch(/*LTE_DL_FRAME_PARMS *frame_parms*/unsigned short lbar,unsign unsigned int nid; /// to be updated from higher layer - unsigned short lbar = 0; + //unsigned short lbar = 0; for (nscid=0; nscid<2; nscid++) { if (n_idDMRS) diff --git a/openair1/PHY/NR_REFSIG/refsig_defs_ue.h b/openair1/PHY/NR_REFSIG/refsig_defs_ue.h index 49d8add3f113ad4ae2ec6fc6bc4103bca64da3e7..2d4db86ef9bcf3bfb9538bfe57a883da290ef866 100644 --- a/openair1/PHY/NR_REFSIG/refsig_defs_ue.h +++ b/openair1/PHY/NR_REFSIG/refsig_defs_ue.h @@ -42,4 +42,12 @@ int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch, int32_t *output ); void nr_gold_pbch(PHY_VARS_NR_UE* ue); +void nr_gold_pdsch(PHY_VARS_NR_UE* ue, + unsigned short lbar, + unsigned int nr_gold_pdsch[2][20][2][21], + unsigned int Nid_cell, + unsigned short *n_idDMRS, + unsigned short length_dmrs); + + #endif diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c index eb1c5bb82088623104c42f53655cb968935314e4..ccc031ed8434e762c67cb7217a2891f0a8c7776e 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c @@ -258,7 +258,7 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode) set_default_frame_parms_single(config,&ue->frame_parms); nr_init_frame_parms_ue(config,&ue->frame_parms); - //nr_gold_pbch(ue); + nr_gold_pbch(ue); ret = pbch_detection(ue,mode); // write_output("rxdata2.m","rxd2",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);