File: kw_udx.c
*********************************************************************21*/
-
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services */
-#include "cm5.h" /* common timer defines */
-#include "cm_tkns.h" /* common tokens defines */
-#include "cm_mblk.h" /* common memory allocation library defines */
-#include "cm_llist.h" /* common link list defines */
-#include "cm_hash.h" /* common hash list defines */
-#include "cm_lte.h" /* common LTE defines */
+#include "common_def.h"
#include "lkw.h"
#include "kw_udx.h" /* UDX defines */
+#include "kw.h"
/* extern (.x) include files */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services */
-
-#include "cm5.x" /* common timer library */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_mblk.x" /* common memory allocation */
-#include "cm_llist.x" /* common link list */
-#include "cm_hash.x" /* common hash list */
-#include "cm_lte.x" /* common LTE includes */
-#include "cm_lib.x" /* common memory allocation library */
-#include "kw.h"
#include "lkw.x"
#include "kw_udx.x"
-#include <stdlib.h>
\f
#ifdef LCUDX
* File: ckw.c
*
*/
-#ifdef ANSI
-PRIVATE S16 cmUnpkUdxStruct
-(
-Buffer *srcMBuf,
-U32 offset,
-U8 *dstBuf,
-U32 size
-)
-#else
-PRIVATE S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size)
-Buffer *srcMBuf;
-U32 offset;
-U8 *dstBuf;
-MsgLen size;
-#endif
+static S16 cmUnpkUdxStruct(Buffer *srcMBuf,uint32_t offset,uint8_t *dstBuf,uint32_t size)
{
MsgLen tmpLen;
- TRC3(cmUnpkUdxStruct)
- RETVALUE(SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
+ return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
} /*end of function cmPkUdxBndReq*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PRIVATE S16 cmPkUdxStruct
-(
-U8 *srcBuf,
-MsgLen size,
-Buffer *dstMBuf
-)
-#else
-PRIVATE S16 cmPkUdxStruct(dstMBuf,srcBuf,size)
-U8 *srcBuf;
-MsgLen size;
-Buffer *dstMBuf;
-#endif
+static S16 cmPkUdxStruct(uint8_t *srcBuf,MsgLen size,Buffer *dstMBuf)
{
- TRC3(cmPkUdxStruct)
- RETVALUE(SAddPstMsgMult(srcBuf,size,dstMBuf));
+ return (SAddPstMsgMult(srcBuf,size,dstMBuf));
} /*end of function cmPkUdxBndReq*/
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxBndReq
-(
-Pst *pst,
-SuId suId,
-SpId spId
-)
-#else
-PUBLIC S16 cmPkUdxBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
+S16 cmPkUdxBndReq(Pst *pst,SuId suId,SpId spId)
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkUdxBndReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_BND_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
} /*end of function cmPkUdxBndReq*/
\f
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUbndReq
-(
-Pst *pst,
-SpId spId,
-Reason reason
-)
-#else
-PUBLIC S16 cmPkUdxUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
+S16 cmPkUdxUbndReq(Pst *pst,SpId spId,Reason reason)
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkUdxUbndReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
CMCHKPKLOG(SPkS16, reason, mBuf, EUDXXXX, pst);
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_UBND_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
} /*end of function cmPkUdxUbndReq*/
\f
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxBndCfm
-(
-Pst *pst,
-SuId suId,
-U8 status
-)
-#else
-PUBLIC S16 cmPkUdxBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-U8 status;
-#endif
+S16 cmPkUdxBndCfm(Pst *pst,SuId suId,uint8_t status)
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkUdxBndCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
- CMCHKPKLOG(SPkU8, status, mBuf, EUDXXXX, pst);
+ CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EUDXXXX, pst);
CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_BND_CFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
} /*end of function cmPkUdxBndCfm*/
\f
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxCfgReq
-(
-Pst *pst,
-SpId spId,
-CkwCfgInfo *cfgInfo
-)
-#else
-PUBLIC S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
-Pst *pst;
-SpId spId;
-CkwCfgInfo *cfgInfo;
-#endif
+S16 cmPkUdxCfgReq(Pst *pst,SpId spId,RlcCfgInfo *cfgInfo)
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkUdxCfgReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch(pst->selector)
#ifdef LCUDX
case UDX_SEL_LC:
{
- cmPkUdxStruct((U8 *)cfgInfo, sizeof(CkwCfgInfo),mBuf);
+ cmPkUdxStruct((uint8_t *)cfgInfo, sizeof(RlcCfgInfo),mBuf);
/* Need Not free CfgInfo here as it is stored
in UL */
break;
}
case UDX_SEL_LWLC:
{
- CMCHKPKLOG(cmPkPtr,(PTR)cfgInfo,mBuf,EUDXXXX,pst);
+ CMCHKPKLOG(oduPackPointer,(PTR)cfgInfo,mBuf,EUDXXXX,pst);
break;
}
#endif /* LCUDX */
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_CFG_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
} /* cmPkUdxCfgReq */
\f
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxCfgCfm
-(
-Pst *pst,
-SuId suId,
-CkwCfgCfmInfo *cfgCfmInfo
-)
-#else
-PUBLIC S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
-Pst *pst;
-SuId suId;
-CkwCfgCfmInfo *cfgCfmInfo;
-#endif
+S16 cmPkUdxCfgCfm(Pst *pst,SuId suId,RlcCfgCfmInfo *cfgCfmInfo)
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkUdxCfgCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch(pst->selector)
#ifdef LCUDX
case UDX_SEL_LC:
{
- cmPkUdxStruct((U8 *)cfgCfmInfo, sizeof(CkwCfgCfmInfo),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,
- sizeof(CkwCfgCfmInfo),0);
+ sizeof(RlcCfgCfmInfo),0);
break;
}
case UDX_SEL_LWLC:
{
- CMCHKPKLOG(cmPkPtr,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst);
+ CMCHKPKLOG(oduPackPointer,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst);
break;
}
#endif /* LCUDX */
CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_CFG_CFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
} /* cmPkUdxCfgCfm */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgReq
+S16 cmPkUdxUeIdChgReq
(
-Pst *pst,
-SpId spId,
-U32 transId,
-CkwUeInfo *ueInfo,
-CkwUeInfo *newUeInfo
+Pst *pst,
+SpId spId,
+uint32_t transId,
+CkwUeInfo *ueInfo,
+CkwUeInfo *newUeInfo
)
-#else
-PUBLIC S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst *pst;
-SpId spId;
-U32 transId;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-#endif
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxUeIdChgReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch(pst->selector)
#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;
}
case UDX_SEL_LWLC:
{
- CMCHKPKLOG(cmPkPtr,(PTR)newUeInfo,mBuf,EUDXXXX,pst);
- CMCHKPKLOG(cmPkPtr,(PTR)ueInfo,mBuf,EUDXXXX,pst);
+ CMCHKPKLOG(oduPackPointer,(PTR)newUeInfo,mBuf,EUDXXXX,pst);
+ CMCHKPKLOG(oduPackPointer,(PTR)ueInfo,mBuf,EUDXXXX,pst);
break;
}
default:
}
#endif
}
- CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst);
+ CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_UEIDCHG_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxUeIdChgReq */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgCfm
-(
-Pst *pst,
-SuId suId,
-U32 transId,
-CmStatus status
-)
-#else
-PUBLIC S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status)
-Pst *pst;
-SuId suId;
-U32 transId;
-CmStatus status;
-#endif
+S16 cmPkUdxUeIdChgCfm(Pst *pst,SuId suId,uint32_t transId,CmStatus status)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxUeIdChgCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
CMCHKPK(cmPkCmStatus, &status, mBuf);
- CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst);
+ CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_UEIDCHG_CFM;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxUeIdChgCfm */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdCfm
-(
-Pst *pst,
-SuId suId,
-CmLteRlcId *rlcId,
-KwUdxBufLst *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu)
-Pst *pst;
-SuId suId;
-CmLteRlcId *rlcId;
-KwUdxBufLst *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdCfm(Pst *pst,SuId suId,CmLteRlcId *rlcId,RlcUdxBufLst *pStaPdu)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxStaUpdCfm)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
{
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:
{
- CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
- CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf);
break;
}
}
CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_STA_UPD_CFM;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxStaUpdCfm */
* File: Kw_udx.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaProhTmrStart
-(
-Pst *pst,
-SpId spId,
-CmLteRlcId *rlcId
-)
-#else
-PUBLIC S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId)
-Pst *pst;
-SpId spId;
-CmLteRlcId *rlcId;
-#endif
+S16 cmPkUdxStaProhTmrStart(Pst *pst,SpId spId,CmLteRlcId *rlcId)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxStaProhTmrStart)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
{
case UDX_SEL_LC:
{
- cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
+ cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf);
break;
}
case UDX_SEL_LWLC:
{
- CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf);
break;
}
}
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_STA_PHBT_TMR_START;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxStaProhTmrStart */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdReq
-(
-Pst *pst,
-SpId spId,
-CmLteRlcId *rlcId,
-KwUdxStaPdu *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu)
-Pst *pst;
-SpId spId;
-CmLteRlcId *rlcId;
-KwUdxStaPdu *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxStaPdu *pStaPdu)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxStaUpdReq)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
{
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;
}
case UDX_SEL_LWLC:
{
- CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
- CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf);
break;
}
}
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_STA_UPD_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxStaUpdReq */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaPduReq
-(
-Pst *pst,
-SpId spId,
-CmLteRlcId *rlcId,
-KwUdxDlStaPdu *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu)
-Pst *pst;
-SpId spId;
-CmLteRlcId *rlcId;
-KwUdxDlStaPdu *pStaPdu;
-#endif
+S16 cmPkUdxStaPduReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxDlStaPdu *pStaPdu)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxStaUpdReq)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
{
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:
{
- CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
- CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf);
break;
}
}
CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
pst->event = (Event) UDX_EVT_STA_PDU_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxStaUpdReq */
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasReq
-(
-Pst *pst,
-KwL2MeasReqEvt *measReqEvt
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasReq(pst, measReqEvt)
-Pst *pst;
-KwL2MeasReqEvt *measReqEvt;
-#endif
+S16 cmPkUdxL2MeasReq(Pst *pst,RlcL2MeasReqEvt *measReqEvt)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxL2MeasReq)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
{
case UDX_SEL_LC:
{
- cmPkUdxStruct((U8 *)measReqEvt, sizeof(KwL2MeasReqEvt),mBuf);
+ cmPkUdxStruct((uint8_t *)measReqEvt, sizeof(RlcL2MeasReqEvt),mBuf);
break;
}
case UDX_SEL_LWLC:
{
- CMCHKPK(cmPkPtr,(PTR) measReqEvt, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) measReqEvt, mBuf);
break;
}
}
pst->event = (Event) UDX_EVT_L2MEAS_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
} /* cmPkUdxStaUpdReq */
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasSendReq
-(
-Pst *pst,
-U8 measType
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasSendReq(pst, measReqEvt)
-Pst *pst;
-U8 measType
-#endif
+S16 cmPkUdxL2MeasSendReq(Pst *pst,uint8_t measType)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxL2MeasSendReq)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
case UDX_SEL_LC:
case UDX_SEL_LWLC:
{
- CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst);
+ CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
break;
}
}
pst->event = (Event) UDX_EVT_L2MEAS_SEND_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
}
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasStopReq
-(
-Pst *pst,
-U8 measType
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasStopReq(pst, measType)
-Pst *pst;
-U8 measType
-#endif
+S16 cmPkUdxL2MeasStopReq(Pst *pst,uint8_t measType)
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkUdxL2MeasStopReq)
-
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
switch (pst->selector)
case UDX_SEL_LC:
case UDX_SEL_LWLC:
{
- CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst);
+ CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
break;
}
}
pst->event = (Event) UDX_EVT_L2MEAS_STOP_REQ;
- RETVALUE(SPstTsk(pst, mBuf));
+ return (SPstTsk(pst, mBuf));
}
#endif
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndReq
-(
-UdxBndReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxBndReq(func, pst, mBuf)
-UdxBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxBndReq(UdxBndReq func,Pst *pst,Buffer *mBuf)
{
SuId suId = 0;
SpId spId = 0;
- TRC3(cmUnpkUdxBndReq)
-
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, spId));
+ return ((*func)(pst, suId, spId));
} /*end of function cmUnpkUdxBndReq*/
\f
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUbndReq
-(
-UdxUbndReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUbndReq(func, pst, mBuf)
-UdxUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxUbndReq(UdxUbndReq func,Pst *pst,Buffer *mBuf)
{
SpId spId = 0;
Reason reason = 0;
- TRC3(cmUnpkUdxUbndReq)
-
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, reason));
+ return ((*func)(pst, spId, reason));
} /*end of function cmUnpkUdxUbndReq*/
\f
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndCfm
-(
-UdxBndCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxBndCfm(func, pst, mBuf)
-UdxBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxBndCfm(UdxBndCfm func,Pst *pst,Buffer *mBuf)
{
SuId suId = 0;
- U8 status = 0;
+ uint8_t status = 0;
- TRC3(cmUnpkUdxBndCfm)
-
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
- CMCHKUNPKLOG(SUnpkU8, &status, mBuf, EUDXXXX, pst);
+ CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, status));
+ return ((*func)(pst, suId, status));
} /*end of function cmUnpkUdxBndCfm*/
\f
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgReq
-(
-UdxCfgReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxCfgReq(func, pst, mBuf)
-UdxCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxCfgReq(UdxCfgReq func,Pst *pst,Buffer *mBuf)
{
#if(ERRCLASS & ERRCLS_DEBUG)
S16 ret1;
#endif /* ERRCLASS & ERRCLS_DEBUG */
SpId spId = 0;
- CkwCfgInfo tmpCfgInfo;
- CkwCfgInfo *cfgInfo; /*stack Variable because it is not freed */
+ RlcCfgInfo tmpCfgInfo;
+ RlcCfgInfo *cfgInfo; /*stack Variable because it is not freed */
- TRC3(cmUnpkUdxCfgReq)
-
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
switch(pst->selector)
{
case UDX_SEL_LC:
{
#if(ERRCLASS & ERRCLS_DEBUG)
- ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(CkwCfgInfo));
+ ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo));
if(ret1 != ROK)
{
SPutMsg(mBuf);
SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
(ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure");
- RETVALUE( ret1 );
+ return ( ret1 );
}
#else
- cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(CkwCfgInfo));
+ cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo));
#endif /* ERRCLASS & ERRCLS_DEBUG */
cfgInfo = &tmpCfgInfo;
break;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgInfo, mBuf);
break;
}
#endif /* LCUDX */
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, cfgInfo));
+ return ((*func)(pst, spId, cfgInfo));
} /* cmUnpkUdxCfgReq */
\f
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgCfm
-(
-UdxCfgCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxCfgCfm(func, pst, mBuf)
-UdxCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxCfgCfm(UdxCfgCfm func,Pst *pst,Buffer *mBuf)
{
S16 ret1;
SuId suId = 0;
- CkwCfgCfmInfo *cfgCfmInfo = NULLP;
+ RlcCfgCfmInfo *cfgCfmInfo = NULLP;
- TRC3(cmUnpkUdxCfgCfm)
-
CMCHKUNPK(SUnpkS16, &suId, mBuf);
switch(pst->selector)
case UDX_SEL_LC:
{
if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
- sizeof(CkwCfgCfmInfo),0)) != ROK)
+ sizeof(RlcCfgCfmInfo),0)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if(ret1 != ROK)
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
- ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(CkwCfgCfmInfo));
+ ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)cfgCfmInfo, sizeof(RlcCfgCfmInfo));
#if(ERRCLASS & ERRCLS_DEBUG)
if(ret1 != ROK)
{
SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
(ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure");
- RETVALUE( ret1 );
+ return ( ret1 );
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
break;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgCfmInfo, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgCfmInfo, mBuf);
break;
}
#endif /* LCUDX */
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, cfgCfmInfo));
+ return ((*func)(pst, suId, cfgCfmInfo));
} /* cmUnpkUdxCfgCfm */
/*
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgReq
-(
-UdxUeIdChgReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf)
-UdxUeIdChgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgReq(UdxUeIdChgReq func,Pst *pst,Buffer *mBuf)
{
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(SUnpkU32, &transId, mBuf, EUDXXXX, pst);
+ CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
switch(pst->selector)
{
#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;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &ueInfo, mBuf);
- CMCHKUNPK(cmUnpkPtr,(PTR *) &newUeInfo, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &ueInfo, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &newUeInfo, mBuf);
break;
}
default:
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo));
+ return ((*func)(pst, spId, transId, ueInfo, newUeInfo));
} /* cmUnpkUdxUeIdChgReq */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgCfm
-(
-UdxUeIdChgCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf)
-UdxUeIdChgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgCfm(UdxUeIdChgCfm func,Pst *pst,Buffer *mBuf)
{
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(SUnpkU32, &transId, mBuf, EUDXXXX, pst);
+ CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
CMCHKUNPK(cmUnpkCmStatus, &status, mBuf);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, transId, status));
+ return ((*func)(pst, suId, transId, status));
} /* cmUnpkUdxUeIdChgCfm */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdCfm
-(
-UdxStaUpdCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf)
-UdxStaUpdCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdCfm(UdxStaUpdCfm func,Pst *pst,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)
{
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
- CMCHKUNPK(cmUnpkPtr, (PTR *)&pBufLst,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&pBufLst,mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, rlcId, pBufLst));
+ return ((*func)(pst, suId, rlcId, pBufLst));
} /* cmUnpkUdxUeIdChgCfm */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdReq
-(
-UdxStaUpdReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaUpdReq(func, pst, mBuf)
-UdxStaUpdReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdReq(UdxStaUpdReq func,Pst *pst,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)
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ 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;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
- CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, rlcId, pStaPdu));
+ return ((*func)(pst, spId, rlcId, pStaPdu));
} /* cmUnpkUdxUeIdChgCfm */
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaPduReq
-(
-UdxStaPduReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaPduReq(func, pst, mBuf)
-UdxStaPduReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxStaPduReq(UdxStaPduReq func,Pst *pst,Buffer *mBuf)
{
S16 ret1;
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)
(ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ 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;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
- CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, rlcId, pStaPdu));
+ return ((*func)(pst, spId, rlcId, pStaPdu));
} /* cmUnpkUdxUeIdChgCfm */
* File: kw_udx.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaProhTmrStart
-(
-UdxStaProhTmrStart func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf)
-UdxStaProhTmrStart func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxStaProhTmrStart(UdxStaProhTmrStart func,Pst *pst,Buffer *mBuf)
{
SpId spId = 0;
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;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, rlcId));
+ return ((*func)(pst, spId, rlcId));
} /* cmUnpkUdxStaProhTmrStart */
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasReq
-(
-UdxL2MeasReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasReq(func, pst, mBuf)
-UdxL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasReq(UdxL2MeasReq func,Pst *pst,Buffer *mBuf)
{
- 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;
}
case UDX_SEL_LWLC:
{
- CMCHKUNPK(cmUnpkPtr, (PTR *)&measReqEvt,mBuf);
+ CMCHKUNPK(oduUnpackPointer, (PTR *)&measReqEvt,mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measReqEvt));
+ return ((*func)(pst, measReqEvt));
} /* cmUnpkUdxL2MeasReq */
/*
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasSendReq
-(
-UdxL2MeasSendReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf)
-UdxL2MeasSendReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasSendReq(UdxL2MeasSendReq func,Pst *pst,Buffer *mBuf)
{
- U8 measType = 0; /* KW_FIX */
-
- TRC3(cmUnpkUdxL2MeasSendReq)
+ uint8_t measType = 0; /* KW_FIX */
switch (pst->selector)
{
case UDX_SEL_LC:
case UDX_SEL_LWLC:
{
- CMCHKUNPK(SUnpkU8, &measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measType, mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measType));
+ return ((*func)(pst, measType));
} /* cmUnpkUdxL2MeasReq */
/*
*
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasStopReq
-(
-UdxL2MeasStopReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf)
-UdxL2MeasSendReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasStopReq(UdxL2MeasStopReq func,Pst *pst,Buffer *mBuf)
{
- U8 measType = 0; /* KW_FIX */
-
- TRC3(cmUnpkUdxL2MeasStopReq)
+ uint8_t measType = 0; /* KW_FIX */
switch (pst->selector)
{
case UDX_SEL_LC:
case UDX_SEL_LWLC:
{
- CMCHKUNPK(SUnpkU8, &measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measType, mBuf);
break;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measType));
+ return ((*func)(pst, measType));
} /* cmUnpkUdxL2MeasStopReq */
#endif
#endif /* LCUDX */
Code Review / o-du / l2.git / blobdiff