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
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
oai
openairinterface5G
Commits
9dcd1f9b
Commit
9dcd1f9b
authored
7 years ago
by
Robert Schmidt
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: max_allowed_rbs has been renamed max_rbs_allowed_slice
parent
50f70531
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!276
Feature merge merge f68
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
targets/SIMU/USER/event_handler.c
+8
-8
8 additions, 8 deletions
targets/SIMU/USER/event_handler.c
with
8 additions
and
8 deletions
targets/SIMU/USER/event_handler.c
+
8
−
8
View file @
9dcd1f9b
...
...
@@ -524,9 +524,9 @@ void update_mac(Event_t event)
for
(
j
=
0
;
j
<
MAX_NUM_LCID
;
j
++
)
{
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
]
=
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
LOG_I
(
EMU
,
"max_allowed_rbs UE %d LCID %d:"
,
i
,
j
);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]);
}
}
...
...
@@ -646,9 +646,9 @@ void update_mac(Event_t event)
if
(
mac_config
->
max_allowed_rbs
!=
NULL
)
{
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
]
=
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
LOG_I
(
EMU
,
"max_allowed_rbs UE %d LCID %d:"
,
i
,
j
);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]);
}
...
...
@@ -951,18 +951,18 @@ void update_mac(Event_t event)
if
(
&
mac_config
[
i
].
max_allowed_rbs
[
j
]
!=
NULL
)
{
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
]
=
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]
=
oai_emulation
->
mac_config
[
i
].
max_allowed_rbs
[
j
];
LOG_I
(
EMU
,
"max_allowed_rbs UE %d LCID %d:"
,
i
,
j
);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_allowed_
rbs
[
j
]);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
i
].
max_
rbs_
allowed_
slice
[
j
][
0
]);
}
}
}
}
}
else
{
oai_emulation
->
mac_config
[
event
.
ue
].
max_allowed_rbs
[
event
.
lcid
]
=
mac_config
[
event
.
ue
].
max_allowed_rbs
[
event
.
lcid
];
UE_list
->
UE_sched_ctrl
[
event
.
ue
].
max_allowed_
rbs
[
event
.
lcid
]
=
oai_emulation
->
mac_config
[
event
.
ue
].
max_allowed_rbs
[
event
.
lcid
];
UE_list
->
UE_sched_ctrl
[
event
.
ue
].
max_
rbs_
allowed_
slice
[
event
.
lcid
]
[
0
]
=
oai_emulation
->
mac_config
[
event
.
ue
].
max_allowed_rbs
[
event
.
lcid
];
LOG_I
(
EMU
,
"max_allowed_rbs UE %d LCID %d:"
,
event
.
ue
,
event
.
lcid
);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
event
.
ue
].
max_allowed_
rbs
[
event
.
lcid
]);
LOG_I
(
EMU
,
"%"
PRIu16
"
\n
"
,
UE_list
->
UE_sched_ctrl
[
event
.
ue
].
max_
rbs_
allowed_
slice
[
event
.
lcid
]
[
0
]
);
}
}
else
if
(
!
strcmp
((
char
*
)
event
.
key
,
"max_mcs"
)
&&
event
.
value
!=
NULL
&&
validate_mac
(
event
))
{
...
...
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