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
lizhongxiao
OpenXG-RAN
Commits
eb56a40d
Commit
eb56a40d
authored
Jan 13, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix in msg2 frame and slot re-selection
parent
49cf701a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+10
-5
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
eb56a40d
...
@@ -405,7 +405,6 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
...
@@ -405,7 +405,6 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// preferentially we schedule the msg2 in the mixed slot or in the last dl slot
// preferentially we schedule the msg2 in the mixed slot or in the last dl slot
// if they are allowed by search space configuration
// if they are allowed by search space configuration
uint8_t
mu
=
*
scc
->
ssbSubcarrierSpacing
;
uint8_t
mu
=
*
scc
->
ssbSubcarrierSpacing
;
uint8_t
response_window
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
ra_ResponseWindow
;
uint8_t
response_window
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
ra_ResponseWindow
;
uint8_t
slot_window
;
uint8_t
slot_window
;
...
@@ -491,9 +490,15 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
...
@@ -491,9 +490,15 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
||
(
*
msg2_frame
==
frame_limit
&&
*
msg2_slot
>
slot_limit
)
||
(
*
msg2_frame
==
frame_limit
&&
*
msg2_slot
>
slot_limit
)
||
((
*
msg2_frame
*
nr_slots_per_frame
[
mu
]
+
*
msg2_slot
-
monitoring_offset
)
%
monitoring_slot_period
!=
0
))
{
||
((
*
msg2_frame
*
nr_slots_per_frame
[
mu
]
+
*
msg2_slot
-
monitoring_offset
)
%
monitoring_slot_period
!=
0
))
{
if
(
!
tdd
||
((
*
msg2_slot
%
tdd_period_slot
)
>
0
))
{
if
((
frame_type
==
FDD
)
||
((
*
msg2_slot
%
tdd_period_slot
)
>
0
))
{
if
(
*
msg2_slot
==
0
)
if
(
*
msg2_slot
==
0
)
{
if
(
*
msg2_frame
!=
0
)
(
*
msg2_frame
)
--
;
(
*
msg2_frame
)
--
;
else
*
msg2_frame
=
1023
;
*
msg2_slot
=
nr_slots_per_frame
[
mu
]
-
1
;
}
else
(
*
msg2_slot
)
--
;
(
*
msg2_slot
)
--
;
}
}
else
else
...
...
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