From 2c534c905959305d0d6d9a1e9e1a24299d11b016 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Fri, 28 Feb 2020 15:50:02 +0100 Subject: [PATCH] Correction of TX_DELAY and FDD_HARQ_DELAY_MS uses in srsenb PHY --- srsenb/src/phy/cc_worker.cc | 2 +- srsenb/src/phy/sf_worker.cc | 2 +- srsenb/src/phy/txrx.cc | 2 +- srsenb/test/phy/enb_phy_test.cc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srsenb/src/phy/cc_worker.cc b/srsenb/src/phy/cc_worker.cc index 5388b8441..e7a63f718 100644 --- a/srsenb/src/phy/cc_worker.cc +++ b/srsenb/src/phy/cc_worker.cc @@ -175,7 +175,7 @@ cf_t* cc_worker::get_buffer_tx(uint32_t antenna_idx) void cc_worker::set_tti(uint32_t tti_) { tti_rx = tti_; - tti_tx_dl = TTI_TX(tti_rx); + tti_tx_dl = TTI_ADD(tti_rx, FDD_HARQ_DELAY_MS); tti_tx_ul = TTI_RX_ACK(tti_rx); } diff --git a/srsenb/src/phy/sf_worker.cc b/srsenb/src/phy/sf_worker.cc index 51d96f4a7..76cb9bf92 100644 --- a/srsenb/src/phy/sf_worker.cc +++ b/srsenb/src/phy/sf_worker.cc @@ -121,7 +121,7 @@ cf_t* sf_worker::get_buffer_rx(uint32_t cc_idx, uint32_t antenna_idx) void sf_worker::set_time(uint32_t tti_, uint32_t tx_worker_cnt_, srslte_timestamp_t tx_time_) { tti_rx = tti_; - tti_tx_dl = TTI_TX(tti_rx); + tti_tx_dl = TTI_ADD(tti_rx, FDD_HARQ_DELAY_MS); tti_tx_ul = TTI_RX_ACK(tti_rx); t_tx_dl = TTIMOD(tti_tx_dl); diff --git a/srsenb/src/phy/txrx.cc b/srsenb/src/phy/txrx.cc index de3710bb7..e6cd8f4a9 100644 --- a/srsenb/src/phy/txrx.cc +++ b/srsenb/src/phy/txrx.cc @@ -141,7 +141,7 @@ void txrx::run_thread() /* Compute TX time: Any transmission happens in TTI+4 thus advance 4 ms the reception time */ srslte_timestamp_copy(&tx_time, &rx_time); - srslte_timestamp_add(&tx_time, 0, TX_DELAY * 1e-3); + srslte_timestamp_add(&tx_time, 0, FDD_HARQ_DELAY_MS * 1e-3); Debug("Settting TTI=%d, tx_mutex=%d, tx_time=%ld:%f to worker %d\n", tti, diff --git a/srsenb/test/phy/enb_phy_test.cc b/srsenb/test/phy/enb_phy_test.cc index 0e7666e2e..8920783de 100644 --- a/srsenb/test/phy/enb_phy_test.cc +++ b/srsenb/test/phy/enb_phy_test.cc @@ -572,7 +572,7 @@ public: tti_dl_info_t& tti_dl_ack = tti_dl_info_ack_queue.front(); // Calculate ACK TTI - tti_dl_sched.tti = TTI_ADD(tti_dl_sched.tti, FDD_HARQ_DELAY_MS); + tti_dl_sched.tti = TTI_ADD(tti_dl_sched.tti, TX_DELAY); // Assert that ACKs have been received TESTASSERT(tti_dl_sched.tti == tti_dl_ack.tti); @@ -919,8 +919,8 @@ public: TESTASSERT(work_ul(pdsch_ack, uci_data) == SRSLTE_SUCCESS); // Increment TTI - sf_dl_cfg.tti = (sf_dl_cfg.tti + 1) % 10240; - sf_ul_cfg.tti = (sf_ul_cfg.tti + 1) % 10240; + sf_dl_cfg.tti = TTI_ADD(sf_dl_cfg.tti, 1); + sf_ul_cfg.tti = TTI_ADD(sf_ul_cfg.tti, 1); return SRSLTE_SUCCESS; }