X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptmi.c;h=87419c34179e9bd6fdacbac2c56d541cf97f7511;hb=2193e4cf01012809495be026097e8d7eacb9f0ac;hp=ca75c16ec7454dec96240442f0ae98a64173a37f;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c
index ca75c16ec..87419c341 100755
--- a/src/5gnrmac/rg_ptmi.c
+++ b/src/5gnrmac/rg_ptmi.c
@@ -37,25 +37,9 @@
 */
 
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "lrg.h"           /* LRG Interface defines */
-
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "lrg.x"           /* LRG Interface includes */
 
 #ifdef __cplusplus
@@ -115,7 +99,7 @@ PRIVATE CONSTANT LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] =
 #ifdef SM 
    SmMiLrgCfgCfm,                  /* 1 - Tightly coupled SM */
 #else
-   PtMiLrgCfgCfm,                  /* 1 - Tightly coupled SM  */
+   //PtMiLrgCfgCfm,                  /* 1 - Tightly coupled SM  */
 #endif
 };
 
@@ -130,7 +114,7 @@ PRIVATE CONSTANT LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] =
 #ifdef SM 
    SmMiLrgSchCfgCfm,                  /* 1 - Tightly coupled SM */
 #else
-   PtMiLrgSchCfgCfm,                  /* 1 - Tightly coupled SM  */
+   //PtMiLrgSchCfgCfm,                  /* 1 - Tightly coupled SM  */
 #endif
 };
 
@@ -296,13 +280,13 @@ PRIVATE CONSTANT LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR]
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgCfgCfm
+S16 RgMiLrgCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgCfgCfm(pst, cfm)
+S16 RgMiLrgCfgCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* config confirm structure  */
 #endif    
