maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved fix gNB downlink MAC short/long header accordingly with RLC buffer size

Browse Source
This commit is contained in:
luis_pereira87
2021-07-03 08:54:16 +01:00
parent 081a287929
commit 88d7ad11a2
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+15 -18
View File
@@ -1101,19 +1101,21 @@ void nr_schedule_ue_spec(module_id_t module_id,
int dlsch_total_bytes = 0; int dlsch_total_bytes = 0;
if (sched_ctrl->num_total_bytes > 0) { if (sched_ctrl->num_total_bytes > 0) {
tbs_size_t len = 0; tbs_size_t len = 0;
while (size > 3) {
// Check MAC header short/long format and size
// Check if data from RLC is equal or longer than 256B or not.
// Data from RLC was checked before, in function nr_store_dlsch_buffer
int header_size = sizeof(NR_MAC_SUBHEADER_SHORT);
if (sched_ctrl->num_total_bytes >= 256) {
header_size = sizeof(NR_MAC_SUBHEADER_LONG);
}
while (size > header_size) {
// Reserve space for short or long header. // Reserve space for short or long header.
// Check if data from RLC is equal or longer than 256B or not.
// Data from RLC was checked before, in function nr_store_dlsch_buffer
uint8_t *header = buf; uint8_t *header = buf;
if (sched_ctrl->num_total_bytes >= 256) { buf += header_size;
buf += sizeof(NR_MAC_SUBHEADER_LONG); size -= header_size;
size -= sizeof(NR_MAC_SUBHEADER_LONG);
} else {
buf += sizeof(NR_MAC_SUBHEADER_SHORT);
size -= sizeof(NR_MAC_SUBHEADER_SHORT);
}
/* limit requested number of bytes to what preprocessor specified, or /* limit requested number of bytes to what preprocessor specified, or
* such that TBS is full */ * such that TBS is full */
@@ -1143,7 +1145,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
if (len == 0) if (len == 0)
break; break;
if (sched_ctrl->num_total_bytes >= 256) { if (header_size == sizeof(NR_MAC_SUBHEADER_LONG)) {
((NR_MAC_SUBHEADER_LONG *) header)->R = 0; ((NR_MAC_SUBHEADER_LONG *) header)->R = 0;
((NR_MAC_SUBHEADER_LONG *) header)->F = 1; ((NR_MAC_SUBHEADER_LONG *) header)->F = 1;
((NR_MAC_SUBHEADER_LONG *) header)->LCID = lcid; ((NR_MAC_SUBHEADER_LONG *) header)->LCID = lcid;
@@ -1162,13 +1164,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
} }
if (len == 0) { if (len == 0) {
/* RLC did not have data anymore, mark buffer as unused */ /* RLC did not have data anymore, mark buffer as unused */
if (sched_ctrl->num_total_bytes >= 256) { buf -= header_size;
buf -= sizeof(NR_MAC_SUBHEADER_LONG); size += header_size;
size += sizeof(NR_MAC_SUBHEADER_LONG);
} else {
buf -= sizeof(NR_MAC_SUBHEADER_SHORT);
size += sizeof(NR_MAC_SUBHEADER_SHORT);
}
} }
} }
else if (get_softmodem_params()->phy_test || get_softmodem_params()->do_ra || get_softmodem_params()->sa) { else if (get_softmodem_params()->phy_test || get_softmodem_params()->do_ra || get_softmodem_params()->sa) {