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
wangjie
OpenXG-RAN
Commits
0ac2e2d5
Commit
0ac2e2d5
authored
Dec 19, 2020
by
imad
Committed by
Robert Schmidt
Jan 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modification on the slot location
parent
0f3d3b56
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+3
-2
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+4
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
0ac2e2d5
...
...
@@ -418,7 +418,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
}
// This schedule SR
nr_sr_reporting
(
module_idP
,
UE_id
,
slot
,
nr_slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
],
frame
);
nr_sr_reporting
(
module_idP
,
UE_id
,
slot
,
nr_slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
],
frame
,
num_slots_per_tdd
,
nr_ulmix_slots
);
// Schedule CSI measurement reporting: check in slot 0 for the whole frame
if
(
slot
==
0
)
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
0ac2e2d5
...
...
@@ -721,7 +721,8 @@ uint16_t compute_pucch_prb_size(uint8_t format,
}
void
nr_sr_reporting
(
int
Mod_idp
,
int
UE_id
,
sub_frame_t
slot
,
int
n_slots_frame
,
frame_t
SFN
){
void
nr_sr_reporting
(
int
Mod_idp
,
int
UE_id
,
sub_frame_t
slot
,
int
n_slots_frame
,
frame_t
SFN
,
int
slots_per_tdd
,
int
ul_slots
){
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
Mod_idp
]
->
UE_info
;
NR_PUCCH_ResourceSet_t
*
pucchresset
;
...
...
@@ -754,7 +755,7 @@ void nr_sr_reporting (int Mod_idp, int UE_id,sub_frame_t slot, int n_slots_frame
if
(((
SFN
*
n_slots_frame
)
+
slot
-
SR_offset
)
%
SR_period
==
0
){
NR_PUCCH_ResourceId_t
*
PucchResourceId
=
SchedulingRequestResourceConfig
->
resource
;
curr_pucch
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
[
slot
][
0
];
curr_pucch
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
[
(
slot
%
slots_per_tdd
)
-
slots_per_tdd
+
ul_slots
][
0
];
curr_pucch
->
sr_flag
=
true
;
curr_pucch
->
frame
=
SFN
;
curr_pucch
->
ul_slot
=
slot
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
0ac2e2d5
...
...
@@ -407,10 +407,13 @@ void nr_sr_reporting (int Mod_idp,
int
UE_id
,
sub_frame_t
slotP
,
int
n_slots_frame
,
frame_t
frameP
);
frame_t
frameP
,
int
slots_per_tdd
,
int
ul_slots
);
void
periodicity__SRR
(
NR_SchedulingRequestResourceConfig_t
*
SchedulingReqRecconf
,
int
*
period
,
int
*
offset
);
#endif
/*__LAYER2_NR_MAC_PROTO_H__*/
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