Replaced old SSI function with new macros jira id - ODUHIGH-212

[o-du/l2.git] / src / 5gnrsch / rg_sch_uhm.c

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index ab40396..91141d9 100755 (executable)
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -406,10 +406,10 @@ U8               idx;
 #if (ERRCLASS & ERRCLS_DEBUG)
    if(idx >= ueUl->hqEnt.numHqPrcs)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 #endif
-   RETVALUE(&(ueUl->hqEnt.hqProcCb[idx]));
+   return (&(ueUl->hqEnt.hqProcCb[idx]));
 }  /* rgSCHUhmGetUlHqProc */
 
 /**
@@ -785,7 +785,7 @@ U8                     idx;
    TRC2(rgSCHUhmAppendPhich)
 
 #ifdef RG_5GTF
-   RETVALUE(ROK);
+   return ROK;
 #endif
    if(cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO)
    {
@@ -812,7 +812,7 @@ U8                     idx;
             if (rgSCHUtlGetPhichInfo (ulAlloc->hqProc, &rbStart, &nDmrs) != ROK)
 #endif
             {
-               RETVALUE (RFAILED);
+               return  (RFAILED);
             }
          if(nDmrs != RGSCH_INVALID_NDMRS)
          {
@@ -865,7 +865,7 @@ U8                     idx;
          ulAlloc = rgSCHUtlNextHqFdbkAlloc (cellCb, ulAlloc, idx);
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmAppendPhich */
 
 /**
@@ -915,11 +915,11 @@ RgSchUeCb           *ueCb;
                            ueUl->hqEnt.numHqPrcs * \
                            sizeof(RgSchUlHqProcCb)) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmHqEntInit */
 
 #ifdef RG_5GTF
@@ -982,7 +982,7 @@ RgSchUlHqProcCb       **hqP;
       //printf("5GTF_ERROR rgSCHUhmGetAvlHqProc cellId %d  %ld inUse %ld ue %d"
                               //, cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId);
       /* No Harq Process available in the free queue. */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    tmpHqProc = (RgSchUlHqProcCb *)(tmp->node);
@@ -1000,7 +1000,7 @@ RgSchUlHqProcCb       **hqP;
 
    *hqP = tmpHqProc;
    
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmGetAvlHqProc */
 
 /**
@@ -1050,11 +1050,11 @@ CmLteTimingInfo  frm;
       if (RGSCH_TIMEINFO_SAME(proc->schdTime, frm))
       {
         // printf("Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot, proc->procId);
-         RETVALUE(proc);
+         return (proc);
       }
    }
 
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHUhmGetUlProcByTime */
 #endif