maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix phy simulators, merge develop

Browse Source
This commit is contained in:
Laurent THOMAS
2021-03-15 12:40:15 +01:00
parent d659ceb849
commit a97bf1da6e
18 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/dlsim.c
+2 -2
View File
@@ -1179,7 +1179,7 @@ int main(int argc, char **argv) {
DS_TDL,
forgetting_factor,
rx_sample_offset,
0);
0, 0);
reset_meas(&eNB2UE[0]->random_channel);
reset_meas(&eNB2UE[0]->interp_time);
@@ -1193,7 +1193,7 @@ int main(int argc, char **argv) {
DS_TDL,
forgetting_factor,
rx_sample_offset,
0);
0, 0);
reset_meas(&eNB2UE[n]->random_channel);
reset_meas(&eNB2UE[n]->interp_time);
}
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+2 -2
View File
@@ -988,7 +988,7 @@ int main(int argc, char **argv)
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
if(num_rounds>1) {
for(n=1; n<8; n++)
@@ -999,7 +999,7 @@ int main(int argc, char **argv)
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
}
if (eNB2UE[0]==NULL) {
openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
+2 -2
View File
@@ -834,7 +834,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
if(num_rounds>1) {
for(n=1; n<4; n++)
@@ -845,7 +845,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
}
if (eNB2UE[0]==NULL) {
openair1/SIMULATION/LTE_PHY/mbmssim.c
+2 -2
View File
@@ -1290,7 +1290,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
reset_meas(&eNB2UE[0]->random_channel);
reset_meas(&eNB2UE[0]->interp_time);
@@ -1303,7 +1303,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
forgetting_factor,
rx_sample_offset,
0);
0, 0);
reset_meas(&eNB2UE[n]->random_channel);
reset_meas(&eNB2UE[n]->interp_time);
}
openair1/SIMULATION/LTE_PHY/pbchsim.c
+3 -3
View File
@@ -386,7 +386,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
0,
0,
0);
0, 0);
if (interf1>-20)
eNB2UE1 = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx,
@@ -396,7 +396,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
0,
4,
0);
0, 0);
if (interf2>-20)
eNB2UE2 = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx,
@@ -406,7 +406,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
0,
8,
0);
0, 0);
if (eNB2UE==NULL) {
msg("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+1 -1
View File
@@ -708,7 +708,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_DL),
0,
0,
0);
0, 0);
L1_rxtx_proc_t *proc_rxtx = (subframe == 0)? &eNB->proc.L1_proc: &eNB->proc.L1_proc_tx;
eNB->ulsch[0] = new_eNB_ulsch(MAX_TURBO_ITERATIONS,N_RB_DL,0);
UE->ulsch[0] = new_ue_ulsch(N_RB_DL,0);
openair1/SIMULATION/LTE_PHY/prachsim.c
+1 -1
View File
@@ -343,7 +343,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_UL),
0.0,
delay,
0);
0, 0);
if (UE2eNB==NULL) {
msg("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/LTE_PHY/pucchsim.c
+1 -1
View File
@@ -323,7 +323,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(eNB->frame_parms.N_RB_UL),
0.0,
0,
0);
0, 0);
if (UE2eNB==NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/LTE_PHY/scansim.c
+1 -1
View File
@@ -335,7 +335,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth(PHY_vars_eNB->lte_frame_parms.N_RB_DL),
0,
0,
0);
0, 0);
if (eNB2UE==NULL) {
msg("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/LTE_PHY/syncsim.c
+3 -3
View File
@@ -724,7 +724,7 @@ int main(int argc, char **argv) {
BW,
0,
0,
0);
0, 0);
if (interf1>-20)
eNB2UE1 = new_channel_desc_scm(PHY_vars_eNB->lte_frame_parms.nb_antennas_tx,
@@ -733,7 +733,7 @@ int main(int argc, char **argv) {
BW,
0,
0,
0);
0, 0);
if (interf2>-20)
eNB2UE2 = new_channel_desc_scm(PHY_vars_eNB->lte_frame_parms.nb_antennas_tx,
@@ -742,7 +742,7 @@ int main(int argc, char **argv) {
BW,
0,
0,
0);
0, 0);
if (eNB2UE==NULL) {
msg("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/LTE_PHY/ulsim.c
+1 -1
View File
@@ -734,7 +734,7 @@ int main(int argc, char **argv) {
30e-9,
forgetting_factor,
delay,
0);
0, 0);
// set Doppler
UE2eNB->max_Doppler = maxDoppler;
openair1/SIMULATION/NR_PHY/dlschsim.c
+1 -1
View File
@@ -339,7 +339,7 @@ int main(int argc, char **argv)
61.44e6, //N_RB2sampling_rate(N_RB_DL),
40e6, //N_RB2channel_bandwidth(N_RB_DL),
DS_TDL,
0, 0, 0);
0, 0, 0, 0);
if (gNB2UE == NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/dlsim.c
+1 -1
View File
@@ -757,7 +757,7 @@ int main(int argc, char **argv)
30e-9,
0,
0,
0);
0, 0);
if (gNB2UE==NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/pbchsim.c
+1 -1
View File
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
300e-9,
0,
0,
0);
0, 0);
if (gNB2UE==NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/prachsim.c
+1 -1
View File
@@ -655,7 +655,7 @@ int main(int argc, char **argv){
DS_TDL,
0.0,
delay,
0);
0, 0);
if (UE2gNB==NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/pucchsim.c
+1 -1
View File
@@ -418,7 +418,7 @@ int main(int argc, char **argv)
printf("FFO = %lf; IFO = %d\n",eps-IFO,IFO);
}
UE2gNB = new_channel_desc_scm(n_tx, n_rx, channel_model, fs, bw, DS_TDL,0, 0, 0);
UE2gNB = new_channel_desc_scm(n_tx, n_rx, channel_model, fs, bw, DS_TDL,0, 0, 0, 0);
if (UE2gNB==NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/ulschsim.c
+1 -1
View File
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
61.44e6, //N_RB2sampling_rate(N_RB_DL),
40e6, //N_RB2channel_bandwidth(N_RB_DL),
DS_TDL,
0,0,0);
0,0,0, 0);
if (gNB2UE == NULL) {
printf("Problem generating channel model. Exiting.\n");
openair1/SIMULATION/NR_PHY/ulsim.c
+1 -1
View File
@@ -592,7 +592,7 @@ int main(int argc, char **argv)
sampling_frequency,
bandwidth,
DS_TDL,
0, 0, 0);
0, 0, 0, 0);
if (UE2gNB == NULL) {
printf("Problem generating channel model. Exiting.\n");