remove/replaced PRIVATE and EXTERN keywords

[o-du/l2.git] / src / 5gnrmac / rg_ptmi.c

diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c
index 87419c3..0ce1260 100755 (executable)
--- a/src/5gnrmac/rg_ptmi.c
+++ b/src/5gnrmac/rg_ptmi.c
@@ -54,18 +54,18 @@ extern "C" {
 
 /* portable functions at LRG interface */
 #ifdef PTRGMILRG
-EXTERN S16 PtMiLrgCfgCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgSchCfgCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgStsCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgStaCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgStaInd ARGS((Pst *pst, RgMngmt *usta));
-EXTERN S16 PtMiLrgSchStaInd ARGS((Pst *pst, RgMngmt *usta));
-EXTERN S16 PtMiLrgCntrlCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgSchCntrlCfm ARGS((Pst *pst, RgMngmt *cfm));
-EXTERN S16 PtMiLrgTrcInd ARGS((Pst *pst, RgMngmt *trc,Buffer *mBuf));
+S16 PtMiLrgCfgCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgSchCfgCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgStsCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgStaCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgStaInd ARGS((Pst *pst, RgMngmt *usta));
+S16 PtMiLrgSchStaInd ARGS((Pst *pst, RgMngmt *usta));
+S16 PtMiLrgCntrlCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgSchCntrlCfm ARGS((Pst *pst, RgMngmt *cfm));
+S16 PtMiLrgTrcInd ARGS((Pst *pst, RgMngmt *trc,Buffer *mBuf));
 #ifdef LTE_L2_MEAS
-EXTERN S16 PtMiLrgSchL2MeasCfm ARGS((Pst *pst, LrgSchMeasCfmInfo *cfm));
-EXTERN S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm ));
+S16 PtMiLrgSchL2MeasCfm ARGS((Pst *pst, LrgSchMeasCfmInfo *cfm));
+S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm ));
 #endif
 #endif
 
@@ -89,7 +89,7 @@ EXTERN S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm ));
  *  In a similar fashion, the matrices for Status, Statistics and
  *  Control confirms and, Status and trace indications are defined.
  **/
-PRIVATE CONSTANT LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] =
+static const LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgCfgCfm,                  /* 0 - loosely coupled */
@@ -104,7 +104,7 @@ PRIVATE CONSTANT LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Scheduler Config Confirm primitive Matrix */
-PRIVATE CONSTANT LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] =
+static const LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgSchCfgCfm,                  /* 0 - loosely coupled */
@@ -119,7 +119,7 @@ PRIVATE CONSTANT LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Statistics Confirm primitive Matrix */
-PRIVATE CONSTANT LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] =
+static const LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgStsCfm,                  /* 0 - loosely coupled */
@@ -134,7 +134,7 @@ PRIVATE CONSTANT LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Status Confirm primitive Matrix */
-PRIVATE CONSTANT LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] =
+static const LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgStaCfm,                  /* 0 - loosely coupled */
@@ -150,7 +150,7 @@ PRIVATE CONSTANT LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] =
 
 
 /** @brief Status Indication primitive Matrix */
-PRIVATE CONSTANT LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] =
+static const LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgStaInd,                  /* 0 - loosely coupled */
@@ -165,7 +165,7 @@ PRIVATE CONSTANT LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Scheduler  Status Indication primitive Matrix */
-PRIVATE CONSTANT LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] =
+static const LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgSchStaInd,                  /* 0 - loosely coupled */
@@ -181,7 +181,7 @@ PRIVATE CONSTANT LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] =
 
 
 /** @brief Control Confirm primitive Matrix */
-PRIVATE CONSTANT LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] =
+static const LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgCntrlCfm,                  /* 0 - loosely coupled */
@@ -196,7 +196,7 @@ PRIVATE CONSTANT LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Scheduler Control Confirm primitive Matrix */
-PRIVATE CONSTANT LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] =
+static const LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgSchCntrlCfm,                  /* 0 - loosely coupled */
@@ -211,7 +211,7 @@ PRIVATE CONSTANT LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] =
 };
 
 /** @brief Trace Indication primitive Matrix */
-PRIVATE CONSTANT LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] =
+static const LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgTrcInd,                  /* 0 - loosely coupled */
@@ -226,7 +226,7 @@ PRIVATE CONSTANT LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] =
 };
 #ifdef LTE_L2_MEAS
 /** @brief L2 Meas Cfm primitive Matrix */
-PRIVATE CONSTANT LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] =
+static const LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgSchL2MeasCfm,                /* 0 - loosely coupled */
@@ -240,7 +240,7 @@ PRIVATE CONSTANT LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] =
 #endif
 };
 /** @brief L2 Meas Stop Cfm primitive Matrix */
