X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx.c;h=7f10dbcbc29ab461fec6fcb5c8d97e3d199e2f36;hb=073b67b21b11eefdaa84a30029f374435c3e0fd0;hp=a793ed9f6c0acf647cb54776a2cabb9d0ea84abe;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c index a793ed9f6..7f10dbcbc 100755 --- a/src/5gnrrlc/kw_udx.c +++ b/src/5gnrrlc/kw_udx.c @@ -54,24 +54,23 @@ * */ #ifdef ANSI -PRIVATE S16 cmUnpkUdxStruct +static S16 cmUnpkUdxStruct ( -Buffer *srcMBuf, -U32 offset, -U8 *dstBuf, -U32 size +Buffer *srcMBuf, +uint32_t offset, +uint8_t *dstBuf, +uint32_t size ) #else -PRIVATE S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size) -Buffer *srcMBuf; -U32 offset; -U8 *dstBuf; +static S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size) +Buffer *srcMBuf; +uint32_t offset; +uint8_t *dstBuf; MsgLen size; #endif { MsgLen tmpLen; - TRC3(cmUnpkUdxStruct) return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen)); } /*end of function cmPkUdxBndReq*/ @@ -90,21 +89,20 @@ MsgLen size; * */ #ifdef ANSI -PRIVATE S16 cmPkUdxStruct +static S16 cmPkUdxStruct ( -U8 *srcBuf, -MsgLen size, -Buffer *dstMBuf +uint8_t *srcBuf, +MsgLen size, +Buffer *dstMBuf ) #else -PRIVATE S16 cmPkUdxStruct(dstMBuf,srcBuf,size) -U8 *srcBuf; -MsgLen size; -Buffer *dstMBuf; +static S16 cmPkUdxStruct(dstMBuf,srcBuf,size) +uint8_t *srcBuf; +MsgLen size; +Buffer *dstMBuf; #endif { - TRC3(cmPkUdxStruct) return (SAddPstMsgMult(srcBuf,size,dstMBuf)); } /*end of function cmPkUdxBndReq*/ @@ -122,14 +120,14 @@ Buffer *dstMBuf; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxBndReq +S16 cmPkUdxBndReq ( Pst *pst, SuId suId, SpId spId ) #else -PUBLIC S16 cmPkUdxBndReq(pst, suId, spId) +S16 cmPkUdxBndReq(pst, suId, spId) Pst *pst; SuId suId; SpId spId; @@ -138,7 +136,6 @@ SpId spId; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxBndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -173,14 +170,14 @@ SpId spId; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxUbndReq +S16 cmPkUdxUbndReq ( Pst *pst, SpId spId, Reason reason ) #else -PUBLIC S16 cmPkUdxUbndReq(pst, spId, reason) +S16 cmPkUdxUbndReq(pst, spId, reason) Pst *pst; SpId spId; Reason reason; @@ -189,7 +186,6 @@ Reason reason; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxUbndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -224,23 +220,22 @@ Reason reason; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxBndCfm +S16 cmPkUdxBndCfm ( Pst *pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 cmPkUdxBndCfm(pst, suId, status) +S16 cmPkUdxBndCfm(pst, suId, status) Pst *pst; SuId suId; -U8 status; +uint8_t status; #endif { S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxBndCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -277,14 +272,14 @@ U8 status; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxCfgReq +S16 cmPkUdxCfgReq ( Pst *pst, SpId spId, RlcCfgInfo *cfgInfo ) #else -PUBLIC S16 cmPkUdxCfgReq(pst, spId, cfgInfo) +S16 cmPkUdxCfgReq(pst, spId, cfgInfo) Pst *pst; SpId spId; RlcCfgInfo *cfgInfo; @@ -293,7 +288,6 @@ RlcCfgInfo *cfgInfo; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxCfgReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -313,7 +307,7 @@ RlcCfgInfo *cfgInfo; #ifdef LCUDX case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)cfgInfo, sizeof(RlcCfgInfo),mBuf); + cmPkUdxStruct((uint8_t *)cfgInfo, sizeof(RlcCfgInfo),mBuf); /* Need Not free CfgInfo here as it is stored in UL */ break; @@ -347,14 +341,14 @@ RlcCfgInfo *cfgInfo; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxCfgCfm +S16 cmPkUdxCfgCfm ( Pst *pst, SuId suId, RlcCfgCfmInfo *cfgCfmInfo ) #else -PUBLIC S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo) +S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo) Pst *pst; SuId suId; RlcCfgCfmInfo *cfgCfmInfo; @@ -363,7 +357,6 @@ RlcCfgCfmInfo *cfgCfmInfo; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxCfgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -383,7 +376,7 @@ RlcCfgCfmInfo *cfgCfmInfo; #ifdef LCUDX case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo),mBuf); + cmPkUdxStruct((uint8_t *)cfgCfmInfo, sizeof(RlcCfgCfmInfo),mBuf); /* Need to free the cfgCfmInfo here as it is allocated buffer call SPutStaticBuffer */ SPutStaticBuffer(pst->region,pst->pool,(Data *) cfgCfmInfo, @@ -419,19 +412,19 @@ RlcCfgCfmInfo *cfgCfmInfo; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxUeIdChgReq +S16 cmPkUdxUeIdChgReq ( Pst *pst, SpId spId, -U32 transId, +uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo ) #else -PUBLIC S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo) +S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo) Pst *pst; SpId spId; -U32 transId; +uint32_t transId; CkwUeInfo *ueInfo; CkwUeInfo *newUeInfo; #endif @@ -439,7 +432,6 @@ CkwUeInfo *newUeInfo; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxUeIdChgReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -460,8 +452,8 @@ CkwUeInfo *newUeInfo; #ifdef LCUDX case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)newUeInfo, sizeof(CkwUeInfo),mBuf); - cmPkUdxStruct((U8 *)ueInfo, sizeof(CkwUeInfo),mBuf); + cmPkUdxStruct((uint8_t *)newUeInfo, sizeof(CkwUeInfo),mBuf); + cmPkUdxStruct((uint8_t *)ueInfo, sizeof(CkwUeInfo),mBuf); /* No need to free ueInfo here as it is stored */ break; } @@ -500,24 +492,23 @@ CkwUeInfo *newUeInfo; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxUeIdChgCfm +S16 cmPkUdxUeIdChgCfm ( Pst *pst, SuId suId, -U32 transId, +uint32_t transId, CmStatus status ) #else -PUBLIC S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status) +S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status) Pst *pst; SuId suId; -U32 transId; +uint32_t transId; CmStatus status; #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxUeIdChgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -556,26 +547,24 @@ CmStatus status; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxStaUpdCfm +S16 cmPkUdxStaUpdCfm ( Pst *pst, SuId suId, CmLteRlcId *rlcId, -KwUdxBufLst *pStaPdu +RlcUdxBufLst *pStaPdu ) #else -PUBLIC S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu) +S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu) Pst *pst; SuId suId; CmLteRlcId *rlcId; -KwUdxBufLst *pStaPdu; +RlcUdxBufLst *pStaPdu; #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdCfm) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -594,8 +583,8 @@ KwUdxBufLst *pStaPdu; { case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxBufLst),mBuf); - cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf); + cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxBufLst),mBuf); + cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf); break; } case UDX_SEL_LWLC: @@ -626,14 +615,14 @@ KwUdxBufLst *pStaPdu; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxStaProhTmrStart +S16 cmPkUdxStaProhTmrStart ( Pst *pst, SpId spId, CmLteRlcId *rlcId ) #else -PUBLIC S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId) +S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId) Pst *pst; SpId spId; CmLteRlcId *rlcId; @@ -642,8 +631,6 @@ CmLteRlcId *rlcId; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaProhTmrStart) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -662,7 +649,7 @@ CmLteRlcId *rlcId; { case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf); + cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf); break; } case UDX_SEL_LWLC: @@ -692,26 +679,24 @@ CmLteRlcId *rlcId; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxStaUpdReq +S16 cmPkUdxStaUpdReq ( Pst *pst, SpId spId, CmLteRlcId *rlcId, -KwUdxStaPdu *pStaPdu +RlcUdxStaPdu *pStaPdu ) #else -PUBLIC S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu) +S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu) Pst *pst; SpId spId; CmLteRlcId *rlcId; -KwUdxStaPdu *pStaPdu; +RlcUdxStaPdu *pStaPdu; #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -730,10 +715,10 @@ KwUdxStaPdu *pStaPdu; { case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxStaPdu),mBuf); - cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf); + cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxStaPdu),mBuf); + cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf); SPutStaticBuffer(pst->region,pst->pool,(Data *) pStaPdu, - sizeof(KwUdxStaPdu),0); + sizeof(RlcUdxStaPdu),0); break; } @@ -765,26 +750,24 @@ KwUdxStaPdu *pStaPdu; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxStaPduReq +S16 cmPkUdxStaPduReq ( Pst *pst, SpId spId, CmLteRlcId *rlcId, -KwUdxDlStaPdu *pStaPdu +RlcUdxDlStaPdu *pStaPdu ) #else -PUBLIC S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu) +S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu) Pst *pst; SpId spId; CmLteRlcId *rlcId; -KwUdxDlStaPdu *pStaPdu; +RlcUdxDlStaPdu *pStaPdu; #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -803,11 +786,11 @@ KwUdxDlStaPdu *pStaPdu; { case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxDlStaPdu),mBuf); - cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf); + cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxDlStaPdu),mBuf); + cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf); /* Free status Pdu here for LC */ SPutStaticBuffer(pst->region,pst->pool,(Data *) pStaPdu, - sizeof(KwUdxDlStaPdu),0); + sizeof(RlcUdxDlStaPdu),0); break; } case UDX_SEL_LWLC: @@ -836,22 +819,20 @@ KwUdxDlStaPdu *pStaPdu; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxL2MeasReq +S16 cmPkUdxL2MeasReq ( Pst *pst, -KwL2MeasReqEvt *measReqEvt +RlcL2MeasReqEvt *measReqEvt ) #else -PUBLIC S16 cmPkUdxL2MeasReq(pst, measReqEvt) +S16 cmPkUdxL2MeasReq(pst, measReqEvt) Pst *pst; -KwL2MeasReqEvt *measReqEvt; +RlcL2MeasReqEvt *measReqEvt; #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -870,7 +851,7 @@ KwL2MeasReqEvt *measReqEvt; { case UDX_SEL_LC: { - cmPkUdxStruct((U8 *)measReqEvt, sizeof(KwL2MeasReqEvt),mBuf); + cmPkUdxStruct((uint8_t *)measReqEvt, sizeof(RlcL2MeasReqEvt),mBuf); break; } case UDX_SEL_LWLC: @@ -896,22 +877,20 @@ KwL2MeasReqEvt *measReqEvt; * */ #ifdef ANSI -PUBLIC S16 cmPkUdxL2MeasSendReq +S16 cmPkUdxL2MeasSendReq ( Pst *pst, -U8 measType +uint8_t measType ) #else -PUBLIC S16 cmPkUdxL2MeasSendReq(pst, measReqEvt) +S16 cmPkUdxL2MeasSendReq(pst, measReqEvt) Pst *pst; -U8 measType +uint8_t measType #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasSendReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -952,22 +931,20 @@ U8 measType * */ #ifdef ANSI -PUBLIC S16 cmPkUdxL2MeasStopReq +S16 cmPkUdxL2MeasStopReq ( Pst *pst, -U8 measType +uint8_t measType ) #else -PUBLIC S16 cmPkUdxL2MeasStopReq(pst, measType) +S16 cmPkUdxL2MeasStopReq(pst, measType) Pst *pst; -U8 measType +uint8_t measType #endif { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasStopReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1015,14 +992,14 @@ U8 measType * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxBndReq +S16 cmUnpkUdxBndReq ( UdxBndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxBndReq(func, pst, mBuf) +S16 cmUnpkUdxBndReq(func, pst, mBuf) UdxBndReq func; Pst *pst; Buffer *mBuf; @@ -1031,8 +1008,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkUdxBndReq) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1054,14 +1029,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxUbndReq +S16 cmUnpkUdxUbndReq ( UdxUbndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxUbndReq(func, pst, mBuf) +S16 cmUnpkUdxUbndReq(func, pst, mBuf) UdxUbndReq func; Pst *pst; Buffer *mBuf; @@ -1070,8 +1045,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkUdxUbndReq) - CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1092,24 +1065,22 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxBndCfm +S16 cmUnpkUdxBndCfm ( UdxBndCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxBndCfm(func, pst, mBuf) +S16 cmUnpkUdxBndCfm(func, pst, mBuf) UdxBndCfm func; Pst *pst; Buffer *mBuf; #endif { SuId suId = 0; - U8 status = 0; + uint8_t status = 0; - TRC3(cmUnpkUdxBndCfm) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1132,14 +1103,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxCfgReq +S16 cmUnpkUdxCfgReq ( UdxCfgReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxCfgReq(func, pst, mBuf) +S16 cmUnpkUdxCfgReq(func, pst, mBuf) UdxCfgReq func; Pst *pst; Buffer *mBuf; @@ -1152,8 +1123,6 @@ Buffer *mBuf; RlcCfgInfo tmpCfgInfo; RlcCfgInfo *cfgInfo; /*stack Variable because it is not freed */ - TRC3(cmUnpkUdxCfgReq) - CMCHKUNPK(SUnpkS16, &(spId), mBuf); switch(pst->selector) { @@ -1161,7 +1130,7 @@ Buffer *mBuf; case UDX_SEL_LC: { #if(ERRCLASS & ERRCLS_DEBUG) - ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo)); + ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo)); if(ret1 != ROK) { SPutMsg(mBuf); @@ -1171,7 +1140,7 @@ Buffer *mBuf; return ( ret1 ); } #else - cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo)); + cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo)); #endif /* ERRCLASS & ERRCLS_DEBUG */ cfgInfo = &tmpCfgInfo; break; @@ -1203,14 +1172,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxCfgCfm +S16 cmUnpkUdxCfgCfm ( UdxCfgCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxCfgCfm(func, pst, mBuf) +S16 cmUnpkUdxCfgCfm(func, pst, mBuf) UdxCfgCfm func; Pst *pst; Buffer *mBuf; @@ -1220,8 +1189,6 @@ Buffer *mBuf; SuId suId = 0; RlcCfgCfmInfo *cfgCfmInfo = NULLP; - TRC3(cmUnpkUdxCfgCfm) - CMCHKUNPK(SUnpkS16, &suId, mBuf); switch(pst->selector) @@ -1243,7 +1210,7 @@ Buffer *mBuf; return (ret1); } - ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo)); + ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)cfgCfmInfo, sizeof(RlcCfgCfmInfo)); #if(ERRCLASS & ERRCLS_DEBUG) if(ret1 != ROK) { @@ -1282,29 +1249,26 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxUeIdChgReq +S16 cmUnpkUdxUeIdChgReq ( UdxUeIdChgReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf) +S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf) UdxUeIdChgReq func; Pst *pst; Buffer *mBuf; #endif { SpId spId = 0; - U32 transId = 0; + uint32_t transId = 0; CkwUeInfo tmpUeInfo; CkwUeInfo tmpNewUeInfo; CkwUeInfo *ueInfo; CkwUeInfo *newUeInfo; - TRC3(cmUnpkUdxUeIdChgReq) - - CMCHKUNPK(SUnpkS16, &(spId), mBuf); CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); @@ -1313,8 +1277,8 @@ Buffer *mBuf; #ifdef LCUDX case UDX_SEL_LC: { - cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpNewUeInfo, sizeof(CkwUeInfo)); - cmUnpkUdxStruct(mBuf,sizeof(CkwUeInfo),(U8 *)&tmpUeInfo, sizeof(CkwUeInfo)); + cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpNewUeInfo, sizeof(CkwUeInfo)); + cmUnpkUdxStruct(mBuf,sizeof(CkwUeInfo),(uint8_t *)&tmpUeInfo, sizeof(CkwUeInfo)); ueInfo = &tmpUeInfo; newUeInfo = &tmpNewUeInfo; @@ -1354,26 +1318,24 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxUeIdChgCfm +S16 cmUnpkUdxUeIdChgCfm ( UdxUeIdChgCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf) +S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf) UdxUeIdChgCfm func; Pst *pst; Buffer *mBuf; #endif { SuId suId = 0; - U32 transId = 0; + uint32_t transId = 0; CmStatus status; - TRC3(cmUnpkUdxUeIdChgCfm) - - cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus)); + memset(&status, 0, sizeof(CmStatus)); CMCHKUNPK(SUnpkS16, &suId, mBuf); CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); @@ -1400,14 +1362,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxStaUpdCfm +S16 cmUnpkUdxStaUpdCfm ( UdxStaUpdCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf) +S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf) UdxStaUpdCfm func; Pst *pst; Buffer *mBuf; @@ -1415,10 +1377,8 @@ Buffer *mBuf; { SuId suId = 0; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ - KwUdxBufLst *pBufLst = NULLP; /* KW_FIX*/ + RlcUdxBufLst *pBufLst = NULLP; /* KW_FIX*/ - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &suId, mBuf); switch (pst->selector) { @@ -1454,14 +1414,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxStaUpdReq +S16 cmUnpkUdxStaUpdReq ( UdxStaUpdReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxStaUpdReq(func, pst, mBuf) +S16 cmUnpkUdxStaUpdReq(func, pst, mBuf) UdxStaUpdReq func; Pst *pst; Buffer *mBuf; @@ -1469,19 +1429,17 @@ Buffer *mBuf; { SpId spId = 0; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ - KwUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */ + RlcUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */ S16 ret1; CmLteRlcId tmpRlcId; - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { case UDX_SEL_LC: { if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&pStaPdu, - sizeof(KwUdxStaPdu),0)) != ROK) + sizeof(RlcUdxStaPdu),0)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) if(ret1 != ROK) @@ -1493,8 +1451,8 @@ Buffer *mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)pStaPdu, sizeof(KwUdxStaPdu)); - ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId)); + ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)pStaPdu, sizeof(RlcUdxStaPdu)); + ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxStaPdu),(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId)); rlcId = &tmpRlcId; break; } @@ -1526,14 +1484,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxStaPduReq +S16 cmUnpkUdxStaPduReq ( UdxStaPduReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxStaPduReq(func, pst, mBuf) +S16 cmUnpkUdxStaPduReq(func, pst, mBuf) UdxStaPduReq func; Pst *pst; Buffer *mBuf; @@ -1543,17 +1501,15 @@ Buffer *mBuf; SpId spId = 0; CmLteRlcId tmpRlcId; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ - KwUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */ + RlcUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */ - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { case UDX_SEL_LC: { if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&pStaPdu, - sizeof(KwUdxDlStaPdu),0)) != ROK) + sizeof(RlcUdxDlStaPdu),0)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) if(ret1 != ROK) @@ -1565,8 +1521,8 @@ Buffer *mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - ret1 = cmUnpkUdxStruct(mBuf,0, (U8 *)pStaPdu, sizeof(KwUdxDlStaPdu)); - ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxDlStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId)); + ret1 = cmUnpkUdxStruct(mBuf,0, (uint8_t *)pStaPdu, sizeof(RlcUdxDlStaPdu)); + ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxDlStaPdu),(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId)); rlcId = &tmpRlcId; break; } @@ -1597,14 +1553,14 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxStaProhTmrStart +S16 cmUnpkUdxStaProhTmrStart ( UdxStaProhTmrStart func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf) +S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf) UdxStaProhTmrStart func; Pst *pst; Buffer *mBuf; @@ -1614,14 +1570,12 @@ Buffer *mBuf; CmLteRlcId tmpRlcId; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ - TRC3(cmUnpkUdxStaProhTmrStart) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { case UDX_SEL_LC: { - cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpRlcId,sizeof(CmLteRlcId)); + cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId)); rlcId = &tmpRlcId; break; } @@ -1651,29 +1605,27 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxL2MeasReq +S16 cmUnpkUdxL2MeasReq ( UdxL2MeasReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxL2MeasReq(func, pst, mBuf) +S16 cmUnpkUdxL2MeasReq(func, pst, mBuf) UdxL2MeasReq func; Pst *pst; Buffer *mBuf; #endif { - KwL2MeasReqEvt tmpMeasReqEvt; - KwL2MeasReqEvt *measReqEvt = NULLP; /* KW_FIX */ - - TRC3(cmUnpkUdxL2MeasReq) + RlcL2MeasReqEvt tmpMeasReqEvt; + RlcL2MeasReqEvt *measReqEvt = NULLP; /* KW_FIX */ switch (pst->selector) { case UDX_SEL_LC: { - cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpMeasReqEvt,sizeof(KwL2MeasReqEvt)); + cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpMeasReqEvt,sizeof(RlcL2MeasReqEvt)); measReqEvt = &tmpMeasReqEvt; break; } @@ -1700,22 +1652,20 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxL2MeasSendReq +S16 cmUnpkUdxL2MeasSendReq ( UdxL2MeasSendReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf) +S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf) UdxL2MeasSendReq func; Pst *pst; Buffer *mBuf; #endif { - U8 measType = 0; /* KW_FIX */ - - TRC3(cmUnpkUdxL2MeasSendReq) + uint8_t measType = 0; /* KW_FIX */ switch (pst->selector) { @@ -1743,22 +1693,20 @@ Buffer *mBuf; * */ #ifdef ANSI -PUBLIC S16 cmUnpkUdxL2MeasStopReq +S16 cmUnpkUdxL2MeasStopReq ( UdxL2MeasStopReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf) +S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf) UdxL2MeasSendReq func; Pst *pst; Buffer *mBuf; #endif { - U8 measType = 0; /* KW_FIX */ - - TRC3(cmUnpkUdxL2MeasStopReq) + uint8_t measType = 0; /* KW_FIX */ switch (pst->selector) {