|
|
@ -25,9 +25,8 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <boost/concept_check.hpp>
|
|
|
|
|
|
|
|
#include <srslte/interfaces/sched_interface.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "srslte/srslte.h"
|
|
|
|
#include "srslte/common/pdu.h"
|
|
|
|
#include "srslte/common/pdu.h"
|
|
|
|
#include "mac/scheduler_ue.h"
|
|
|
|
#include "mac/scheduler_ue.h"
|
|
|
|
#include "mac/scheduler.h"
|
|
|
|
#include "mac/scheduler.h"
|
|
|
@ -412,12 +411,6 @@ int sched_ue::generate_format1(dl_harq_proc *h,
|
|
|
|
|
|
|
|
|
|
|
|
h->new_tx(0, tti, mcs, tbs, data->dci_location.ncce);
|
|
|
|
h->new_tx(0, tti, mcs, tbs, data->dci_location.ncce);
|
|
|
|
|
|
|
|
|
|
|
|
Debug("SCHED: Alloc format1 new mcs=%d, tbs=%d, nof_prb=%d, req_bytes=%d\n", mcs, tbs, nof_prb, req_bytes);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
h->new_retx(0, tti, &mcs, &tbs);
|
|
|
|
|
|
|
|
Debug("SCHED: Alloc format1 previous mcs=%d, tbs=%d\n", mcs, tbs);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Allocate MAC ConRes CE
|
|
|
|
// Allocate MAC ConRes CE
|
|
|
|
if (need_conres_ce) {
|
|
|
|
if (need_conres_ce) {
|
|
|
|
data->pdu[0][0].lcid = srslte::sch_subh::CON_RES_ID;
|
|
|
|
data->pdu[0][0].lcid = srslte::sch_subh::CON_RES_ID;
|
|
|
@ -435,6 +428,12 @@ int sched_ue::generate_format1(dl_harq_proc *h,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while(rem_tbs > 0 && x > 0);
|
|
|
|
} while(rem_tbs > 0 && x > 0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Debug("SCHED: Alloc format1 new mcs=%d, tbs=%d, nof_prb=%d, req_bytes=%d\n", mcs, tbs, nof_prb, req_bytes);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
h->new_retx(0, tti, &mcs, &tbs);
|
|
|
|
|
|
|
|
Debug("SCHED: Alloc format1 previous mcs=%d, tbs=%d\n", mcs, tbs);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
data->rnti = rnti;
|
|
|
|
data->rnti = rnti;
|
|
|
|
|
|
|
|
|
|
|
|
if (tbs > 0) {
|
|
|
|
if (tbs > 0) {
|
|
|
|