Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
16
Merge Requests
16
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
f88a43ca
Commit
f88a43ca
authored
Nov 29, 2018
by
Wang Tsu-Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for getting config by command line
parent
5d0fe4ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
15 deletions
+21
-15
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+19
-13
targets/RT/USER/lte-softmodem-common.c
targets/RT/USER/lte-softmodem-common.c
+2
-2
No files found.
openair2/ENB_APP/enb_config.c
View file @
f88a43ca
...
...
@@ -69,6 +69,8 @@ extern PARALLEL_CONF_t get_thread_parallel_conf(void);
extern
WORKER_CONF_t
get_thread_worker_conf
(
void
);
extern
uint32_t
to_earfcn_DL
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
uint32_t
bw
);
extern
uint32_t
to_earfcn_UL
(
int
eutra_bandP
,
uint32_t
ul_CarrierFreq
,
uint32_t
bw
);
extern
char
*
parallel_config
;
extern
char
*
worker_config
;
void
RCconfig_flexran
()
{
uint16_t
i
;
...
...
@@ -2672,29 +2674,33 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) {
int
RCconfig_parallel
(
void
)
{
char
*
parallel_conf
=
NULL
;
char
*
worker_conf
=
NULL
;
paramdef_t
ThreadParams
[]
=
THREAD_CONF_DESC
;
paramlist_def_t
THREADParamList
=
{
THREAD_CONFIG_STRING_THREAD_STRUCT
,
NULL
,
0
};
config_getlist
(
&
THREADParamList
,
NULL
,
0
,
NULL
);
if
(
THREADParamList
.
numelt
>
0
)
{
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
parallel_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
}
else
{
parallel_conf
=
strdup
(
"PARALLEL_RU_L1_TRX_SPLIT"
);
if
(
parallel_config
==
NULL
){
if
(
THREADParamList
.
numelt
>
0
)
{
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
parallel_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
}
else
{
parallel_conf
=
strdup
(
"PARALLEL_RU_L1_TRX_SPLIT"
);
}
set_parallel_conf
(
parallel_conf
);
}
if
(
THREADParamList
.
numelt
>
0
)
{
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
worker_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_WORKER_IDX
].
strptr
));
}
else
{
worker_conf
=
strdup
(
"WORKER_ENABLE"
);
if
(
worker_config
==
NULL
){
if
(
THREADParamList
.
numelt
>
0
)
{
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
worker_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_WORKER_IDX
].
strptr
));
}
else
{
worker_conf
=
strdup
(
"WORKER_ENABLE"
);
}
set_worker_conf
(
worker_conf
);
}
set_parallel_conf
(
parallel_conf
);
set_worker_conf
(
worker_conf
);
return
0
;
}
...
...
targets/RT/USER/lte-softmodem-common.c
View file @
f88a43ca
...
...
@@ -35,6 +35,8 @@
#include "common/config/config_userapi.h"
#include "common/utils/load_module_shlib.h"
static
softmodem_params_t
softmodem_params
;
char
*
parallel_config
=
NULL
;
char
*
worker_config
=
NULL
;
uint64_t
get_softmodem_optmask
(
void
)
{
return
softmodem_params
.
optmask
;
...
...
@@ -74,8 +76,6 @@ WORKER_CONF_t get_thread_worker_conf(void)
#endif
void
get_common_options
(
void
)
{
char
*
parallel_config
=
NULL
;
char
*
worker_config
=
NULL
;
uint32_t
online_log_messages
;
...
...
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