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

diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index b288a0c3e..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 RRM to MAC for 
- * configuring Cell/Ue/Lc
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRgrCfgReq
-(
-Pst* pst,
-SpId spId,
-RgrCfgTransId transId,
-RgrCfgReqInfo * cfgReqInfo
-)
-#else
-PUBLIC S16 cmPkRgrCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-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 (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);
-   }
-   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) EVTRGRCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
-}
-
-
 /***********************************************************
 *
 *     Func : cmUnpkRgrCfgReq
@@ -545,12 +434,11 @@ Pst *pst;
 Buffer *mBuf;
 #endif
 {
-   SpId spId;
    RgrCfgTransId transId;
    RgrCfgReqInfo *cfgReqInfo;
    
    TRC3(cmUnpkRgrCfgReq)
-
+#if 0
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -560,6 +448,8 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
+#endif
+
    if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -579,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);
@@ -591,7 +481,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, spId, transId, cfgReqInfo));
+   RETVALUE((*func)(pst, transId, cfgReqInfo));
 }
 
 /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */
@@ -820,14 +710,12 @@ Buffer *mBuf;
 PUBLIC S16 cmPkRgrCfgCfm
 (
 Pst* pst,
-SuId suId,
 RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 cmPkRgrCfgCfm(pst, suId, transId, status)
+PUBLIC S16 cmPkRgrCfgCfm(pst, transId, status)
 Pst* pst;
-SuId suId;
 RgrCfgTransId transId;
 U8 status;
 #endif
@@ -861,16 +749,7 @@ U8 status;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR034, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-   pst->event = (Event) EVTRGRCFGCFM;
+   pst->event = (Event) EVTMACSCHCFGCFM;
    RETVALUE(SPstTsk(pst,mBuf));
 }
 
@@ -904,21 +783,11 @@ Pst *pst;
 Buffer *mBuf;
 #endif
 {
-   SuId suId;
    RgrCfgTransId transId;
    U8 status;
    
    TRC3(cmUnpkRgrCfgCfm)
 
-   if (SUnpkS16(&suId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR035, (ErrVal)0, "Packing failed");
-#endif
-      RETVALUE(RFAILED);
-   }
    if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -938,7 +807,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, suId, transId, status));
+   RETVALUE((*func)(pst, transId, status));
 }
 
 /* rgr_c_001.main_4: ADD-Added for SI Enhancement. */
@@ -3687,9 +3556,6 @@ Buffer           *mBuf
    {
 
       CMCHKPK(SPkU32, param->dynConfig[(U8)idx], mBuf);
-#if 0
-      printf("\npk dyn:%u\n",param->dynConfig[(U8)idx]);
-#endif
    }
    CMCHKPK(SPkU8, param->uePerGrp, mBuf);
    CMCHKPK(SPkU8, param->ueGrpPerTti, mBuf);
@@ -3697,13 +3563,6 @@ Buffer           *mBuf
    CMCHKPK(SPkU8, param->numOfCC, mBuf);
    CMCHKPK(SPkU8, param->bwPerCC, mBuf);
    CMCHKPK(SPkU8, param->cfi, mBuf);
-#if 0
-   printf("\npk uePerGrp%:%u\n",param->uePerGrp);
-   printf("\npk ueGrpPerTti:%u\n",param->ueGrpPerTti);
-   printf("\npk num of UEs:%u\n",param->numUes);
-   printf("\npk Num of CC:%u\n",param->numOfCC);
-   printf("\npk bw per cc:%u\n",param->bwPerCC);
-#endif
    RETVALUE(ROK);
 }
 
@@ -3721,20 +3580,10 @@ Buffer           *mBuf
    CMCHKUNPK(SUnpkU8, &param->numUes, mBuf);
    CMCHKUNPK(SUnpkU8, &param->ueGrpPerTti, mBuf);
    CMCHKUNPK(SUnpkU8, &param->uePerGrp, mBuf);
-#if 0
-   printf("\nunpk uePerGrp:%u\n",param->uePerGrp);
-   printf("\nunpk ueGrpPerTti:%u\n",param->ueGrpPerTti);
-   printf("\nunpk num of ues:%u\n",param->numUes);
-   printf("\nunpk num of cc:%u\n",param->numOfCC);
-   printf("\nunpk bw per cc:%u\n",param->bwPerCC);
-#endif
    for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx)
    {
 
       CMCHKUNPK(SUnpkU32, &param->dynConfig[(U8)idx], mBuf);
-#if 0
-      printf("\nunpk dyn:%u\n",param->dynConfig[(U8)idx]);
-#endif
    }
    RETVALUE(ROK);
 }
