Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
e1a598bc
Commit
e1a598bc
authored
Aug 13, 2018
by
Robert Schmidt
Browse files
Fix function parameter definition/order
Affects: * store_dlsch_buffer() * assign_rbs_required()
parent
21983a20
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair2/LAYER2/MAC/mac_proto.h
View file @
e1a598bc
...
...
@@ -700,8 +700,8 @@ int add_new_ue(module_id_t Mod_id, int CC_id, rnti_t rnti, int harq_pid
);
int
rrc_mac_remove_ue
(
module_id_t
Mod_id
,
rnti_t
rntiP
);
void
store_dlsch_buffer
(
module_id_t
Mod_id
,
slice_id_
t
slice_id
,
frame_t
frameP
,
sub_frame_t
subframeP
);
void
assign_rbs_required
(
module_id_t
Mod_id
,
slice_id_
t
slice_id
,
frame_t
frameP
,
sub_frame_t
subframe
,
uint16_t
nb_rbs_required
[
NFAPI_CC_MAX
][
MAX_MOBILES_PER_ENB
],
int
min_rb_unit
[
NFAPI_CC_MAX
]);
void
store_dlsch_buffer
(
module_id_t
Mod_id
,
in
t
slice_id
x
,
frame_t
frameP
,
sub_frame_t
subframeP
);
void
assign_rbs_required
(
module_id_t
Mod_id
,
in
t
slice_id
x
,
frame_t
frameP
,
sub_frame_t
subframe
,
uint16_t
nb_rbs_required
[
NFAPI_CC_MAX
][
MAX_MOBILES_PER_ENB
],
int
min_rb_unit
[
NFAPI_CC_MAX
]);
int
maxround
(
module_id_t
Mod_id
,
uint16_t
rnti
,
int
frame
,
sub_frame_t
subframe
,
uint8_t
ul_flag
);
...
...
openair2/LAYER2/MAC/pre_processor.c
View file @
e1a598bc
...
...
@@ -177,8 +177,8 @@ assign_rbs_required(module_id_t Mod_id,
int
slice_idx
,
frame_t
frameP
,
sub_frame_t
subframe
,
int
min_rb_unit
[
NFAPI_CC_MAX
],
u
int
16_t
nb_rbs_required
[
NFAPI_CC_MAX
][
MAX_MOBILES_PER_ENB
])
u
int
16_t
nb_rbs_required
[
NFAPI_CC_MAX
][
MAX_MOBILES_PER_ENB
],
int
min_rb_unit
[
NFAPI_CC_MAX
])
{
uint16_t
TBS
=
0
;
...
...
@@ -1279,9 +1279,7 @@ dlsch_scheduler_pre_processor(module_id_t Mod_id,
store_dlsch_buffer
(
Mod_id
,
slice_idx
,
frameP
,
subframeP
);
// Calculate the number of RBs required by each UE on the basis of logical channel's buffer
assign_rbs_required
(
Mod_id
,
slice_idx
,
frameP
,
subframeP
,
min_rb_unit
,
nb_rbs_required
);
assign_rbs_required
(
Mod_id
,
slice_idx
,
frameP
,
subframeP
,
nb_rbs_required
,
min_rb_unit
);
// Sorts the user on the basis of dlsch logical channel buffer and CQI
sort_UEs
(
Mod_id
,
slice_idx
,
frameP
,
subframeP
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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