Skip to content

O
OpenXG UE
Commit 9d8c3006 authored by Francesco Mani's avatar Francesco Mani
Browse files
Options

fix for unresolved conflict

parent e01999af
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
openair1/SIMULATION/TOOLS/random_channel.c
View file @ 9d8c3006
...@@ -666,13 +666,12 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx, ...@@ -666,13 +666,12 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
} }
break; break;
<<<<<<< HEAD
case TDL_A: case TDL_A:
case TDL_B: case TDL_B:
case TDL_C: case TDL_C:
case TDL_D: case TDL_D:
case TDL_E: case TDL_E:
if (channel_model == TDL_A) { if (channel_model == TDL_A) {
tdl_paths=TDL_A_PATHS; tdl_paths=TDL_A_PATHS;
tdl_delays=tdl_a_delays; tdl_delays=tdl_a_delays;
...@@ -762,9 +761,6 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx, ...@@ -762,9 +761,6 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
break; break;
=======
>>>>>>> origin/develop
case EPA: case EPA:
chan_desc->nb_taps = 7; chan_desc->nb_taps = 7;
chan_desc->Td = .410; chan_desc->Td = .410;
......
targets/ARCH/rfsimulator/simulator.c
View file @ 9d8c3006
...@@ -332,6 +332,7 @@ static int rfsimu_setchanmod_cmd(char *buff, int debug, telnet_printfunc_t prnt, ...@@ -332,6 +332,7 @@ static int rfsimu_setchanmod_cmd(char *buff, int debug, telnet_printfunc_t prnt,
channelmod, channelmod,
t->sample_rate, t->sample_rate,
t->tx_bw, t->tx_bw,
30e-9, // TDL delay-spread parameter
t->chan_forgetfact, // forgetting_factor t->chan_forgetfact, // forgetting_factor
t->chan_offset, // maybe used for TA t->chan_offset, // maybe used for TA
t->chan_pathloss); // path_loss in dB t->chan_pathloss); // path_loss in dB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment