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
zzha zzha
OpenXG-RAN
Commits
87c69d2f
Commit
87c69d2f
authored
Feb 18, 2022
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
To use initialBWP when there are no dedicated BWPs in config file
parent
589cb2f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
17 deletions
+34
-17
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+34
-17
No files found.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
87c69d2f
...
...
@@ -1009,13 +1009,21 @@ void fill_default_downlinkBWP(NR_BWP_Downlink_t *bwp,
NR_ServingCellConfigCommon_t
*
scc
,
rrc_gNB_carrier_data_t
*
carrier
)
{
bwp
->
bwp_Id
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Id
;
/// BWP common configuration
bwp
->
bwp_Common
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Common
));
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
;
bwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
bwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
cyclicPrefix
;
if
(
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
&&
bwp_loop
<
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
count
)
{
bwp
->
bwp_Id
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Id
;
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
;
bwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
bwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
cyclicPrefix
;
}
else
{
bwp
->
bwp_Id
=
bwp_loop
+
1
;
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
PRBalloc_to_locationandbandwidth
(
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
carrierBandwidth
,
0
);
bwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
.
subcarrierSpacing
;
bwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
.
cyclicPrefix
;
}
bwp
->
bwp_Common
->
pdcch_ConfigCommon
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Common
->
pdcch_ConfigCommon
));
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
present
=
NR_SetupRelease_PDCCH_ConfigCommon_PR_setup
;
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
));
...
...
@@ -1114,9 +1122,6 @@ void fill_default_downlinkBWP(NR_BWP_Downlink_t *bwp,
ASN_SEQUENCE_ADD
(
&
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
->
list
,
ss
);
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceSIB1
=
NULL
;
if
(
get_softmodem_params
()
->
sa
)
{
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceSIB1
=
NULL
;
}
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceOtherSystemInformation
=
NULL
;
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
pagingSearchSpace
=
NULL
;
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
=
NULL
;
...
...
@@ -1242,13 +1247,21 @@ void fill_default_uplinkBWP(NR_BWP_Uplink_t *ubwp,
rrc_gNB_carrier_data_t
*
carrier
,
int
uid
)
{
ubwp
->
bwp_Id
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Id
;
/// BWP common configuration
ubwp
->
bwp_Common
=
calloc
(
1
,
sizeof
(
*
ubwp
->
bwp_Common
));
ubwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
;
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
ubwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
cyclicPrefix
;
if
(
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
&&
bwp_loop
<
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
count
)
{
ubwp
->
bwp_Id
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Id
;
ubwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
;
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
ubwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_loop
]
->
bwp_Common
->
genericParameters
.
cyclicPrefix
;
}
else
{
ubwp
->
bwp_Id
=
bwp_loop
+
1
;
ubwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
=
PRBalloc_to_locationandbandwidth
(
scc
->
uplinkConfigCommon
->
frequencyInfoUL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
carrierBandwidth
,
0
);
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
subcarrierSpacing
;
ubwp
->
bwp_Common
->
genericParameters
.
cyclicPrefix
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
cyclicPrefix
;
}
ubwp
->
bwp_Common
->
rach_ConfigCommon
=
NULL
;
ubwp
->
bwp_Common
->
pusch_ConfigCommon
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
;
ubwp
->
bwp_Common
->
pucch_ConfigCommon
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
;
...
...
@@ -1872,8 +1885,10 @@ void fill_initial_SpCellConfig(rnti_t rnti,
*
pdsch_servingcellconfig
->
ext1
->
maxMIMO_Layers
=
2
;
// Downlink BWPs
int
n_dl_bwp
=
0
;
if
(
servingcellconfigdedicated
&&
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
)
{
int
n_dl_bwp
=
1
;
if
(
servingcellconfigdedicated
&&
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
&&
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
count
>
0
)
{
n_dl_bwp
=
servingcellconfigdedicated
->
downlinkBWP_ToAddModList
->
list
.
count
;
}
if
(
n_dl_bwp
>
0
){
...
...
@@ -1890,8 +1905,10 @@ void fill_initial_SpCellConfig(rnti_t rnti,
}
// Uplink BWPs
int
n_ul_bwp
=
0
;
if
(
servingcellconfigdedicated
&&
servingcellconfigdedicated
->
uplinkConfig
&&
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
)
{
int
n_ul_bwp
=
1
;
if
(
servingcellconfigdedicated
&&
servingcellconfigdedicated
->
uplinkConfig
&&
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
&&
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
count
>
0
)
{
n_ul_bwp
=
servingcellconfigdedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
count
;
}
if
(
n_ul_bwp
>
0
)
{
...
...
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