X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flrg.c;h=154b0e9d1f386f4caad325520544928405ca9555;hb=105199ef642ffe9736ea24a01d4546578fa25e60;hp=08ad06247478b06aa3937b2aba1c65064f41c662;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git

diff --git a/src/cm/lrg.c b/src/cm/lrg.c
index 08ad06247..154b0e9d1 100755
--- a/src/cm/lrg.c
+++ b/src/cm/lrg.c
@@ -35,25 +35,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 */
 
 #if (defined(LCLRG))
@@ -95,7 +79,7 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTLRGCFGREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -193,8 +177,8 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
-      if (cmPkRgMngmt(pst, cfg, EVTLRGSCHCFGREQ, mBuf) != ROK) {
+   if (pst->selector == ODU_SELECTOR_LC) {
+      if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -205,7 +189,6 @@ RgMngmt * cfg;
       }
    }
    
-   pst->event = (Event) EVTLRGSCHCFGREQ;
    RETVALUE(SPstTsk(pst,mBuf));
 }
 
@@ -242,7 +225,7 @@ Buffer *mBuf;
    
    TRC3(cmUnpkLrgSchCfgReq)
 
-   if (cmUnpkRgMngmt(pst, &cfg, EVTLRGSCHCFGREQ, mBuf) != ROK) {
+   if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -292,7 +275,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCFGCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -390,8 +373,8 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
-      if (cmPkRgMngmt(pst, cfg, EVTLRGSCHCFGCFM, mBuf) != ROK) {
+   if (pst->selector == ODU_SELECTOR_LC) {
+      if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -402,7 +385,7 @@ RgMngmt * cfg;
       }
    }
    
-   pst->event = (Event) EVTLRGSCHCFGCFM;
+   pst->event = (Event) EVTMACSCHGENCFGCFM;
    RETVALUE(SPstTsk(pst,mBuf));
 }
 
@@ -438,7 +421,7 @@ Buffer *mBuf;
    
    TRC3(cmUnpkLrgSchCfgCfm)
   
-   if (cmUnpkRgMngmt(pst, &cfg, EVTLRGSCHCFGCFM, mBuf) != ROK) {
+   if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -488,7 +471,7 @@ RgMngmt * sts;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sts, EVTLRGSTSREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -586,7 +569,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGSTSCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -878,7 +861,7 @@ RgMngmt * usta;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, usta, EVTLRGUSTAIND, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -976,7 +959,7 @@ RgMngmt * sta;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sta, EVTLRGSCHSTAIND, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1074,7 +1057,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1172,7 +1155,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1270,7 +1253,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCNTRLCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1368,7 +1351,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1470,7 +1453,7 @@ Buffer * trcBuf;
       SPutMsg(trcBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen;
       if (SFndLenMsg(trcBuf, &msgLen) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1552,7 +1535,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen, totalMsgLen;
       CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
       if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
@@ -3571,8 +3554,8 @@ Buffer *mBuf;
             if(cmPkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
                RETVALUE(RFAILED);
             break;
-         case EVTLRGSCHCFGREQ:
-         case  EVTLRGSCHCFGCFM:
+         case EVTMACSCHGENCFGREQ:
+         case  EVTMACSCHGENCFGCFM:
             if(cmPkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
                RETVALUE(RFAILED);
             break;
@@ -3625,8 +3608,8 @@ Buffer *mBuf;
       switch(eventType) {
          case EVTLRGCFGREQ:
          case  EVTLRGCFGCFM:
-         case EVTLRGSCHCFGREQ:
-         case  EVTLRGSCHCFGCFM:
+         case EVTMACSCHGENCFGREQ:
+         case  EVTMACSCHGENCFGCFM:
             if(cmUnpkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
                RETVALUE(RFAILED);
             break;