Merge branch 'OAI_develop' into oai_develop_nfapi

2019-07-02 22:23:35 +09:00
parent 5d11ab5467 67293964ac
commit 4239dacd02
418 changed files with 13757 additions and 596104 deletions
@@ -871,7 +871,6 @@ uci_procedures(PHY_VARS_eNB *eNB,
                  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
-
            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
                harq_ack[0] = 4; // DTX