From bf62f2bcce48c9bb1b759c7c962d0130d78ca12c Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Sun, 22 Nov 2020 21:40:36 +0100
Subject: [PATCH] fixing FR2 arfcn
---
cmake_targets/autotests/test_case_list.xml | 2 +-
openair1/SIMULATION/NR_PHY/prachsim.c | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index b21661536f..02eb86a653 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1305,7 +1305,7 @@
<desc>nr_prachsim Test cases. (Test1: 30kHz SCS, 106 PRBs, Prach format A2),
(Test2: 30kHz SCS, 217 PRBs, Prach format A2),
(Test3: 30kHz SCS, 273 PRBs, Prach format A2),
- (Test4: 30kHz SCS, 106 PRBs, Prach format 0),
+ (Test4: 30kHz SCS, 106 PRBs, Prach format 0),
(Test5: 120kHz SCS, 32 PRBs, Prach format A2),
(Test6: 120kHz SCS, 66 PRBs, Prach format A2)</desc>
<pre_compile_prog></pre_compile_prog>
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index 9224f5fa34..3992b27c06 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -408,15 +408,12 @@ int main(int argc, char **argv){
frame_parms->N_RB_UL = N_RB_UL;
frame_parms->threequarter_fs = threequarter_fs;
frame_parms->frame_type = TDD;
- frame_parms->freq_range = nr_FR1;
+ frame_parms->freq_range = (mu==1 ? nr_FR1 : nr_FR2);
frame_parms->numerology_index = mu;
nr_phy_config_request_sim(gNB, N_RB_UL, N_RB_UL, mu, Nid_cell, SSB_positions);
- uint64_t absoluteFrequencyPointA = to_nrarfcn(frame_parms->nr_band,
- frame_parms->dl_CarrierFreq,
- frame_parms->numerology_index,
- frame_parms->N_RB_UL*(180e3)*(1 << frame_parms->numerology_index));
+ uint64_t absoluteFrequencyPointA = (mu==1 ? 640000 : 2070833);
uint8_t subframe = slot/frame_parms->slots_per_subframe;
--
2.26.2