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
377cfc6f
Commit
377cfc6f
authored
Jun 12, 2020
by
Florian Kaltenberger
Committed by
Francesco Mani
Jun 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing an issue with libconfig
parent
9add099c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
common/config/libconfig/config_libconfig.c
common/config/libconfig/config_libconfig.c
+2
-2
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+0
-5
No files found.
common/config/libconfig/config_libconfig.c
View file @
377cfc6f
...
@@ -179,8 +179,8 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
...
@@ -179,8 +179,8 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
*
(
cfgoptions
[
i
].
u64ptr
)
=
(
uint64_t
)
llu
;
*
(
cfgoptions
[
i
].
u64ptr
)
=
(
uint64_t
)
llu
;
printf_params
(
"[LIBCONFIG] %s: %llu
\n
"
,
cfgpath
,(
long
long
unsigned
)(
*
(
cfgoptions
[
i
].
u64ptr
))
);
printf_params
(
"[LIBCONFIG] %s: %llu
\n
"
,
cfgpath
,(
long
long
unsigned
)(
*
(
cfgoptions
[
i
].
u64ptr
))
);
}
else
{
}
else
{
*
(
cfgoptions
[
i
].
iptr
)
=
llu
;
*
(
cfgoptions
[
i
].
i
64
ptr
)
=
llu
;
printf_params
(
"[LIBCONFIG] %s: %llu
\n
"
,
cfgpath
,(
long
long
unsigned
)(
*
(
cfgoptions
[
i
].
i64ptr
))
);
printf_params
(
"[LIBCONFIG] %s: %llu
\n
"
,
cfgpath
,(
long
long
)(
*
(
cfgoptions
[
i
].
i64ptr
))
);
}
}
}
else
{
}
else
{
defval
=
config_setdefault_int64
(
&
(
cfgoptions
[
i
]),
prefix
);
defval
=
config_setdefault_int64
(
&
(
cfgoptions
[
i
]),
prefix
);
...
...
openair2/GNB_APP/gnb_config.c
View file @
377cfc6f
...
@@ -259,11 +259,6 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
...
@@ -259,11 +259,6 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
if
(
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
!=
0
)
if
(
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
!=
0
)
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
=
NULL
;
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
=
NULL
;
// fix libconfig (asn1c uses long)
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
preambleReceivedTargetPower
-=
((
long
)
1
<<
32
);
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
p0_NominalWithGrant
-=
((
long
)
1
<<
32
);
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
p0_nominal
-=
((
long
)
1
<<
32
);
// fix DL and UL Allocation lists
// fix DL and UL Allocation lists
for
(
int
i
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
count
-
1
;
i
>=
0
;
i
--
)
{
for
(
int
i
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
count
-
1
;
i
>=
0
;
i
--
)
{
...
...
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