From 327b9a8b70c271d2e0a1e67e102a4c1b23b4fd80 Mon Sep 17 00:00:00 2001
From: Romain Beurdouche <romain.beurdouche@eurecom.fr>
Date: Tue, 25 Jun 2024 10:38:09 +0200
Subject: [PATCH] fix(phy_simulators): enable the use of option -O to pass a
configuration file to configmodule in phy simulators
---
openair1/PHY/CODING/TESTBENCH/ldpctest.c | 6 +++---
openair1/PHY/CODING/TESTBENCH/polartest.c | 6 +++---
openair1/PHY/CODING/TESTBENCH/smallblocktest.c | 6 +++---
openair1/SIMULATION/NR_PHY/dlschsim.c | 4 ++--
openair1/SIMULATION/NR_PHY/dlsim.c | 6 +++---
openair1/SIMULATION/NR_PHY/pbchsim.c | 4 ++--
openair1/SIMULATION/NR_PHY/prachsim.c | 6 +++---
openair1/SIMULATION/NR_PHY/psbchsim.c | 6 +++---
openair1/SIMULATION/NR_PHY/pucchsim.c | 6 +++---
openair1/SIMULATION/NR_PHY/ulschsim.c | 6 +++---
openair1/SIMULATION/NR_PHY/ulsim.c | 6 +++---
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
index 43a84e4b8ff..d676a902641 100644
--- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c
+++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
@@ -430,11 +430,11 @@ int main(int argc, char *argv[])
}
logInit();
- while ((c = getopt (argc, argv, "--:q:r:s:S:l:G:n:d:i:t:u:hv:")) != -1) {
+ while ((c = getopt (argc, argv, "--:O:q:r:s:S:l:G:n:d:i:t:u:hv:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/PHY/CODING/TESTBENCH/polartest.c b/openair1/PHY/CODING/TESTBENCH/polartest.c
index 78b44599fbe..be7987f340a 100644
--- a/openair1/PHY/CODING/TESTBENCH/polartest.c
+++ b/openair1/PHY/CODING/TESTBENCH/polartest.c
@@ -38,11 +38,11 @@ int main(int argc, char *argv[])
}
logInit();
- while ((arguments = getopt (argc, argv, "--:s:d:f:m:i:l:a:p:hqgFL:k:")) != -1) {
+ while ((arguments = getopt (argc, argv, "--:O:s:d:f:m:i:l:a:p:hqgFL:k:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (arguments == 1 || arguments == '-')
+ if (arguments == 1 || arguments == '-' || arguments == 'O')
continue;
printf("handling optarg %c\n",arguments);
diff --git a/openair1/PHY/CODING/TESTBENCH/smallblocktest.c b/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
index d6306495a7e..dfc8aadc8e0 100644
--- a/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
+++ b/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
@@ -32,11 +32,11 @@ int main(int argc, char *argv[])
}
logInit();
- while ((arguments = getopt(argc, argv, "--:s:d:f:l:i:mhg")) != -1) {
+ while ((arguments = getopt(argc, argv, "--:O:s:d:f:l:i:mhg")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (arguments == 1 || arguments == '-')
+ if (arguments == 1 || arguments == '-' || arguments == 'O')
continue;
printf("handling optarg %c\n",arguments);
diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c
index 7466da841c1..b49eed1bd69 100644
--- a/openair1/SIMULATION/NR_PHY/dlschsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlschsim.c
@@ -146,11 +146,11 @@ int main(int argc, char **argv)
// logInit();
randominit(0);
- while ((c = getopt(argc, argv, "--:df:hpVg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:L:X:")) != -1) {
+ while ((c = getopt(argc, argv, "--:O:df:hpVg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:L:X:")) != -1) {
/* ignore long options starting with '--' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index 6f48f80ce98..728163e049c 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -336,11 +336,11 @@ int main(int argc, char **argv)
FILE *scg_fd=NULL;
- while ((c = getopt(argc, argv, "--:f:hA:p:f:g:i:n:s:S:t:v:x:y:z:o:M:N:F:GR:d:PI:L:a:b:e:m:w:T:U:q:X:Y:Z:c")) != -1) {
+ while ((c = getopt(argc, argv, "--:O:f:hA:p:f:g:i:n:s:S:t:v:x:y:z:o:M:N:F:GR:d:PI:L:a:b:e:m:w:T:U:q:X:Y:Z:c")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c
index 716cf5e2fc8..63546246f0b 100644
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
@@ -244,11 +244,11 @@ int main(int argc, char **argv)
exit_fun("[NR_PBCHSIM] Error, configuration module init failed\n");
}
- while ((c = getopt (argc, argv, "--:c:F:g:hIL:m:M:n:N:o:P:r:R:s:S:x:y:z:")) != -1) {
+ while ((c = getopt (argc, argv, "--:O:c:F:g:hIL:m:M:n:N:o:P:r:R:s:S:x:y:z:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index ef05cd49404..785e8bb96f9 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -164,11 +164,11 @@ int main(int argc, char **argv){
randominit(0);
- while ((c = getopt (argc, argv, "--:hHaA:Cc:l:r:p:g:m:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) {
+ while ((c = getopt (argc, argv, "--:O:hHaA:Cc:l:r:p:g:m:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/psbchsim.c b/openair1/SIMULATION/NR_PHY/psbchsim.c
index fd96f233ca5..63a4ae5ff2a 100644
--- a/openair1/SIMULATION/NR_PHY/psbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/psbchsim.c
@@ -313,11 +313,11 @@ int main(int argc, char **argv)
randominit(0);
- while ((c = getopt(argc, argv, "--:c:hn:o:s:FIL:N:R:S:T:")) != -1) {
+ while ((c = getopt(argc, argv, "--:O:c:hn:o:s:FIL:N:R:S:T:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("SIDELINK PSBCH SIM: handling optarg %c\n", c);
diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c
index 1609c365114..5291930c12f 100644
--- a/openair1/SIMULATION/NR_PHY/pucchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pucchsim.c
@@ -155,11 +155,11 @@ int main(int argc, char **argv)
randominit(0);
logInit();
- while ((c = getopt (argc, argv, "--:f:hA:f:g:i:I:P:B:b:t:T:m:n:r:o:s:S:x:y:z:N:F:GR:IL:q:cd:")) != -1) {
+ while ((c = getopt (argc, argv, "--:O:f:hA:f:g:i:I:P:B:b:t:T:m:n:r:o:s:S:x:y:z:N:F:GR:IL:q:cd:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/ulschsim.c b/openair1/SIMULATION/NR_PHY/ulschsim.c
index 1da4da5b245..ebe0ff89157 100644
--- a/openair1/SIMULATION/NR_PHY/ulschsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulschsim.c
@@ -166,11 +166,11 @@ int main(int argc, char **argv)
randominit(0);
//while ((c = getopt(argc, argv, "--:df:hpg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:")) != -1) {
- while ((c = getopt(argc, argv, "--:hg:n:s:S:py:z:M:N:R:F:m:l:q:r:W:")) != -1) {
+ while ((c = getopt(argc, argv, "--:O:hg:n:s:S:py:z:M:N:R:F:m:l:q:r:W:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 0efdc9be39b..822153fd143 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -223,11 +223,11 @@ int main(int argc, char *argv[])
/* initialize the sin-cos table */
InitSinLUT();
- while ((c = getopt(argc, argv, "--:a:b:c:d:ef:g:h:i:k:m:n:op:q:r:s:t:u:v:w:y:z:C:F:G:H:I:M:N:PR:S:T:U:L:ZW:E:X:")) != -1) {
+ while ((c = getopt(argc, argv, "--:O:a:b:c:d:ef:g:h:i:k:m:n:op:q:r:s:t:u:v:w:y:z:C:F:G:H:I:M:N:PR:S:T:U:L:ZW:E:X:")) != -1) {
- /* ignore long options starting with '--' and their arguments that are handled by configmodule */
+ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
- if (c == 1 || c == '-')
+ if (c == 1 || c == '-' || c == 'O')
continue;
printf("handling optarg %c\n",c);
--
GitLab