Skip to content

O
OpenXG-RAN
Commit ea3aecf4 authored by tomita's avatar tomita
Browse files
Options

Bug fix about harq_pid calculation (harq_pid is calculated less than 0).

parent a53e22c2
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @ ea3aecf4
...@@ -3839,10 +3839,15 @@ extract_harq(module_id_t mod_idP, int CC_idP, int UE_id, ...@@ -3839,10 +3839,15 @@ extract_harq(module_id_t mod_idP, int CC_idP, int UE_id,
int M = ul_ACK_subframe2_M(fp,subframeP); int M = ul_ACK_subframe2_M(fp,subframeP);
for(m=0;m<M;m++){ for(m=0;m<M;m++){
subframe_tx = ul_ACK_subframe2_dl_subframe(fp,subframeP,m); subframe_tx = ul_ACK_subframe2_dl_subframe(fp,subframeP,m);
if(frameP==1023&&subframeP>5) switch (cc->tdd_Config->subframeAssignment){
frame_tx= -1; case 1:
if(frameP==0&&subframeP<4)
frame_tx= 0;
else else
frame_tx = subframeP < 5 ? frameP-1:frameP; // not formal frame_tx = subframeP < 4 ? frameP-1:frameP; // not formal
break;
// TODO : Other TDD Config
}
harq_pid = frame_subframe2_dl_harq_pid(cc->tdd_Config,frame_tx,subframe_tx); harq_pid = frame_subframe2_dl_harq_pid(cc->tdd_Config,frame_tx,subframe_tx);
if(num_ack_nak==1){ if(num_ack_nak==1){
if(harq_indication_tdd->harq_data[0].bundling.value_0==1){ //ack if(harq_indication_tdd->harq_data[0].bundling.value_0==1){ //ack
......
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