Code Review / o-du / l2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CU testing fixes
[o-du/l2.git] / src / 5gnrsch / rg_sch_ram.c
diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c
index 9f9d5a0..a5b5f7d 100755 (executable)
--- a/src/5gnrsch/rg_sch_ram.c
+++ b/src/5gnrsch/rg_sch_ram.c
@@ -63,20 +63,20 @@ static int RLOG_FILE_ID=171;
 #include "rg_sch.x"        /* Scheduler includes */
 #include "rg_sch_cmn.x"
 #ifdef EMTC_ENABLE
-EXTERN Bool rgSCHRamVldtRgrEmtcUeCfg  ARGS((
+Bool rgSCHRamVldtRgrEmtcUeCfg  ARGS((
 RgSchCellCb  *cell,
 RgrUeCfg     *ueCfg
 ));
 
-EXTERN S16 rgSCHRamRmvAllFrmEmtcRaInfoSchdLst
+S16 rgSCHRamRmvAllFrmEmtcRaInfoSchdLst
 (
 RgSchCellCb       *cell
 );
-EXTERN Void rgSCHEmtcUtlUpdCmnNb 
+Void rgSCHEmtcUtlUpdCmnNb 
 (
 RgSchRaCb      *raCb
 );
-EXTERN Void rgSCHEmtcHqPAlloc 
+Void rgSCHEmtcHqPAlloc 
 (
 RgSchCellCb       *cell,
 RgSchDlHqEnt      *hqEnt
@@ -84,30 +84,30 @@ RgSchDlHqEnt      *hqEnt
 #endif
 /* local defines */
 /* local typedefs */
-PRIVATE Void rgSCHRamUlFreeAllocation ARGS((RgSchUlSf *sf,RgSchUlAlloc *alloc, 
+static Void rgSCHRamUlFreeAllocation ARGS((RgSchUlSf *sf,RgSchUlAlloc *alloc, 
          RgSchCellCb     *cell,Bool isEmtc));
 
-PRIVATE S16 rgSCHRamContResCrnti   ARGS((RgSchCellCb *cell, RgSchUeCb *ue, 
+static S16 rgSCHRamContResCrnti   ARGS((RgSchCellCb *cell, RgSchUeCb *ue, 
                                       RgSchRaCb *raCb, RgSchErrInfo *err));
-PRIVATE S16 rgSCHRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
+static S16 rgSCHRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
 #ifdef EMTC_ENABLE
 
-EXTERN S16 rgSCHEmtcRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
-EXTERN S16 rgSCHRamEmtcContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
-EXTERN Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb        *cell));
-EXTERN Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
-EXTERN Void rgSCHEmtcRaInfoFree ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
+S16 rgSCHEmtcRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
+S16 rgSCHRamEmtcContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
+Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb        *cell));
+Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
+Void rgSCHEmtcRaInfoFree ARGS((RgSchCellCb *cell, RgSchRaCb *raCb));
 #endif
 #ifdef RGR_V1
-PRIVATE Void rgSCHChkContResGrdTmrExp ARGS((RgSchCellCb        *cell));
-PRIVATE Void rgSCHChkContResTmrExp ARGS((RgSchCellCb        *cell));
-PRIVATE Void rgSCHRamProcContResExp ARGS((RgSchCellCb *cell, 
+static Void rgSCHChkContResGrdTmrExp ARGS((RgSchCellCb        *cell));
+static Void rgSCHChkContResTmrExp ARGS((RgSchCellCb        *cell));
+static Void rgSCHRamProcContResExp ARGS((RgSchCellCb *cell, 
                                  RgSchRaCb  *raCb));
-PRIVATE Void rgSCHRamProcContResGrdExp ARGS((RgSchCellCb *cell,
+static Void rgSCHRamProcContResGrdExp ARGS((RgSchCellCb *cell,
                                       RgSchRaCb  *raCb));
 #ifdef EMTC_ENABLE
-EXTERN Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb        *cell));
-EXTERN Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
+Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb        *cell));
+Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
 #endif
 #endif
 /* forward references */
@@ -186,7 +186,7 @@ RgrUeCfg     *ueCfg;
 #ifdef ANSI
 S16 rgSCHRamProcRaReq
 (
-U8                raReqCnt,
+uint8_t                raReqCnt,
 RgSchCellCb       *cell,
 CmLteRnti         raRnti,
 TfuRachInfo       *raReqInd,
@@ -196,7 +196,7 @@ RgSchErrInfo      *err
 )
 #else
 S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
-U8                raReqCnt;
+uint8_t                raReqCnt;
 RgSchCellCb       *cell;
 CmLteRnti         raRnti;
 TfuRachInfo       *raReqInd;
@@ -206,10 +206,10 @@ RgSchErrInfo      *err;
 #endif
 {
    RgSchRaReqInfo *raReqInfo;
-   U16            raIndex;
+   uint16_t            raIndex;
 #ifdef LTE_TDD
-   U8             fid;
-   U8             tid;
+   uint8_t             fid;
+   uint8_t             tid;
 #endif
 
 
@@ -439,7 +439,7 @@ RgSchErrInfo   *err;
 {
    /* Releasing HARQ processes of old UE when ue
     *           reconfig with new crnti */
-  /* U32 cnt; */
+  /* uint32_t cnt; */
    RgSchDlHqEnt          **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell));
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
 
@@ -496,7 +496,7 @@ RgSchErrInfo   *err;
  *      -# ROK 
  **/
 #ifdef ANSI
-PRIVATE S16 rgSCHRamContResCrnti
+static S16 rgSCHRamContResCrnti
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -504,7 +504,7 @@ RgSchRaCb    *raCb,
 RgSchErrInfo *err
 )
 #else
-PRIVATE S16 rgSCHRamContResCrnti(cell, ue, raCb, err)
+static S16 rgSCHRamContResCrnti(cell, ue, raCb, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchRaCb    *raCb;
@@ -562,13 +562,13 @@ RgSchErrInfo *err;
  *      -# ROK 
  **/
 #ifdef ANSI
-PRIVATE S16 rgSCHRamContResCcchsdu
+static S16 rgSCHRamContResCcchsdu
 (
 RgSchCellCb *cell,
 RgSchRaCb *raCb
 )
 #else
-PRIVATE S16 rgSCHRamContResCcchsdu(cell, raCb)
+static S16 rgSCHRamContResCcchsdu(cell, raCb)
 RgSchCellCb *cell;
 RgSchRaCb *raCb;
 #endif
@@ -707,7 +707,7 @@ RgInfCmnBoRpt     *staRsp;
 {
 
    /* Update Bo in RaCb */
-   raCb->dlCcchInfo.bo = (U32)(staRsp->bo);
+   raCb->dlCcchInfo.bo = (uint32_t)(staRsp->bo);
    /* SR_RACH_STATS : MSG4 WITH CCCH SDU */
    rgNumMsg4WithCCCHSdu++;
 
@@ -1063,19 +1063,19 @@ RgSchCellCb  *cell;
 #endif
 {
    RgSchRaCb   *raCb;
-   U16         raSfn;
-   U16         crntSfn;
-   U16         dist;       /* Number of frames between raCb's creation and crnt
+   uint16_t         raSfn;
+   uint16_t         crntSfn;
+   uint16_t         dist;       /* Number of frames between raCb's creation and crnt
                               frame */
-   U8          idx;
-   U32         maxCnt;
+   uint8_t          idx;
+   uint32_t         maxCnt;
 #ifndef LTE_TDD
-   U8          winGap;        
-   U8          raIdx;
+   uint8_t          winGap;        
+   uint8_t          raIdx;
    RgSchRaReqInfo *raReqInfo;
 #else
    CmLteTimingInfo      frm;
-   U8                   raIdx;
+   uint8_t                   raIdx;
 #endif
 
 
@@ -1193,13 +1193,13 @@ RgSchCellCb    *cell;
 {
    RgSchRaReqInfo  *raReqInfo;
    RgSchRaCb       *raCb;
-   U8              idx;
-   U8              raCbCnt;
+   uint8_t              idx;
+   uint8_t              raCbCnt;
    Inst            inst = cell->instIdx;
-   U8              lstSz;
+   uint8_t              lstSz;
 #ifdef LTE_TDD
-   U8              maxUlSubframes;
-   U8              maxDlSubframes;
+   uint8_t              maxUlSubframes;
+   uint8_t              maxDlSubframes;
 #endif
 
 
@@ -1271,13 +1271,13 @@ RgSchCellCb    *cell;
 } /* rgSCHRamFreeCell */
 #ifdef RGR_V1
 #ifdef ANSI
-PRIVATE Void rgSCHRamProcContResExp
+static Void rgSCHRamProcContResExp
 (
 RgSchCellCb *cell,
 RgSchRaCb  *raCb
 )
 #else
-PRIVATE Void rgSCHRamProcContResExp (cell, raCb)
+static Void rgSCHRamProcContResExp (cell, raCb)
 RgSchCellCb *cell;
 RgSchRaCb  *raCb;
 #endif
@@ -1296,17 +1296,17 @@ RgSchRaCb  *raCb;
       /* Delete RACB and release RNTI */
       rgSCHRamDelRaCb(cell, raCb, TRUE);
    }
-   RETVOID;
+   return;
 }
 
 #ifdef ANSI
-PRIVATE Void rgSCHRamProcContResGrdExp
+static Void rgSCHRamProcContResGrdExp
 (
 RgSchCellCb *cell,
 RgSchRaCb  *raCb
 )
 #else
-PRIVATE Void rgSCHRamProcContResGrdExp (cell, raCb)
+static Void rgSCHRamProcContResGrdExp (cell, raCb)
 RgSchCellCb  *cell;
 RgSchRaCb  *raCb;
 #endif
@@ -1331,7 +1331,7 @@ RgSchRaCb  *raCb;
             raCb->rntiLnk->rnti);   
    rgSCHRamAddToRaInfoSchdLst(cell, raCb);
    /* MSG4 Fix End */    
-   RETVOID;
+   return;
    
 }
 /**
@@ -1349,12 +1349,12 @@ RgSchRaCb  *raCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHChkContResTmrExp
+static Void rgSCHChkContResTmrExp
 (
 RgSchCellCb        *cell
 )
 #else
-PRIVATE Void rgSCHChkContResTmrExp(cell)
+static Void rgSCHChkContResTmrExp(cell)
 RgSchCellCb        *cell;
 #endif
 {
@@ -1395,12 +1395,12 @@ RgSchCellCb        *cell;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHChkContResGrdTmrExp
+static Void rgSCHChkContResGrdTmrExp
 (
 RgSchCellCb        *cell
 )
 #else
-PRIVATE Void rgSCHChkContResGrdTmrExp(cell)
+static Void rgSCHChkContResGrdTmrExp(cell)
 RgSchCellCb        *cell;
 #endif
 {
@@ -1441,7 +1441,7 @@ RgSchCellCb        *cell;
  *
  *  @param[in,out] RgSchCellCb      *cell
  *  @param[in]     CmLteTimingInfo  timingInfo
- *  @param[in]     U8               raIdx
+ *  @param[in]     uint8_t               raIdx
  *  @return  S16
  *      -# ROK
  **/
@@ -1450,24 +1450,24 @@ S16 rgSCHRamDelRaReq
 (
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo,
-U8                   raIdx
+uint8_t                   raIdx
 )
 #else
 S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
-U8                   raIdx;
+uint8_t                   raIdx;
 #endif
 {
-   U8                   subfrmIdx;
+   uint8_t                   subfrmIdx;
    RgSchTddRachRspLst   *rachRsp;
-   U16                   sfnIdx;
+   uint16_t                   sfnIdx;
    S16                  calcSfn;
-   U8                   subfrm;
+   uint8_t                   subfrm;
    RgSchRaReqInfo       *raReqInfo;
-   U8                   idx;
-   U8                   i;
-   U8                   raRntiIdx;
+   uint8_t                   idx;
+   uint8_t                   i;
+   uint8_t                   raRntiIdx;
    CmLteRnti            raRnti;
 
 
@@ -1585,7 +1585,7 @@ RgSchRaCb         *raCb;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHRamUlFreeAllocation
+static Void rgSCHRamUlFreeAllocation
 (
 RgSchUlSf       *sf,
 RgSchUlAlloc    *alloc,
@@ -1594,7 +1594,7 @@ Bool            isEmtc
 
 )
 #else
-PRIVATE Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc)
+static Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc)
 RgSchUlSf       *sf;
 RgSchUlAlloc    *alloc;
 RgSchCellCb     *cell;
@@ -1607,7 +1607,7 @@ Bool            isEmtc;
    {
       rgSCHUtlUlAllocRls(sf, alloc);
    }
-   RETVOID;
+   return;
 }
 
 /**********************************************************************
O-RAN DU Layer 2