Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
c56cac3e
Commit
c56cac3e
authored
5 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Read RU config before FlexRAN to allow split identification
parent
5501c2cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
12 deletions
+18
-12
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+2
-0
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+1
-7
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+15
-5
No files found.
openair2/ENB_APP/enb_config.c
View file @
c56cac3e
...
...
@@ -3104,4 +3104,6 @@ void read_config_and_init(void) {
memset
((
void
*
)
RC
.
rrc
[
enb_id
],
0
,
sizeof
(
eNB_RRC_INST
));
RCconfig_RRC
(
enb_id
,
RC
.
rrc
[
enb_id
],
macrlc_has_f1
[
enb_id
]);
}
RCconfig_flexran
();
}
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-ru.c
View file @
c56cac3e
...
...
@@ -2683,13 +2683,9 @@ void init_RU(char *rf_config_file, clock_source_t clock_source, clock_source_t t
PHY_VARS_eNB
*
eNB0
=
(
PHY_VARS_eNB
*
)
NULL
;
LTE_DL_FRAME_PARMS
*
fp
=
(
LTE_DL_FRAME_PARMS
*
)
NULL
;
// create status mask
RC
.
ru_mask
=
0
;
RC
.
ru_mask
=
(
1
<<
RC
.
nb_RU
)
-
1
;
pthread_mutex_init
(
&
RC
.
ru_mutex
,
NULL
);
pthread_cond_init
(
&
RC
.
ru_cond
,
NULL
);
// read in configuration file)
printf
(
"configuring RU from file
\n
"
);
RCconfig_RU
();
LOG_I
(
PHY
,
"number of L1 instances %d, number of RU %d, number of CPU cores %d
\n
"
,
RC
.
nb_L1_inst
,
RC
.
nb_RU
,
get_nprocs
());
if
(
RC
.
nb_CC
!=
0
)
for
(
i
=
0
;
i
<
RC
.
nb_L1_inst
;
i
++
)
...
...
@@ -2919,8 +2915,6 @@ void RCconfig_RU(void) {
if
(
RUParamList
.
numelt
>
0
)
{
RC
.
ru
=
(
RU_t
**
)
malloc
(
RC
.
nb_RU
*
sizeof
(
RU_t
*
));
RC
.
ru_mask
=
(
1
<<
RC
.
nb_RU
)
-
1
;
printf
(
"Set RU mask to %lx
\n
"
,
RC
.
ru_mask
);
for
(
int
j
=
0
;
j
<
RC
.
nb_RU
;
j
++
)
{
RC
.
ru
[
j
]
=
(
RU_t
*
)
malloc
(
sizeof
(
RU_t
));
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
c56cac3e
...
...
@@ -585,9 +585,22 @@ int main ( int argc, char **argv )
/* Read configuration */
if
(
RC
.
nb_inst
>
0
)
{
read_config_and_init
();
/* Start the agent. If it is turned off in the configuration, it won't start */
RCconfig_flexran
();
}
else
{
printf
(
"RC.nb_inst = 0, Initializing L1
\n
"
);
RCconfig_L1
();
}
/* We need to read RU configuration before FlexRAN starts so it knows what
* splits to report. Actual RU start comes later. */
if
(
RC
.
nb_RU
>
0
&&
NFAPI_MODE
!=
NFAPI_MODE_VNF
)
{
RCconfig_RU
();
LOG_I
(
PHY
,
"number of L1 instances %d, number of RU %d, number of CPU cores %d
\n
"
,
RC
.
nb_L1_inst
,
RC
.
nb_RU
,
get_nprocs
());
}
if
(
RC
.
nb_inst
>
0
)
{
/* Start the agent. If it is turned off in the configuration, it won't start */
for
(
i
=
0
;
i
<
RC
.
nb_inst
;
i
++
)
{
flexran_agent_start
(
i
);
}
...
...
@@ -607,9 +620,6 @@ int main ( int argc, char **argv )
itti_send_msg_to_task
(
TASK_RRC_ENB
,
ENB_MODULE_ID_TO_INSTANCE
(
enb_id
),
msg_p
);
}
node_type
=
RC
.
rrc
[
0
]
->
node_type
;
}
else
{
printf
(
"RC.nb_inst = 0, Initializing L1
\n
"
);
RCconfig_L1
();
}
if
(
RC
.
nb_inst
>
0
&&
NODE_IS_CU
(
node_type
))
{
...
...
This diff is collapsed.
Click to expand it.
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