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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
efd99aca
Commit
efd99aca
authored
Apr 20, 2022
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix read SSpace array index at -1
parent
709db951
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+4
-2
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
No files found.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
efd99aca
...
...
@@ -560,7 +560,8 @@ void configure_ss_coreset(NR_UE_MAC_INST_t *mac,
AssertFatal
(
ss
->
searchSpaceType
!=
NULL
,
"ss->searchSpaceType is null
\n
"
);
AssertFatal
(
ss
->
monitoringSymbolsWithinSlot
!=
NULL
,
"NR_SearchSpace->monitoringSymbolsWithinSlot is null
\n
"
);
AssertFatal
(
ss
->
monitoringSymbolsWithinSlot
->
buf
!=
NULL
,
"NR_SearchSpace->monitoringSymbolsWithinSlot->buf is null
\n
"
);
mac
->
SSpace
[
dl_bwp_id
-
1
][
ss
->
searchSpaceId
-
1
]
=
ss
;
AssertFatal
(
ss
->
searchSpaceId
<=
FAPI_NR_MAX_SS
,
"Invalid searchSpaceId
\n
"
);
mac
->
SSpace
[
dl_bwp_id
][
ss
->
searchSpaceId
-
1
]
=
ss
;
}
struct
NR_PDCCH_ConfigCommon__commonSearchSpaceList
*
commonSearchSpaceList
=
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
;
...
...
@@ -575,7 +576,8 @@ void configure_ss_coreset(NR_UE_MAC_INST_t *mac,
AssertFatal
(
css
->
searchSpaceType
!=
NULL
,
"css->searchSpaceType is null
\n
"
);
AssertFatal
(
css
->
monitoringSymbolsWithinSlot
!=
NULL
,
"css->monitoringSymbolsWithinSlot is null
\n
"
);
AssertFatal
(
css
->
monitoringSymbolsWithinSlot
->
buf
!=
NULL
,
"css->monitoringSymbolsWithinSlot->buf is null
\n
"
);
mac
->
SSpace
[
dl_bwp_id
-
1
][
css
->
searchSpaceId
-
1
]
=
css
;
AssertFatal
(
css
->
searchSpaceId
<=
FAPI_NR_MAX_SS
,
"Invalid searchSpaceId
\n
"
);
mac
->
SSpace
[
dl_bwp_id
][
css
->
searchSpaceId
-
1
]
=
css
;
}
}
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
efd99aca
...
...
@@ -102,7 +102,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
ss_id
,
mac
->
ra
.
ss
->
searchSpaceId
);
}
else
ss
=
mac
->
SSpace
[
dl_bwp_id
-
1
][
ss_id
-
1
];
ss
=
mac
->
SSpace
[
dl_bwp_id
][
ss_id
-
1
];
}
else
ss
=
mac
->
search_space_zero
;
...
...
@@ -277,12 +277,12 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
if
(
bwpd
)
{
for
(
ss_id
=
1
;
ss_id
<=
FAPI_NR_MAX_SS
;
ss_id
++
){
if
(
mac
->
SSpace
[
bwp_id
-
1
][
ss_id
-
1
]
==
NULL
)
{
if
(
mac
->
SSpace
[
bwp_id
][
ss_id
-
1
]
==
NULL
)
{
continue
;
}
LOG_D
(
NR_MAC
,
"[DCI_CONFIG] ss_id %d
\n
"
,
ss_id
);
NR_SearchSpace_t
*
ss
=
mac
->
SSpace
[
bwp_id
-
1
][
ss_id
-
1
];
NR_SearchSpace_t
*
ss
=
mac
->
SSpace
[
bwp_id
][
ss_id
-
1
];
AssertFatal
(
ss_id
==
ss
->
searchSpaceId
,
"SS IDs don't correspond
\n
"
);
fapi_nr_dl_config_dci_dl_pdu_rel15_t
*
rel15
=
&
dl_config
->
dl_config_list
[
dl_config
->
number_pdus
].
dci_config_pdu
.
dci_config_rel15
;
NR_SetupRelease_PDCCH_ConfigCommon_t
*
pdcch_ConfigCommon
=
bwp_Common
->
pdcch_ConfigCommon
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
efd99aca
...
...
@@ -2642,7 +2642,7 @@ int get_n_rb(NR_UE_MAC_INST_t *mac, int rnti_type){
case
NR_RNTI_P
:
{
if
(
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
controlResourceSetZero
)
{
uint8_t
coreset_id
=
0
;
// assuming controlResourceSetId is 0 for controlResourceSetZero
NR_ControlResourceSet_t
*
coreset
=
mac
->
coreset
[
dl_bwp_id
-
1
][
coreset_id
];
NR_ControlResourceSet_t
*
coreset
=
mac
->
coreset
[
dl_bwp_id
][
coreset_id
];
get_coreset_rballoc
(
coreset
->
frequencyDomainResources
.
buf
,
&
N_RB
,
&
start_RB
);
}
else
{
N_RB
=
NRRIV2BW
(
mac
->
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