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
lizhongxiao
OpenXG-RAN
Commits
29ddb924
Commit
29ddb924
authored
Feb 06, 2024
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not call RCconfig_NR_L1 twice in monolithic mode
parent
ff1cc7b3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
executables/nr-softmodem.c
executables/nr-softmodem.c
+4
-3
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+0
-1
No files found.
executables/nr-softmodem.c
View file @
29ddb924
...
@@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf
...
@@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf
RCconfig_verify
(
cfg
,
node_type
);
RCconfig_verify
(
cfg
,
node_type
);
RCconfig_NR_L1
();
RCconfig_nr_prs
();
RCconfig_nr_prs
();
if
(
RC
.
nb_nr_macrlc_inst
>
0
)
if
(
RC
.
nb_nr_macrlc_inst
>
0
)
...
@@ -682,11 +681,13 @@ int main( int argc, char **argv ) {
...
@@ -682,11 +681,13 @@ int main( int argc, char **argv ) {
#endif
#endif
LOG_I
(
HW
,
"Version: %s
\n
"
,
PACKAGE_VERSION
);
LOG_I
(
HW
,
"Version: %s
\n
"
,
PACKAGE_VERSION
);
if
(
RC
.
nb_nr_L1_inst
>
0
)
RCconfig_NR_L1
();
// don't create if node doesn't connect to RRC/S1/GTP
// don't create if node doesn't connect to RRC/S1/GTP
const
ngran_node_t
node_type
=
get_node_type
();
const
ngran_node_t
node_type
=
get_node_type
();
if
(
RC
.
nb_nr_L1_inst
>
0
)
RCconfig_NR_L1
();
if
(
NFAPI_MODE
!=
NFAPI_MODE_PNF
)
{
if
(
NFAPI_MODE
!=
NFAPI_MODE_PNF
)
{
int
ret
=
create_gNB_tasks
(
node_type
,
uniqCfg
);
int
ret
=
create_gNB_tasks
(
node_type
,
uniqCfg
);
AssertFatal
(
ret
==
0
,
"cannot create ITTI tasks
\n
"
);
AssertFatal
(
ret
==
0
,
"cannot create ITTI tasks
\n
"
);
...
...
openair2/GNB_APP/gnb_config.c
View file @
29ddb924
...
@@ -809,7 +809,6 @@ void RCconfig_nr_prs(void)
...
@@ -809,7 +809,6 @@ void RCconfig_nr_prs(void)
void
RCconfig_NR_L1
(
void
)
void
RCconfig_NR_L1
(
void
)
{
{
int
j
=
0
;
int
j
=
0
;
if
(
RC
.
gNB
==
NULL
)
{
if
(
RC
.
gNB
==
NULL
)
{
RC
.
gNB
=
(
PHY_VARS_gNB
**
)
malloc
((
1
+
NUMBER_OF_gNB_MAX
)
*
sizeof
(
PHY_VARS_gNB
*
));
RC
.
gNB
=
(
PHY_VARS_gNB
**
)
malloc
((
1
+
NUMBER_OF_gNB_MAX
)
*
sizeof
(
PHY_VARS_gNB
*
));
LOG_I
(
NR_PHY
,
"RC.gNB = %p
\n
"
,
RC
.
gNB
);
LOG_I
(
NR_PHY
,
"RC.gNB = %p
\n
"
,
RC
.
gNB
);
...
...
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