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
spbro
OpenXG-RAN
Commits
34b82143
Commit
34b82143
authored
Mar 04, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add UL BLER options and read from config
parent
17cbc4db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/GNB_APP/MACRLC_nr_paramdef.h
+13
-3
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+4
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1
-0
No files found.
openair2/GNB_APP/MACRLC_nr_paramdef.h
View file @
34b82143
...
...
@@ -63,10 +63,14 @@
#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER "dl_bler_target_upper"
#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER "dl_bler_target_lower"
#define CONFIG_STRING_MACRLC_DL_MAX_MCS "dl_max_mcs"
#define CONFIG_STRING_MACRLC_UL_BLER_TARGET_UPPER "ul_bler_target_upper"
#define CONFIG_STRING_MACRLC_UL_BLER_TARGET_LOWER "ul_bler_target_lower"
#define CONFIG_STRING_MACRLC_UL_MAX_MCS "ul_max_mcs"
#define CONFIG_STRING_MACRLC_HARQ_ROUND_MAX "harq_round_max"
#define CONFIG_STRING_MACRLC_MIN_GRANT_PRB "min_grant_prb"
#define CONFIG_STRING_MACRLC_MIN_GRANT_MCS "min_grant_mcs"
/*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* MacRLC configuration parameters */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
...
...
@@ -97,6 +101,9 @@
{CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER, "Upper threshold of BLER to decrease DL MCS", 0, dblptr:NULL, defdblval:0.15, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER, "Lower threshold of BLER to increase DL MCS", 0, dblptr:NULL, defdblval:0.05, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_DL_MAX_MCS, "Maximum DL MCS that should be used", 0, u8ptr:NULL, defintval:28, TYPE_UINT8, 0}, \
{CONFIG_STRING_MACRLC_UL_BLER_TARGET_UPPER, "Upper threshold of BLER to decrease UL MCS", 0, dblptr:NULL, defdblval:0.15, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_UL_BLER_TARGET_LOWER, "Lower threshold of BLER to increase UL MCS", 0, dblptr:NULL, defdblval:0.05, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_UL_MAX_MCS, "Maximum UL MCS that should be used", 0, u8ptr:NULL, defintval:9, TYPE_UINT8, 0}, \
{CONFIG_STRING_MACRLC_HARQ_ROUND_MAX, "Maximum number of HARQ rounds", 0, u8ptr:NULL, defintval:4, TYPE_UINT8, 0}, \
{CONFIG_STRING_MACRLC_MIN_GRANT_PRB, "Minimal Periodic ULSCH Grant PRBs", 0, u8ptr:NULL, defintval:5, TYPE_UINT8, 0}, \
{CONFIG_STRING_MACRLC_MIN_GRANT_MCS, "Minimal Periodic ULSCH Grant MCS", 0, u8ptr:NULL, defintval:9, TYPE_UINT8, 0} \
...
...
@@ -126,9 +133,12 @@
#define MACRLC_DL_BLER_TARGET_UPPER_IDX 22
#define MACRLC_DL_BLER_TARGET_LOWER_IDX 23
#define MACRLC_DL_MAX_MCS_IDX 24
#define MACRLC_HARQ_ROUND_MAX_IDX 25
#define MACRLC_MIN_GRANT_PRB_IDX 26
#define MACRLC_MIN_GRANT_MCS_IDX 27
#define MACRLC_UL_BLER_TARGET_UPPER_IDX 25
#define MACRLC_UL_BLER_TARGET_LOWER_IDX 26
#define MACRLC_UL_MAX_MCS_IDX 27
#define MACRLC_HARQ_ROUND_MAX_IDX 28
#define MACRLC_MIN_GRANT_PRB_IDX 29
#define MACRLC_MIN_GRANT_MCS_IDX 30
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
openair2/GNB_APP/gnb_config.c
View file @
34b82143
...
...
@@ -877,6 +877,10 @@ void RCconfig_nr_macrlc() {
dl_bler_options
->
upper
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_BLER_TARGET_UPPER_IDX
].
dblptr
);
dl_bler_options
->
lower
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_BLER_TARGET_LOWER_IDX
].
dblptr
);
dl_bler_options
->
max_mcs
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_MAX_MCS_IDX
].
u8ptr
);
NR_bler_options_t
*
ul_bler_options
=
&
RC
.
nrmac
[
j
]
->
ul_bler
;
ul_bler_options
->
upper
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_UL_BLER_TARGET_UPPER_IDX
].
dblptr
);
ul_bler_options
->
lower
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_UL_BLER_TARGET_LOWER_IDX
].
dblptr
);
ul_bler_options
->
max_mcs
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_UL_MAX_MCS_IDX
].
u8ptr
);
RC
.
nrmac
[
j
]
->
harq_round_max
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_HARQ_ROUND_MAX_IDX
].
u8ptr
);
RC
.
nrmac
[
j
]
->
min_grant_prb
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_MIN_GRANT_PRB_IDX
].
u8ptr
);
RC
.
nrmac
[
j
]
->
min_grant_mcs
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_MIN_GRANT_MCS_IDX
].
u8ptr
);
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
34b82143
...
...
@@ -840,6 +840,7 @@ typedef struct gNB_MAC_INST_s {
bool
first_MIB
;
NR_bler_options_t
dl_bler
;
NR_bler_options_t
ul_bler
;
uint8_t
harq_round_max
;
uint8_t
min_grant_prb
;
uint8_t
min_grant_mcs
;
...
...
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