X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_l2m.c;h=d5668f1c0d77f2735939dc91fac56bd6a440ec02;hb=2f4aa1b4a81b2511d67ef0894923a7733da65be7;hp=e9cab73a59bc2c1691b642fd7db11e0933700cbf;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index e9cab73a5..d5668f1c0 100755
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -62,12 +62,12 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=166;
 
-PRIVATE S16 rgSchL2mInsertMeasCb ARGS((
+static S16 rgSchL2mInsertMeasCb ARGS((
          RgSchCellCb       *cell,
          RgSchL2MeasCb     *measCb,
          LrgSchMeasReqInfo *measInfo ));
 
-PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
+static RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
          RgSchCellCb       *cell,
          LrgSchMeasReqInfo *measInfo,
          RgSchErrInfo      err));
@@ -86,26 +86,18 @@ PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
  * @param  [in] measTime
  * @return  Void
  */
-#ifdef ANSI
 S16 rgSchFillL2MeasCfm
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
 LrgSchMeasCfmInfo *cfm,
-uint32_t               measTime   
+uint32_t          measTime   
 )
-#else
-S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
-RgSchCellCb       *cell;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasCfmInfo *cfm;
-uint32_t               measTime;
-#endif
 {
-   uint8_t                 idx;
+   uint8_t            idx;
    LrgSchMeasReqInfo  *measInfo;
-   uint8_t                 qciVal = 0;
-   uint32_t                 sampOc = 0;
+   uint8_t            qciVal = 0;
+   uint32_t           sampOc = 0;
 
    measInfo = &measCb->measReq;   
 
@@ -317,7 +309,6 @@ uint32_t               measTime;
  * @param  [in] Bool     isErr
  * @return  Void
  */
-#ifdef ANSI
 S16 rgSchL2mSndCfm
 (
 Pst               *pst,
@@ -325,13 +316,6 @@ RgSchL2MeasCb     *measCb,
 LrgSchMeasReqInfo *measInfo,
 Bool              isErr
 )
-#else
-S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
-Pst               *pst;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasReqInfo *measInfo;
-Bool              isErr;
-#endif
 {
    LrgSchMeasCfmInfo   cfm;
 
@@ -361,19 +345,12 @@ Bool              isErr;
  * @param  [in] LrgSchMeasReqInfo *measInfo
  * @return  Void
  */
-#ifdef ANSI
 Void rgSchL2mFillCfmPst
 (
 Pst    *pst,
 Pst    *cfmPst,
 LrgSchMeasReqInfo *measInfo 
 )
-#else
-Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
-Pst    *pst;
-Pst    *cfmPst;
-LrgSchMeasReqInfo *measInfo;
-#endif
 {
  
    cfmPst->srcEnt    = pst->dstEnt;
@@ -405,23 +382,16 @@ LrgSchMeasReqInfo *measInfo;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-PRIVATE S16 rgSchL2mInsertMeasCb
+static S16 rgSchL2mInsertMeasCb
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
 LrgSchMeasReqInfo *measInfo
 )
-#else
-PRIVATE S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo)
-RgSchCellCb       *cell;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasReqInfo *measInfo;
-#endif
 {
    CmLList   *lnk, *node;
    RgSchL2MeasCb   *oldMeasCb;
-   uint32_t              diffTime;
+   uint32_t        diffTime;
    
    /* 
     * 1. Check if l2mList has any entries.
@@ -466,20 +436,12 @@ LrgSchMeasReqInfo *measInfo;
  *
  * @param  [in] RgSchCellCb       *cell
  */
-#ifdef ANSI
-PRIVATE Void rgSchL2CalDlPrbCount
-(
-RgSchCellCb       *cell
-)
-#else
-PRIVATE Void rgSchL2CalDlPrbCount(cell)
-RgSchCellCb       *cell;
-#endif
+static Void rgSchL2CalDlPrbCount(RgSchCellCb *cell)
 {
    CmLteTimingInfo    frm;
    RgSchDlSf          *sf = NULLP;
 #ifdef LTE_TDD
-   uint8_t                 idx;
+   uint8_t            idx;
 #endif
 
    frm   = cell->crntTime;
@@ -508,20 +470,12 @@ RgSchCellCb       *cell;
  *
  * @param  [in] RgSchCellCb       *cell
  */
-#ifdef ANSI
-PRIVATE Void rgSchL2CalUlPrbCount
-(
-RgSchCellCb       *cell
-)
-#else
-PRIVATE Void rgSchL2CalUlPrbCount(cell)
-RgSchCellCb       *cell;
-#endif
+static Void rgSchL2CalUlPrbCount(RgSchCellCb  *cell)
 {
    RgSchUlSf        *sf = NULLP;
    RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 #ifdef LTE_TDD
-   uint8_t                 idx;
+   uint8_t  idx;
 #endif
 
 #ifdef LTE_TDD
@@ -548,19 +502,12 @@ RgSchCellCb       *cell;
  * @param  [out] RgSchErrInfo      *err
  * @return  RgSchL2MeasCb *
  */
-#ifdef ANSI
-PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb
+static RgSchL2MeasCb * rgSchL2mAllocMeasCb
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
-#else
-PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err)
-RgSchCellCb       *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo      err;
-#endif
 {
    RgSchL2MeasCb       *measCb = NULLP;
    Inst                inst = cell->instIdx;
@@ -601,23 +548,16 @@ RgSchErrInfo      err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSchL2mMeasReq 
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
-#else
-S16 rgSchL2mMeasReq(cell, measInfo, err)
-RgSchCellCb       *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo      err;
-#endif    
 {
    RgSchL2MeasCb *measCb;
-   uint8_t            idx;
-   uint8_t            qciVal;
+   uint8_t       idx;
+   uint8_t       qciVal;
 
 
    qciVal = 0;
@@ -696,31 +636,25 @@ RgSchErrInfo      err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHL2Meas
 (
 RgSchCellCb  *cell,
 uint8_t isCalrCrcInd
 )
-#else
-S16 rgschL2Meas(cell,isCalrCrcInd)
-RgSchCellCb  *cell;
-uint8_t isCalrCrcInd
-#endif
 {
    CmLList           *node = NULLP;
    RgSchL2MeasCb     *measCb = NULLP;
-   uint8_t                idx;
+   uint8_t           idx;
    LrgSchMeasCfmInfo measCfm;
-   uint8_t                qciVal = 0;
-   uint32_t               sfDiff;
-   uint32_t               meas;
+   uint8_t           qciVal = 0;
+   uint32_t          sfDiff;
+   uint32_t          meas;
 #ifdef LTE_TDD
-   uint8_t                sfIdx;
+   uint8_t           sfIdx;
    Bool              isDlDataAllowed;  
-   uint8_t                rem;
-   uint32_t               numDlSf;
-   uint32_t               numUlSf;
+   uint8_t           rem;
+   uint32_t          numDlSf;
+   uint32_t          numUlSf;
 #endif
 
    node = cell->l2mList.first;