Skip to content

O
OpenXG-RAN
Commit ed10f077 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

bug in uci stats handling

parent f8aa8564
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @ ed10f077
...@@ -843,7 +843,6 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, ...@@ -843,7 +843,6 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
if(fmt!=pucch_format3) { /* PUCCH format3 */ if(fmt!=pucch_format3) { /* PUCCH format3 */
eNB_UCI_STATS_t *first_uci_stats=NULL; eNB_UCI_STATS_t *first_uci_stats=NULL;
LOG_I(PHY,"Getting UCI stats, UCI_id %d\n",UCI_id);
for (int i=0;i<NUMBER_OF_SCH_STATS_MAX;i++) for (int i=0;i<NUMBER_OF_SCH_STATS_MAX;i++)
if (eNB->uci_stats[i].rnti == eNB->uci_vars[UCI_id].rnti) { if (eNB->uci_stats[i].rnti == eNB->uci_vars[UCI_id].rnti) {
uci_stats = &eNB->uci_stats[i]; uci_stats = &eNB->uci_stats[i];
......
openair1/SCHED/fapi_l1.c
View file @ ed10f077
...@@ -600,7 +600,7 @@ void handle_uci_sr_pdu(PHY_VARS_eNB *eNB, ...@@ -600,7 +600,7 @@ void handle_uci_sr_pdu(PHY_VARS_eNB *eNB,
uci->frame = frame; uci->frame = frame;
uci->subframe = subframe; uci->subframe = subframe;
uci->rnti = ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti; uci->rnti = ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti;
uci->ue_id = find_ulsch(ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti,eNB,SEARCH_EXIST_OR_FREE); uci->ue_id = find_ulsch(ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti,eNB,SEARCH_EXIST_OR_FREE);
uci->type = SR; uci->type = SR;
uci->pucch_fmt = pucch_format1; uci->pucch_fmt = pucch_format1;
uci->num_antenna_ports = 1; uci->num_antenna_ports = 1;
...@@ -626,7 +626,7 @@ void handle_uci_sr_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_ ...@@ -626,7 +626,7 @@ void handle_uci_sr_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_
uci->frame = frame; uci->frame = frame;
uci->subframe = subframe; uci->subframe = subframe;
uci->rnti = ul_config_pdu->uci_sr_harq_pdu.ue_information.ue_information_rel8.rnti; uci->rnti = ul_config_pdu->uci_sr_harq_pdu.ue_information.ue_information_rel8.rnti;
uci->ue_id = find_ulsch(ul_config_pdu->uci_sr_harq_pdu.ue_information.ue_information_rel8.rnti,eNB,SEARCH_EXIST_OR_FREE); uci->ue_id = find_ulsch(ul_config_pdu->uci_sr_harq_pdu.ue_information.ue_information_rel8.rnti,eNB,SEARCH_EXIST_OR_FREE);
uci->type = HARQ_SR; uci->type = HARQ_SR;
uci->num_antenna_ports = 1; uci->num_antenna_ports = 1;
uci->num_pucch_resources = 1; uci->num_pucch_resources = 1;
......
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ ed10f077
...@@ -854,7 +854,7 @@ uci_procedures(PHY_VARS_eNB *eNB, ...@@ -854,7 +854,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
int pucch1_thres = (uci->ue_type == 0) ? eNB->pucch1_DTX_threshold : eNB->pucch1_DTX_threshold_emtc[0]; int pucch1_thres = (uci->ue_type == 0) ? eNB->pucch1_DTX_threshold : eNB->pucch1_DTX_threshold_emtc[0];
metric_SR = rx_pucch(eNB, metric_SR = rx_pucch(eNB,
uci->pucch_fmt, uci->pucch_fmt,
uci->ue_id, i,//uci->ue_id,
uci->n_pucch_1_0_sr[0], uci->n_pucch_1_0_sr[0],
0, // n2_pucch 0, // n2_pucch
uci->srs_active, // shortened format uci->srs_active, // shortened format
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment