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
wangjie
OpenXG-RAN
Commits
c956d051
Commit
c956d051
authored
5 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added logical antenna port parameter to configuration file (RRC section)
parent
20484b5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/GNB_APP/RRC_nr_paramsvalues.h
+2
-0
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+8
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+1
-0
No files found.
openair2/GNB_APP/RRC_nr_paramsvalues.h
View file @
c956d051
...
...
@@ -39,6 +39,7 @@
/* cell configuration section name */
#define GNB_CONFIG_STRING_GNB_LIST "gNBs"
#define GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET "ssb_SubcarrierOffset"
#define GNB_CONFIG_STRING_PDSCH_ANTENNAPORTS "pdsch_AntennaPorts"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON "servingCellConfigCommon"
#define GNB_CONFIG_STRING_PHYSCELLID "physCellId"
#define GNB_CONFIG_STRING_NTIMINGADVANCEOFFSET "n_TimingAdvanceOffset"
...
...
@@ -222,6 +223,7 @@
#define SSBPARAMS_DESC {{GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET,NULL,0,iptr:&ssb_SubcarrierOffset,defintval:0,TYPE_INT,0}}
#define PDSCHANTENNA_DESC {{GNB_CONFIG_STRING_PDSCHANTENNAPORTS,NULL,0,iptr:&pdsch_AntennaPorts,defintval:1,TYPE_INT,0}}
#define SCCPARAMS_DESC(scc) { \
{GNB_CONFIG_STRING_PHYSCELLID,NULL,0,i64ptr:scc->physCellId,defint64val:0,TYPE_INT64,0
/*0*/
}, \
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
c956d051
...
...
@@ -519,13 +519,15 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
NR_ServingCellConfigCommon_t
*
scc
=
calloc
(
1
,
sizeof
(
NR_ServingCellConfigCommon_t
));
int
ssb_SubcarrierOffset
=
0
;
int
pdschAntennaPorts
=
1
;
int
ssb_bitmap
=
0xff
;
memset
((
void
*
)
scc
,
0
,
sizeof
(
NR_ServingCellConfigCommon_t
));
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
};
////////// Physical parameters
...
...
@@ -559,6 +561,9 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
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
(
&
SCCsParamList
,
NULL
,
0
,
aprefix
);
if
(
SCCsParamList
.
numelt
>
0
)
{
...
...
@@ -643,6 +648,8 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
printf
(
"SSB SCO %d
\n
"
,
ssb_SubcarrierOffset
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ssb_SubcarrierOffset
=
ssb_SubcarrierOffset
;
printf
(
"pdschAntennaPorts %d
\n
"
,
pdschAntennaPorts
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pdschAntennaPorts
=
pdschAntennaPorts
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
scc
=
scc
;
}
//
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @
c956d051
...
...
@@ -22,6 +22,7 @@ gNBs =
//////////
Physical
parameters
:
ssb_SubcarrierOffset
=
0
;
pdsch_AntennaPorts
=
1
;
servingCellConfigCommon
= (
{
...
...
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