Merge "Replaced old SSI function with new macros jira id - ODUHIGH-212"

[o-du/l2.git] / src / 5gnrrlc / kw_ptmi.c

diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c
index 32757f0..1216fe3 100755 (executable)
--- a/src/5gnrrlc/kw_ptmi.c
+++ b/src/5gnrrlc/kw_ptmi.c
@@ -71,7 +71,7 @@
 #ifdef PTKWLKW
 /* portable functions */
 
-PRIVATE S16 PtMiLkwCfgCfm    ARGS((Pst *pst, KwMngmt *cfm));
+PRIVATE S16 PtMiRlcConfigCfm    ARGS((Pst *pst, KwMngmt *cfm));
 PRIVATE S16 PtMiLkwCntrlCfm  ARGS((Pst *pst, KwMngmt *cfm));
 PRIVATE S16 PtMiLkwStaInd    ARGS((Pst *pst, KwMngmt *usta));
 
@@ -93,17 +93,17 @@ PRIVATE S16 PtMiLkwL2MeasStopCfm   ARGS((Pst *pst, U8 measType,U8 status));
  ********************************************************************/
 /* Configuration confirmation primitive */
 
-PRIVATE LkwCfgCfm kwMiLkwCfgCfmMt[MAXKWMI] =
+PRIVATE RlcConfigCfm kwMiRlcConfigCfmMt[MAXKWMI] =
 {
 #ifdef LCKWMILKW
-   cmPkLkwCfgCfm,            /* 0 - loosely coupled - fc */
+   packRlcConfigCfm,            /* 0 - loosely coupled - fc */
 #else
-   PtMiLkwCfgCfm,            /* 0 - tightly coupled portable */
+   PtMiRlcConfigCfm,            /* 0 - tightly coupled portable */
 #endif /* LCRLMILKW */
 #ifdef SM
-   SmMiLkwCfgCfm,            /* 1 - tightly coupled layer management*/
+   SmMiRlcConfigCfm,            /* 1 - tightly coupled layer management*/
 #else
-   PtMiLkwCfgCfm,            /* 1 - tightly coupled portable */
+   PtMiRlcConfigCfm,            /* 1 - tightly coupled portable */
 #endif /* SM */
 };
 
@@ -222,7 +222,7 @@ PRIVATE CONSTANT LkwL2MeasStopCfm KwMiLkwL2MeasStopCfmMt[] =
  ***************************************************************************/
 /**
    @brief
-   This function is called by the KwMiLkwCfgReq function for responding
+   This function is called by the KwMiRlcConfigReq function for responding
    to configuration requests.The cfm field in the KwMngmt  structure contains
  the response value.
 
@@ -237,23 +237,23 @@ PRIVATE CONSTANT LkwL2MeasStopCfm KwMiLkwL2MeasStopCfmMt[] =
 
 */
 #ifdef ANSI
-PUBLIC S16 KwMiLkwCfgCfm
+PUBLIC S16 KwMiRlcConfigCfm
 (
 Pst        *pst,                /* post structure */
 KwMngmt    *cfm                 /* Layer Management structure */
 )
 #else
-PUBLIC S16 KwMiLkwCfgCfm(pst, cfm)
+PUBLIC S16 KwMiRlcConfigCfm(pst, cfm)
 Pst        *pst;                /* post structure */
 KwMngmt    *cfm;                /* Layer Management structure */
 #endif
 {
-   TRC3(KwMiLkwCfgCfm);
+   TRC3(KwMiRlcConfigCfm);
 
    /* jump to specific primitive depending on configured selector */
-   (*kwMiLkwCfgCfmMt[pst->selector])(pst, cfm);
+   (*kwMiRlcConfigCfmMt[pst->selector])(pst, cfm);
    
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -287,7 +287,7 @@ KwMngmt *cfm;                /* confirm */
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwCntrlCfmMt[pst->selector])(pst, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwMiLkwCntrlCfm */
 
@@ -326,7 +326,7 @@ KwMngmt *usta;               /* unsolicited status */
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwStaIndMt[pst->selector])(pst, usta);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of KwMiLkwStaInd */
 
 
@@ -364,7 +364,7 @@ KwMngmt *cfm;                /* solicited status confirmation */
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwStaCfmMt[pst->selector])(pst, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwMiLkwStaCfm */
 
@@ -405,7 +405,7 @@ KwMngmt *cfm;                /* statistics confirmation */
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwStsCfmMt[pst->selector])(pst, action, cfm);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwMiLkwStsCfm */
 
@@ -445,7 +445,7 @@ Buffer *mBuf;                /* message buffer */
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwTrcIndMt[pst->selector])(pst, trc, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwMiLkwTrcInd */
 
@@ -469,7 +469,7 @@ KwL2MeasCfmEvt *measEvt;
 
    (*KwMiLkwL2MeasCfmMt[pst->selector])(pst, measEvt);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #ifdef ANSI
@@ -491,7 +491,7 @@ U8  status;
 
    (*KwMiLkwL2MeasStopCfmMt[pst->selector])(pst, measType,status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*  LTE_L2_MEAS */
@@ -517,26 +517,26 @@ U8  status;
  */
 
 #ifdef ANSI
-PUBLIC S16 PtMiLkwCfgCfm
+PUBLIC S16 PtMiRlcConfigCfm
 (
 Pst *pst,                    /* post structure */
 KwMngmt *cfm                 /* Layer Management structure */
 )
 #else
-PUBLIC S16 PtMiLkwCfgCfm(pst, cfm)
+PUBLIC S16 PtMiRlcConfigCfm(pst, cfm)
 Pst *pst;                    /* post structure */
 KwMngmt *cfm;                /* Layer Management structure */
 #endif
 {
-   TRC3(PtMiLkwCfgCfm)
+   TRC3(PtMiRlcConfigCfm)
 
    UNUSED(pst);
    UNUSED(cfm);
 
-   TRC2(PtMiLkwCfgCfm() : function is not implemented)
+   TRC2(PtMiRlcConfigCfm() : function is not implemented)
 
-   RETVALUE(ROK);
-} /* end of PtMiLkwCfgCfm */
+   return ROK;
+} /* end of PtMiRlcConfigCfm */
 
 /*
  *
@@ -573,7 +573,7 @@ KwMngmt *cfm;             /* Layer Management structure */
 
    TRC2(PtMiLkwCntrlCfm() :  function is not implemented)
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of PtMiLkwCntrlCfm */
 
 
@@ -610,7 +610,7 @@ KwMngmt *usta;               /* unsolicited status */
 
    TRC2(PtMiLkwStaInd() : function is not implemented)
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of PtMiLkwStaInd */
 
 
@@ -645,7 +645,7 @@ KwMngmt *cfm;                /* solicited status confirmation */
    UNUSED(pst);
    UNUSED(cfm);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of PtMiLkwStaCfm */
 
 
@@ -683,7 +683,7 @@ KwMngmt *cfm;                /* statistics confirmation */
    UNUSED(action);
    UNUSED(cfm);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of PtMiLkwStsCfm */
 
 
@@ -721,7 +721,7 @@ Buffer *mBuf;                /* message buffer */
    UNUSED(trc);
    UNUSED(mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* end of PtMiLkwTrcInd */
 
 /* kw005.201 added support for L2 Measurement */
@@ -744,7 +744,7 @@ KwL2MeasCfmEvt * measEvt;
    UNUSED(pst);
    UNUSED(measEvt);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #ifdef ANSI
@@ -768,7 +768,7 @@ U8  status;
    UNUSED(measType);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*  LTE_L2_MEAS */