From 5dbc96458a71acbf4a1d2f379272126b08c03446 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Tue, 11 Feb 2020 13:04:19 +0100 Subject: [PATCH] Sets PUCCH decode threshold as macro --- lib/include/srslte/phy/phch/pucch.h | 2 ++ srsenb/src/phy/cc_worker.cc | 1 + srsenb/src/phy/phy.cc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/include/srslte/phy/phch/pucch.h b/lib/include/srslte/phy/phch/pucch.h index d5cd871ee..47b6608d2 100644 --- a/lib/include/srslte/phy/phch/pucch.h +++ b/lib/include/srslte/phy/phch/pucch.h @@ -53,6 +53,8 @@ #define SRSLTE_PUCCH_FORMAT3_MAX_CARRIERS 5 #define SRSLTE_PUCCH_CS_MAX_NOF_ALLOC 4 +#define SRSLTE_PUCCH_DEFAULT_THRESHOLD_FORMAT1 (0.1f) + typedef struct { srslte_sequence_t seq_f2[SRSLTE_NOF_SF_X_FRAME]; uint32_t cell_id; diff --git a/srsenb/src/phy/cc_worker.cc b/srsenb/src/phy/cc_worker.cc index c3b8097b4..5f57b1ccc 100644 --- a/srsenb/src/phy/cc_worker.cc +++ b/srsenb/src/phy/cc_worker.cc @@ -252,6 +252,7 @@ void cc_worker::set_config_dedicated(uint16_t rnti, const srslte::phy_cfg_t& ded if (ue_db.count(rnti)) { ue_db[rnti]->ul_cfg = dedicated.ul_cfg; + ue_db[rnti]->ul_cfg.pucch.threshold_format1 = SRSLTE_PUCCH_DEFAULT_THRESHOLD_FORMAT1; ue_db[rnti]->ul_cfg.pucch.rnti = rnti; ue_db[rnti]->ul_cfg.pusch.rnti = rnti; ue_db[rnti]->dl_cfg = dedicated.dl_cfg; diff --git a/srsenb/src/phy/phy.cc b/srsenb/src/phy/phy.cc index 75f24693a..93d59ec89 100644 --- a/srsenb/src/phy/phy.cc +++ b/srsenb/src/phy/phy.cc @@ -96,7 +96,7 @@ void phy::parse_config(const phy_cfg_t& cfg) workers_common.ul_cfg_com.pucch.N_cs = cfg.pucch_cnfg.ncs_an; workers_common.ul_cfg_com.pucch.n_rb_2 = cfg.pucch_cnfg.nrb_cqi; workers_common.ul_cfg_com.pucch.N_pucch_1 = cfg.pucch_cnfg.n1_pucch_an; - workers_common.ul_cfg_com.pucch.threshold_format1 = 0.8; + workers_common.ul_cfg_com.pucch.threshold_format1 = SRSLTE_PUCCH_DEFAULT_THRESHOLD_FORMAT1; // PDSCH configuration workers_common.dl_cfg_com.tm = SRSLTE_TM1;