From f2f8d47384ac785135b4b04750d8deb8a72c0548 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger Date: Tue, 20 Aug 2019 09:13:02 +0200 Subject: [PATCH] hotfix: replacing msg with printf in unitary simulators (msg(...) was replaced with LOG_D(PHY,...) but it was used before log was initialized) --- openair1/SIMULATION/NR_PHY/dlschsim.c | 2 +- openair1/SIMULATION/NR_PHY/dlsim.c | 14 +++++++------- openair1/SIMULATION/NR_PHY/pucchsim.c | 16 ++++++++-------- openair1/SIMULATION/NR_PHY/ulsim.c | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c index 7b5ae806e8..09ef2ff3f3 100644 --- a/openair1/SIMULATION/NR_PHY/dlschsim.c +++ b/openair1/SIMULATION/NR_PHY/dlschsim.c @@ -191,7 +191,7 @@ int main(int argc, char **argv) case 'S': snr1 = atof(optarg); snr1set = 1; - msg("Setting SNR1 to %f\n", snr1); + printf("Setting SNR1 to %f\n", snr1); #ifdef DEBUG_NR_DLSCHSIM printf("Setting SNR1 to %f\n", snr1); #endif diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c index 60bf1f6a7e..b6edec1dc9 100644 --- a/openair1/SIMULATION/NR_PHY/dlsim.c +++ b/openair1/SIMULATION/NR_PHY/dlsim.c @@ -194,7 +194,7 @@ int main(int argc, char **argv) break; default: - msg("Unsupported channel model!\n"); + printf("Unsupported channel model!\n"); exit(-1); } @@ -214,13 +214,13 @@ int main(int argc, char **argv) case 's': snr0 = atof(optarg); - msg("Setting SNR0 to %f\n",snr0); + printf("Setting SNR0 to %f\n",snr0); break; case 'S': snr1 = atof(optarg); snr1set=1; - msg("Setting SNR1 to %f\n",snr1); + printf("Setting SNR1 to %f\n",snr1); break; /* @@ -247,7 +247,7 @@ int main(int argc, char **argv) if ((transmission_mode!=1) && (transmission_mode!=2) && (transmission_mode!=6)) { - msg("Unsupported transmission mode %d\n",transmission_mode); + printf("Unsupported transmission mode %d\n",transmission_mode); exit(-1); } @@ -257,7 +257,7 @@ int main(int argc, char **argv) n_tx=atoi(optarg); 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); } @@ -267,7 +267,7 @@ int main(int argc, char **argv) n_rx=atoi(optarg); 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); } @@ -402,7 +402,7 @@ int main(int argc, char **argv) 0); if (gNB2UE==NULL) { - msg("Problem generating channel model. Exiting.\n"); + printf("Problem generating channel model. Exiting.\n"); exit(-1); } diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c index 0868bc4a3a..9e03a06a82 100644 --- a/openair1/SIMULATION/NR_PHY/pucchsim.c +++ b/openair1/SIMULATION/NR_PHY/pucchsim.c @@ -156,7 +156,7 @@ int main(int argc, char **argv) break; default: - msg("Unsupported channel model!\n"); + printf("Unsupported channel model!\n"); exit(-1); } break; @@ -167,18 +167,18 @@ int main(int argc, char **argv) case 'o': cfo = atof(optarg); - msg("Setting CFO to %f Hz\n",cfo); + printf("Setting CFO to %f Hz\n",cfo); break; case 's': snr0 = atof(optarg); - msg("Setting SNR0 to %f\n",snr0); + printf("Setting SNR0 to %f\n",snr0); break; case 'S': snr1 = atof(optarg); snr1set=1; - msg("Setting SNR1 to %f\n",snr1); + printf("Setting SNR1 to %f\n",snr1); break; /* @@ -208,7 +208,7 @@ int main(int argc, char **argv) if ((transmission_mode!=1) && (transmission_mode!=2) && (transmission_mode!=6)) { - msg("Unsupported transmission mode %d\n",transmission_mode); + printf("Unsupported transmission mode %d\n",transmission_mode); exit(-1); } break; @@ -217,7 +217,7 @@ int main(int argc, char **argv) n_tx=atoi(optarg); 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); } break; @@ -226,7 +226,7 @@ int main(int argc, char **argv) n_rx=atoi(optarg); 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); } 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); if (gNB2UE==NULL) { - msg("Problem generating channel model. Exiting.\n"); + printf("Problem generating channel model. Exiting.\n"); exit(-1); } diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c index 287f14918d..d71bea59f0 100644 --- a/openair1/SIMULATION/NR_PHY/ulsim.c +++ b/openair1/SIMULATION/NR_PHY/ulsim.c @@ -173,7 +173,7 @@ int main(int argc, char **argv) break; default: - msg("Unsupported channel model!\n"); + printf("Unsupported channel model!\n"); exit(-1); } @@ -193,13 +193,13 @@ int main(int argc, char **argv) case 's': snr0 = atof(optarg); - msg("Setting SNR0 to %f\n", snr0); + printf("Setting SNR0 to %f\n", snr0); break; case 'S': snr1 = atof(optarg); snr1set = 1; - msg("Setting SNR1 to %f\n", snr1); + printf("Setting SNR1 to %f\n", snr1); break; case 'p': @@ -220,7 +220,7 @@ int main(int argc, char **argv) n_tx = atoi(optarg); 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); } @@ -230,7 +230,7 @@ int main(int argc, char **argv) n_rx = atoi(optarg); 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); } @@ -317,7 +317,7 @@ int main(int argc, char **argv) 0, 0, 0); if (gNB2UE == NULL) { - msg("Problem generating channel model. Exiting.\n"); + printf("Problem generating channel model. Exiting.\n"); exit(-1); }