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

pre-integration cleanup

Browse Source
This commit is contained in:
Cedric Roux
2017-06-16 11:51:10 +02:00
parent 727782a04a
commit 3f1e218a01
6 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+18 -7
View File
@@ -625,10 +625,10 @@ int main(int argc, char **argv)
rank_adapt=1;
break;
case 'V':
cond_num_threshold = atof(optarg);
cond_num_threshold = atoi(optarg);
break;
case 'J':
dlsch_demod_shift = atof(optarg);
dlsch_demod_shift = atoi(optarg);
break;
case 'K':
tpmi_retr = atoi(optarg);
@@ -672,6 +672,16 @@ int main(int argc, char **argv)
}
}
if (dlsch_demod_shift==0) {
if ((transmission_mode==3 || transmission_mode==4) && (rx_type>rx_standard)) {
if (mcs1<17)
dlsch_demod_shift=0;
else
dlsch_demod_shift=-2;
}
}
logInit();
// enable these lines if you need debug info
set_comp_log(PHY,LOG_DEBUG,LOG_HIGH,1);
@@ -719,10 +729,11 @@ int main(int argc, char **argv)
if (transmission_mode==4 && rx_type == rx_SIC_dual_stream )
use_sic_receiver = 1;
else if (transmission_mode==4 && rx_type == rx_IC_dual_stream )
else if (transmission_mode==4 && rx_type < rx_SIC_dual_stream )
use_sic_receiver = 0;
if (xforms==1) {
fl_initialize (&argc, argv, NULL, 0, 0);
form_ue = create_lte_phy_scope_ue();
@@ -3908,12 +3919,12 @@ int main(int argc, char **argv)
#endif
if (transmission_mode==4 && use_sic_receiver==1){
rx_type=rx_SIC_dual_stream;
//printf("I am using SIC!\n");
if (rx_type>rx_IC_single_stream)
rx_type=rx_SIC_dual_stream;
}
else if (transmission_mode==4 && use_sic_receiver==0){
rx_type=rx_IC_dual_stream;
//printf("I am using PIA!\n");
if (rx_type>rx_IC_single_stream)
rx_type=rx_IC_dual_stream;
}
switch (transmission_mode) {