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
fb5f1f69
Commit
fb5f1f69
authored
Jun 07, 2021
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
including NR band in LTE config file
parent
379aa9c4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+2
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
+1
-0
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
fb5f1f69
...
@@ -326,6 +326,7 @@ typedef struct RrcConfigurationReq_s {
...
@@ -326,6 +326,7 @@ typedef struct RrcConfigurationReq_s {
long
discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
MAX_NUM_CCs
];
long
discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
MAX_NUM_CCs
];
//Nr secondary cell group SSB central frequency (for ENDC NSA)
//Nr secondary cell group SSB central frequency (for ENDC NSA)
int
nr_scg_ssb_freq
;
int
nr_scg_ssb_freq
;
int
nr_band
;
}
RrcConfigurationReq
;
}
RrcConfigurationReq
;
#define MAX_NUM_NBIOT_CELEVELS 3
#define MAX_NUM_NBIOT_CELEVELS 3
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
fb5f1f69
...
@@ -3310,10 +3310,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
...
@@ -3310,10 +3310,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
if
(
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
==
NULL
)
exit
(
1
);
if
(
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
==
NULL
)
exit
(
1
);
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
present
=
LTE_MeasObjectNR_r15__ext1__bandNR_r15_PR_setup
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
present
=
LTE_MeasObjectNR_r15__ext1__bandNR_r15_PR_setup
;
if
(
rrc_inst
->
nr_scg_ssb_freq
>
2016666
)
//FR2
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
choice
.
setup
=
rrc_inst
->
nr_band
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
choice
.
setup
=
261
;
else
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
choice
.
setup
=
78
;
ASN_SEQUENCE_ADD
(
&
MeasObj_list
->
list
,
MeasObj2
);
ASN_SEQUENCE_ADD
(
&
MeasObj_list
->
list
,
MeasObj2
);
}
}
...
@@ -7026,6 +7023,7 @@ char openair_rrc_eNB_configuration(
...
@@ -7026,6 +7023,7 @@ char openair_rrc_eNB_configuration(
}
}
RC
.
rrc
[
ctxt
.
module_id
]
->
nr_scg_ssb_freq
=
configuration
->
nr_scg_ssb_freq
;
RC
.
rrc
[
ctxt
.
module_id
]
->
nr_scg_ssb_freq
=
configuration
->
nr_scg_ssb_freq
;
RC
.
rrc
[
ctxt
.
module_id
]
->
nr_band
=
configuration
->
nr_band
;
openair_rrc_on
(
&
ctxt
);
openair_rrc_on
(
&
ctxt
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
View file @
fb5f1f69
...
@@ -143,6 +143,7 @@ eNBs =
...
@@ -143,6 +143,7 @@ eNBs =
//
SSB
central
frequency
of
NR
secondary
cell
group
(
for
ENDC
NSA
)
//
SSB
central
frequency
of
NR
secondary
cell
group
(
for
ENDC
NSA
)
nr_scg_ssb_freq
=
641272
;
nr_scg_ssb_freq
=
641272
;
nr_band
=
78
;
}
}
);
);
...
...
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