X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptmi.c;h=c928a9241c50216affbb713bc816097d08995faf;hb=3eb33bcb19a8e47fcf8b58b417d6fa05919952cf;hp=a7fa99a701329df5e838a6246ca53a351901475d;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c
index a7fa99a70..c928a9241 100755
--- 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 */
@@ -279,17 +279,11 @@ PRIVATE CONSTANT LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR]
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
-#else
-S16 RgMiLrgCfgCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* config confirm structure  */
-#endif    
 {
    
    (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm);
@@ -315,17 +309,11 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
-#else
-S16 RgMiLrgSchCfgCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* config confirm structure  */
-#endif    
 {
    
    (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm);
@@ -353,17 +341,11 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStsCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* statistics confirm structure  */
 )
-#else
-S16 RgMiLrgStsCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* statistics confirm structure  */
-#endif    
 {
    
    (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm);
@@ -390,17 +372,11 @@ RgMngmt  *cfm;    /* statistics confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStaCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* status confirm structure  */
 )
-#else
-S16 RgMiLrgStaCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* status confirm structure  */
-#endif    
 {
    
    (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm);
@@ -427,17 +403,11 @@ RgMngmt  *cfm;    /* status confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
-#else
-S16 RgMiLrgCntrlCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* control confirm structure  */
-#endif    
 {
    
    (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm);
@@ -463,17 +433,11 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
-#else
-S16 RgMiLrgSchCntrlCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* control confirm structure  */
-#endif    
 {
    
    (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm);
@@ -500,17 +464,11 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
-#else
-S16 RgMiLrgStaInd(pst, usta)
-Pst      *pst;    /* post structure  */
-RgMngmt  *usta;    /* status indication structure  */
-#endif    
 {
    
    (*RgMiLrgStaIndMt[pst->selector])(pst,usta);
@@ -536,17 +494,11 @@ RgMngmt  *usta;    /* status indication structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
-#else
-S16 RgMiLrgSchStaInd(pst, usta)
-Pst      *pst;    /* post structure  */
-RgMngmt  *usta;    /* status indication structure  */
-#endif    
 {
    
    (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta);
@@ -574,19 +526,12 @@ RgMngmt  *usta;    /* status indication structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgTrcInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *trc,    /* Trace event  */
 Buffer   *mBuf    /* Trace message  */
 )
-#else
-S16 RgMiLrgTrcInd(pst, trc, mBuf)
-Pst      *pst;    /* post structure  */
-RgMngmt  *trc;    /* Trace event  */
-Buffer   *mBuf;   /* Trace message  */
-#endif    
 {
    
    (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf);
@@ -598,17 +543,11 @@ Buffer   *mBuf;   /* Trace message  */
 #ifdef LTE_L2_MEAS
 
 /* TODO: Function header */
-#ifdef ANSI
 S16 RgMiLrgSchL2MeasCfm
 (
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )
-#else
-S16 RgMiLrgSchL2MeasCfm(pst, cfm)
-Pst               *pst;          /* post structure  */
-LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
-#endif    
 {
    
    (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm);
@@ -634,17 +573,11 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  *      -# ROK
  **/
 
-#ifdef ANSI 
 S16 RgMiLrgSchL2MeasStopCfm
 (        
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )        
-#else    
-S16 RgMiLrgSchL2MeasStopCfm(pst, cfm)
-Pst               *pst;          /* post structure  */
-LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
-#endif    
 {
    (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm);
           
@@ -677,17 +610,11 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
-#else
-S16 PtMiLrgCfgCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Config Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgCfgCfm */
@@ -711,17 +638,11 @@ RgMngmt *cfm;           /* Config Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
-#else
-S16 PtMiLrgSchCfgCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Config Confirm */
-#endif
 {
 
    return ROK;
@@ -748,17 +669,11 @@ RgMngmt *cfm;           /* Config Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStsCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Statistics Confirm */
 )
-#else
-S16 PtMiLrgStsCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Statistics Confirm */
-#endif
 {
 
    return ROK;
@@ -785,17 +700,11 @@ RgMngmt *cfm;           /* Statistics Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStaCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Status Confirm */
 )
-#else
-S16 PtMiLrgStaCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Status Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgStaCfm */
@@ -821,17 +730,11 @@ RgMngmt *cfm;           /* Status Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
-#else
-S16 PtMiLrgStaInd  (pst, usta)
-Pst *pst;               /* post structure */
-RgMngmt *usta;          /* Status indication */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgStaInd */
@@ -855,17 +758,11 @@ RgMngmt *usta;          /* Status indication */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
-#else
-S16 PtMiLrgSchStaInd  (pst, usta)
-Pst *pst;               /* post structure */
-RgMngmt *usta;          /* Status indication */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgSchStaInd */
@@ -890,17 +787,11 @@ RgMngmt *usta;          /* Status indication */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
-#else
-S16 PtMiLrgCntrlCfm (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Control Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgCntrlCfm */
@@ -924,17 +815,11 @@ RgMngmt *cfm;           /* Control Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
-#else
-S16 PtMiLrgSchCntrlCfm (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Control Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgSchCntrlCfm */
@@ -959,19 +844,12 @@ RgMngmt *cfm;           /* Control Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgTrcInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *trc,           /* Trace Event */
 Buffer *mBuf            /* Trace message */
 )
-#else
-S16 PtMiLrgTrcInd (pst, trc,mBuf)
-Pst *pst;               /* post structure */
-RgMngmt *trc;           /* Trace Event */
-Buffer *mBuf;           /* Trace message */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgTrcInd */
@@ -990,17 +868,11 @@ Buffer *mBuf;           /* Trace message */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchL2MeasCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
-#else
-S16 PtMiLrgSchL2MeasCfm(pst, cfm)
-Pst *pst;               /* post structure */
-LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
-#endif
 {
 
    return ROK;
@@ -1020,17 +892,11 @@ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchL2MeasStopCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
-#else
-S16 PtMiLrgSchL2MeasStopCfm(pst, cfm)
-Pst *pst;               /* post structure */
-LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
-#endif
 {
 
    return ROK;