X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fcm%2Fkwu.c;h=155f3562e9407be6bf7640ff2d8a7acd261d4b74;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=1784166cf119c88ee7c9546e4e80924c86bd346d;hpb=7d9367ae84317dce9bbe8cca3c0ae805ddaeee63;p=o-du%2Fl2.git diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 1784166cf..155f3562e 100755 --- 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)); @@ -147,8 +147,8 @@ uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) case CM_LTE_LCH_PCCH: CMCHKPK(cmPkLteTimingInfo, ¶m->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,7 +160,7 @@ uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) CMCHKPK(cmPkLteLcType, param->lcType, mBuf); #endif - CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); + CMCHKPK(oduPackUInt32, param->sduId, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); return ROK; } /* cmPkRlcDatReqInfo */ @@ -187,7 +187,7 @@ uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* 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, + if((ret1 = SGetStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&datReqInfo, sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -226,7 +226,7 @@ uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf) #endif /* ERRCLASS & ERRCLS_ADD_RES */ if(pst->srcEnt == ENTNH) { - if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, + if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq, sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); @@ -316,7 +316,7 @@ uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf) ret1 = SPstTsk(pst,mBuf); if(pst->selector == ODU_SELECTOR_LC) { - if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, + if (SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq, sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); @@ -332,7 +332,7 @@ uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf) 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, ¶m->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, ¶m->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, ¶m->rlcId, mBuf); return ROK; @@ -589,7 +589,7 @@ S16 cmUnpkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf) { CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->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, ¶m->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)); @@ -905,7 +905,7 @@ S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->sduId, mBuf); #ifdef CCPU_OPT CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); @@ -913,8 +913,8 @@ S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) case CM_LTE_LCH_BCCH: case CM_LTE_LCH_PCCH: #ifdef EMTC_ENABLE - CMCHKUNPK(oduPackUInt8,¶m->pnb , mBuf); - CMCHKUNPK(oduPackUInt8,¶m->emtcDiReason , mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->pnb , mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->emtcDiReason , mBuf); #endif CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->tm.tmg, mBuf); @@ -986,7 +986,7 @@ 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, + retVal = SPutStaticBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)datReq, sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY); } return (retVal); @@ -1001,7 +1001,7 @@ uint8_t cmUnpkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf) #ifdef CCPU_OPT CMCHKUNPK(cmUnpkLteRnti, ¶m->tCrnti, mBuf); #endif - CMCHKUNPK(oduPackUInt8, ¶m->isOutOfSeq, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->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, ¶m->rlcId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->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, ¶m->sduIds[iter], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->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, ¶m->rlcId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->numSdu, mBuf); for (i = 0; i < param->numSdu; i++) { - CMCHKUNPK(oduPackUInt32, ¶m->sduId[i], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->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, ¶m->sduId, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->sduId, mBuf); CMCHKUNPK(cmUnpkLteRlcId, ¶m->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)