maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix: TDD uci_procedures misdeal pucch format1a."

Browse Source 
This reverts commit c652a883ff.
This commit is contained in:
Haruki NAOI
2018-05-29 14:29:00 +09:00
parent 14740aec74
commit 18bd37f913
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/phy_procedures_lte_eNb.c
+1 -11
View File
@@ -990,7 +990,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
if (uci->type==HARQ_SR && metric[0] <= metric_SR) { if (uci->type==HARQ_SR && metric[0] <= metric_SR) {
SR_payload = 1; SR_payload = 1;
metric[0] = rx_pucch(eNB, metric[0] = rx_pucch(eNB,
uci->pucch_fmt, pucch_format1b,
i, i,
uci->n_pucch_1_0_sr[0], uci->n_pucch_1_0_sr[0],
0, //n2_pucch 0, //n2_pucch
@@ -1052,15 +1052,6 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
uci->rnti,uci->type,SR_payload,frame,subframe,pucch_b0b1[0][0],pucch_b0b1[0][1],pucch_b0b1[1][0],pucch_b0b1[1][1]); uci->rnti,uci->type,SR_payload,frame,subframe,pucch_b0b1[0][0],pucch_b0b1[0][1],pucch_b0b1[1][0],pucch_b0b1[1][1]);
#endif #endif
#endif #endif
if(uci->pucch_fmt == pucch_format1a) {
LOG_D(PHY,"[eNB %d][PDSCH %x] Frame %d subframe %d pucch1a (TDD) payload %d (metric %d)\n",
eNB->Mod_id,uci->rnti,frame,subframe,pucch_b0b1[0][0],metric[0]);
uci->stat = metric[0];
fill_uci_harq_indication(eNB,uci,frame,subframe,pucch_b0b1[0],0,0xffff);
}
else if(uci->pucch_fmt == pucch_format1b) {
if (SR_payload == 1) { // this implements Table 7.3.1 from 36.213 if (SR_payload == 1) { // this implements Table 7.3.1 from 36.213
if (pucch_b0b1[0][0] == 4) { // there isn't a likely transmission if (pucch_b0b1[0][0] == 4) { // there isn't a likely transmission
harq_ack[0] = 4; // DTX harq_ack[0] = 4; // DTX
@@ -1360,7 +1351,6 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
AssertFatal(1==0,"Unsupported UCI type %d\n",uci->type); AssertFatal(1==0,"Unsupported UCI type %d\n",uci->type);
break; break;
} }
}
if (SR_payload == 1) { if (SR_payload == 1) {
LOG_D(PHY,"[eNB %d][SR %x] Frame %d subframe %d Got SR for PUSCH, transmitting to MAC\n",eNB->Mod_id, LOG_D(PHY,"[eNB %d][SR %x] Frame %d subframe %d Got SR for PUSCH, transmitting to MAC\n",eNB->Mod_id,