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
spbro
OpenXG-RAN
Commits
6475c794
Commit
6475c794
authored
9 months ago
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
this avoids member access within null pointer error seen in RFsim CI tests sometimes
parent
fefdac73
Branches unavailable
2024.w43
2024.w42
2024.w41
2024.w40
2024.w39
2024.w38
2024.w36
2024.w35
2024.w34
2024.w33
2024.w32
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+3
-5
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
6475c794
...
...
@@ -1065,7 +1065,7 @@ void nr_ue_aperiodic_srs_scheduling(NR_UE_MAC_INST_t *mac, long resource_trigger
NR_UE_UL_BWP_t
*
current_UL_BWP
=
mac
->
current_UL_BWP
;
NR_SRS_Config_t
*
srs_config
=
current_UL_BWP
->
srs_Config
;
if
(
!
srs_config
)
{
if
(
!
srs_config
||
!
srs_config
->
srs_ResourceSetToAddModList
)
{
LOG_E
(
NR_MAC
,
"DCI is triggering aperiodic SRS but there is no SRS configuration
\n
"
);
return
;
}
...
...
@@ -1126,17 +1126,15 @@ void nr_ue_aperiodic_srs_scheduling(NR_UE_MAC_INST_t *mac, long resource_trigger
// Periodic SRS scheduling
static
bool
nr_ue_periodic_srs_scheduling
(
NR_UE_MAC_INST_t
*
mac
,
frame_t
frame
,
slot_t
slot
)
{
bool
srs_scheduled
=
false
;
NR_UE_UL_BWP_t
*
current_UL_BWP
=
mac
->
current_UL_BWP
;
NR_SRS_Config_t
*
srs_config
=
current_UL_BWP
?
current_UL_BWP
->
srs_Config
:
NULL
;
if
(
!
srs_config
)
{
if
(
!
srs_config
||
!
srs_config
->
srs_ResourceSetToAddModList
)
{
return
false
;
}
bool
srs_scheduled
=
false
;
for
(
int
rs
=
0
;
rs
<
srs_config
->
srs_ResourceSetToAddModList
->
list
.
count
;
rs
++
)
{
// Find periodic resource set
NR_SRS_ResourceSet_t
*
srs_resource_set
=
srs_config
->
srs_ResourceSetToAddModList
->
list
.
array
[
rs
];
if
(
srs_resource_set
->
resourceType
.
present
!=
NR_SRS_ResourceSet__resourceType_PR_periodic
)
{
...
...
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