Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
edcd0019
Commit
edcd0019
authored
Jun 25, 2024
by
Romain Beurdouche
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(nr_pbchsim): replace option -O by option -c
parent
9055fabe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
cmake_targets/autotests/test_case_list.xml
cmake_targets/autotests/test_case_list.xml
+1
-1
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+8
-7
No files found.
cmake_targets/autotests/test_case_list.xml
View file @
edcd0019
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
<main_exec>
nr_pbchsim
</main_exec>
<main_exec>
nr_pbchsim
</main_exec>
<main_exec_args>
-s-11 -S-8 -n10 -R106 -N2
<main_exec_args>
-s-11 -S-8 -n10 -R106 -N2
-s-11 -S-8 -n10 -o8000 -I -R106
-s-11 -S-8 -n10 -o8000 -I -R106
-s-11 -S-8 -n10 -R106 -
O
6
</main_exec_args>
-s-11 -S-8 -n10 -R106 -
c
6
</main_exec_args>
<tags>
test1 test2 test3
</tags>
<tags>
test1 test2 test3
</tags>
<search_expr_true>
PBCH test OK
</search_expr_true>
<search_expr_true>
PBCH test OK
</search_expr_true>
<search_expr_false>
segmentation fault|assertion|exiting|fatal
</search_expr_false>
<search_expr_false>
segmentation fault|assertion|exiting|fatal
</search_expr_false>
...
...
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
edcd0019
...
@@ -244,15 +244,20 @@ int main(int argc, char **argv)
...
@@ -244,15 +244,20 @@ int main(int argc, char **argv)
exit_fun
(
"[NR_PBCHSIM] Error, configuration module init failed
\n
"
);
exit_fun
(
"[NR_PBCHSIM] Error, configuration module init failed
\n
"
);
}
}
while
((
c
=
getopt
(
argc
,
argv
,
"--:
F:g:hIL:m:M:n:N:o:O
:P:r:R:s:S:x:y:z:"
))
!=
-
1
)
{
while
((
c
=
getopt
(
argc
,
argv
,
"--:
c:F:g:hIL:m:M:n:N:o
:P:r:R:s:S:x:y:z:"
))
!=
-
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' */
/* with this opstring getopt returns 1 for non-option arguments, refer to 'man 3 getopt' */
if
(
c
==
1
||
c
==
'-'
)
if
(
c
==
1
||
c
==
'-'
)
continue
;
continue
;
printf
(
"handling optarg %c
\n
"
,
c
);
printf
(
"handling optarg %c
\n
"
,
c
);
switch
(
c
)
{
switch
(
c
)
{
case
'c'
:
ssb_subcarrier_offset
=
atoi
(
optarg
);
break
;
/*case 'f':
/*case 'f':
write_output_file=1;
write_output_file=1;
output_fd = fopen(optarg,"w");
output_fd = fopen(optarg,"w");
...
@@ -349,10 +354,6 @@ int main(int argc, char **argv)
...
@@ -349,10 +354,6 @@ int main(int argc, char **argv)
Nid_cell
=
atoi
(
optarg
);
Nid_cell
=
atoi
(
optarg
);
break
;
break
;
case
'O'
:
ssb_subcarrier_offset
=
atoi
(
optarg
);
break
;
case
'o'
:
case
'o'
:
cfo
=
atof
(
optarg
);
cfo
=
atof
(
optarg
);
#ifdef DEBUG_NR_PBCHSIM
#ifdef DEBUG_NR_PBCHSIM
...
@@ -440,6 +441,7 @@ int main(int argc, char **argv)
...
@@ -440,6 +441,7 @@ int main(int argc, char **argv)
printf
(
"%s -F input_filename -g channel_mod -h(elp) -I(nitial sync) -L log_lvl -n n_frames -M SSBs -n frames -N cell_id -o FO -P phase -r seed -R RBs -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant
\n
"
,
printf
(
"%s -F input_filename -g channel_mod -h(elp) -I(nitial sync) -L log_lvl -n n_frames -M SSBs -n frames -N cell_id -o FO -P phase -r seed -R RBs -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant
\n
"
,
argv
[
0
]);
argv
[
0
]);
//printf("-A Interpolation_filname Run with Abstraction to generate Scatter plot using interpolation polynomial in file\n");
//printf("-A Interpolation_filname Run with Abstraction to generate Scatter plot using interpolation polynomial in file\n");
printf
(
"-c SSB subcarrier offset
\n
"
);
//printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
//printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
//printf("-d Use TDD\n");
//printf("-d Use TDD\n");
//printf("-f Output filename (.txt format) for Pe/SNR results\n");
//printf("-f Output filename (.txt format) for Pe/SNR results\n");
...
@@ -455,7 +457,6 @@ int main(int argc, char **argv)
...
@@ -455,7 +457,6 @@ int main(int argc, char **argv)
printf
(
"-n Number of frames to simulate
\n
"
);
printf
(
"-n Number of frames to simulate
\n
"
);
printf
(
"-N Nid_cell
\n
"
);
printf
(
"-N Nid_cell
\n
"
);
printf
(
"-o Carrier frequency offset in Hz
\n
"
);
printf
(
"-o Carrier frequency offset in Hz
\n
"
);
printf
(
"-O SSB subcarrier offset
\n
"
);
//printf("-O oversampling factor (1,2,4,8,16)\n");
//printf("-O oversampling factor (1,2,4,8,16)\n");
//printf("-p Use extended prefix mode\n");
//printf("-p Use extended prefix mode\n");
printf
(
"-P PBCH phase, allowed values 0-3
\n
"
);
printf
(
"-P PBCH phase, allowed values 0-3
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment