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
OpenXG
OpenXG UE
Commits
62523bae
Commit
62523bae
authored
Sep 25, 2017
by
oai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove legacy configuration mechanism
parent
a8185e80
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
3289 deletions
+57
-3289
common/config/config_load_configmodule.c
common/config/config_load_configmodule.c
+1
-2
common/config/config_load_configmodule.h
common/config/config_load_configmodule.h
+1
-2
common/config/config_userapi.h
common/config/config_userapi.h
+1
-1
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+35
-2795
openair2/ENB_APP/enb_config.h
openair2/ENB_APP/enb_config.h
+5
-1
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+14
-488
No files found.
common/config/config_load_configmodule.c
View file @
62523bae
...
...
@@ -139,11 +139,10 @@ int i;
modeparams
=
strdup
(
"oaisoftmodem.conf"
);
}
else
if
(
i
==
1
)
{
/* -O argument doesn't contain ":" separator,
legacy
-O <conf file> option, default cfgmode to libconfig
/* -O argument doesn't contain ":" separator,
assume
-O <conf file> option, default cfgmode to libconfig
with one parameter, the path to the configuration file */
modeparams
=
cfgmode
;
cfgmode
=
strdup
(
"libconfig"
);
tmpflags
=
tmpflags
|
CONFIG_LEGACY
;
/* temporary, legacy mode */
}
cfgptr
=
malloc
(
sizeof
(
configmodule_interface_t
));
...
...
common/config/config_load_configmodule.h
View file @
62523bae
...
...
@@ -46,8 +46,7 @@
#define CONFIG_DEBUGCMDLINE 4 // print command line processing messages
#define CONFIG_HELP 8 // print help message
#define CONFIG_ABORT 16 // config failed,abort execution
/* temporary flag to be able to use legacy config mechanism */
#define CONFIG_LEGACY (1 << 10)
typedef
int
(
*
configmodule_initfunc_t
)(
char
*
cfgP
[],
int
numP
);
typedef
int
(
*
configmodule_getfunc_t
)(
paramdef_t
*
,
int
numparams
,
char
*
prefix
);
...
...
common/config/config_userapi.h
View file @
62523bae
...
...
@@ -52,7 +52,7 @@ extern int config_isparamset(paramdef_t *params,int paramidx);
extern
void
config_assign_int
(
paramdef_t
*
cfgoptions
,
char
*
fullname
,
int
val
);
extern
int
config_process_cmdline
(
paramdef_t
*
cfgoptions
,
int
numoptions
,
char
*
prefix
);
#define config_getlist config_get_if()->getlist
#define CONFIG_GETCONFFILE (config_get_if()->cfgP[0])
#ifdef __cplusplus
}
...
...
openair2/ENB_APP/enb_config.c
View file @
62523bae
This source diff could not be displayed because it is too large. You can
view the blob
instead.
openair2/ENB_APP/enb_config.h
View file @
62523bae
...
...
@@ -91,7 +91,11 @@ typedef struct ru_config_s {
uint8_t
if_compress
;
}
ru_config_t
;
extern
void
RCconfig_RU
(
void
);
extern
void
RCconfig_L1
(
void
);
extern
void
RCconfig_macrlc
(
void
);
extern
int
RCconfig_gtpu
(
void
);
extern
void
RCConfig
(
void
);
void
enb_config_display
(
void
);
void
ru_config_display
(
void
);
...
...
targets/RT/USER/lte-softmodem.c
View file @
62523bae
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