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
canghaiwuhen
OpenXG-RAN
Commits
4d0d54a9
Commit
4d0d54a9
authored
Aug 19, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
power target from config file functional
parent
f8c510e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
42 deletions
+26
-42
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/GNB_APP/RRC_nr_paramsvalues.h
+1
-10
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+11
-32
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+14
-0
No files found.
openair2/GNB_APP/RRC_nr_paramsvalues.h
View file @
4d0d54a9
...
...
@@ -38,10 +38,7 @@
/* cell configuration section name */
#define GNB_CONFIG_STRING_GNB_LIST "gNBs"
#define GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET "ssb_SubcarrierOffset"
#define GNB_CONFIG_STRING_PDSCHANTENNAPORTS "pdsch_AntennaPorts"
#define GNB_CONFIG_STRING_PUSCHTARGETPOWX10 "pusch_TargetSNRx10"
#define GNB_CONFIG_STRING_PUCCHTARGETPOWX10 "pucch_TargetSNRx10"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON "servingCellConfigCommon"
#define GNB_CONFIG_STRING_PHYSCELLID "physCellId"
#define GNB_CONFIG_STRING_NTIMINGADVANCEOFFSET "n_TimingAdvanceOffset"
...
...
@@ -225,12 +222,6 @@
#define GNB_CONFIG_DLCARRIERBANDWIDTH_IDX 10
#define SSBPARAMS_DESC {{GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET,NULL,0,iptr:&ssb_SubcarrierOffset,defintval:0,TYPE_INT,0}}
#define PDSCHANTENNAPARAMS_DESC {{GNB_CONFIG_STRING_PDSCHANTENNAPORTS,NULL,0,iptr:&pdsch_AntennaPorts,defintval:1,TYPE_INT,0}}
#define TARGETPOWER_DESC { \
{GNB_CONFIG_STRING_PUSCHTARGETPOWX10,NULL,0,iptr:&pusch_TargetSNRx10,defintval:200,TYPE_INT,0},\
{GNB_CONFIG_STRING_PUCCHTARGETPOWX10,NULL,0,iptr:&pucch_TargetSNRx10,defintval:200,TYPE_INT,0}}
#define SCCPARAMS_DESC(scc) { \
{GNB_CONFIG_STRING_PHYSCELLID,NULL,0,i64ptr:scc->physCellId,defint64val:0,TYPE_INT64,0
/*0*/
}, \
{GNB_CONFIG_STRING_NTIMINGADVANCEOFFSET,NULL,0,i64ptr:scc->n_TimingAdvanceOffset,defint64val:NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n0,TYPE_INT64,0
/*1*/
},\
...
...
openair2/GNB_APP/gnb_config.c
View file @
4d0d54a9
...
...
@@ -529,12 +529,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
prepare_scc
(
scc
);
paramdef_t
SCCsParams
[]
=
SCCPARAMS_DESC
(
scc
);
paramlist_def_t
SCCsParamList
=
{
GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON
,
NULL
,
0
};
paramdef_t
SSBsParams
[]
=
SSBPARAMS_DESC
;
paramlist_def_t
SSBsParamList
=
{
GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET
,
NULL
,
0
};
paramdef_t
PDSCHANTENNAParams
[]
=
PDSCHANTENNAPARAMS_DESC
;
paramlist_def_t
PDSCHANTENNAParamList
=
{
GNB_CONFIG_STRING_PDSCHANTENNAPORTS
,
NULL
,
0
};
paramdef_t
PUSCHTARGETPOWParams
[]
=
TARGETPOWER_DESC
;
paramlist_def_t
PUSCHTARGETPOWParamList
=
{
GNB_CONFIG_STRING_PDSCHANTENNAPORTS
,
NULL
,
0
};
////////// Physical parameters
...
...
@@ -583,14 +577,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
}
sprintf
(
aprefix
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
0
);
config_getlist
(
&
SSBsParamList
,
NULL
,
0
,
aprefix
);
if
(
SSBsParamList
.
numelt
>
0
)
config_get
(
SSBsParams
,
sizeof
(
SSBsParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
config_getlist
(
&
PDSCHANTENNAParamList
,
NULL
,
0
,
aprefix
);
if
(
PDSCHANTENNAParamList
.
numelt
>
0
)
config_get
(
PDSCHANTENNAParams
,
sizeof
(
PDSCHANTENNAParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
config_getlist
(
&
PUSCHTARGETPOWParamList
,
NULL
,
0
,
aprefix
);
if
(
PUSCHTARGETPOWParamList
.
numelt
>
0
)
config_get
(
PUSCHTARGETPOWParams
,
sizeof
(
PUSCHTARGETPOWParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
config_getlist
(
&
SCCsParamList
,
NULL
,
0
,
aprefix
);
if
(
SCCsParamList
.
numelt
>
0
)
{
...
...
@@ -666,19 +652,16 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
(
NRRRC_CONFIGURATION_REQ
(
msg_p
).
mnc_digit_length
[
l
]
==
3
),
"BAD MNC DIGIT LENGTH %d"
,
NRRRC_CONFIGURATION_REQ
(
msg_p
).
mnc_digit_length
[
l
]);
}
// Parse optional physical parameters
sprintf
(
gnbpath
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
),
printf
(
"SSB SCO %d
\n
"
,
ssb_SubcarrierOffset
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ssb_SubcarrierOffset
=
ssb_SubcarrierOffset
;
printf
(
"pdsch_AntennaPorts %d
\n
"
,
pdsch_AntennaPorts
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pdsch_AntennaPorts
=
pdsch_AntennaPorts
;
printf
(
"pusch_TargetSNRx10 %d
\n
"
,
pusch_TargetSNRx10
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pusch_TargetSNRx10
=
pusch_TargetSNRx10
;
printf
(
"pucch_TargetSNRx10 %d
\n
"
,
pucch_TargetSNRx10
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pucch_TargetSNRx10
=
pucch_TargetSNRx10
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
scc
=
scc
;
printf
(
"SSB SCO %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_SSB_SUBCARRIEROFFSET_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ssb_SubcarrierOffset
=
*
GNBParamList
.
paramarray
[
i
][
GNB_SSB_SUBCARRIEROFFSET_IDX
].
iptr
;
printf
(
"pdsch_AntennaPorts %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_PDSCH_ANTENNAPORTS_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pdsch_AntennaPorts
=
*
GNBParamList
.
paramarray
[
i
][
GNB_PDSCH_ANTENNAPORTS_IDX
].
iptr
;
printf
(
"pusch_TargetSNRx10 %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_PUSCH_TARGETPOW_X10_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pusch_TargetSNRx10
=
*
GNBParamList
.
paramarray
[
i
][
GNB_PUSCH_TARGETPOW_X10_IDX
].
iptr
;
printf
(
"pucch_TargetSNRx10 %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_PUCCH_TARGETPOW_X10_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pucch_TargetSNRx10
=
*
GNBParamList
.
paramarray
[
i
][
GNB_PUCCH_TARGETPOW_X10_IDX
].
iptr
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
scc
=
scc
;
}
//
}
//End for (k=0; k <num_gnbs ; k++)
...
...
@@ -787,11 +770,7 @@ int RCconfig_NR_S1(MessageDef *msg_p, uint32_t i) {
if
(
GNBSParams
[
GNB_ACTIVE_GNBS_IDX
].
numelt
>
0
)
{
// Output a list of all gNBs.
config_getlist
(
&
GNBParamList
,
GNBParams
,
sizeof
(
GNBParams
)
/
sizeof
(
paramdef_t
),
NULL
);
if
(
GNBParamList
.
numelt
>
0
)
{
for
(
k
=
0
;
k
<
GNBParamList
.
numelt
;
k
++
)
{
if
(
GNBParamList
.
paramarray
[
k
][
GNB_GNB_ID_IDX
].
uptr
==
NULL
)
{
...
...
openair2/GNB_APP/gnb_paramdef.h
View file @
4d0d54a9
...
...
@@ -113,6 +113,11 @@ typedef enum {
#define GNB_CONFIG_STRING_REMOTE_S_PORTC "remote_s_portc"
#define GNB_CONFIG_STRING_LOCAL_S_PORTD "local_s_portd"
#define GNB_CONFIG_STRING_REMOTE_S_PORTD "remote_s_portd"
#define GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET "ssb_SubcarrierOffset"
#define GNB_CONFIG_STRING_PDSCHANTENNAPORTS "pdsch_AntennaPorts"
#define GNB_CONFIG_STRING_PUSCHTARGETPOWX10 "pusch_TargetSNRx10"
#define GNB_CONFIG_STRING_PUCCHTARGETPOWX10 "pucch_TargetSNRx10"
typedef
struct
ccparams_nr_x2
{
char
*
frame_type
;
...
...
@@ -156,7 +161,12 @@ typedef struct ccparams_nr_x2 {
{GNB_CONFIG_STRING_REMOTE_S_PORTC, NULL, 0, uptr:NULL, defuintval:50000, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_PORTD, NULL, 0, uptr:NULL, defuintval:50001, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_REMOTE_S_PORTD, NULL, 0, uptr:NULL, defuintval:50001, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET, NULL, 0, iptr:NULL, defintval:31, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PDSCHANTENNAPORTS, NULL, 0, iptr:NULL, defintval:1, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PUSCHTARGETPOWX10, NULL, 0, iptr:NULL, defintval:200, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PUCCHTARGETPOWX10, NULL, 0, iptr:NULL, defintval:200, TYPE_INT, 0}, \
}
#define GNB_GNB_ID_IDX 0
#define GNB_CELL_TYPE_IDX 1
#define GNB_GNB_NAME_IDX 2
...
...
@@ -171,6 +181,10 @@ typedef struct ccparams_nr_x2 {
#define GNB_REMOTE_S_PORTC_IDX 11
#define GNB_LOCAL_S_PORTD_IDX 12
#define GNB_REMOTE_S_PORTD_IDX 13
#define GNB_SSB_SUBCARRIEROFFSET_IDX 14
#define GNB_PDSCH_ANTENNAPORTS_IDX 15
#define GNB_PUSCH_TARGETPOW_X10_IDX 16
#define GNB_PUCCH_TARGETPOW_X10_IDX 17
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define GNBPARAMS_CHECK { \
...
...
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