@@ -4201,9 +4050,9 @@ PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
 
 /***********************************************************
 *
-*     Func : cmPkRgrSchedEnbCfg
+*     Func : cmPkMacSchedGnbCfg
 *
-*     Desc : SCH ENB Configurations 
+*     Desc : SCH GNB Configurations 
 *
 *     Ret  : S16
 *
@@ -4213,53 +4062,34 @@ PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgrSchedEnbCfg
+PUBLIC S16 cmPkMacSchedGnbCfg
 (
-RgrSchedEnbCfg *param,
+MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
 #else
-PUBLIC S16 cmPkRgrSchedEnbCfg(param, mBuf)
+PUBLIC S16 cmPkMacSchedGnbCfg(param, mBuf)
 RgrSchedEnbCfg *param;
 Buffer         *mBuf;
 #endif
 {
+   TRC3(cmPkMacSchedGnbCfg)
 
-   //S32 i;
-   TRC3(cmPkRgrSchedEnbCfg)
-
-#ifdef RG_5GTF
-   CMCHKPK(SPkU8, param->isDynTddEnbld, mBuf);
-#endif
-   CMCHKPK(SPkU32, param->accsMode, mBuf);
-   switch(param->ulSchdType) 
-   {
-      case RGR_SCH_TYPE_PFS:
-         CMCHKPK(cmPkRgrEnbPfs, &param->ulSchInfo.ulPfs, mBuf);
-         break;
-      default :
-         break;
-   }
-   CMCHKPK(SPkU8, param->ulSchdType, mBuf);
-   switch(param->dlSchdType) 
-   {
-      case RGR_SCH_TYPE_PFS:
-         CMCHKPK(cmPkRgrEnbPfs, &param->dlSchInfo.dlPfs, mBuf);
-         break;
-      default :
-         break;
-   }
+   CMCHKPK(SPkU8, param->maxDlUePerTti, mBuf);
+   CMCHKPK(SPkU8, param->maxUlUePerTti, mBuf);
+   CMCHKPK(SPkU8, param->numCells, mBuf);
    CMCHKPK(SPkU8, param->dlSchdType, mBuf);
+   CMCHKPK(SPkU8, param->ulSchdType, mBuf);
    CMCHKPK(SPkU8, param->numTxAntPorts, mBuf);
    RETVALUE(ROK);
 } /* cmPkRgrSchedEnbCfg */
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrSchedEnbCfg
+*     Func : cmUnpkMacSchedGnbCfg
 *
 *
-*     Desc : SCH Enodeb Configuration to SCH
+*     Desc : SCH Gnodeb Configuration to SCH
 *
 *
 *     Ret  : S16
