From 85171f3ca79da83fcbea26dadb85acb4908f03b9 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Thu, 20 Feb 2020 15:52:41 +0100 Subject: [PATCH] Fix eNb UL PUCCH1b CS decoding --- lib/src/phy/enb/enb_ul.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/src/phy/enb/enb_ul.c b/lib/src/phy/enb/enb_ul.c index 3a2401565..4ef7424b0 100644 --- a/lib/src/phy/enb/enb_ul.c +++ b/lib/src/phy/enb/enb_ul.c @@ -169,9 +169,10 @@ static int get_pucch(srslte_enb_ul_t* q, srslte_ul_sf_cfg_t* ul_sf, srslte_pucch int ret = SRSLTE_SUCCESS; uint32_t n_pucch_i[SRSLTE_PUCCH_MAX_ALLOC] = {}; srslte_pucch_res_t pucch_res = {}; + uint32_t uci_cfg_total_ack = srslte_uci_cfg_total_ack(&cfg->uci_cfg); // Drop CQI if there is collision with ACK - if (!cfg->simul_cqi_ack && srslte_uci_cfg_total_ack(&cfg->uci_cfg) > 0 && cfg->uci_cfg.cqi.data_enable) { + if (!cfg->simul_cqi_ack && uci_cfg_total_ack > 0 && cfg->uci_cfg.cqi.data_enable) { cfg->uci_cfg.cqi.data_enable = false; } @@ -209,7 +210,7 @@ static int get_pucch(srslte_enb_ul_t* q, srslte_ul_sf_cfg_t* ul_sf, srslte_pucch } else { // If channel selection enabled - if (cfg->ack_nack_feedback_mode == SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS) { + if (uci_cfg_total_ack > 0 && cfg->ack_nack_feedback_mode == SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS) { uint8_t b[2] = {pucch_res.uci_data.ack.ack_value[0], pucch_res.uci_data.ack.ack_value[1]}; srslte_pucch_cs_get_ack(cfg, &cfg->uci_cfg, i, b, &pucch_res.uci_data); }