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
cb3c25f8
Commit
cb3c25f8
authored
May 20, 2020
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: PUSCH RB overlap is detected
(cherry picked from commit cdc5100d250883e90472d6de605a790a3c80052d)
parent
819a5a49
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+5
-0
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
cb3c25f8
...
@@ -3621,7 +3621,12 @@ void ulsch_scheduler_pre_ue_select_fairRR(
...
@@ -3621,7 +3621,12 @@ void ulsch_scheduler_pre_ue_select_fairRR(
saved_ulsch_dci
[
CC_id
]
=
eNB
->
HI_DCI0_req
[
CC_id
][
subframeP
].
hi_dci0_request_body
.
number_of_dci
;
saved_ulsch_dci
[
CC_id
]
=
eNB
->
HI_DCI0_req
[
CC_id
][
subframeP
].
hi_dci0_request_body
.
number_of_dci
;
// maximum multiplicity number
// maximum multiplicity number
ulsch_ue_max_num
[
CC_id
]
=
RC
.
rrc
[
module_idP
]
->
configuration
.
radioresourceconfig
[
CC_id
].
ue_multiple_max
;
ulsch_ue_max_num
[
CC_id
]
=
RC
.
rrc
[
module_idP
]
->
configuration
.
radioresourceconfig
[
CC_id
].
ue_multiple_max
;
if
(
eNB
->
volte_ul_cycle
[
CC_id
]
!=
0
){
ulsch_ue_max_num_volte
[
CC_id
]
=
(
uint16_t
)(
ulsch_ue_max_num
[
CC_id
]
/
2
);
ulsch_ue_max_num_volte
[
CC_id
]
=
(
uint16_t
)(
ulsch_ue_max_num
[
CC_id
]
/
2
);
}
else
{
ulsch_ue_max_num_volte
[
CC_id
]
=
0
;
}
ulsch_ue_max_num_normal
[
CC_id
]
=
ulsch_ue_max_num
[
CC_id
]
-
ulsch_ue_max_num_volte
[
CC_id
];
ulsch_ue_max_num_normal
[
CC_id
]
=
ulsch_ue_max_num
[
CC_id
]
-
ulsch_ue_max_num_volte
[
CC_id
];
cc_id_flag
[
CC_id
]
=
0
;
cc_id_flag
[
CC_id
]
=
0
;
ue_first_num
[
CC_id
]
=
0
;
ue_first_num
[
CC_id
]
=
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