|
|
@ -227,6 +227,9 @@ void sched_ue::new_subframe(tti_point tti_rx, uint32_t enb_cc_idx)
|
|
|
|
if (current_tti != tti_rx) {
|
|
|
|
if (current_tti != tti_rx) {
|
|
|
|
current_tti = tti_rx;
|
|
|
|
current_tti = tti_rx;
|
|
|
|
lch_handler.new_tti();
|
|
|
|
lch_handler.new_tti();
|
|
|
|
|
|
|
|
for (auto& cc : carriers) {
|
|
|
|
|
|
|
|
cc.harq_ent.new_tti(tti_rx);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int ue_cc_idx = enb_ue_cc_idx_map[enb_cc_idx];
|
|
|
|
int ue_cc_idx = enb_ue_cc_idx_map[enb_cc_idx];
|
|
|
|
if (ue_cc_idx >= 0) {
|
|
|
|
if (ue_cc_idx >= 0) {
|
|
|
@ -1501,7 +1504,7 @@ int cc_sched_ue::get_required_prb_dl(uint32_t req_bytes, uint32_t nof_ctrl_symbo
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto compute_tbs_approx = [this, nof_ctrl_symbols](uint32_t nof_prb) {
|
|
|
|
auto compute_tbs_approx = [this, nof_ctrl_symbols](uint32_t nof_prb) {
|
|
|
|
uint32_t nof_re = srslte_ra_dl_approx_nof_re(&cell_params->cfg.cell, nof_prb, nof_ctrl_symbols);
|
|
|
|
uint32_t nof_re = srslte_ra_dl_approx_nof_re(&cell_params->cfg.cell, nof_prb, nof_ctrl_symbols);
|
|
|
|
int mcs, tbs;
|
|
|
|
int mcs;
|
|
|
|
if (fixed_mcs_dl < 0 or not dl_cqi_rx) {
|
|
|
|
if (fixed_mcs_dl < 0 or not dl_cqi_rx) {
|
|
|
|
return alloc_tbs_dl(nof_prb, nof_re, 0, &mcs);
|
|
|
|
return alloc_tbs_dl(nof_prb, nof_re, 0, &mcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1523,7 +1526,7 @@ uint32_t cc_sched_ue::get_required_prb_ul(uint32_t req_bytes)
|
|
|
|
auto compute_tbs_approx = [this](uint32_t nof_prb) {
|
|
|
|
auto compute_tbs_approx = [this](uint32_t nof_prb) {
|
|
|
|
const uint32_t N_srs = 0;
|
|
|
|
const uint32_t N_srs = 0;
|
|
|
|
uint32_t nof_re = (2 * (SRSLTE_CP_NSYMB(cell_params->cfg.cell.cp) - 1) - N_srs) * nof_prb * SRSLTE_NRE;
|
|
|
|
uint32_t nof_re = (2 * (SRSLTE_CP_NSYMB(cell_params->cfg.cell.cp) - 1) - N_srs) * nof_prb * SRSLTE_NRE;
|
|
|
|
int mcs, tbs;
|
|
|
|
int mcs;
|
|
|
|
if (fixed_mcs_ul < 0) {
|
|
|
|
if (fixed_mcs_ul < 0) {
|
|
|
|
return alloc_tbs_ul(nof_prb, nof_re, 0, &mcs);
|
|
|
|
return alloc_tbs_ul(nof_prb, nof_re, 0, &mcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|