mirror of https://github.com/PentHertz/srsLTE.git
SRSENB: Fixed PUCCH resource selection
This commit is contained in:
parent
19e8f7aab5
commit
62d2956715
|
@ -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)
|
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_uci_value_t uci_value_default = {};
|
||||||
srslte_ue_ul_pucch_resource_selection(&q->cell, cfg, &cfg->uci_cfg, NULL);
|
srslte_ue_ul_pucch_resource_selection(&q->cell, cfg, &cfg->uci_cfg, &uci_value_default);
|
||||||
|
|
||||||
// Prepare configuration
|
// Prepare configuration
|
||||||
if (srslte_chest_ul_estimate_pucch(&q->chest, ul_sf, cfg, q->sf_symbols, &q->chest_res)) {
|
if (srslte_chest_ul_estimate_pucch(&q->chest, ul_sf, cfg, q->sf_symbols, &q->chest_res)) {
|
||||||
|
|
|
@ -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
|
format = SRSLTE_PUCCH_FORMAT_1B; // with channel selection if > 2
|
||||||
}
|
}
|
||||||
// If UCI value is provided, use SR signal only, otherwise SR request opportunity
|
// If UCI value is provided, use SR signal only, otherwise SR request opportunity
|
||||||
else if (uci_value) {
|
else if (uci_cfg->is_scheduling_request_tti || (uci_value && uci_value->scheduling_request)) {
|
||||||
if (uci_value->scheduling_request) {
|
|
||||||
format = SRSLTE_PUCCH_FORMAT_1;
|
|
||||||
}
|
|
||||||
} else if (uci_cfg->is_scheduling_request_tti) {
|
|
||||||
format = SRSLTE_PUCCH_FORMAT_1;
|
format = SRSLTE_PUCCH_FORMAT_1;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
|
|
Loading…
Reference in New Issue