X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_uhm.c;h=a74e7af0b1ce47f04ac9f11a353e0ae138f42607;hb=refs%2Fchanges%2F97%2F4697%2F5;hp=fa58038de247e05ca12b8fbbd4b4e7a770aab66d;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index fa58038de..a74e7af0b 100755
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -33,19 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-  
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-
-#include "cm_lte.h"        /* Common LTE */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"       /* memory management */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "rgr.h"           /* RGR Interface defines */
@@ -56,15 +44,6 @@
 #include "rg_sch_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* system services */
-#include "cm_lte.x"        /* Common LTE */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"       /* memory management */
 
 #include "tfu.x"           /* TFU Interface defines */
 #include "rgr.x"           /* RGR Interface includes */
@@ -89,18 +68,18 @@
    EXTERN U32 gUlCrcPassCounter;
    EXTERN U32 gUlCrcFailCounter;*/
 #endif
-PUBLIC U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
-PUBLIC U8 rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
+U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
+U8 rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
 
 #ifdef EMTC_ENABLE
-PUBLIC Void rgSCHCmnEmtcHdlHarqProcFail
+Void rgSCHCmnEmtcHdlHarqProcFail
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ue,
 RgSchUlHqProcCb   *hqProc,
 CmLteTimingInfo   frm
 );
-PUBLIC Void rgSCHEmtcInitUlUeHqEnt
+Void rgSCHEmtcInitUlUeHqEnt
 (
 RgSchCellCb      *cell,
 RgrUeCfg         *ueCfg,
@@ -128,21 +107,21 @@ RgSchUeCb        *ueCb
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm)
+Void rgSCHUhmProcDatInd(cell, ue, frm)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
 #endif
 #else  /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -150,7 +129,7 @@ CmLteTimingInfo      frm,
 U8                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
+Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -172,7 +151,7 @@ U8                   cqi;
    if (hqProc == NULLP)
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
-		      ue->ueId, frm.sfn, frm.subframe);
+		      ue->ueId, frm.sfn, frm.slot);
       RETVOID;
    }
    hqProc->rcvdCrcInd = TRUE;
@@ -227,12 +206,12 @@ U8                   cqi;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3DatInd
+Void rgSCHUhmProcMsg3DatInd
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3DatInd(hqProc)
+Void rgSCHUhmProcMsg3DatInd(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
@@ -259,12 +238,12 @@ RgSchUlHqProcCb *hqProc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3Failure
+Void rgSCHUhmProcMsg3Failure
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3Failure(hqProc)
+Void rgSCHUhmProcMsg3Failure(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
@@ -302,7 +281,7 @@ RgSchUlHqProcCb *hqProc;
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -310,7 +289,7 @@ CmLteTimingInfo      frm,
 TknU8                rv
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
+Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -318,7 +297,7 @@ TknU8                rv;
 #endif
 #else /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -327,7 +306,7 @@ TknU8                rv,
 U8                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
+Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -347,7 +326,7 @@ U8                   cqi;
    if (hqProc == NULLP)
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
-		      ue->ueId, frm.sfn, frm.subframe);
+		      ue->ueId, frm.sfn, frm.slot);
       RETVOID;
    }
 #ifdef UL_LA
@@ -408,14 +387,14 @@ U8                   cqi;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
 U8               idx
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
 U8               idx;
@@ -427,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 */
 
 /**
@@ -451,14 +430,14 @@ U8               idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmNewTx
+Void rgSCHUhmNewTx
 (
 RgSchUlHqProcCb *hqProc,
 U8              maxHqRetx,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
+Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
 RgSchUlHqProcCb *hqProc;
 U8              maxHqRetx;
 RgSchUlAlloc    *alloc;
@@ -498,13 +477,13 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeProc
+Void rgSCHUhmFreeProc
 (
 RgSchUlHqProcCb *hqProc,
 RgSchCellCb      *cell
 )
 #else
-PUBLIC Void rgSCHUhmFreeProc(hqProc, cell)
+Void rgSCHUhmFreeProc(hqProc, cell)
 RgSchUlHqProcCb *hqProc;
 RgSchCellCb      *cell;
 #endif
@@ -550,7 +529,7 @@ RgSchCellCb      *cell;
 #endif
    hqProc->alloc = NULLP;
    hqProc->ulSfIdx = RGSCH_INVALID_INFO;
-   /*ccpu00116293 - Correcting relation between UL subframe and DL subframe based on RG_UL_DELTA*/
+   /*ccpu00116293 - Correcting relation between UL slot and DL slot based on RG_UL_DELTA*/
    hqProc->isRetx  = FALSE;
    hqProc->remTx = 0; /*Reseting the remTx value to 0*/
 #ifdef EMTC_ENABLE
