[ Jira id - ODUHIGH-593 ] Pack and unpack function nomenclature correction

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

diff --git a/src/cm/kwu.c b/src/cm/kwu.c
index 81e3176..155f356 100755 (executable)
--- a/src/cm/kwu.c
+++ b/src/cm/kwu.c
@@ -102,7 +102,7 @@ S16 cmPkKwuBndCfm(Pst * pst,SuId suId,uint8_t status)
       return (ret1);
    }
 
-   CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EKWU005, pst);
+   CMCHKPKLOG(oduPackUInt8, status, mBuf, EKWU005, pst);
    CMCHKPKLOG(SPkS16, suId, mBuf, EKWU006, pst);
    pst->event = (Event) KWU_EVT_BND_CFM;
    return (SPstTsk(pst,mBuf));
@@ -136,7 +136,7 @@ S16 cmPkKwuUbndReq(Pst * pst,SuId suId,Reason reason)
    return (SPstTsk(pst,mBuf));
 } /* cmPkKwuUbndReq */
 
-uint8_t cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
+uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
 {
 #ifdef CCPU_OPT
    switch(param->lcType) {
@@ -147,8 +147,8 @@ uint8_t cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
       case  CM_LTE_LCH_PCCH:
          CMCHKPK(cmPkLteTimingInfo, &param->tm.tmg, mBuf);
 #ifdef EMTC_ENABLE
-         CMCHKPK(oduUnpackUInt8, param->emtcDiReason,mBuf);
-         CMCHKPK(oduUnpackUInt8, param->pnb,mBuf);
+         CMCHKPK(oduPackUInt8, param->emtcDiReason,mBuf);
+         CMCHKPK(oduPackUInt8, param->pnb,mBuf);
 #endif
          break;
       case CM_LTE_LCH_DTCH:
@@ -160,13 +160,13 @@ uint8_t cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
    CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
 
 #endif
-   CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
+   CMCHKPK(oduPackUInt32, param->sduId, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
-} /* cmPkKwuDatReqInfo */
+} /* cmPkRlcDatReqInfo */
 
 \f
-uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
+uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf)
 {
 #ifdef LCKWU
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -174,7 +174,7 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
 #endif /* LCKWU */
    S16 ret1 = ROK;
 #ifndef SS_RBUF
-   KwuDatReqInfo* datReqInfo;
+   RlcDatReqInfo* datReqInfo;
 #endif
 #ifndef SS_RBUF
    switch(pst->selector)
@@ -187,8 +187,8 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
               * the contents and pass the pointer of the allocated memory. The
               * subsequent free would be done during the Unpack function of the
               * primitive. */
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datReqInfo,
-                        sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY)) != ROK)
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datReqInfo,
+                        sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
                if(ret1 != ROK)
@@ -200,7 +200,7 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
                return (ret1);
             }
-            memcpy(datReqInfo,datReq,sizeof(KwuDatReqInfo));
+            memcpy(datReqInfo,datReq,sizeof(RlcDatReqInfo));
             CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf);
            }
            else
