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
canghaiwuhen
OpenXG-RAN
Commits
9dcd1f9b
Commit
9dcd1f9b
authored
Feb 14, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: max_allowed_rbs has been renamed max_rbs_allowed_slice
parent
50f70531
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
targets/SIMU/USER/event_handler.c
targets/SIMU/USER/event_handler.c
+8
-8
No files found.
targets/SIMU/USER/event_handler.c
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
))
{
...
...
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