@@ -590,13 +569,13 @@ RgSchCellCb      *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRetx
+Void rgSCHUhmRetx
 (
 RgSchUlHqProcCb *hqProc,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmRetx(hqProc, alloc) 
+Void rgSCHUhmRetx(hqProc, alloc) 
 RgSchUlHqProcCb *hqProc;
 RgSchUlAlloc    *alloc;
 #endif
@@ -630,14 +609,14 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeCfg
+Void rgSCHUhmRgrUeCfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeCfg          *ueCfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
+Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
@@ -696,14 +675,14 @@ RgrUeCfg          *ueCfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeRecfg
+Void rgSCHUhmRgrUeRecfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeRecfg        *ueRecfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
+Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeRecfg        *ueRecfg;
@@ -737,13 +716,13 @@ RgrUeRecfg        *ueRecfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeUe
+Void rgSCHUhmFreeUe
 (
 RgSchCellCb       *cellCb,
 RgUeUlHqCb        *hqEnt
 )
 #else
-PUBLIC Void rgSCHUhmFreeUe(cellCb, hqEnt) 
+Void rgSCHUhmFreeUe(cellCb, hqEnt) 
 RgSchCellCb       *cellCb;
 RgUeUlHqCb       *hqEnt;
 #endif
@@ -779,14 +758,14 @@ RgUeUlHqCb       *hqEnt;
 *  @return  Void
 */
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmAppendPhich
+S16 rgSCHUhmAppendPhich
 (
 RgSchCellCb            *cellCb,
 CmLteTimingInfo        frm,
 U8                     idx
 )
 #else
-PUBLIC S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
+S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
 RgSchCellCb            *cellCb;
 CmLteTimingInfo        frm;
 U8                     idx;
@@ -806,7 +785,7 @@ U8                     idx;
    TRC2(rgSCHUhmAppendPhich)
 
 #ifdef RG_5GTF
-   RETVALUE(ROK);
+   return ROK;
 #endif
    if(cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO)
    {
@@ -833,7 +812,7 @@ U8                     idx;
             if (rgSCHUtlGetPhichInfo (ulAlloc->hqProc, &rbStart, &nDmrs) != ROK)
 #endif
             {
-               RETVALUE (RFAILED);
+               return  (RFAILED);
             }
          if(nDmrs != RGSCH_INVALID_NDMRS)
          {
@@ -886,7 +865,7 @@ U8                     idx;
          ulAlloc = rgSCHUtlNextHqFdbkAlloc (cellCb, ulAlloc, idx);
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmAppendPhich */
 
 /**
@@ -908,13 +887,13 @@ U8                     idx;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmHqEntInit
+S16 rgSCHUhmHqEntInit
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb           *ueCb
 )
 #else
-PUBLIC S16 rgSCHUhmHqEntInit(cellCb, ueCb)
+S16 rgSCHUhmHqEntInit(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb           *ueCb;
 #endif
@@ -936,11 +915,11 @@ RgSchUeCb           *ueCb;
                            ueUl->hqEnt.numHqPrcs * \
                            sizeof(RgSchUlHqProcCb)) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmHqEntInit */
 
 #ifdef RG_5GTF
@@ -970,14 +949,14 @@ RgSchUeCb           *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmGetAvlHqProc
+S16 rgSCHUhmGetAvlHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
 RgSchUlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
+S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 RgSchUlHqProcCb       **hqP;
@@ -1003,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);
@@ -1015,13 +994,13 @@ RgSchUlHqProcCb       **hqP;
    cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk);
 
 #ifdef UL_ADPT_DBG 
-         printf("rgSCHUhmGetAvlHqProc cellId %d  free %ld inUse %ld ue %d time (%d %d)\n",cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId,cellUl->schdTime.sfn,cellUl->schdTime.subframe);
+         printf("rgSCHUhmGetAvlHqProc cellId %d  free %ld inUse %ld ue %d time (%d %d)\n",cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId,cellUl->schdTime.sfn,cellUl->schdTime.slot);
 #endif         
    tmpHqProc->schdTime = cellUl->schdTime;
 
    *hqP = tmpHqProc;
    
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHUhmGetAvlHqProc */
 
 /**
@@ -1043,14 +1022,14 @@ RgSchUlHqProcCb       **hqP;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
 CmLteTimingInfo  frm
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
 CmLteTimingInfo  frm;
@@ -1067,15 +1046,15 @@ CmLteTimingInfo  frm;
    {
       proc = (RgSchUlHqProcCb *)(lnk->node);
       lnk = lnk->next;
-      //   printf("compare rgSCHUhmGetUlProcByTime time (%d %d) CRC time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.subframe,frm.sfn,frm.subframe ,proc->procId);
+      //   printf("compare rgSCHUhmGetUlProcByTime time (%d %d) CRC time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot,frm.sfn,frm.slot ,proc->procId);
       if (RGSCH_TIMEINFO_SAME(proc->schdTime, frm))
       {
-        // printf("Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.subframe, proc->procId);
-         RETVALUE(proc);
+        // printf("Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot, proc->procId);
+         return (proc);
       }
    }
 
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHUhmGetUlProcByTime */
 #endif