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
98ab5026
Commit
98ab5026
authored
Apr 22, 2020
by
ShintaroOgawa
Committed by
Haruki NAOI
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
non "--mu" Build error and Warinig
(cherry picked from commit f709e4a765b3ab8461bafcba672bae6b9c3f966f)
parent
da35d9ee
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+3
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
98ab5026
...
@@ -170,7 +170,6 @@ int dl_dtch_num;
...
@@ -170,7 +170,6 @@ int dl_dtch_num;
dl_buffer_total
[
CC_id
][
UE_id
]
+=
header_length_total
;
dl_buffer_total
[
CC_id
][
UE_id
]
+=
header_length_total
;
}
}
}
}
#endif
void
dlsch_scheduler_nb_rbs_required_lcid
(
module_id_t
module_idP
,
void
dlsch_scheduler_nb_rbs_required_lcid
(
module_id_t
module_idP
,
frame_t
frameP
,
frame_t
frameP
,
...
@@ -250,6 +249,7 @@ void dlsch_scheduler_nb_rbs_required_lcid( module_id_t module_idP,
...
@@ -250,6 +249,7 @@ void dlsch_scheduler_nb_rbs_required_lcid( module_id_t module_idP,
dl_buffer_total
[
CC_id
][
UE_id
]
+=
header_length_total
;
dl_buffer_total
[
CC_id
][
UE_id
]
+=
header_length_total
;
}
}
}
}
#endif
int
cc_id_end
(
uint8_t
*
cc_id_flag
)
{
int
cc_id_end
(
uint8_t
*
cc_id_flag
)
{
int
end_flag
=
1
;
int
end_flag
=
1
;
...
@@ -1017,8 +1017,10 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
...
@@ -1017,8 +1017,10 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
uint8_t
CC_id
;
uint8_t
CC_id
;
UE_list_t
*
UE_list
=
&
RC
.
mac
[
Mod_id
]
->
UE_list
;
UE_list_t
*
UE_list
=
&
RC
.
mac
[
Mod_id
]
->
UE_list
;
int
N_RB_DL
;
int
N_RB_DL
;
#if defined(PRE_SCD_THREAD)
eNB_UE_STATS
*
eNB_UE_stats
;
eNB_UE_STATS
*
eNB_UE_stats
;
uint16_t
step_size
;
uint16_t
step_size
;
#endif
UE_sched_ctrl_t
*
ue_sched_ctl
;
UE_sched_ctrl_t
*
ue_sched_ctl
;
// int rrc_status = RRC_IDLE;
// int rrc_status = RRC_IDLE;
COMMON_channels_t
*
cc
;
COMMON_channels_t
*
cc
;
...
@@ -3596,7 +3598,6 @@ void ulsch_scheduler_pre_ue_select_fairRR(
...
@@ -3596,7 +3598,6 @@ void ulsch_scheduler_pre_ue_select_fairRR(
uint8_t
ulsch_ue_max_num
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num_volte
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num_volte
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num_normal
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num_normal
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_num_volte
[
MAX_NUM_CCs
];
uint16_t
saved_ulsch_dci
[
MAX_NUM_CCs
];
uint16_t
saved_ulsch_dci
[
MAX_NUM_CCs
];
rnti_t
rnti
;
rnti_t
rnti
;
UE_sched_ctrl_t
*
UE_sched_ctl
=
NULL
;
UE_sched_ctrl_t
*
UE_sched_ctl
=
NULL
;
...
...
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