@@ -4270,48 +4100,28 @@ Buffer         *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgrSchedEnbCfg
+PUBLIC S16 cmUnpkMacSchedGnbCfg
 (
-RgrSchedEnbCfg *param,
+MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgrSchedEnbCfg(param, mBuf)
-RgrSchedEnbCfg *param;
+PUBLIC S16 cmUnpkMacSchedGnbCfg(param, mBuf)
+MacSchedGnbCfg *param;
 Buffer         *mBuf;
 #endif
 {
 
-   //S32 i;
-   U32 tmpEnum;
-   TRC3(cmUnpkRgrSchedEnbCfg)
+   TRC3(cmUnpkMacSchedGnbCfg)
 
    CMCHKUNPK(SUnpkU8, &param->numTxAntPorts, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->dlSchdType, mBuf);
-   switch(param->dlSchdType) 
-   {
-      case RGR_SCH_TYPE_PFS:
-         CMCHKUNPK(cmUnpkRgrEnbPfs, &param->dlSchInfo.dlPfs, mBuf);
-         break;
-      default :
-         break;
-   }
    CMCHKUNPK(SUnpkU8, &param->ulSchdType, mBuf);
-   switch(param->ulSchdType) 
-   {
-      case RGR_SCH_TYPE_PFS:
-         CMCHKUNPK(cmUnpkRgrEnbPfs, &param->ulSchInfo.ulPfs, mBuf);
-         break;
-      default :
-         break;
-   }
-   CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
-   param->accsMode = (RgrCellAccsMode) tmpEnum;
-#ifdef RG_5GTF
-   CMCHKUNPK(SUnpkU8, &param->isDynTddEnbld, mBuf);
-#endif
+   CMCHKUNPK(SUnpkU8, &param->dlSchdType, mBuf);
+   CMCHKUNPK(SUnpkU8, &param->numCells, mBuf);
+   CMCHKUNPK(SUnpkU8, &param->maxUlUePerTti, mBuf);
+   CMCHKUNPK(SUnpkU8, &param->maxDlUePerTti, mBuf);
    RETVALUE(ROK);
-} /* cmUnpkRgrSchedEnbCfg */
+} /* cmUnpkMacSchedGnbCfg */
 
 
 /***********************************************************
@@ -6889,9 +6699,6 @@ PUBLIC S16 cmUnpkRgr5gtfUeCfg
    CMCHKUNPK(SUnpkU8, &param->numCC, mBuf);
    CMCHKUNPK(SUnpkU8, &param->mcs, mBuf);
    CMCHKUNPK(SUnpkU8, &param->maxPrb, mBuf);
-#if 0
-   printf("\nunpk %u,%u,%u,%u,%u\n",param->grpId,param->BeamId,param->numCC,param->mcs,param->maxPrb);
-#endif
    RETVALUE(ROK);
 }
 
@@ -6906,9 +6713,6 @@ PUBLIC S16 cmPkRgr5gtfUeCfg
    CMCHKPK(SPkU8, param->numCC, mBuf);
    CMCHKPK(SPkU8, param->BeamId, mBuf);
    CMCHKPK(SPkU8, param->grpId, mBuf);
-#if 0
- printf("\npk %u,%u,%u,%u,%u\n",param->grpId,param->BeamId,param->numCC,param->mcs,param->maxPrb);
-#endif
    RETVALUE(ROK);
 }
 #endif
@@ -7742,8 +7546,8 @@ Buffer *mBuf;
          case RGR_CELL_CFG:
             CMCHKPK(cmPkRgrCellCfg, &param->u.cellCfg, mBuf);
             break;
-         case RGR_ENB_CFG:
-            CMCHKPK(cmPkRgrSchedEnbCfg, &param->u.schedEnbCfg, mBuf);
+         case MAC_GNB_CFG:
+            CMCHKPK(cmPkMacSchedGnbCfg, &param->u.schedGnbCfg, mBuf);
             break;
          default :
             RETVALUE(RFAILED);
@@ -7786,8 +7590,8 @@ Buffer *mBuf;
 
    CMCHKUNPK(SUnpkU8, &param->cfgType, mBuf);
       switch(param->cfgType) {
-         case RGR_ENB_CFG:
-            CMCHKUNPK(cmUnpkRgrSchedEnbCfg, &param->u.schedEnbCfg, mBuf);
+         case MAC_GNB_CFG:
+            CMCHKUNPK(cmUnpkMacSchedGnbCfg, &param->u.schedGnbCfg, mBuf);
             break;
          case RGR_CELL_CFG:
             CMCHKUNPK(cmUnpkRgrCellCfg, &param->u.cellCfg, mBuf);
@@ -9225,7 +9029,7 @@ Buffer *mBuf;
          case RGR_RECONFIG:
             CMCHKPK(cmPkRgrRecfg, &param->u.recfgInfo, mBuf);
             break;
-         case RGR_CONFIG:
+         case SCH_CONFIG:
             CMCHKPK(cmPkRgrCfg, &param->u.cfgInfo, mBuf);
             break;
 #ifdef LTE_ADV
@@ -9276,7 +9080,7 @@ Buffer *mBuf;
 
    CMCHKUNPK(SUnpkU8, &param->action, mBuf);
       switch(param->action) {
-         case RGR_CONFIG:
+         case SCH_CONFIG:
             CMCHKUNPK(cmUnpkRgrCfg, &param->u.cfgInfo, mBuf);
             break;
          case RGR_RECONFIG:
@@ -9540,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));
@@ -9851,7 +9655,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == RGR_SEL_LC)
+   if (pst->selector == ODU_SELECTOR_LC)
    {
       if (cmUnpkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) 
       {
@@ -10496,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));
@@ -11372,9 +11176,6 @@ Buffer *mBuf;
 #endif
 {
    S8          idx;
-#if 0
-   Ptr         ptr;
-#endif
 
    /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
    TknStrOSXL  *tknStr;
@@ -11392,9 +11193,6 @@ Buffer *mBuf;
    }
    else
    {
-#if 0
-      ptr =(Ptr)param;
-#endif
 
       /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** Start */
       tknStr = &param->u.rntpInfo;