mirror of https://github.com/PentHertz/srsLTE.git
sched: add missing checks for prachs with tti duration above 1msec
This commit is contained in:
parent
b589c0d184
commit
61a73d5187
|
@ -439,7 +439,7 @@ void sched::carrier_sched::alloc_dl_users(sf_sched* tti_result)
|
|||
// NOTE: In case of 6 PRBs, do not transmit if there is going to be a PRACH in the UL to avoid collisions
|
||||
if (cc_cfg->nof_prb() == 6) {
|
||||
tti_point tti_rx_ack = to_tx_dl_ack(tti_result->get_tti_rx());
|
||||
if (srsran_prach_tti_opportunity_config_fdd(cc_cfg->cfg.prach_config, tti_rx_ack.to_uint(), -1)) {
|
||||
if (srsran_prach_in_window_config_fdd(cc_cfg->cfg.prach_config, tti_rx_ack.to_uint(), -1)) {
|
||||
tti_result->reserve_dl_rbgs(0, cc_cfg->nof_rbgs);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -319,7 +319,7 @@ void sf_sched::new_tti(tti_point tti_rx_, sf_sched_result* cc_results_)
|
|||
// setup first prb to be used for msg3 alloc. Account for potential PRACH alloc
|
||||
last_msg3_prb = tti_alloc.get_pucch_width();
|
||||
tti_point tti_msg3_alloc = to_tx_ul(tti_rx) + MSG3_DELAY_MS;
|
||||
if (srsran_prach_tti_opportunity_config_fdd(cc_cfg->cfg.prach_config, tti_msg3_alloc.to_uint(), -1)) {
|
||||
if (srsran_prach_in_window_config_fdd(cc_cfg->cfg.prach_config, tti_msg3_alloc.to_uint(), -1)) {
|
||||
last_msg3_prb = std::max(last_msg3_prb, cc_cfg->cfg.prach_freq_offset + 6);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ int test_pusch_collisions(const sf_output_res_t& sf_out, uint32_t enb_cc_idx, co
|
|||
|
||||
/* TEST: Check if there is space for PRACH */
|
||||
bool is_prach_tti_tx_ul =
|
||||
srsran_prach_tti_opportunity_config_fdd(cell_params.cfg.prach_config, to_tx_ul(sf_out.tti_rx).to_uint(), -1);
|
||||
srsran_prach_in_window_config_fdd(cell_params.cfg.prach_config, to_tx_ul(sf_out.tti_rx).to_uint(), -1);
|
||||
if (is_prach_tti_tx_ul) {
|
||||
try_ul_fill({cell_params.cfg.prach_freq_offset, cell_params.cfg.prach_freq_offset + 6}, "PRACH");
|
||||
}
|
||||
|
@ -122,8 +122,7 @@ int test_pdsch_collisions(const sf_output_res_t& sf_out, uint32_t enb_cc_idx, co
|
|||
|
||||
// forbid Data in DL if its ACKs conflict with PRACH for PRB==6
|
||||
if (cell_params.nof_prb() == 6) {
|
||||
if (srsran_prach_tti_opportunity_config_fdd(
|
||||
cell_params.cfg.prach_config, to_tx_dl_ack(sf_out.tti_rx).to_uint(), -1)) {
|
||||
if (srsran_prach_in_window_config_fdd(cell_params.cfg.prach_config, to_tx_dl_ack(sf_out.tti_rx).to_uint(), -1)) {
|
||||
dl_allocs.fill(0, dl_allocs.size());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue