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
Michael Black
OpenXG UE
Commits
10a8ba0d
Commit
10a8ba0d
authored
Oct 26, 2021
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs
parents
f86ab78c
ba10e08a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+13
-6
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+2
-2
No files found.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
10a8ba0d
...
...
@@ -677,12 +677,19 @@ int nr_rrc_mac_config_req_ue(
else
if
(
cell_group_config
!=
NULL
){
LOG_I
(
MAC
,
"Applying CellGroupConfig from gNodeB
\n
"
);
mac
->
cg
=
cell_group_config
;
mac
->
servCellIndex
=
cell_group_config
->
spCellConfig
->
servCellIndex
?
*
cell_group_config
->
spCellConfig
->
servCellIndex
:
0
;
mac
->
DL_BWP_Id
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
?
*
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
:
0
;
mac
->
UL_BWP_Id
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
?
*
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
:
0
;
if
(
get_softmodem_params
()
->
phy_test
==
1
||
get_softmodem_params
()
->
do_ra
==
1
||
get_softmodem_params
()
->
nsa
)
{
config_control_ue
(
mac
);
if
(
cell_group_config
->
spCellConfig
->
reconfigurationWithSync
)
{
if
(
cell_group_config
->
spCellConfig
)
{
mac
->
servCellIndex
=
cell_group_config
->
spCellConfig
->
servCellIndex
?
*
cell_group_config
->
spCellConfig
->
servCellIndex
:
0
;
mac
->
DL_BWP_Id
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
?
*
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
:
0
;
mac
->
UL_BWP_Id
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
?
*
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
:
0
;
}
else
{
mac
->
servCellIndex
=
0
;
mac
->
DL_BWP_Id
=
0
;
mac
->
UL_BWP_Id
=
0
;
}
config_control_ue
(
mac
);
if
(
get_softmodem_params
()
->
nsa
)
{
if
(
cell_group_config
->
spCellConfig
&&
cell_group_config
->
spCellConfig
->
reconfigurationWithSync
)
{
if
(
cell_group_config
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
)
{
ra
->
rach_ConfigDedicated
=
cell_group_config
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
->
choice
.
uplink
;
}
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
10a8ba0d
...
...
@@ -1000,8 +1000,8 @@ uint8_t do_RRCReject(uint8_t Mod_id,
}
void
fill_initial_SpCellConfig
(
rnti_t
rnti
,
NR_SpCellConfig_t
*
SpCellConfig
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_SpCellConfig_t
*
SpCellConfig
,
NR_ServingCellConfigCommon_t
*
scc
,
rrc_gNB_carrier_data_t
*
carrier
)
{
int
curr_bwp
=
NRRIV2BW
(
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
...
...
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