X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fkwu.c;h=94e294a5ea3b541871a6368c25a813fa047e2357;hb=64580b61ab517a3c1fc09b3e0dc32109b913b726;hp=81e31769438f755658dd36f417df57ab05535414;hpb=95fc4329bde1b6a06b00f94bd0eeab8bc5ba7295;p=o-du%2Fl2.git diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 81e317694..94e294a5e 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -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) { @@ -163,10 +163,10 @@ uint8_t cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf) CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); return ROK; -} /* cmPkKwuDatReqInfo */ +} /* cmPkRlcDatReqInfo */ -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,7 +326,7 @@ uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf) } return (ret1); #endif -} /* cmPkKwuDatReq */ +} /* cmPkRlcDatReq */ uint8_t cmPkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf) @@ -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) @@ -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) @@ -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) @@ -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); @@ -900,7 +900,7 @@ S16 cmUnpkKwuUbndReq(KwuUbndReq func,Pst *pst,Buffer *mBuf) } /* cmUnpkKwuUbndReq */ -S16 cmUnpkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf) +S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *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 */ @@ -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); @@ -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) @@ -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) @@ -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)