@@ -212,7 +212,7 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
      case ODU_SELECTOR_LC:
         {
 #if (ERRCLASS & ERRCLS_ADD_RES)
-           ret1 = cmPkKwuDatReqInfo( (datReq), mBuf);
+           ret1 = cmPkRlcDatReqInfo( (datReq), mBuf);
            if(ret1 != ROK)
            {
               SPutMsg(mBuf);
@@ -222,12 +222,12 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
               return ( ret1 );
            }
 #else
-           cmPkKwuDatReqInfo( (datReq), mBuf);
+           cmPkRlcDatReqInfo( (datReq), mBuf);
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
            if(pst->srcEnt == ENTNH)
            {
-              if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
-                       sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK)
+              if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq,
+                       sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK)
               {
                  SPutMsg(mBuf);
                  return RFAILED;
@@ -290,7 +290,7 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
 #ifdef LCKWU
          case ODU_SELECTOR_LC:
             {
-               ret1 = cmPkKwuDatReqInfo( (datReq), mBuf);
+               ret1 = cmPkRlcDatReqInfo( (datReq), mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
                if(ret1 != ROK)
                {
@@ -316,8 +316,8 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
       ret1 = SPstTsk(pst,mBuf);
       if(pst->selector == ODU_SELECTOR_LC)
       {
-         if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
-                  sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK)
+         if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq,
+                  sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK)
          {
             SPutMsg(mBuf);
             return RFAILED;
@@ -326,13 +326,13 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
    }
    return (ret1);
 #endif
-} /* cmPkKwuDatReq */
+} /* cmPkRlcDatReq */
 
 \f
 uint8_t cmPkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 {
 
-   CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf);
+   CMCHKPK(oduPackUInt8, param->isOutOfSeq, mBuf);
 #ifdef CCPU_OPT
    CMCHKPK(cmPkLteRnti, param->tCrnti, mBuf);
 #endif
@@ -370,7 +370,7 @@ uint8_t cmPkKwuDatInd(Pst * pst,KwuDatIndInfo* datInd,Buffer * mBuf)
               * the contents and pass the pointer of the allocated memory. The
               * subsequent free would be done during the Unpack function of the
               * primitive. */
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datIndInfo,
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datIndInfo,
                         sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -427,9 +427,9 @@ S16 cmPkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 
    for(iter = 0; iter < param->numSduIds; iter++)
    {
-      CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf);
+      CMCHKPK(oduPackUInt32, param->sduIds[iter], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->numSduIds, mBuf);
+   CMCHKPK(oduPackUInt32, param->numSduIds, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
 } /* cmPkKwuDatCfmInfo */
@@ -471,7 +471,7 @@ S16 cmPkKwuDatCfm(Pst * pst,SuId suId,KwuDatCfmInfo* datCfm)
 #else
             cmPkKwuDatCfmInfo( (datCfm), mBuf);
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-            if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datCfm,
+            if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datCfm,
                      sizeof(KwuDatCfmInfo),SS_SHARABLE_MEMORY) != ROK)
             {
                SPutMsg(mBuf);
@@ -518,7 +518,7 @@ S16 cmPkKwuDiscSduReq(Pst * pst,SpId spId,KwuDiscSduInfo* discSdu)
              * the contents and pass the pointer of the allocated memory. The
              * subsequent free would be done during the Unpack function of the
              * primitive. */
-           if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&discSduInfo,
+           if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&discSduInfo,
                        sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY)) != ROK)
            {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -569,9 +569,9 @@ S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 
    for (i = (param->numSdu - 1); i >= 0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, param->sduId[(uint16_t)i], mBuf);
+      CMCHKPK(oduPackUInt32, param->sduId[(uint16_t)i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->numSdu, mBuf);
+   CMCHKPK(oduPackUInt32, param->numSdu, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
 }
@@ -579,7 +579,7 @@ S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 S16 cmPkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
 
-   CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);   
+   CMCHKPK(oduPackUInt32, param->pktAdmitCnt, mBuf);   
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
 
    return ROK;
@@ -589,7 +589,7 @@ S16 cmUnpkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
    
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->pktAdmitCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->pktAdmitCnt, mBuf);
   
    return ROK;
 } /* cmUnpkKwuFlowCntrlIndInfo */
