Skip to content

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

fix rm916 bug

parent bb6d1165
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ 38363b10
...@@ -889,7 +889,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) ...@@ -889,7 +889,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
LOG_E(PHY,"Unknown number for N_RB_UL %d\n",fp->N_RB_UL); LOG_E(PHY,"Unknown number for N_RB_UL %d\n",fp->N_RB_UL);
break; break;
} }
SR_payload = 0;
switch (uci->type) { switch (uci->type) {
case SR: case SR:
case HARQ_SR: case HARQ_SR:
...@@ -2010,6 +2010,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB, ...@@ -2010,6 +2010,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
switch (harq_ack[0]) { switch (harq_ack[0]) {
case 0: case 0:
case 4:
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 0; pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 0;
break; break;
case 1: // check if M=1,4,7 case 1: // check if M=1,4,7
...@@ -2018,7 +2019,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB, ...@@ -2018,7 +2019,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1; pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1;
release_harq(eNB,UE_id,0,frame,subframe,0xffff); release_harq(eNB,UE_id,0,frame,subframe,0xffff);
release_harq(eNB,UE_id,1,frame,subframe,0xffff); release_harq(eNB,UE_id,1,frame,subframe,0xffff);
} }else{
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 0;
}
break; break;
case 2: // check if M=2,5,8 case 2: // check if M=2,5,8
if (uci->num_pucch_resources == 2 || tdd_config5_sf2scheds == 2 || if (uci->num_pucch_resources == 2 || tdd_config5_sf2scheds == 2 ||
...@@ -2026,7 +2029,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB, ...@@ -2026,7 +2029,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1; pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1;
release_harq(eNB,UE_id,0,frame,subframe,0xffff); release_harq(eNB,UE_id,0,frame,subframe,0xffff);
release_harq(eNB,UE_id,1,frame,subframe,0xffff); release_harq(eNB,UE_id,1,frame,subframe,0xffff);
} }else{
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 0;
}
break; break;
case 3: // check if M=3,6,9 case 3: // check if M=3,6,9
if (uci->num_pucch_resources == 3 || tdd_config5_sf2scheds == 3 || if (uci->num_pucch_resources == 3 || tdd_config5_sf2scheds == 3 ||
...@@ -2034,7 +2039,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB, ...@@ -2034,7 +2039,9 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1; pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 1;
release_harq(eNB,UE_id,0,frame,subframe,0xffff); release_harq(eNB,UE_id,0,frame,subframe,0xffff);
release_harq(eNB,UE_id,1,frame,subframe,0xffff); release_harq(eNB,UE_id,1,frame,subframe,0xffff);
} }else{
pdu->harq_indication_tdd_rel13.harq_data[0].bundling.value_0 = 0;
}
break; break;
} }
break; break;
......
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