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

hotfix: replacing msg with printf in unitary simulators (msg(...) was replaced with LOG_D(PHY,...) but it was used before log was initialized)

Browse Source
This commit is contained in:
Florian Kaltenberger
2019-08-20 09:13:02 +02:00
parent 2ec61ea77e
commit f2f8d47384
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/NR_PHY/dlschsim.c
+1 -1
View File
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
case 'S': case 'S':
snr1 = atof(optarg); snr1 = atof(optarg);
snr1set = 1; snr1set = 1;
msg("Setting SNR1 to %f\n", snr1); printf("Setting SNR1 to %f\n", snr1);
#ifdef DEBUG_NR_DLSCHSIM #ifdef DEBUG_NR_DLSCHSIM
printf("Setting SNR1 to %f\n", snr1); printf("Setting SNR1 to %f\n", snr1);
#endif #endif
openair1/SIMULATION/NR_PHY/dlsim.c
+7 -7
View File
@@ -194,7 +194,7 @@ int main(int argc, char **argv)
break; break;
default: default:
msg("Unsupported channel model!\n"); printf("Unsupported channel model!\n");
exit(-1); exit(-1);
} }
@@ -214,13 +214,13 @@ int main(int argc, char **argv)
case 's': case 's':
snr0 = atof(optarg); snr0 = atof(optarg);
msg("Setting SNR0 to %f\n",snr0); printf("Setting SNR0 to %f\n",snr0);
break; break;
case 'S': case 'S':
snr1 = atof(optarg); snr1 = atof(optarg);
snr1set=1; snr1set=1;
msg("Setting SNR1 to %f\n",snr1); printf("Setting SNR1 to %f\n",snr1);
break; break;
/* /*
@@ -247,7 +247,7 @@ int main(int argc, char **argv)
if ((transmission_mode!=1) && if ((transmission_mode!=1) &&
(transmission_mode!=2) && (transmission_mode!=2) &&
(transmission_mode!=6)) { (transmission_mode!=6)) {
msg("Unsupported transmission mode %d\n",transmission_mode); printf("Unsupported transmission mode %d\n",transmission_mode);
exit(-1); exit(-1);
} }
@@ -257,7 +257,7 @@ int main(int argc, char **argv)
n_tx=atoi(optarg); n_tx=atoi(optarg);
if ((n_tx==0) || (n_tx>2)) { if ((n_tx==0) || (n_tx>2)) {
msg("Unsupported number of tx antennas %d\n",n_tx); printf("Unsupported number of tx antennas %d\n",n_tx);
exit(-1); exit(-1);
} }
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
n_rx=atoi(optarg); n_rx=atoi(optarg);
if ((n_rx==0) || (n_rx>2)) { if ((n_rx==0) || (n_rx>2)) {
msg("Unsupported number of rx antennas %d\n",n_rx); printf("Unsupported number of rx antennas %d\n",n_rx);
exit(-1); exit(-1);
} }
@@ -402,7 +402,7 @@ int main(int argc, char **argv)
0); 0);
if (gNB2UE==NULL) { if (gNB2UE==NULL) {
msg("Problem generating channel model. Exiting.\n"); printf("Problem generating channel model. Exiting.\n");
exit(-1); exit(-1);
} }
openair1/SIMULATION/NR_PHY/pucchsim.c
+8 -8
View File
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
break; break;
default: default:
msg("Unsupported channel model!\n"); printf("Unsupported channel model!\n");
exit(-1); exit(-1);
} }
break; break;
@@ -167,18 +167,18 @@ int main(int argc, char **argv)
case 'o': case 'o':
cfo = atof(optarg); cfo = atof(optarg);
msg("Setting CFO to %f Hz\n",cfo); printf("Setting CFO to %f Hz\n",cfo);
break; break;
case 's': case 's':
snr0 = atof(optarg); snr0 = atof(optarg);
msg("Setting SNR0 to %f\n",snr0); printf("Setting SNR0 to %f\n",snr0);
break; break;
case 'S': case 'S':
snr1 = atof(optarg); snr1 = atof(optarg);
snr1set=1; snr1set=1;
msg("Setting SNR1 to %f\n",snr1); printf("Setting SNR1 to %f\n",snr1);
break; break;
/* /*
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
if ((transmission_mode!=1) && if ((transmission_mode!=1) &&
(transmission_mode!=2) && (transmission_mode!=2) &&
(transmission_mode!=6)) { (transmission_mode!=6)) {
msg("Unsupported transmission mode %d\n",transmission_mode); printf("Unsupported transmission mode %d\n",transmission_mode);
exit(-1); exit(-1);
} }
break; break;
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
n_tx=atoi(optarg); n_tx=atoi(optarg);
if ((n_tx==0) || (n_tx>2)) { if ((n_tx==0) || (n_tx>2)) {
msg("Unsupported number of tx antennas %d\n",n_tx); printf("Unsupported number of tx antennas %d\n",n_tx);
exit(-1); exit(-1);
} }
break; break;
@@ -226,7 +226,7 @@ int main(int argc, char **argv)
n_rx=atoi(optarg); n_rx=atoi(optarg);
if ((n_rx==0) || (n_rx>2)) { if ((n_rx==0) || (n_rx>2)) {
msg("Unsupported number of rx antennas %d\n",n_rx); printf("Unsupported number of rx antennas %d\n",n_rx);
exit(-1); exit(-1);
} }
break; break;
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
gNB2UE = new_channel_desc_scm(n_tx, n_rx, channel_model, fs, bw, 0, 0, 0); gNB2UE = new_channel_desc_scm(n_tx, n_rx, channel_model, fs, bw, 0, 0, 0);
if (gNB2UE==NULL) { if (gNB2UE==NULL) {
msg("Problem generating channel model. Exiting.\n"); printf("Problem generating channel model. Exiting.\n");
exit(-1); exit(-1);
} }
openair1/SIMULATION/NR_PHY/ulsim.c
+6 -6
View File
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
break; break;
default: default:
msg("Unsupported channel model!\n"); printf("Unsupported channel model!\n");
exit(-1); exit(-1);
} }
@@ -193,13 +193,13 @@ int main(int argc, char **argv)
case 's': case 's':
snr0 = atof(optarg); snr0 = atof(optarg);
msg("Setting SNR0 to %f\n", snr0); printf("Setting SNR0 to %f\n", snr0);
break; break;
case 'S': case 'S':
snr1 = atof(optarg); snr1 = atof(optarg);
snr1set = 1; snr1set = 1;
msg("Setting SNR1 to %f\n", snr1); printf("Setting SNR1 to %f\n", snr1);
break; break;
case 'p': case 'p':
@@ -220,7 +220,7 @@ int main(int argc, char **argv)
n_tx = atoi(optarg); n_tx = atoi(optarg);
if ((n_tx == 0) || (n_tx > 2)) { if ((n_tx == 0) || (n_tx > 2)) {
msg("Unsupported number of tx antennas %d\n", n_tx); printf("Unsupported number of tx antennas %d\n", n_tx);
exit(-1); exit(-1);
} }
@@ -230,7 +230,7 @@ int main(int argc, char **argv)
n_rx = atoi(optarg); n_rx = atoi(optarg);
if ((n_rx == 0) || (n_rx > 2)) { if ((n_rx == 0) || (n_rx > 2)) {
msg("Unsupported number of rx antennas %d\n", n_rx); printf("Unsupported number of rx antennas %d\n", n_rx);
exit(-1); exit(-1);
} }
@@ -317,7 +317,7 @@ int main(int argc, char **argv)
0, 0, 0); 0, 0, 0);
if (gNB2UE == NULL) { if (gNB2UE == NULL) {
msg("Problem generating channel model. Exiting.\n"); printf("Problem generating channel model. Exiting.\n");
exit(-1); exit(-1);
} }