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

diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c
index ffa51ba66..c02637511 100755
--- a/src/5gnrsch/rg_sch_scell.c
+++ b/src/5gnrsch/rg_sch_scell.c
@@ -33,16 +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 layer */
-#include "ssi.h"           /* system service interface */
-#include "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -54,15 +45,6 @@
 #include "rg_sch_cmn.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -73,29 +55,29 @@
 
 #ifdef LTE_ADV
 
-PUBLIC Void rgSCHSCellActivation ARGS((
+Void rgSCHSCellActivation ARGS((
 RgSchUeCellInfo  *sCell
 ));
 
-PUBLIC Void rgSCHSCellSchdActDeactCe ARGS((
+Void rgSCHSCellSchdActDeactCe ARGS((
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 ));
-PUBLIC Void rgSCHSCellAddToActDeactLst ARGS((
+Void rgSCHSCellAddToActDeactLst ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
 
-PUBLIC Void rgSCHSCellRmvFrmActLst ARGS((
+Void rgSCHSCellRmvFrmActLst ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
-PUBLIC S16 rgSCHSCellIsActive ARGS((
+S16 rgSCHSCellIsActive ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
 
-PUBLIC Void rgSCHSCellHndlFdbkInd ARGS((
+Void rgSCHSCellHndlFdbkInd ARGS((
 RgSchDlHqProcCb   *hqP,
 U8                tbIdx,
 U8                fdbk,
@@ -103,23 +85,23 @@ Bool              maxHqRetxReached
 ));
 
 #ifdef LTE_ADV
-PUBLIC Void rgSCHSCellDeactTmrExpry ARGS((
+Void rgSCHSCellDeactTmrExpry ARGS((
 RgSchUeCellInfo *sCell
 ));
 #endif
 
-PUBLIC Void rgSCHSCellDelUeSCell ARGS((
+Void rgSCHSCellDelUeSCell ARGS((
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
 U8            sCellIdx
 ));
 
-PUBLIC S16 rgSCHSCellDelUe ARGS((
+S16 rgSCHSCellDelUe ARGS((
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb
 ));
 #ifdef TFU_UPGRADE
-PUBLIC S16 rgSCHSCellPCqiCfg ARGS((
+S16 rgSCHSCellPCqiCfg ARGS((
 RgSchCellCb  *priCellCb,
 RgSchCellCb  *secCellCb,
 RgSchUeCb    *ueCb,
@@ -151,13 +133,13 @@ U16           rnti
  *      -# None.
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellSchdActDeactCe
+Void rgSCHSCellSchdActDeactCe
 (
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 )
 #else
-PUBLIC Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
+Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
 RgSchUeCb         *ueCb;
 RgSchDlHqTbCb     *tbInfo;
 #endif
@@ -239,13 +221,13 @@ RgSchDlHqTbCb     *tbInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellAddToActDeactLst
+Void rgSCHSCellAddToActDeactLst
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellAddToActDeactLst(cell, ue)
+Void rgSCHSCellAddToActDeactLst(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
@@ -284,13 +266,13 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellRmvFrmActLst
+Void rgSCHSCellRmvFrmActLst
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellRmvFrmActLst(cell, ue)
+Void rgSCHSCellRmvFrmActLst(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
@@ -324,12 +306,12 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellActivation
+Void rgSCHSCellActivation
 (
 RgSchUeCellInfo  *sCellInfo
 )
 #else
-PUBLIC Void rgSCHSCellActivation(sCellInfo)
+Void rgSCHSCellActivation(sCellInfo)
 RgSchUeCellInfo  *sCellInfo
 #endif
 {
@@ -371,7 +353,7 @@ RgSchUeCellInfo  *sCellInfo
 #ifdef TFU_UPGRADE
    /* Start receiving CQI for this SCell for this UE */
    crntTime = (ueCb->cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)+
-                  (ueCb->cell->crntTime.subframe);
+                  (ueCb->cell->crntTime.slot);
 
    cqiCb = &sCellInfo->cqiCb;
    cqiCfg = &cqiCb->cqiCfg;
@@ -389,7 +371,7 @@ RgSchUeCellInfo  *sCellInfo
       }
 
       timingInfo.sfn =  cqiCb->nCqiTrIdx/RGSCH_NUM_SUB_FRAMES_5G;
-      timingInfo.subframe =  cqiCb->nCqiTrIdx%RGSCH_NUM_SUB_FRAMES_5G;
+      timingInfo.slot =  cqiCb->nCqiTrIdx%RGSCH_NUM_SUB_FRAMES_5G;
       if(cqiCb->cqiCfg.cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP)
       {
          rgSCHTomUtlPcqiSbCalcBpIdx(timingInfo,ueCb,cqiCb); 
@@ -610,7 +592,7 @@ PRIVATE S16 rgSCHSCellDeActivation(sCellInfo)
 RgSchUeCellInfo *sCellInfo
 #endif
 {
-   RETVALUE(ROK);
+   return ROK;
    RgSchCmnCell *cellSch;
    Inst inst = sCellInfo->cell->instIdx;
 
@@ -661,7 +643,7 @@ RgSchUeCellInfo *sCellInfo
    printf("SCELL DEATIVATED  sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
    //MSPD_DBG("SCELL DEATIVATED  sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
 #endif
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -705,7 +687,7 @@ U16           rnti;
    if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP)
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    hqEntRstInfo.cellId = secCellId;
@@ -715,7 +697,7 @@ U16           rnti;
 
    RgSchMacRstHqEnt(&pst, &hqEntRstInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /*removed endif*/
 
@@ -742,7 +724,7 @@ U16           rnti;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellHndlFdbkInd
+Void rgSCHSCellHndlFdbkInd
 (
 RgSchDlHqProcCb   *hqP,
 U8                tbIdx,
@@ -750,7 +732,7 @@ U8                fdbk,
 Bool              maxHqRetxReached
 )
 #else
-PUBLIC Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
+Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
 RgSchDlHqProcCb   *hqP;
 U8                tbIdx;
 U8                fdbk;
@@ -851,12 +833,12 @@ Bool              maxHqRetxReached;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDeactTmrExpry
+Void rgSCHSCellDeactTmrExpry
 (
 RgSchUeCellInfo *sCellInfo
 )
 #else
-PUBLIC Void rgSCHSCellDeactTmrExpry(sCellInfo)
+Void rgSCHSCellDeactTmrExpry(sCellInfo)
 RgSchUeCellInfo *sCellInfo;
 #endif
 {
@@ -908,7 +890,7 @@ RgSchUeCellInfo *sCellInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellTrigActDeact
+S16 rgSCHSCellTrigActDeact
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb,
@@ -916,7 +898,7 @@ U8            sCellIdx,
 U8            action
 )
 #else
-PUBLIC S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
+S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb;
 U8            sCellIdx;
@@ -933,14 +915,14 @@ U8            action;
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", \
                sCellIdx));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(ueCb->cellInfo[sCellIdx] == NULLP)
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \
               sCellIdx,ueCb->ueId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    switch (action)
@@ -1012,7 +994,7 @@ U8            action;
          break;
       }
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
  
@@ -1053,10 +1035,10 @@ U8           *sCellIdx;
       if((ueCb->cellInfo[(*sCellIdx)] != NULLP) &&
             (ueCb->cellInfo[(*sCellIdx)]->sCellState == RG_SCH_SCELL_READY))
       {
-         RETVALUE(ROK);
+         return ROK;
       }
    }
-   RETVALUE(RFAILED);
+   return RFAILED;
 }
 
 /**
@@ -1077,14 +1059,14 @@ U8           *sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellSelectAndActDeAct
+Void rgSCHSCellSelectAndActDeAct
 (
 RgSchCellCb  *pCell,
 RgSchUeCb    *ueCb,
 U8           action
 )
 #else
-PUBLIC Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
+Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
 RgSchCellCb  *pCell;
 RgSchUeCb    *ueCb;
 U8           action;
@@ -1136,14 +1118,14 @@ U8           action;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDelUeSCell
+Void rgSCHSCellDelUeSCell
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
 U8            sCellIdx
 )
 #else
-PUBLIC Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
+Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
 RgSchCellCb  *cellCb;
 RgSchUeCb    *ueCb;
 U8            sCellIdx;
@@ -1223,13 +1205,13 @@ U8            sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellDelUe
+S16 rgSCHSCellDelUe
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb
 )
 #else
-PUBLIC S16 rgSCHSCellDelUe(cellCb,ueCb)
+S16 rgSCHSCellDelUe(cellCb,ueCb)
 RgSchCellCb  *cellCb;
 RgSchUeCb    *ueCb;
 #endif
@@ -1242,7 +1224,7 @@ RgSchUeCb    *ueCb;
       rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef TFU_UPGRADE
@@ -1278,7 +1260,7 @@ RgSchUeCb    *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellPCqiCfg
+S16 rgSCHSCellPCqiCfg
 (
 RgSchCellCb  *priCellCb,
 RgSchCellCb  *secCellCb,
@@ -1288,7 +1270,7 @@ CmLteUeCategory   ueCat,
 U8            sCellIdx
 )
 #else
-PUBLIC S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
+S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
 RgSchCellCb       *priCellCb;
 RgSchCellCb       *secCellCb;
 RgSchUeCb         *ueCb;
@@ -1316,7 +1298,7 @@ U8                sCellIdx;
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n",
                sCellIdx));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    sCellInfo = ueCb->cellInfo[sCellIdx];
@@ -1421,7 +1403,7 @@ U8                sCellIdx;
    cqiCb->riDist    = RG_SCH_INVALID_IDX; 
    cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX;
  
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -1442,13 +1424,13 @@ U8                sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlUeReset
+Void rgSCHSCellDlUeReset
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellDlUeReset(cell, ue)
+Void rgSCHSCellDlUeReset(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
@@ -1487,14 +1469,14 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcCfg
+Void rgSCHSCellDlLcCfg
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlLcCfg(cell, ue, svc)
+Void rgSCHSCellDlLcCfg(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -1529,14 +1511,14 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcDel
+Void rgSCHSCellDlLcDel
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlLcDel(cell, ue, svc)
+Void rgSCHSCellDlLcDel(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -1571,14 +1553,14 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlDedBoUpd
+Void rgSCHSCellDlDedBoUpd
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
+Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -1668,7 +1650,7 @@ RgSchUePCqiCb     *cqiCb2;
       }
    }
 
-   RETVALUE(retCqiCb->servCellInfo->sCellIdx);
+   return (retCqiCb->servCellInfo->sCellIdx);
 }
 
 /**
@@ -1687,12 +1669,12 @@ RgSchUePCqiCb     *cqiCb2;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn
+S16 rgSCHUtlSCellHndlCqiCollsn
 (
 RgSchUePCqiCb *cqiCb
 )
 #else
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
@@ -1778,7 +1760,7 @@ RgSchUePCqiCb     *cqiCb;
    idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1));
    ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1798,12 +1780,12 @@ RgSchUePCqiCb     *cqiCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn
+S16 rgSCHUtlSCellHndlRiCollsn
 (
 RgSchUePCqiCb *cqiCb
 )
 #else
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
@@ -1896,7 +1878,7 @@ RgSchUePCqiCb     *cqiCb;
    /* Set the next expected Cqi into nPCqiCb */
    ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif/*TFU_UPGRADE*/
 
@@ -1917,13 +1899,13 @@ RgSchUePCqiCb     *cqiCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellIsActive
+S16 rgSCHSCellIsActive
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC S16 rgSCHSCellIsActive(cell, ue)
+S16 rgSCHSCellIsActive(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
@@ -1941,7 +1923,7 @@ RgSchUeCb                  *ue;
          break;
       }
    }
-   RETVALUE(retVal);	
+   return (retVal);	
 }
 
 /**
@@ -1959,13 +1941,13 @@ RgSchUeCb                  *ue;
  *      -#  TRUE
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHIsActvReqd 
+Bool rgSCHIsActvReqd 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Bool rgSCHIsActvReqd(cell, ue)
+Bool rgSCHIsActvReqd(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue
 #endif
@@ -1976,9 +1958,9 @@ RgSchUeCb      *ue
     * outstanding BO */
    if(ue->remBoCnt == RG_SCH_ACTIVATION_COUNT)
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
-   RETVALUE(FALSE);
+   return (FALSE);
 }
 #endif/*LTE_ADV*/