From 09344667c3392ab09a4e5f1a3d36c1726ac9743f Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Fri, 21 Aug 2020 15:08:26 +0200
Subject: [PATCH] fix for unresolved conflict
---
openair1/SIMULATION/TOOLS/random_channel.c | 6 +-----
targets/ARCH/rfsimulator/simulator.c | 1 +
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c
index 505016b2795..8c063fadc09 100644
--- a/openair1/SIMULATION/TOOLS/random_channel.c
+++ b/openair1/SIMULATION/TOOLS/random_channel.c
@@ -666,13 +666,12 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
}
break;
-<<<<<<< HEAD
case TDL_A:
case TDL_B:
case TDL_C:
case TDL_D:
- case TDL_E:
+ case TDL_E:
if (channel_model == TDL_A) {
tdl_paths=TDL_A_PATHS;
tdl_delays=tdl_a_delays;
@@ -762,9 +761,6 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
break;
-=======
-
->>>>>>> origin/develop
case EPA:
chan_desc->nb_taps = 7;
chan_desc->Td = .410;
diff --git a/targets/ARCH/rfsimulator/simulator.c b/targets/ARCH/rfsimulator/simulator.c
index 1ebfb7c77d0..b330e219ba4 100644
--- a/targets/ARCH/rfsimulator/simulator.c
+++ b/targets/ARCH/rfsimulator/simulator.c
@@ -332,6 +332,7 @@ static int rfsimu_setchanmod_cmd(char *buff, int debug, telnet_printfunc_t prnt,
channelmod,
t->sample_rate,
t->tx_bw,
+ 30e-9, // TDL delay-spread parameter
t->chan_forgetfact, // forgetting_factor
t->chan_offset, // maybe used for TA
t->chan_pathloss); // path_loss in dB
--
GitLab