X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fkwu.c;h=06899000e45633af9a3e7c828a8b5ac3e1630b22;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=88cdcc888728e323a83b0f7d5ec88c2db339d0e6;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 88cdcc888..06899000e 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -56,14 +56,14 @@ * Packing Functions ***************************************************************************/ #ifdef ANSI -PUBLIC S16 cmPkKwuBndReq +S16 cmPkKwuBndReq ( Pst * pst, SuId suId, SpId spId ) #else -PUBLIC S16 cmPkKwuBndReq(pst, suId, spId) +S16 cmPkKwuBndReq(pst, suId, spId) Pst * pst; SuId suId; SpId spId; @@ -72,7 +72,6 @@ SpId spId; S16 ret1; Buffer *mBuf; - TRC3(cmPkKwuBndReq) mBuf = NULLP; @@ -96,23 +95,22 @@ SpId spId; #ifdef ANSI -PUBLIC S16 cmPkKwuBndCfm +S16 cmPkKwuBndCfm ( Pst * pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 cmPkKwuBndCfm(pst, suId, status) +S16 cmPkKwuBndCfm(pst, suId, status) Pst * pst; SuId suId; -U8 status; +uint8_t status; #endif { S16 ret1; Buffer *mBuf; - TRC3(cmPkKwuBndCfm) mBuf = NULLP; @@ -137,14 +135,14 @@ U8 status; #ifdef ANSI -PUBLIC S16 cmPkKwuUbndReq +S16 cmPkKwuUbndReq ( Pst * pst, SuId suId, Reason reason ) #else -PUBLIC S16 cmPkKwuUbndReq(pst, suId, reason) +S16 cmPkKwuUbndReq(pst, suId, reason) Pst * pst; SuId suId; Reason reason; @@ -153,7 +151,6 @@ Reason reason; S16 ret1; Buffer *mBuf; - TRC3(cmPkKwuUbndReq) mBuf = NULLP; @@ -189,7 +186,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkKwuDatReqInfo); #ifdef CCPU_OPT switch(param->lcType) { @@ -241,7 +237,6 @@ Buffer * mBuf; #ifndef SS_RBUF KwuDatReqInfo* datReqInfo; #endif - TRC3(cmPkKwuDatReq) #ifndef SS_RBUF switch(pst->selector) { @@ -266,7 +261,7 @@ Buffer * mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - cmMemcpy((U8*)datReqInfo,(U8*)datReq,sizeof(KwuDatReqInfo)); + memcpy(datReqInfo,datReq,sizeof(KwuDatReqInfo)); CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf); } else @@ -407,7 +402,6 @@ KwuDatIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuDatIndInfo); CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf); #ifdef CCPU_OPT @@ -442,7 +436,6 @@ Buffer * mBuf; #endif KwuDatIndInfo *datIndInfo = NULLP; - TRC3(cmPkKwuDatInd) #ifdef TENB_SPLIT_ARCH /* SSI_CHANGES: */ @@ -474,7 +467,7 @@ Buffer * mBuf; return (ret1); } - cmMemcpy((U8*)datIndInfo,(U8*)datInd,sizeof(KwuDatIndInfo)); + memcpy(datIndInfo, datInd,sizeof(KwuDatIndInfo)); CMCHKPK(oduPackPointer,(PTR)datIndInfo, mBuf); } break; @@ -512,20 +505,19 @@ Buffer * mBuf; #ifdef ANSI -PUBLIC S16 cmPkKwuDatCfmInfo +S16 cmPkKwuDatCfmInfo ( KwuDatCfmInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkKwuDatCfmInfo(param, mBuf) +S16 cmPkKwuDatCfmInfo(param, mBuf) KwuDatCfmInfo *param; Buffer *mBuf; #endif { - register U32 iter; + register uint32_t iter; - TRC3(cmPkKwuDatCfmInfo); for(iter = 0; iter < param->numSduIds; iter++) { CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf); @@ -537,14 +529,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmPkKwuDatCfm +S16 cmPkKwuDatCfm ( Pst * pst, SuId suId, KwuDatCfmInfo* datCfm ) #else -PUBLIC S16 cmPkKwuDatCfm(pst, suId, datCfm) +S16 cmPkKwuDatCfm(pst, suId, datCfm) Pst * pst; SuId suId; KwuDatCfmInfo* datCfm; @@ -555,7 +547,6 @@ KwuDatCfmInfo* datCfm; #endif Buffer *mBuf; - TRC3(cmPkKwuDatCfm) mBuf = NULLP; @@ -611,14 +602,14 @@ KwuDatCfmInfo* datCfm; #ifdef ANSI -PUBLIC S16 cmPkKwuDiscSduReq +S16 cmPkKwuDiscSduReq ( Pst * pst, SpId spId, KwuDiscSduInfo* discSdu ) #else -PUBLIC S16 cmPkKwuDiscSduReq(pst, spId, discSdu) +S16 cmPkKwuDiscSduReq(pst, spId, discSdu) Pst * pst; SpId spId; KwuDiscSduInfo* discSdu; @@ -630,7 +621,6 @@ KwuDiscSduInfo* discSdu; Buffer *mBuf; KwuDiscSduInfo* discSduInfo = NULLP; - TRC3(cmPkKwuDiscSduReq) mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -659,7 +649,7 @@ KwuDiscSduInfo* discSdu; return (ret1); } - cmMemcpy((U8*)discSduInfo,(U8*)discSdu,sizeof(KwuDiscSduInfo)); + memcpy(discSduInfo, discSdu,sizeof(KwuDiscSduInfo)); CMCHKPK(oduPackPointer,(PTR)discSduInfo, mBuf); } break; @@ -690,24 +680,23 @@ KwuDiscSduInfo* discSdu; #ifdef ANSI -PUBLIC S16 cmPkKwuStaIndInfo +S16 cmPkKwuStaIndInfo ( KwuStaIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkKwuStaIndInfo(param, mBuf) +S16 cmPkKwuStaIndInfo(param, mBuf) KwuStaIndInfo *param; Buffer *mBuf; #endif { S16 i; - TRC3(cmPkKwuStaIndInfo); for (i = (param->numSdu - 1); i >= 0; i--) { - CMCHKPK(oduUnpackUInt32, param->sduId[(U16)i], mBuf); + CMCHKPK(oduUnpackUInt32, param->sduId[(uint16_t)i], mBuf); } CMCHKPK(oduUnpackUInt32, param->numSdu, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); @@ -715,18 +704,17 @@ Buffer *mBuf; } #ifdef ANSI -PUBLIC S16 cmPkKwuFlowCntrlIndInfo +S16 cmPkKwuFlowCntrlIndInfo ( KwuFlowCntrlIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkKwuFlowCntrlIndInfo(param, mBuf) +S16 cmPkKwuFlowCntrlIndInfo(param, mBuf) KwuFlowCntrlIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuFlowCntrlIndInfo); CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); @@ -735,18 +723,17 @@ Buffer *mBuf; } /* cmPkKwuFlowCntrlIndInfo */ #ifdef ANSI -PUBLIC S16 cmUnpkKwuFlowCntrlIndInfo +S16 cmUnpkKwuFlowCntrlIndInfo ( KwuFlowCntrlIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuFlowCntrlIndInfo(param, mBuf) +S16 cmUnpkKwuFlowCntrlIndInfo(param, mBuf) KwuFlowCntrlIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuFlowCntrlIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); @@ -756,14 +743,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmPkKwuStaInd +S16 cmPkKwuStaInd ( Pst * pst, SuId suId, KwuStaIndInfo* staInd ) #else -PUBLIC S16 cmPkKwuStaInd(pst, suId, staInd) +S16 cmPkKwuStaInd(pst, suId, staInd) Pst * pst; SuId suId; KwuStaIndInfo* staInd; @@ -776,7 +763,6 @@ KwuStaIndInfo* staInd; #endif /* LCKWU */ Buffer *mBuf; - TRC3(cmPkKwuStaInd) mBuf = NULLP; @@ -832,14 +818,14 @@ KwuStaIndInfo* staInd; #ifdef ANSI -PUBLIC S16 cmPkKwuReEstCmpInd +S16 cmPkKwuReEstCmpInd ( Pst * pst, SuId suId, CmLteRlcId rlcId ) #else -PUBLIC S16 cmPkKwuReEstCmpInd(pst, suId, rlcId) +S16 cmPkKwuReEstCmpInd(pst, suId, rlcId) Pst * pst; SuId suId; CmLteRlcId rlcId; @@ -852,7 +838,6 @@ CmLteRlcId rlcId; #endif /* LCKWU */ Buffer *mBuf; - TRC3(cmPkKwuReEstCmpInd) mBuf = NULLP; @@ -891,14 +876,14 @@ CmLteRlcId rlcId; /* kwu_c_001.main_3 added support for L2 Measurement */ #ifdef ANSI -PUBLIC S16 cmPkKwuDiscSduCfm +S16 cmPkKwuDiscSduCfm ( Pst *pst, SpId spId, KwuDiscSduInfo *discCfmSdu ) #else -PUBLIC S16 cmPkKwuDiscSduCfm(pst, spId, discCfmSdu) +S16 cmPkKwuDiscSduCfm(pst, spId, discCfmSdu) Pst *pst; SpId spId; KwuDiscSduInfo *discCfmSdu; @@ -909,7 +894,6 @@ KwuDiscSduInfo *discCfmSdu; #endif Buffer *mBuf; - TRC3(cmPkKwuDiscSduCfm) mBuf = NULLP; @@ -964,14 +948,14 @@ KwuDiscSduInfo *discCfmSdu; } /* cmPkKwuDiscSduCfm */ #ifdef ANSI -PUBLIC S16 cmPkKwuFlowCntrlInd +S16 cmPkKwuFlowCntrlInd ( Pst *pst, SuId suId, KwuFlowCntrlIndInfo *flowCntrlIndInfo ) #else -PUBLIC S16 cmPkKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) +S16 cmPkKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) Pst *pst; SuId suId; KwuFlowCntrlIndInfo *flowCntrlIndInfo; @@ -979,7 +963,6 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; { Buffer *mBuf; - TRC3(cmPkKwuFlowCntrlInd) mBuf = NULLP; @@ -1025,18 +1008,17 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; #ifdef LTE_L2_MEAS #ifdef ANSI -PUBLIC S16 cmPkKwuDatAckInfo +S16 cmPkKwuDatAckInfo ( KwuDatAckInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkKwuDatAckInfo(param, mBuf) +S16 cmPkKwuDatAckInfo(param, mBuf) KwuDatAckInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuDatAckIndInfo); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); @@ -1044,14 +1026,14 @@ Buffer *mBuf; } #ifdef ANSI -PUBLIC S16 cmPkKwuDatAckInd +S16 cmPkKwuDatAckInd ( Pst * pst, SuId suId, KwuDatAckInfo* datInd ) #else -PUBLIC S16 cmPkKwuDatAckInd(pst, suId, datInd) +S16 cmPkKwuDatAckInd(pst, suId, datInd) Pst * pst; SuId suId; KwuDatAckInfo* datInd; @@ -1061,7 +1043,6 @@ KwuDatAckInfo* datInd; Buffer *mBuf; - TRC3(cmPkKwuDatAckInd); mBuf = NULLP; @@ -1096,14 +1077,14 @@ KwuDatAckInfo* datInd; #ifdef ANSI -PUBLIC S16 cmUnpkKwuBndReq +S16 cmUnpkKwuBndReq ( KwuBndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuBndReq(func, pst, mBuf) +S16 cmUnpkKwuBndReq(func, pst, mBuf) KwuBndReq func; Pst *pst; Buffer *mBuf; @@ -1112,8 +1093,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkKwuBndReq) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU020, pst); CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU021, pst); SPutMsg(mBuf); @@ -1123,23 +1102,22 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuBndCfm +S16 cmUnpkKwuBndCfm ( KwuBndCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuBndCfm(func, pst, mBuf) +S16 cmUnpkKwuBndCfm(func, pst, mBuf) KwuBndCfm func; Pst *pst; Buffer *mBuf; #endif { SuId suId = 0; - U8 status = 0; + uint8_t status = 0; - TRC3(cmUnpkKwuBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst); CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst); @@ -1150,14 +1128,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuUbndReq +S16 cmUnpkKwuUbndReq ( KwuUbndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuUbndReq(func, pst, mBuf) +S16 cmUnpkKwuUbndReq(func, pst, mBuf) KwuUbndReq func; Pst *pst; Buffer *mBuf; @@ -1166,7 +1144,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkKwuUbndReq) CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU024, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EKWU025, pst); @@ -1177,19 +1154,18 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatReqInfo +S16 cmUnpkKwuDatReqInfo ( KwuDatReqInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatReqInfo(param, mBuf) +S16 cmUnpkKwuDatReqInfo(param, mBuf) KwuDatReqInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatReqInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); @@ -1221,14 +1197,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatReq +S16 cmUnpkKwuDatReq ( KwuDatReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatReq(func, pst, mBuf) +S16 cmUnpkKwuDatReq(func, pst, mBuf) KwuDatReq func; Pst *pst; Buffer *mBuf; @@ -1241,7 +1217,6 @@ Buffer *mBuf; KwuDatReqInfo *datReq = NULLP; KwuDatReqInfo datReqTmp; - TRC3(cmUnpkKwuDatReq) switch(pst->selector) { @@ -1255,7 +1230,7 @@ Buffer *mBuf; /* Allocate the memory statically as there is no free * in RLC */ datReq = &datReqTmp; - cmMemset((U8 *)datReq, 0, sizeof(KwuDatReqInfo)); + memset(datReq, 0, sizeof(KwuDatReqInfo)); #if(ERRCLASS & ERRCLS_DEBUG) ret1 = cmUnpkKwuDatReqInfo( (datReq), mBuf); if(ret1 != ROK) @@ -1305,7 +1280,6 @@ KwuDatIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -1335,7 +1309,6 @@ Buffer *mBuf; KwuDatIndInfo *datInd = NULLP; KwuDatIndInfo datIndTmp; - TRC3(cmUnpkKwuDatInd) switch(pst->selector) { @@ -1402,19 +1375,18 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatCfmInfo +S16 cmUnpkKwuDatCfmInfo ( KwuDatCfmInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatCfmInfo(param, mBuf) +S16 cmUnpkKwuDatCfmInfo(param, mBuf) KwuDatCfmInfo *param; Buffer *mBuf; #endif { register S32 iter; - TRC3(cmUnpkKwuDatCfmInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf); @@ -1431,14 +1403,14 @@ Buffer *mBuf; } #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatCfm +S16 cmUnpkKwuDatCfm ( KwuDatCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatCfm(func, pst, mBuf) +S16 cmUnpkKwuDatCfm(func, pst, mBuf) KwuDatCfm func; Pst *pst; Buffer *mBuf; @@ -1448,7 +1420,6 @@ Buffer *mBuf; SuId suId = 0; KwuDatCfmInfo *datCfm = NULLP; - TRC3(cmUnpkKwuDatCfm) CMCHKUNPK(SUnpkS16, &(suId), mBuf); @@ -1475,7 +1446,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)datCfm, 0, sizeof(KwuDatCfmInfo)); + memset(datCfm, 0, sizeof(KwuDatCfmInfo)); ret1 = cmUnpkKwuDatCfmInfo( (datCfm), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) if(ret1 != ROK) @@ -1506,14 +1477,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuDiscSduReq +S16 cmUnpkKwuDiscSduReq ( KwuDiscSduReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDiscSduReq(func, pst, mBuf) +S16 cmUnpkKwuDiscSduReq(func, pst, mBuf) KwuDiscSduReq func; Pst *pst; Buffer *mBuf; @@ -1547,7 +1518,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); + memset(discSdu, 0, sizeof(KwuDiscSduInfo)); ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) if(ret1 != ROK) @@ -1577,20 +1548,19 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuStaIndInfo +S16 cmUnpkKwuStaIndInfo ( KwuStaIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuStaIndInfo(param, mBuf) +S16 cmUnpkKwuStaIndInfo(param, mBuf) KwuStaIndInfo *param; Buffer *mBuf; #endif { - U32 i; + uint32_t i; - TRC3(cmUnpkKwuStaIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); @@ -1604,14 +1574,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuStaInd +S16 cmUnpkKwuStaInd ( KwuStaInd func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuStaInd(func, pst, mBuf) +S16 cmUnpkKwuStaInd(func, pst, mBuf) KwuStaInd func; Pst *pst; Buffer *mBuf; @@ -1621,7 +1591,6 @@ Buffer *mBuf; SuId suId = 0; KwuStaIndInfo *staInd = NULLP; - TRC3(cmUnpkKwuStaInd) CMCHKUNPK(SUnpkS16, &(suId), mBuf); @@ -1648,7 +1617,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)staInd, 0, sizeof(KwuStaIndInfo)); + memset(staInd, 0, sizeof(KwuStaIndInfo)); ret1 = cmUnpkKwuStaIndInfo( (staInd), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1679,14 +1648,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuReEstCmpInd +S16 cmUnpkKwuReEstCmpInd ( KwuReEstCmpInd func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuReEstCmpInd(func, pst, mBuf) +S16 cmUnpkKwuReEstCmpInd(func, pst, mBuf) KwuReEstCmpInd func; Pst *pst; Buffer *mBuf; @@ -1698,10 +1667,7 @@ Buffer *mBuf; SuId suId = 0; CmLteRlcId rlcId; - TRC3(cmUnpkKwuReEstCmpInd) - - cmMemset((U8 *)&rlcId, 0, sizeof(CmLteRlcId)); - + memset(&rlcId, 0, sizeof(CmLteRlcId)); CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) { @@ -1732,14 +1698,14 @@ Buffer *mBuf; /* kwu_c_001.main_3 added support for L2 Measurement */ #ifdef ANSI -PUBLIC S16 cmUnpkKwuDiscSduCfm +S16 cmUnpkKwuDiscSduCfm ( KwuDiscSduCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDiscSduCfm(func, pst, mBuf) +S16 cmUnpkKwuDiscSduCfm(func, pst, mBuf) KwuDiscSduCfm func; Pst *pst; Buffer *mBuf; @@ -1749,7 +1715,6 @@ Buffer *mBuf; SpId spId = 0; KwuDiscSduInfo *discSdu = NULLP; - TRC3(cmUnpkKwuDiscSduCfm); CMCHKUNPK(SUnpkS16, &(spId), mBuf); @@ -1775,7 +1740,7 @@ Buffer *mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); + memset(discSdu, 0, sizeof(KwuDiscSduInfo)); ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1803,14 +1768,14 @@ Buffer *mBuf; return ((*func)(pst, spId, discSdu)); } /* cmUnpkKwuDiscSduCfm */ #ifdef ANSI -PUBLIC S16 cmUnpkKwuFlowCntrlInd +S16 cmUnpkKwuFlowCntrlInd ( KwuFlowCntrlInd func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuFlowCntrlInd(func, pst, mBuf) +S16 cmUnpkKwuFlowCntrlInd(func, pst, mBuf) KwuFlowCntrlInd func; Pst *pst; Buffer *mBuf; @@ -1819,7 +1784,6 @@ Buffer *mBuf; SuId suId; KwuFlowCntrlIndInfo *flowCntrlInfo = NULLP; - TRC3(cmUnpkKwuFlowCntrlInd); CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) @@ -1855,18 +1819,17 @@ Buffer *mBuf; #ifdef LTE_L2_MEAS #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatAckInfo +S16 cmUnpkKwuDatAckInfo ( KwuDatAckInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatAckInfo(param, mBuf) +S16 cmUnpkKwuDatAckInfo(param, mBuf) KwuDatAckInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatAckInfo); CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -1876,14 +1839,14 @@ Buffer *mBuf; #ifdef ANSI -PUBLIC S16 cmUnpkKwuDatAckInd +S16 cmUnpkKwuDatAckInd ( KwuDatAckInd func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkKwuDatAckInd(func, pst, mBuf) +S16 cmUnpkKwuDatAckInd(func, pst, mBuf) KwuDatAckInd func; Pst *pst; Buffer *mBuf; @@ -1893,7 +1856,6 @@ Buffer *mBuf; SuId suId = 0; KwuDatAckInfo *datInd = NULLP; - TRC3(cmUnpkKwuDatAckInd); if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,\ sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY)) != ROK) @@ -1909,7 +1871,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)datInd, 0, sizeof(KwuDatAckInfo)); + memset(datInd, 0, sizeof(KwuDatAckInfo)); CMCHKUNPK(SUnpkS16, &(suId), mBuf); ret1 = cmUnpkKwuDatAckInfo( (datInd), mBuf);