fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SRSENB: Fixed PUCCH resource selection

This commit is contained in:
Xavier Arteaga 2019-10-16 15:40:30 +02:00
parent 4d688bce98
commit 73cf593891
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/phy/enb/enb_ul.c
View File

@ -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)) {

6
lib/src/phy/ue/ue_ul.c
View File

@ -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,