@@ -633,7 +633,7 @@ S16 cmPkKwuStaInd(Pst * pst,SuId suId,KwuStaIndInfo* staInd)
 #else
              cmPkKwuStaIndInfo( (staInd), mBuf);
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-             if (SPutStaticBuffer(pst->region, pst->pool, (Data *)staInd,
+             if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd,
                       sizeof(KwuStaIndInfo),SS_SHARABLE_MEMORY) != ROK)
              {
                 SPutMsg(mBuf);
@@ -740,7 +740,7 @@ S16 cmPkKwuDiscSduCfm(Pst *pst,SpId spId,KwuDiscSduInfo *discCfmSdu)
 #else
             cmPkKwuDiscSduInfo((discCfmSdu), mBuf);
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-            if (SPutStaticBuffer(pst->region, pst->pool, (Data *)discCfmSdu,
+            if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)discCfmSdu,
                      sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY) != ROK)
             {
                SPutMsg(mBuf);
@@ -773,7 +773,7 @@ S16 cmPkKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      SPutStaticBuffer(pst->region, 
+      SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, 
                pst->pool, 
                (Data *)flowCntrlIndInfo,
                sizeof(KwuFlowCntrlIndInfo),0);
@@ -786,7 +786,7 @@ S16 cmPkKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo
       {
          cmPkKwuFlowCntrlIndInfo((flowCntrlIndInfo), mBuf);
 
-         if (SPutStaticBuffer(pst->region, 
+         if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, 
                       pst->pool, 
                       (Data *)flowCntrlIndInfo,
                       sizeof(KwuFlowCntrlIndInfo),0) != ROK)
@@ -816,7 +816,7 @@ S16 cmPkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
+   CMCHKPK(oduPackUInt32, param->sduId, mBuf);
    return ROK;
 }
 
@@ -844,7 +844,7 @@ S16 cmPkKwuDatAckInd(Pst * pst,SuId suId,KwuDatAckInfo* datInd)
       return ( ret1 );
    }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-   if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd,
+   if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datInd,
             sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY) != ROK)
    {
       SPutMsg(mBuf);
@@ -879,7 +879,7 @@ S16 cmUnpkKwuBndCfm(KwuBndCfm func,Pst *pst,Buffer *mBuf)
 
 
    CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst);
-   CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst);
+   CMCHKUNPKLOG(oduUnpackUInt8, &status, mBuf, EKWU023, pst);
    SPutMsg(mBuf);
 
    return ((*func)(pst, suId, status));
@@ -900,12 +900,12 @@ S16 cmUnpkKwuUbndReq(KwuUbndReq func,Pst *pst,Buffer *mBuf)
 } /* cmUnpkKwuUbndReq */
 
 \f
-S16 cmUnpkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
+S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
 {
 
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->sduId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->sduId, mBuf);
 
 #ifdef CCPU_OPT
    CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
@@ -913,8 +913,8 @@ S16 cmUnpkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
       case CM_LTE_LCH_BCCH:
       case  CM_LTE_LCH_PCCH:
 #ifdef EMTC_ENABLE
-         CMCHKUNPK(oduPackUInt8,&param->pnb , mBuf);
-         CMCHKUNPK(oduPackUInt8,&param->emtcDiReason , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->pnb , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->emtcDiReason , mBuf);
 #endif         
          CMCHKUNPK(cmUnpkLteTimingInfo, &param->tm.tmg, mBuf);
 
@@ -939,8 +939,8 @@ S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf)
    S16 ret1 = ROK; 
 #endif
    S16 retVal;
-   KwuDatReqInfo *datReq = NULLP;
-   KwuDatReqInfo datReqTmp;
+   RlcDatReqInfo *datReq = NULLP;
+   RlcDatReqInfo datReqTmp;
 
 
    switch(pst->selector)
@@ -955,9 +955,9 @@ S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf)
             /* Allocate the memory statically  as there is no free 
              * in RLC */
             datReq = &datReqTmp;
-            memset(datReq, 0, sizeof(KwuDatReqInfo));
+            memset(datReq, 0, sizeof(RlcDatReqInfo));
 #if(ERRCLASS & ERRCLS_DEBUG)
-            ret1 = cmUnpkKwuDatReqInfo( (datReq), mBuf);
+            ret1 = cmUnpkRlcDatReqInfo( (datReq), mBuf);
             if(ret1 != ROK)
             {
                SPutMsg(mBuf);
@@ -967,7 +967,7 @@ S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf)
                return ( ret1 );
             }
 #else
-            cmUnpkKwuDatReqInfo( (datReq), mBuf);
+            cmUnpkRlcDatReqInfo( (datReq), mBuf);
 #endif /* ERRCLASS & ERRCLS_DEBUG */
          }
          break;
@@ -986,8 +986,8 @@ S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf)
     * free the memory here. */
    if(pst->selector == ODU_SELECTOR_LWLC)
    {
-      retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
-            sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY);
+      retVal = SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq,
+            sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY);
    }
    return (retVal);
 } /* cmUnpkKwuDatReq */
@@ -1001,7 +1001,7 @@ uint8_t cmUnpkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 #ifdef CCPU_OPT
    CMCHKUNPK(cmUnpkLteRnti, &param->tCrnti, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt8, &param->isOutOfSeq, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isOutOfSeq, mBuf);
    return ROK;
 }
 
@@ -1026,7 +1026,7 @@ uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst,Buffer *mBuf)
              * doesn't free any memory */
             if(pst->dstEnt != ENTPJ)
             {
-               if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,
+               if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datInd,
                            sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY)) != ROK)
                {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1070,7 +1070,7 @@ uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst,Buffer *mBuf)
      * free the memory here. */
     if((pst->selector == ODU_SELECTOR_LWLC) && (pst->dstEnt == ENTPJ))
     {
-       retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd,
+       retVal = SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datInd,
                 sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY);
     }
     return (retVal);
@@ -1082,7 +1082,7 @@ S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
    register S32 iter;
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numSduIds, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numSduIds, mBuf);
 
 #ifdef L2_L3_SPLIT /*Work Around */
    if (param->numSduIds >= KWU_MAX_DAT_CFM)
@@ -1090,7 +1090,7 @@ S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 #endif
    for(iter = param->numSduIds -1; iter >= 0 ; iter--)
    {
-      CMCHKUNPK(oduPackUInt32, &param->sduIds[iter], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->sduIds[iter], mBuf);
    }
    return ROK;
 }
@@ -1113,7 +1113,7 @@ S16 cmUnpkKwuDatCfm(KwuDatCfm func,Pst *pst,Buffer *mBuf)
          break;
       case ODU_SELECTOR_LC:
          {
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datCfm,\
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datCfm,\
                         sizeof(KwuDatCfmInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1174,7 +1174,7 @@ S16 cmUnpkKwuDiscSduReq(KwuDiscSduReq func,Pst *pst,Buffer *mBuf)
          break;
       case ODU_SELECTOR_LC:
          {
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&discSdu,\
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&discSdu,\
                         sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1221,10 +1221,10 @@ S16 cmUnpkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
    uint32_t i;
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numSdu, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numSdu, mBuf);
    for (i = 0; i < param->numSdu; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &param->sduId[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->sduId[i], mBuf);
    }
 
    return ROK;
@@ -1249,7 +1249,7 @@ S16 cmUnpkKwuStaInd(KwuStaInd func,Pst *pst,Buffer *mBuf)
          break;
       case ODU_SELECTOR_LC:
          {
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&staInd,\
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&staInd,\
                         sizeof(KwuStaIndInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1349,7 +1349,7 @@ S16 cmUnpkKwuDiscSduCfm(KwuDiscSduCfm  func,Pst *pst,Buffer *mBuf)
          break;
       case ODU_SELECTOR_LC:
          {
-            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&discSdu,\
+            if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&discSdu,\
                         sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY)) != ROK)
             {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1400,7 +1400,7 @@ S16 cmUnpkKwuFlowCntrlInd(KwuFlowCntrlInd func,Pst *pst,Buffer *mBuf)
 #ifdef LCKWU
       case ODU_SELECTOR_LC:
       {
-         if(SGetStaticBuffer(pst->region, 
+         if(SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, 
                      pst->pool, 
                      (Data **)&flowCntrlInfo,
                      sizeof(KwuFlowCntrlIndInfo),0) != ROK)
@@ -1430,7 +1430,7 @@ S16 cmUnpkKwuFlowCntrlInd(KwuFlowCntrlInd func,Pst *pst,Buffer *mBuf)
 S16 cmUnpkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
-   CMCHKUNPK(oduPackUInt32, &param->sduId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->sduId, mBuf);
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
 
    return ROK;
@@ -1444,7 +1444,7 @@ S16 cmUnpkKwuDatAckInd(KwuDatAckInd func,Pst *pst,Buffer *mBuf)
     KwuDatAckInfo *datInd = NULLP;
     
 
-    if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,\
+    if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datInd,\
                 sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)