PHY_DELTA changes

[o-du/l2.git] / src / cm / ckw.c

diff --git a/src/cm/ckw.c b/src/cm/ckw.c
index 7b92609..feec780 100755 (executable)
--- a/src/cm/ckw.c
+++ b/src/cm/ckw.c
@@ -507,9 +507,9 @@ Buffer         *mBuf;
 \f
 /*
 *
-*    Fun:    cmPkCkwCfgReq
+*    Fun:    packUeCreateReq
 *
-*    Desc:    pack the primitive KwUiCkwCfgReq
+*    Desc:    pack the primitive UE Create Req
 *
 *    Ret:    ROK  -ok
 *
@@ -519,23 +519,21 @@ Buffer         *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCkwCfgReq
+PUBLIC S16 packUeCreateReq
 (
 Pst               *pst,
-SpId              spId,
 CkwCfgInfo        *cfgInfo
 )
 #else
-PUBLIC S16 cmPkCkwCfgReq(pst, spId, cfgInfo)
+PUBLIC S16 packUeCreateReq(pst, cfgInfo)
 Pst               *pst;
-SpId              spId;
 CkwCfgInfo        *cfgInfo;
 #endif
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkCkwCfgReq)
+    TRC3(packUeCreateReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -552,37 +550,16 @@ CkwCfgInfo        *cfgInfo;
 
     switch(pst->selector)
     {
-#ifdef LCCKW
-       case CKW_SEL_LC:
+       case CKW_SEL_LWLC:
           {
-             ret1 = cmPkCkwCfgInfo( (cfgInfo), pst, mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-             if(ret1 != ROK)
-             {
-                SPutMsg(mBuf);
-                SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-                      __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-                      (ErrVal)ECKW012, (ErrVal)ret1, "Packing failure");
-                RETVALUE( ret1 );
-             }
-#endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-             if (SPutSBuf(pst->region, pst->pool, (Data *)cfgInfo,
-                      sizeof(CkwCfgInfo)) != ROK)
-             {
-                SPutMsg(mBuf);
-                RETVALUE(RFAILED);
-             }
-
+             CMCHKPK(cmPkPtr,(PTR) cfgInfo, mBuf);
              break;
           }
-#endif /* LCCKW */
     }
-
-    CMCHKPKLOG(SPkS16, spId, mBuf, ECKW013, pst);
-    pst->event = (Event) CKW_EVT_CFG_REQ;
+    pst->event = (Event) RLC_EVT_UE_CREATE_REQ;
 
     RETVALUE(SPstTsk(pst,mBuf));
-} /* cmPkCkwCfgReq */
+} /* packUeCreateReq */
 
 \f
 /*
@@ -1408,9 +1385,9 @@ Buffer         *mBuf;
 \f
 /*
 *
-*    Fun:    cmUnpkCkwCfgReq
+*    Fun:    unpackUeCreateReq
 *
-*    Desc:    unpack the primitive KwUiCkwCfgReq
+*    Desc:    unpack the primitive UE create request
 *
 *    Ret:    ROK  -ok
 *
@@ -1420,7 +1397,7 @@ Buffer         *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCkwCfgReq
+PUBLIC S16 unpackUeCreateReq
 (
 CkwCfgReq         func,
 Pst               *pst,
@@ -1434,10 +1411,9 @@ Buffer            *mBuf;
 #endif
 {
     S16 ret1;
-    SpId          spId = 0;
     CkwCfgInfo    *cfgInfo = NULLP;
     
-    TRC3(cmUnpkCkwCfgReq)
+    TRC3(unpackUeCreateReq)
 
     if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgInfo,\
                 sizeof(CkwCfgInfo))) != ROK)
@@ -1452,32 +1428,17 @@ Buffer            *mBuf;
        RETVALUE(ret1);
     }
 
-    cmMemset((U8 *)cfgInfo, 0, sizeof(CkwCfgInfo));
-
-    CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     switch(pst->selector)
     {
-#ifdef LCCKW
-       case CKW_SEL_LC:
-       {
-          ret1 = cmUnpkCkwCfgInfo( (cfgInfo), pst, mBuf);
-#if(ERRCLASS & ERRCLS_DEBUG)
-          if(ret1 != ROK)
+       case CKW_SEL_LWLC:
           {
-             SPutMsg(mBuf);
-             SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
-                   __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
-                  (ErrVal)ECKW034, (ErrVal)ret1, "Unpacking failure");
-             RETVALUE( ret1 );
+             CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf); 
+             break;
           }
-#endif /* ERRCLASS & ERRCLS_DEBUG */
-          break;
-       }
-#endif /* LCCKW */
     }
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, cfgInfo));
+    RETVALUE((*func)(pst, cfgInfo));
 } /* cmUnpkCkwCfgReq */
 
 \f