From af58597647a1e94caa623f6706f05ad6aab7b413 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Sat, 27 Jun 2020 16:34:47 +0100 Subject: [PATCH] fix mac tb building in scheduler --- srsenb/hdr/stack/mac/scheduler_ue.h | 2 +- srsenb/src/stack/mac/scheduler_ue.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srsenb/hdr/stack/mac/scheduler_ue.h b/srsenb/hdr/stack/mac/scheduler_ue.h index af4cd31e6..f1d42115f 100644 --- a/srsenb/hdr/stack/mac/scheduler_ue.h +++ b/srsenb/hdr/stack/mac/scheduler_ue.h @@ -94,7 +94,7 @@ public: // void ul_recv(uint8_t lcg_id, uint32_t len); void dl_buffer_state(uint8_t lcid, uint32_t tx_queue, uint32_t retx_queue); - bool alloc_rlc_pdu(sched_interface::dl_sched_pdu_t* lcid, int rem_bytes); + int alloc_rlc_pdu(sched_interface::dl_sched_pdu_t* lcid, int rem_bytes); bool is_bearer_active(uint32_t lcid) const; bool is_bearer_ul(uint32_t lcid) const; diff --git a/srsenb/src/stack/mac/scheduler_ue.cc b/srsenb/src/stack/mac/scheduler_ue.cc index 4165ad2e3..8499f8084 100644 --- a/srsenb/src/stack/mac/scheduler_ue.cc +++ b/srsenb/src/stack/mac/scheduler_ue.cc @@ -1415,7 +1415,7 @@ void lch_manager::dl_buffer_state(uint8_t lcid, uint32_t tx_queue, uint32_t retx } /* Allocates first available RLC PDU */ -bool lch_manager::alloc_rlc_pdu(sched_interface::dl_sched_pdu_t* rlc_pdu, int rem_bytes) +int lch_manager::alloc_rlc_pdu(sched_interface::dl_sched_pdu_t* rlc_pdu, int rem_bytes) { // TODO: Implement lcid priority (now lowest index is lowest priority) int alloc_bytes = 0; @@ -1431,7 +1431,7 @@ bool lch_manager::alloc_rlc_pdu(sched_interface::dl_sched_pdu_t* rlc_pdu, int re rlc_pdu->lcid = i - 1; Debug("SCHED: Allocated lcid=%d, nbytes=%d, tbs_bytes=%d\n", rlc_pdu->lcid, rlc_pdu->nbytes, rem_bytes); } - return alloc_bytes > 0; + return alloc_bytes; } int lch_manager::alloc_retx_bytes(uint8_t lcid, uint32_t rem_bytes)