Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Worker.N
openairinterface5G
Commits
e1a598bc
Commit
e1a598bc
authored
6 years ago
by
Robert Schmidt
Browse files
Options
Downloads
Patches
Plain Diff
Fix function parameter definition/order
Affects: * store_dlsch_buffer() * assign_rbs_required()
parent
21983a20
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
openair2/LAYER2/MAC/mac_proto.h
+2
-2
2 additions, 2 deletions
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
+3
-5
3 additions, 5 deletions
openair2/LAYER2/MAC/pre_processor.c
with
5 additions
and
7 deletions
openair2/LAYER2/MAC/mac_proto.h
+
2
−
2
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
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/pre_processor.c
+
3
−
5
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment