From 80846efc2eec9fbba3fe5a934461a1e452b42d7d Mon Sep 17 00:00:00 2001 From: Sakthivel Velumani Date: Fri, 25 Oct 2019 15:16:03 +0200 Subject: [PATCH 1/3] Fixed nr_dlschsim --- openair1/SIMULATION/NR_PHY/dlschsim.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c index 5637f40d24..8e220f7787 100644 --- a/openair1/SIMULATION/NR_PHY/dlschsim.c +++ b/openair1/SIMULATION/NR_PHY/dlschsim.c @@ -452,6 +452,7 @@ int main(int argc, char **argv) rel15->nb_layers = Nl; rel15->nb_re_dmrs = nb_re_dmrs; rel15->transport_block_size = TBS; + rel15->coding_rate = rate; double *modulated_input = malloc16(sizeof(double) * 16 * 68 * 384); // [hna] 16 segments, 68*Zc short *channel_output_fixed = malloc16(sizeof(short) * 16 * 68 * 384); short *channel_output_uncoded = malloc16(sizeof(unsigned short) * 16 * 68 * 384); From d4d4bb6df77e623e149530ee9d7def015b9799c0 Mon Sep 17 00:00:00 2001 From: Sakthivel Velumani Date: Fri, 25 Oct 2019 15:22:18 +0200 Subject: [PATCH 2/3] Removed unused variables --- openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c | 3 +-- openair1/SIMULATION/NR_PHY/dlschsim.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c index 78cb3097a0..ff161e241c 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c @@ -200,7 +200,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch, uint32_t A, Z, F; uint32_t *pz; uint8_t mod_order; - uint16_t Kr,r,r_offset,R; + uint16_t Kr,r,r_offset; uint8_t BG; uint32_t E,Kb; uint8_t Ilbrm; @@ -223,7 +223,6 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch, A = harq_process->TBS; pz = &Z; mod_order = nr_get_Qm_ul(harq_process->mcs,0); - R = nr_get_code_rate_ul(harq_process->mcs,0); Kr=0; r_offset=0; BG = 1; diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c index 8e220f7787..aab762b9e2 100644 --- a/openair1/SIMULATION/NR_PHY/dlschsim.c +++ b/openair1/SIMULATION/NR_PHY/dlschsim.c @@ -434,7 +434,6 @@ int main(int argc, char **argv) uint16_t rate; uint8_t Nl = 1; uint8_t rvidx = 0; - uint8_t scale; dlsch->rnti = 1; /*dlsch->harq_processes[0]->mcs = Imcs; dlsch->harq_processes[0]->rvidx = rvidx;*/ From 0ceb9545a1ced3a81a18f58629d47de0e05bea7c Mon Sep 17 00:00:00 2001 From: Sakthivel Velumani Date: Fri, 25 Oct 2019 15:25:15 +0200 Subject: [PATCH 3/3] Added back the dlschsim test cases --- cmake_targets/autotests/test_case_list.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml index 41a412733e..ae84d41039 100644 --- a/cmake_targets/autotests/test_case_list.xml +++ b/cmake_targets/autotests/test_case_list.xml @@ -1119,14 +1119,14 @@ 3 - + execution