Skip to content

O
OpenXG-RAN
Commit f58ec80a authored by wujing's avatar wujing
Browse files
Options

fix n1_pucch(downlink_assignment_index) issue

parent bf45e945
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @ f58ec80a
...@@ -1710,7 +1710,6 @@ fill_nfapi_harq_information(module_id_t module_idP, ...@@ -1710,7 +1710,6 @@ fill_nfapi_harq_information(module_id_t module_idP,
ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id]; ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
harq_pid = frame_subframe2_dl_harq_pid(cc->tdd_Config, frameP, subframeP); harq_pid = frame_subframe2_dl_harq_pid(cc->tdd_Config, frameP, subframeP);
int ackNAK_absSF = get_pucch1_absSF(cc, absSFP); int ackNAK_absSF = get_pucch1_absSF(cc, absSFP);
uint8_t downlink_assignment_index = (UE_list->UE_template[CC_idP][UE_id].DAI-1)&3;
AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n"); AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n");
AssertFatal(UE_list != NULL, "UE_list is null\n"); AssertFatal(UE_list != NULL, "UE_list is null\n");
...@@ -1743,17 +1742,19 @@ fill_nfapi_harq_information(module_id_t module_idP, ...@@ -1743,17 +1742,19 @@ fill_nfapi_harq_information(module_id_t module_idP,
} }
harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG; harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
harq_information->harq_information_rel10_tdd.n_pucch_1_0 if(getM_mac(cc, (get_pucch1_absSF(cc, absSFP))%10)==1) {
= getNp(cc->mib->message.dl_Bandwidth, cce_idxP, 0) + cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP; harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
} else {
harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP +
(getM_mac(cc,ackNAK_absSF % 10) - getm_mac(cc,subframeP) -1)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,0) +
getm_mac(cc,subframeP)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,1);
}
harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1; harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1;
} else { } else {
harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG; harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG;
harq_information->harq_information_rel9_fdd.number_of_pucch_resources = 1; harq_information->harq_information_rel9_fdd.number_of_pucch_resources = 1;
harq_information->harq_information_rel9_fdd.harq_size = 1; // 1-bit ACK/NAK harq_information->harq_information_rel9_fdd.harq_size = 1; // 1-bit ACK/NAK
harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP + harq_information->harq_information_rel9_fdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
(getM_mac(cc,ackNAK_absSF % 10) - downlink_assignment_index -1)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,0)
+ getm_mac(cc,subframeP)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,1);
harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1;
} }
break; break;
...@@ -1776,10 +1777,9 @@ fill_nfapi_harq_information(module_id_t module_idP, ...@@ -1776,10 +1777,9 @@ fill_nfapi_harq_information(module_id_t module_idP,
harq_information->harq_information_rel10_tdd.harq_size = 1; harq_information->harq_information_rel10_tdd.harq_size = 1;
} }
// harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP + harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP +
(getM_mac(cc,ackNAK_absSF % 10) - downlink_assignment_index -1)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,0) + (getM_mac(cc,ackNAK_absSF % 10) - getm_mac(cc,subframeP)-1)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,0) +
downlink_assignment_index*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,1); getm_mac(cc,subframeP)*getNp(cc->mib->message.dl_Bandwidth,cce_idxP,1);
harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1; harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1;
} else { } else {
...@@ -3803,8 +3803,8 @@ try_again: ...@@ -3803,8 +3803,8 @@ try_again:
} else { } else {
ul_req->ul_config_pdu_list[ack_int].uci_harq_pdu.harq_information.harq_information_rel10_tdd.n_pucch_1_0 = ul_req->ul_config_pdu_list[ack_int].uci_harq_pdu.harq_information.harq_information_rel10_tdd.n_pucch_1_0 =
cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + fCCE + cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + fCCE +
(getM_mac(cc,ackNAK_absSF % 10) - dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.downlink_assignment_index -1)*getNp(cc->mib->message.dl_Bandwidth,fCCE,0) + (getM_mac(cc,ackNAK_absSF % 10) - getm_mac(cc,subframeP) -1)*getNp(cc->mib->message.dl_Bandwidth,fCCE,0) +
dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.downlink_assignment_index*getNp(cc->mib->message.dl_Bandwidth,fCCE,1); getm_mac(cc,subframeP)*getNp(cc->mib->message.dl_Bandwidth,fCCE,1);
} }
} }
} }
......
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