X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_crc.c;h=a49096dac7262adb105cdcf69a3724fc6ac5b19f;hb=HEAD;hp=fe17fdd62837f079a8e6dbd975166ff2e6b89f67;hpb=fa6899dae4aee415bbcfd00760b6e2b312ddceec;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_crc.c b/src/5gnrsch/sch_crc.c
index fe17fdd62..a49096dac 100644
--- a/src/5gnrsch/sch_crc.c
+++ b/src/5gnrsch/sch_crc.c
@@ -24,6 +24,7 @@
 #include "du_app_mac_inf.h"
 #include "mac_sch_interface.h"
 #include "sch.h"
+#include "sch_tmr.h"
 #include "sch_utils.h"
 
 /**
@@ -43,21 +44,21 @@
  **/
 uint8_t SchProcCrcInd(Pst *pst, CrcIndInfo *crcInd)
 {
-   uint16_t count=0;
+   uint16_t crcCnt=0;
    uint8_t  ueId=0;
    SchUlHqProcCb *hqP = NULLP;
    Inst  schInst = pst->dstInst - SCH_INST_START;
    SchCellCb *cell = schCb[schInst].cells[schInst];
    
-   while(count  <crcInd->numCrcInd)
+   while(crcCnt < crcInd->numCrcInd)
    {
       GET_UE_ID(crcInd->crnti, ueId);
       if (cell->raCb[ueId-1].raState == SCH_RA_STATE_MSG3_PENDING)
       {
-         if (crcInd->crcInd[count])
+         if (crcInd->crcInd[crcCnt])
          {
             /* failure case*/
-            if (cell->raCb[ueId-1].msg3HqProc.tbInfo.txCntr < cell->cellCfg.schRachCfg.maxMsg3Tx)
+            if (cell->raCb[ueId-1].msg3HqProc.tbInfo.txCntr < cell->maxMsg3Tx)
             {
                cell->api->SchCrcInd(cell, ueId);
                cell->raCb[ueId - 1].retxMsg3HqProc = &cell->raCb[ueId - 1].msg3HqProc;
@@ -79,22 +80,25 @@ uint8_t SchProcCrcInd(Pst *pst, CrcIndInfo *crcInd)
       {
          if (cell->ueCb[ueId-1].hqUlmap[crcInd->timingInfo.slot]->hqList.count == 0)
          {
-            DU_LOG("\n ERROR no harq stored in ul hq map at slot %d ue id %d\n",crcInd->timingInfo.slot, ueId);
+            crcCnt++;
             continue;
          }
          if (cell->ueCb[ueId-1].hqUlmap[crcInd->timingInfo.slot]->hqList.first == 0)
          {
-            DU_LOG("\n ERROR NULL harq stored in ul hq map at slot %d ue id %d\n",crcInd->timingInfo.slot, ueId);
+            DU_LOG("\nERROR  --> SCH: NULL harq stored in ul hq map at slot %d ue id %d\n",\
+                               crcInd->timingInfo.slot, ueId);
+            crcCnt++;
             continue;
          }
          hqP = (SchUlHqProcCb*) cell->ueCb[ueId-1].hqUlmap[crcInd->timingInfo.slot]->hqList.first->node;
          if(hqP == NULLP)
          {
+            crcCnt++;
             continue;
          }
          else
          {
-            if (crcInd->crcInd[count])
+            if (crcInd->crcInd[crcCnt])
             {             
                /* failure case*/
                schUlHqProcessNack(hqP);
@@ -107,7 +111,7 @@ uint8_t SchProcCrcInd(Pst *pst, CrcIndInfo *crcInd)
          }
          cmLListDelFrm(&(cell->ueCb[ueId-1].hqUlmap[crcInd->timingInfo.slot]->hqList), &hqP->ulSlotLnk);
       }
-      count++;
+      crcCnt++;
    }
    return ROK;
 }