Commit 6a9d6062 authored by Raymond Knopp's avatar Raymond Knopp

Temporarily consider single LCID for DL traffic scheduling

parent 2e809254
...@@ -545,7 +545,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP, ...@@ -545,7 +545,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
nfapi_nr_dl_tti_pdsch_pdu_rel15_t *dlsch_config){ nfapi_nr_dl_tti_pdsch_pdu_rel15_t *dlsch_config){
int post_padding = 0, ta_len = 0, header_length_total = 0, sdu_length_total = 0, num_sdus = 0; int post_padding = 0, ta_len = 0, header_length_total = 0, sdu_length_total = 0, num_sdus = 0;
int lcid, offset, i, header_length_last, TBS_bytes; int lcid, offset, i, header_length_last, TBS_bytes = 0;
int UE_id = 0, CC_id = 0; int UE_id = 0, CC_id = 0;
int pucch_sched; int pucch_sched;
...@@ -585,14 +585,16 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP, ...@@ -585,14 +585,16 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
//at the upper layers //at the upper layers
if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->phy_test == 0){ if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->phy_test == 0){
for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) { lcid = DTCH;
//for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
// TODO: check if the lcid is active // TODO: check if the lcid is active
LOG_D(MAC, "[gNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (TBS %d bytes, len %d)\n", LOG_D(MAC, "[gNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (TBS %d bytes, len %d)\n",
module_idP, frameP, lcid, TBS_bytes, TBS_bytes - ta_len - header_length_total - sdu_length_total - 3); module_idP, frameP, lcid, TBS_bytes, TBS_bytes - ta_len - header_length_total - sdu_length_total - 3);
if (TBS_bytes - ta_len - header_length_total - sdu_length_total - 3 > 0) { //if (TBS_bytes - ta_len - header_length_total - sdu_length_total - 3 > 0) {
rlc_status = mac_rlc_status_ind(module_idP, rlc_status = mac_rlc_status_ind(module_idP,
rnti, rnti,
module_idP, module_idP,
...@@ -661,10 +663,10 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP, ...@@ -661,10 +663,10 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
if (TBS_bytes == 0) if (TBS_bytes == 0)
return; return;
} }
} else { // no TBS_bytes left /*} else { // no TBS_bytes left
break; break;
} }*/
} //} for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
} //if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->phy_test) } //if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->phy_test)
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment