From b30d3c92ad5c18b70da0b7d89b8349d42fe211da Mon Sep 17 00:00:00 2001 From: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Tue, 16 Feb 2016 02:31:48 -0800 Subject: [PATCH] added missing threequarter_fs parameter to lte_param_init in ulsim.c --- openair1/SIMULATION/LTE_PHY/dlsim.c | 12 +++++++++++- openair1/SIMULATION/LTE_PHY/ulsim.c | 8 +++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c index fbb88bf052..2c3d0848c2 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim.c @@ -656,7 +656,17 @@ int main(int argc, char **argv) printf("dual_stream_UE=%d\n", dual_stream_UE); } - lte_param_init(n_tx,n_rx,transmission_mode,extended_prefix_flag,frame_type,Nid_cell,tdd_config,N_RB_DL,threequarter_fs,osf,perfect_ce); + lte_param_init(n_tx, + n_rx, + transmission_mode, + extended_prefix_flag, + frame_type, + Nid_cell, + tdd_config, + N_RB_DL, + threequarter_fs, + osf, + perfect_ce); diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c index a72f2ad6c5..463c74c123 100644 --- a/openair1/SIMULATION/LTE_PHY/ulsim.c +++ b/openair1/SIMULATION/LTE_PHY/ulsim.c @@ -194,6 +194,7 @@ int main(int argc, char **argv) int nb_rb_set = 0; int sf; + int threequarter_fs=0; opp_enabled=1; // to enable the time meas cpu_freq_GHz = (double)get_cpu_freq_GHz(); @@ -203,7 +204,7 @@ int main(int argc, char **argv) logInit(); - while ((c = getopt (argc, argv, "hapZbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:L")) != -1) { + while ((c = getopt (argc, argv, "hapZEbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:L")) != -1) { switch (c) { case 'a': channel_model = AWGN; @@ -373,6 +374,10 @@ int main(int argc, char **argv) cyclic_shift = atoi(optarg); break; + case 'E': + threequarter_fs=1; + break; + case 'N': N0 = atoi(optarg); break; @@ -470,6 +475,7 @@ int main(int argc, char **argv) 0, tdd_config, N_RB_DL, + threequarter_fs, osf, 0); -- GitLab