Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
98b3e3e9
Commit
98b3e3e9
authored
Feb 19, 2021
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix in PHR, addition of configuration parameters for MAC scheduler
parent
50eea051
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
8 deletions
+20
-8
openair2/ENB_APP/MACRLC_paramdef.h
openair2/ENB_APP/MACRLC_paramdef.h
+2
-2
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+11
-3
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-1
openair2/LAYER2/MAC/main.c
openair2/LAYER2/MAC/main.c
+5
-2
No files found.
openair2/ENB_APP/MACRLC_paramdef.h
View file @
98b3e3e9
...
...
@@ -92,8 +92,8 @@
{CONFIG_STRING_MACRLC_DEFAULT_SCHED_DL_ALGO, NULL, 0, strptr:NULL, defstrval:"round_robin_dl", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_UE_MULTIPLE_MAX, NULL, 0, iptr:NULL, defintval:4, TYPE_INT, 0}, \
{CONFIG_STRING_MACRLC_USE_MCS_OFFSET, NULL, 0, iptr:NULL, defintval:1, TYPE_INT, 0}, \
{CONFIG_STRING_MACRLC_BLER_TARGET_LOWER, NULL, 0,
i
ptr:NULL, defdblval:.5, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_BLER_TARGET_UPPER, NULL, 0,
i
ptr:NULL, defdblval:2, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_BLER_TARGET_LOWER, NULL, 0,
dbl
ptr:NULL, defdblval:.5, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_BLER_TARGET_UPPER, NULL, 0,
dbl
ptr:NULL, defdblval:2, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_MAX_UL_RB_INDEX, NULL, 0, iptr:NULL, defintval:22, TYPE_INT, 0}}
#define MACRLC_CC_IDX 0
...
...
openair2/ENB_APP/enb_config.c
View file @
98b3e3e9
...
...
@@ -225,12 +225,20 @@ void RCconfig_macrlc(int macrlc_has_f1[MAX_MAC_INST]) {
RC
.
mac
[
j
]
->
bler_upper
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_BLER_TARGET_UPPER_IDX
].
dblptr
);
RC
.
mac
[
j
]
->
max_ul_rb_index
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_MAX_UL_RB_INDEX_IDX
].
iptr
);
RC
.
nb_mac_CC
[
j
]
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_CC_IDX
].
iptr
);
LOG_I
(
ENB_APP
,
"MAC instance %d parameters : pusch_snr %lf, pucch_snr %lf, ue_multiple_max %d, use_mcs_offset %d, bler_lower %lf, bler_upper %lf,max_ul_rb_index %d
\n
"
,
j
,
RC
.
mac
[
j
]
->
puSch10xSnr
/
10
.
0
,
RC
.
mac
[
j
]
->
puCch10xSnr
/
10
.
0
,
RC
.
mac
[
j
]
->
ue_multiple_max
,
RC
.
mac
[
j
]
->
use_mcs_offset
,
RC
.
mac
[
j
]
->
bler_lower
,
RC
.
mac
[
j
]
->
bler_upper
,
RC
.
mac
[
j
]
->
max_ul_rb_index
);
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"local_RRC"
)
==
0
)
{
// check number of instances is same as RRC/PDCP
printf
(
"Configuring local RRC for MACRLC
\n
"
);
LOG_I
(
ENB_APP
,
"Configuring local RRC for MACRLC
\n
"
);
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"f1"
)
==
0
)
{
printf
(
"Configuring F1 interfaces for MACRLC
\n
"
);
LOG_I
(
ENB_APP
,
"Configuring F1 interfaces for MACRLC
\n
"
);
RC
.
mac
[
j
]
->
eth_params_n
.
local_if_name
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_IF_NAME_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_n
.
remote_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_N_ADDRESS_IDX
].
strptr
));
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
98b3e3e9
...
...
@@ -409,7 +409,8 @@ rx_sdu(const module_id_t enb_mod_idP,
switch
(
rx_ces
[
i
])
{
// implement and process PHR + CRNTI + BSR
case
POWER_HEADROOM
:
if
(
UE_id
!=
-
1
)
{
UE_template_ptr
->
phr_info
=
(
payload_ptr
[
0
]
&
0x3f
)
-
PHR_MAPPING_OFFSET
+
(
int8_t
)(
hundred_times_log10_NPRB
[
UE_template_ptr
->
nb_rb_ul
[
harq_pid
]
-
1
]
/
100
);
/*UE_template_ptr->phr_info = (payload_ptr[0] & 0x3f) - PHR_MAPPING_OFFSET + (int8_t)(hundred_times_log10_NPRB[UE_template_ptr->nb_rb_ul[harq_pid] - 1] / 100);i*/
UE_template_ptr
->
phr_info
=
(
payload_ptr
[
0
]
&
0x3f
)
-
PHR_MAPPING_OFFSET
+
estimate_ue_tx_power
(
0
,
sdu_lenP
*
8
,
UE_template_ptr
->
nb_rb_ul
[
harq_pid
],
0
,
mac
->
common_channels
[
CC_idP
].
Ncp
,
0
);
if
(
UE_template_ptr
->
phr_info
>
40
)
{
UE_template_ptr
->
phr_info
=
40
;
...
...
openair2/LAYER2/MAC/main.c
View file @
98b3e3e9
...
...
@@ -68,7 +68,7 @@ void *mac_stats_thread(void *param) {
else
{
total_bler
=
(
double
)
UE_scheduling_control
->
pusch_rx_error_num
[
CC_id
]
/
(
double
)(
UE_scheduling_control
->
pusch_rx_error_num
[
CC_id
]
+
UE_scheduling_control
->
pusch_rx_num
[
CC_id
])
*
100
;
}
fprintf
(
fd
,
"MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %d UL-stat rcv %lu err %lu bler %lf
mcsoff %d
bsr %u sched %u tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %u 1st %u ret %u ri %d
\n
"
,
fprintf
(
fd
,
"MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %d UL-stat rcv %lu err %lu bler %lf
(%lf/%lf) total_bler %lf mcsoff %d pre_allocated nb_rb %d, mcs %d,
bsr %u sched %u tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %u 1st %u ret %u ri %d
\n
"
,
rnti
,
UE_scheduling_control
->
ul_out_of_sync
==
0
?
"in synch"
:
"out of sync"
,
UE_info
->
UE_template
[
CC_id
][
UE_id
].
phr_info
,
...
...
@@ -78,8 +78,11 @@ void *mac_stats_thread(void *param) {
UE_scheduling_control
->
rlc_out_of_resources_cnt
,
UE_scheduling_control
->
pusch_rx_num
[
CC_id
],
UE_scheduling_control
->
pusch_rx_error_num
[
CC_id
],
total_bler
,
UE_scheduling_control
->
pusch_bler
[
CC_id
],
mac
->
bler_lower
,
mac
->
bler_upper
,
total_bler
,
UE_scheduling_control
->
mcs_offset
[
CC_id
],
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_nb_rb_ul
,
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
,
UE_info
->
UE_template
[
CC_id
][
UE_id
].
estimated_ul_buffer
,
UE_info
->
UE_template
[
CC_id
][
UE_id
].
scheduled_ul_bytes
,
UE_info
->
eNB_UE_stats
[
CC_id
][
UE_id
].
total_pdu_bytes_rx
,
...
...
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