From 62d295671510630ea9aea1754835f6c346de6ed7 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Wed, 16 Oct 2019 15:40:30 +0200 Subject: [PATCH] SRSENB: Fixed PUCCH resource selection --- lib/src/phy/enb/enb_ul.c | 4 ++-- lib/src/phy/ue/ue_ul.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/src/phy/enb/enb_ul.c b/lib/src/phy/enb/enb_ul.c index 0cc695663..8ec178ce5 100644 --- a/lib/src/phy/enb/enb_ul.c +++ b/lib/src/phy/enb/enb_ul.c @@ -174,8 +174,8 @@ void srslte_enb_ul_fft(srslte_enb_ul_t *q) static int get_pucch(srslte_enb_ul_t* q, srslte_ul_sf_cfg_t* ul_sf, srslte_pucch_cfg_t* cfg, srslte_pucch_res_t* res) { - - srslte_ue_ul_pucch_resource_selection(&q->cell, cfg, &cfg->uci_cfg, NULL); + srslte_uci_value_t uci_value_default = {}; + srslte_ue_ul_pucch_resource_selection(&q->cell, cfg, &cfg->uci_cfg, &uci_value_default); // Prepare configuration if (srslte_chest_ul_estimate_pucch(&q->chest, ul_sf, cfg, q->sf_symbols, &q->chest_res)) { diff --git a/lib/src/phy/ue/ue_ul.c b/lib/src/phy/ue/ue_ul.c index db5de765d..b1ee777dc 100644 --- a/lib/src/phy/ue/ue_ul.c +++ b/lib/src/phy/ue/ue_ul.c @@ -500,11 +500,7 @@ get_format(srslte_pucch_cfg_t* cfg, srslte_uci_cfg_t* uci_cfg, srslte_uci_value_ format = SRSLTE_PUCCH_FORMAT_1B; // with channel selection if > 2 } // If UCI value is provided, use SR signal only, otherwise SR request opportunity - else if (uci_value) { - if (uci_value->scheduling_request) { - format = SRSLTE_PUCCH_FORMAT_1; - } - } else if (uci_cfg->is_scheduling_request_tti) { + else if (uci_cfg->is_scheduling_request_tti || (uci_value && uci_value->scheduling_request)) { format = SRSLTE_PUCCH_FORMAT_1; } else { fprintf(stderr,