X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=a5a386a8b6ced189ac8e229c20f619b9732a424a;hb=6c530e3037c009f3c4ec76a14128e89c7a9db0a3;hp=d1bc9468f4f045ebe67ca3a8e88b76fc5166c62a;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index d1bc9468f..a5a386a8b 100755
--- a/src/cm/rgr.c
+++ b/src/cm/rgr.c
@@ -33,31 +33,9 @@
 @brief This file contains the packing/unpacking code for the RGR interface 
        primitives.
 */
-/* 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 */
-/* LTE_ADV_FLAG_REMOVED_START */
-#include "cm_mblk.h"
 /* LTE_ADV_FLAG_REMOVED_END */
+#include "common_def.h"
 #include "rgr.h"           /* RGR 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 */
-/* LTE_ADV_FLAG_REMOVED_START */
-#include "cm_mblk.x"
 /* LTE_ADV_FLAG_REMOVED_END */
 #include "rgr.x"           /* RGR Interface includes */
 
@@ -426,95 +404,6 @@ Buffer *mBuf;
 }
 
 
-/***********************************************************
-*
-*     Func : cmPkRgrCfgReq
-*
-*
-*     Desc : Configuration Request from DU_APP to MAC for 
-*            configuring Cell/Ue/Lc
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRgrCfgReq
-(
-Pst* pst,
-RgrCfgTransId transId,
-RgrCfgReqInfo * cfgReqInfo
-)
-#else
-PUBLIC S16 cmPkRgrCfgReq(pst, transId, cfgReqInfo)
-Pst* pst;
-RgrCfgTransId transId;
-RgrCfgReqInfo * cfgReqInfo;
-#endif
-{
-   Buffer *mBuf = NULLP;
-   TRC3(cmPkRgrCfgReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR016, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
-      RETVALUE(RFAILED);
-   }
-   if (cmPkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR017, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR018, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-#if 0
-   if (SPkS16(spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR019, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-#endif
-   if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR020, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-
-   pst->event = (Event) EVTMACSCHCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
-}
-
-
 /***********************************************************
 *
 *     Func : cmUnpkRgrCfgReq
@@ -580,7 +469,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrCfgReqInfo));
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
          SPutMsg(mBuf);
@@ -9455,7 +9344,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo));
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
                           sizeof(RgrSiCfgReqInfo));
@@ -9766,7 +9655,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == RGR_SEL_LC)
+   if (pst->selector == ODU_SELECTOR_LC)
    {
       if (cmUnpkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) 
       {
@@ -10411,7 +10300,7 @@ Buffer *mBuf;
 
    cmMemset((U8 *)loadInfReq, 0, sizeof(RgrLoadInfReqInfo));
 
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
                           sizeof(RgrLoadInfReqInfo));