@@ -312,7 +296,7 @@ RgMngmt  *cfm;    /* config confirm structure  */
 
    (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgCfgCfm --*/
 
@@ -334,13 +318,13 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchCfgCfm
+S16 RgMiLrgSchCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgSchCfgCfm(pst, cfm)
+S16 RgMiLrgSchCfgCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* config confirm structure  */
 #endif    
@@ -350,7 +334,7 @@ RgMngmt  *cfm;    /* config confirm structure  */
 
    (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgSchCfgCfm --*/
 
@@ -374,13 +358,13 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgStsCfm
+S16 RgMiLrgStsCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* statistics confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgStsCfm(pst, cfm)
+S16 RgMiLrgStsCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* statistics confirm structure  */
 #endif    
@@ -390,7 +374,7 @@ RgMngmt  *cfm;    /* statistics confirm structure  */
 
    (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgStsCfm --*/
 
@@ -413,13 +397,13 @@ RgMngmt  *cfm;    /* statistics confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgStaCfm
+S16 RgMiLrgStaCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* status confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgStaCfm(pst, cfm)
+S16 RgMiLrgStaCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* status confirm structure  */
 #endif    
@@ -429,7 +413,7 @@ RgMngmt  *cfm;    /* status confirm structure  */
     
    (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgStaCfm --*/
 
@@ -452,13 +436,13 @@ RgMngmt  *cfm;    /* status confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgCntrlCfm
+S16 RgMiLrgCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgCntrlCfm(pst, cfm)
+S16 RgMiLrgCntrlCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* control confirm structure  */
 #endif    
@@ -468,7 +452,7 @@ RgMngmt  *cfm;    /* control confirm structure  */
 
    (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgCntrlCfm --*/
 
@@ -490,13 +474,13 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchCntrlCfm
+S16 RgMiLrgSchCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
 #else
-PUBLIC S16 RgMiLrgSchCntrlCfm(pst, cfm)
+S16 RgMiLrgSchCntrlCfm(pst, cfm)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfm;    /* control confirm structure  */
 #endif    
@@ -506,7 +490,7 @@ RgMngmt  *cfm;    /* control confirm structure  */
 
    (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgSchCntrlCfm --*/
 
@@ -529,13 +513,13 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgStaInd
+S16 RgMiLrgStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
 #else
-PUBLIC S16 RgMiLrgStaInd(pst, usta)
+S16 RgMiLrgStaInd(pst, usta)
 Pst      *pst;    /* post structure  */
 RgMngmt  *usta;    /* status indication structure  */
 #endif    
@@ -545,7 +529,7 @@ RgMngmt  *usta;    /* status indication structure  */
 
    (*RgMiLrgStaIndMt[pst->selector])(pst,usta);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgStaInd --*/
 
@@ -567,13 +551,13 @@ RgMngmt  *usta;    /* status indication structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchStaInd
+S16 RgMiLrgSchStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
 #else
-PUBLIC S16 RgMiLrgSchStaInd(pst, usta)
+S16 RgMiLrgSchStaInd(pst, usta)
 Pst      *pst;    /* post structure  */
 RgMngmt  *usta;    /* status indication structure  */
 #endif    
@@ -583,7 +567,7 @@ RgMngmt  *usta;    /* status indication structure  */
 
    (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgSchStaInd --*/
 
@@ -607,14 +591,14 @@ RgMngmt  *usta;    /* status indication structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgTrcInd
+S16 RgMiLrgTrcInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *trc,    /* Trace event  */
 Buffer   *mBuf    /* Trace message  */
 )
 #else
-PUBLIC S16 RgMiLrgTrcInd(pst, trc, mBuf)
+S16 RgMiLrgTrcInd(pst, trc, mBuf)
 Pst      *pst;    /* post structure  */
 RgMngmt  *trc;    /* Trace event  */
 Buffer   *mBuf;   /* Trace message  */
@@ -625,7 +609,7 @@ Buffer   *mBuf;   /* Trace message  */
 
    (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
    
 }/*-- RgMiLrgTrcInd --*/
 
@@ -633,13 +617,13 @@ Buffer   *mBuf;   /* Trace message  */
 
 /* TODO: Function header */
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchL2MeasCfm
+S16 RgMiLrgSchL2MeasCfm
 (
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )
 #else
-PUBLIC S16 RgMiLrgSchL2MeasCfm(pst, cfm)
+S16 RgMiLrgSchL2MeasCfm(pst, cfm)
 Pst               *pst;          /* post structure  */
 LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
 #endif    
@@ -648,7 +632,7 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
    
    (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm);
    
-   RETVALUE(ROK);
+   return ROK;
 
 } /* RgMiLrgSchL2MeasCfm */
 
@@ -670,13 +654,13 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  **/
 
 #ifdef ANSI 
-PUBLIC S16 RgMiLrgSchL2MeasStopCfm
+S16 RgMiLrgSchL2MeasStopCfm
 (        
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )        
 #else    
-PUBLIC S16 RgMiLrgSchL2MeasStopCfm(pst, cfm)
+S16 RgMiLrgSchL2MeasStopCfm(pst, cfm)
 Pst               *pst;          /* post structure  */
 LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
 #endif    
@@ -685,7 +669,7 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
         
    (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm);
           
-   RETVALUE(ROK);
+   return ROK;
         
 } /* RgMiLrgSchL2MeasStopCfm */
 
@@ -715,20 +699,20 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgCfgCfm
+S16 PtMiLrgCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgCfgCfm  (pst, cfm)
+S16 PtMiLrgCfgCfm  (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Config Confirm */
 #endif
 {
    TRC3(PtMiLrgCfgCfm)
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgCfgCfm */
 
 /**
@@ -751,20 +735,20 @@ RgMngmt *cfm;           /* Config Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgSchCfgCfm
+S16 PtMiLrgSchCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgSchCfgCfm  (pst, cfm)
+S16 PtMiLrgSchCfgCfm  (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Config Confirm */
 #endif
 {
    TRC3(PtMiLrgSchCfgCfm)
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgSchCfgCfm */
 
 
@@ -789,20 +773,20 @@ RgMngmt *cfm;           /* Config Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgStsCfm
+S16 PtMiLrgStsCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Statistics Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgStsCfm  (pst, cfm)
+S16 PtMiLrgStsCfm  (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Statistics Confirm */
 #endif
 {
    TRC3(PtMiLrgStsCfm)
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgStsCfm */
 
 
@@ -827,19 +811,19 @@ RgMngmt *cfm;           /* Statistics Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgStaCfm
+S16 PtMiLrgStaCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Status Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgStaCfm  (pst, cfm)
+S16 PtMiLrgStaCfm  (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Status Confirm */
 #endif
 {
    TRC3(PtMiLrgStaCfm)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgStaCfm */
 
 
@@ -864,19 +848,19 @@ RgMngmt *cfm;           /* Status Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgStaInd
+S16 PtMiLrgStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
 #else
-PUBLIC S16 PtMiLrgStaInd  (pst, usta)
+S16 PtMiLrgStaInd  (pst, usta)
 Pst *pst;               /* post structure */
 RgMngmt *usta;          /* Status indication */
 #endif
 {
    TRC3(PtMiLrgStaInd)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgStaInd */
 
 /**
@@ -899,19 +883,19 @@ RgMngmt *usta;          /* Status indication */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgSchStaInd
+S16 PtMiLrgSchStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
 #else
-PUBLIC S16 PtMiLrgSchStaInd  (pst, usta)
+S16 PtMiLrgSchStaInd  (pst, usta)
 Pst *pst;               /* post structure */
 RgMngmt *usta;          /* Status indication */
 #endif
 {
    TRC3(PtMiLrgSchStaInd)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgSchStaInd */
 
 
@@ -935,19 +919,19 @@ RgMngmt *usta;          /* Status indication */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgCntrlCfm
+S16 PtMiLrgCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgCntrlCfm (pst, cfm)
+S16 PtMiLrgCntrlCfm (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Control Confirm */
 #endif
 {
    TRC3(PtMiLrgCntrlCfm)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgCntrlCfm */
 
 /**
@@ -970,19 +954,19 @@ RgMngmt *cfm;           /* Control Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgSchCntrlCfm
+S16 PtMiLrgSchCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgSchCntrlCfm (pst, cfm)
+S16 PtMiLrgSchCntrlCfm (pst, cfm)
 Pst *pst;               /* post structure */
 RgMngmt *cfm;           /* Control Confirm */
 #endif
 {
    TRC3(PtMiLrgSchCntrlCfm)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgSchCntrlCfm */
 
 
@@ -1006,21 +990,21 @@ RgMngmt *cfm;           /* Control Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgTrcInd
+S16 PtMiLrgTrcInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *trc,           /* Trace Event */
 Buffer *mBuf            /* Trace message */
 )
 #else
-PUBLIC S16 PtMiLrgTrcInd (pst, trc,mBuf)
+S16 PtMiLrgTrcInd (pst, trc,mBuf)
 Pst *pst;               /* post structure */
 RgMngmt *trc;           /* Trace Event */
 Buffer *mBuf;           /* Trace message */
 #endif
 {
    TRC3(PtMiLrgTrcInd)
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgTrcInd */
 #ifdef LTE_L2_MEAS
 /**
@@ -1038,20 +1022,20 @@ Buffer *mBuf;           /* Trace message */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgSchL2MeasCfm
+S16 PtMiLrgSchL2MeasCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgSchL2MeasCfm(pst, cfm)
+S16 PtMiLrgSchL2MeasCfm(pst, cfm)
 Pst *pst;               /* post structure */
 LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
 #endif
 {
    TRC3(PtMiLrgSchL2MeasCfm)
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgSchL2MeasCfm */
 
 /**
@@ -1069,20 +1053,20 @@ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtMiLrgSchL2MeasStopCfm
+S16 PtMiLrgSchL2MeasStopCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
 #else
-PUBLIC S16 PtMiLrgSchL2MeasStopCfm(pst, cfm)
+S16 PtMiLrgSchL2MeasStopCfm(pst, cfm)
 Pst *pst;               /* post structure */
 LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
 #endif
 {
    TRC3(PtMiLrgSchL2MeasStopCfm)
 
-   RETVALUE(ROK);
+   return ROK;
 }/* end of PtMiLrgSchL2MeasStopCfm */
 #endif
 #endif /*--PTRGMILRG--*/