-PRIVATE CONSTANT LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR] =
+static const LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR] =
 {
 #ifdef LCRGMILRG
    cmPkLrgSchL2MeasStopCfm,                /* 0 - loosely coupled */
@@ -292,8 +292,6 @@ RgMngmt  *cfm;    /* config confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgCfgCfm);
-
    (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm);
 
    return ROK;
@@ -330,8 +328,6 @@ RgMngmt  *cfm;    /* config confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgSchCfgCfm);
-
    (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm);
 
    return ROK;
@@ -370,8 +366,6 @@ RgMngmt  *cfm;    /* statistics confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgStsCfm);
-
    (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm);
 
    return ROK;
@@ -409,8 +403,6 @@ RgMngmt  *cfm;    /* status confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgStaCfm);
-    
    (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm);
 
    return ROK;
@@ -448,8 +440,6 @@ RgMngmt  *cfm;    /* control confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgCntrlCfm);
-
    (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm);
 
    return ROK;
@@ -486,8 +476,6 @@ RgMngmt  *cfm;    /* control confirm structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgSchCntrlCfm);
-
    (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm);
 
    return ROK;
@@ -525,8 +513,6 @@ RgMngmt  *usta;    /* status indication structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgStaInd);
-
    (*RgMiLrgStaIndMt[pst->selector])(pst,usta);
 
    return ROK;
@@ -563,8 +549,6 @@ RgMngmt  *usta;    /* status indication structure  */
 #endif    
 {
    
-   TRC3(RgMiLrgSchStaInd);
-
    (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta);
 
    return ROK;
@@ -605,8 +589,6 @@ Buffer   *mBuf;   /* Trace message  */
 #endif    
 {
    
-   TRC3(RgMiLrgTrcInd);
-
    (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf);
 
    return ROK;
@@ -628,7 +610,6 @@ Pst               *pst;          /* post structure  */
 LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
 #endif    
 {
-   TRC3(RgMiLrgSchL2MeasCfm)
    
    (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm);
    
@@ -665,8 +646,6 @@ Pst               *pst;          /* post structure  */
 LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
 #endif    
 {
-   TRC3(RgMiLrgSchL2MeasStopCfm)
-        
    (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm);
           
    return ROK;
@@ -710,8 +689,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Config Confirm */
 #endif
 {
-   TRC3(PtMiLrgCfgCfm)
-
    return ROK;
 }/* end of PtMiLrgCfgCfm */
 
@@ -746,7 +723,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Config Confirm */
 #endif
 {
-   TRC3(PtMiLrgSchCfgCfm)
 
    return ROK;
 }/* end of PtMiLrgSchCfgCfm */
@@ -784,7 +760,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Statistics Confirm */
 #endif
 {
-   TRC3(PtMiLrgStsCfm)
 
    return ROK;
 }/* end of PtMiLrgStsCfm */
@@ -822,7 +797,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Status Confirm */
 #endif
 {
-   TRC3(PtMiLrgStaCfm)
    return ROK;
 }/* end of PtMiLrgStaCfm */
 
@@ -859,7 +833,6 @@ Pst *pst;               /* post structure */
 RgMngmt *usta;          /* Status indication */
 #endif
 {
-   TRC3(PtMiLrgStaInd)
    return ROK;
 }/* end of PtMiLrgStaInd */
 
@@ -894,7 +867,6 @@ Pst *pst;               /* post structure */
 RgMngmt *usta;          /* Status indication */
 #endif
 {
-   TRC3(PtMiLrgSchStaInd)
    return ROK;
 }/* end of PtMiLrgSchStaInd */
 
@@ -930,7 +902,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Control Confirm */
 #endif
 {
-   TRC3(PtMiLrgCntrlCfm)
    return ROK;
 }/* end of PtMiLrgCntrlCfm */
 
@@ -965,7 +936,6 @@ Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Control Confirm */
 #endif
 {
-   TRC3(PtMiLrgSchCntrlCfm)
    return ROK;
 }/* end of PtMiLrgSchCntrlCfm */
 
@@ -1003,7 +973,6 @@ RgMngmt *trc;           /* Trace Event */
 Buffer *mBuf;           /* Trace message */
 #endif
 {
-   TRC3(PtMiLrgTrcInd)
    return ROK;
 }/* end of PtMiLrgTrcInd */
 #ifdef LTE_L2_MEAS
@@ -1033,7 +1002,6 @@ Pst *pst;               /* post structure */
 LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
 #endif
 {
-   TRC3(PtMiLrgSchL2MeasCfm)
 
    return ROK;
 }/* end of PtMiLrgSchL2MeasCfm */
@@ -1064,7 +1032,6 @@ Pst *pst;               /* post structure */
 LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
 #endif
 {
-   TRC3(PtMiLrgSchL2MeasStopCfm)
 
    return ROK;
 }/* end of PtMiLrgSchL2MeasStopCfm */