mirror of https://github.com/PentHertz/srsLTE.git
Misc compilation fixes from the fapi repo.
This commit is contained in:
parent
14cc25f181
commit
5c8923123a
|
@ -220,7 +220,7 @@ int main(int argc, char** argv)
|
||||||
printf("+--------+--------+--------+--------+\n");
|
printf("+--------+--------+--------+--------+\n");
|
||||||
for (uint32_t i = 0; i < SRSLTE_SEARCH_SPACE_NOF_AGGREGATION_LEVELS_NR; i++) {
|
for (uint32_t i = 0; i < SRSLTE_SEARCH_SPACE_NOF_AGGREGATION_LEVELS_NR; i++) {
|
||||||
if (enc_time[i].count > 0 && dec_time[i].count) {
|
if (enc_time[i].count > 0 && dec_time[i].count) {
|
||||||
printf("| %6d | %6ld | %6.1f | %6.1f |\n",
|
printf("| %6" PRIu32 "| %6" PRIu64 " | %6.1f | %6.1f |\n",
|
||||||
i,
|
i,
|
||||||
enc_time[i].count,
|
enc_time[i].count,
|
||||||
(double)enc_time[i].time_us / (double)enc_time[i].count,
|
(double)enc_time[i].time_us / (double)enc_time[i].count,
|
||||||
|
|
|
@ -300,8 +300,8 @@ int main(int argc, char** argv)
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
||||||
INFO("format %d, n_pucch: %d, ncs: %d, d: %d, t_encode=%ld us, t_decode=%ld us, EPRE=%+.1f dBfs, RSRP=%+.1f "
|
INFO("format %d, n_pucch: %d, ncs: %d, d: %d, t_encode=%" PRIu64 " us, t_decode=%" PRIu64
|
||||||
"dBfs, SNR=%+.1f dBfs",
|
" us, EPRE=%+.1f dBfs, RSRP=%+.1f dBfs, SNR=%+.1f dBfs\n",
|
||||||
format,
|
format,
|
||||||
n_pucch,
|
n_pucch,
|
||||||
ncs,
|
ncs,
|
||||||
|
|
|
@ -68,7 +68,7 @@ int test_pdsch_grant(const sim_enb_ctxt_t& enb_ctxt,
|
||||||
|
|
||||||
// TEST: Check if CC is configured and active
|
// TEST: Check if CC is configured and active
|
||||||
CONDERROR(cc_cfg == nullptr or not cc_cfg->active, "PDSCH allocation for disabled or unavailable cc");
|
CONDERROR(cc_cfg == nullptr or not cc_cfg->active, "PDSCH allocation for disabled or unavailable cc");
|
||||||
CONDERROR(pdsch.dci.ue_cc_idx != std::distance(&ue_ctxt.ue_cfg.supported_cc_list.front(), cc_cfg),
|
CONDERROR(pdsch.dci.ue_cc_idx != (uint32_t)std::distance(&ue_ctxt.ue_cfg.supported_cc_list.front(), cc_cfg),
|
||||||
"Inconsistent enb_cc_idx -> ue_cc_idx mapping");
|
"Inconsistent enb_cc_idx -> ue_cc_idx mapping");
|
||||||
|
|
||||||
// TEST: DCI is consistent with current UE DL harq state
|
// TEST: DCI is consistent with current UE DL harq state
|
||||||
|
@ -169,8 +169,7 @@ int test_ul_sched_result(const sim_enb_ctxt_t& enb_ctxt, const sf_output_res_t&
|
||||||
bool h_inactive = (not h.active) or (phich_ack or last_retx);
|
bool h_inactive = (not h.active) or (phich_ack or last_retx);
|
||||||
|
|
||||||
// TEST: Already active UL HARQs have to receive PHICH
|
// TEST: Already active UL HARQs have to receive PHICH
|
||||||
CONDERROR(
|
CONDERROR(h.active and phich_ptr == nullptr, "PHICH not received for rnti=0x%x active UL HARQ pid=%d", rnti, pid);
|
||||||
h.active and phich_ptr == nullptr, "PHICH not received for rnti=0x%x active UL HARQ pid=%d", rnti, pid);
|
|
||||||
CONDERROR(not h.active and phich_ptr != nullptr,
|
CONDERROR(not h.active and phich_ptr != nullptr,
|
||||||
"PHICH for rnti=0x%x corresponds to inactive UL HARQ pid=%d",
|
"PHICH for rnti=0x%x corresponds to inactive UL HARQ pid=%d",
|
||||||
rnti,
|
rnti,
|
||||||
|
|
Loading…
Reference in New Issue