*/
/* header include files (.h) */
-#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 "cm_tkns.h" /* Common Token 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 "rgu.h" /* RGU Interface defines */
/* header/extern include files (.x) */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services */
-#include "cm_tkns.x" /* Common Token Definitions */
-#include "cm_llist.x" /* Common Link List Definitions */
-#include "cm_lib.x" /* Common Library Definitions */
-#include "cm_hash.x" /* Common Hash List Definitions */
-#include "cm_lte.x" /* Common LTE Defines */
#include "rgu.x" /* RGU Interface includes */
#ifdef SS_RBUF
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguBndReq
+S16 cmPkRguBndReq
(
Pst* pst,
SuId suId,
SpId spId
)
-#else
-PUBLIC S16 cmPkRguBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
{
Buffer *mBuf = NULLP;
- TRC3(cmPkRguBndReq)
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU001, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU002, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU003, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTRGUBNDREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguBndReq
+S16 cmUnpkRguBndReq
(
RguBndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguBndReq(func, pst, mBuf)
-RguBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SuId suId;
SpId spId;
-
- TRC3(cmUnpkRguBndReq)
if (SUnpkS16(&suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU004, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SUnpkS16(&spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU005, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, spId));
+ return ((*func)(pst, suId, spId));
}
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguUbndReq
+S16 cmPkRguUbndReq
(
Pst* pst,
SpId spId,
Reason reason
)
-#else
-PUBLIC S16 cmPkRguUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
{
Buffer *mBuf = NULLP;
- TRC3(cmPkRguUbndReq)
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU006, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(reason, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU007, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU008, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTRGUUBNDREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguUbndReq
+S16 cmUnpkRguUbndReq
(
RguUbndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguUbndReq(func, pst, mBuf)
-RguUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SpId spId;
Reason reason;
- TRC3(cmUnpkRguUbndReq)
if (SUnpkS16(&spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU009, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SUnpkS16(&reason, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU010, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, reason));
+ return ((*func)(pst, spId, reason));
}
\f
*
* @param[in] Pst* pst
* @param[in] SuId suId
-* @param[in] U8 status
+* @param[in] uint8_t status
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguBndCfm
+S16 cmPkRguBndCfm
(
Pst* pst,
SuId suId,
-U8 status
+uint8_t status
)
-#else
-PUBLIC S16 cmPkRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
{
Buffer *mBuf = NULLP;
- TRC3(cmPkRguBndCfm)
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU011, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU8(status, mBuf) != ROK) {
+ if (oduUnpackUInt8(status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU012, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU013, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTRGUBNDCFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
*
* @param[in] Pst* pst
* @param[in] SuId suId
-* @param[in] U8 status
+* @param[in] uint8_t status
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguBndCfm
+S16 cmUnpkRguBndCfm
(
RguBndCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguBndCfm(func, pst, mBuf)
-RguBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SuId suId;
- U8 status;
-
- TRC3(cmUnpkRguBndCfm)
+ uint8_t status;
if (SUnpkS16(&suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU014, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU8(&status, mBuf) != ROK) {
+ if (oduPackUInt8(&status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU015, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, status));
-}
-
-\f
-/**
-* @brief Request from RLC to MAC for forwarding SDUs on
- * dedicated channel for transmission
-*
-* @details
-*
-* Function : packDlData
-*
-* @param[in] Pst* pst
-* @param[in] SpId spId
-* @param[in] RguDDatReqInfo * datReq
-* @return S16
-* -# ROK
-**/
-PUBLIC uint16_t packDlData
-(
-Pst* pst,
-SpId spId,
-RlcMacData *dlData
-)
-{
- Buffer *mBuf = NULLP;
- TRC3(packDlData)
-
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU022, (ErrVal)0, "Packing failed");
-#endif
- SPutSBuf(pst->region, pst->pool, (Data *)dlData, sizeof(RlcMacData));
- RETVALUE(RFAILED);
- }
-
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKPK(cmPkPtr,(PTR) dlData, mBuf);
- }
- else
- {
- /*rgu_c_001.main_5 - ADD - L2M Support */
-#ifdef LTE_L2_MEAS
- if (packRlcMacDataInfo(pst, dlData, mBuf) != ROK)
-#else
- if (packRlcMacDataInfo(dlData, mBuf) != ROK)
-#endif
- {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU023, (ErrVal)0, "Packing failed");
-#endif
- SPutSBuf(pst->region, pst->pool, (Data *)dlData,
- sizeof(RlcMacData));
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- if (SPutSBuf(pst->region, pst->pool,
- (Data *)dlData, sizeof(RlcMacData)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU025, (ErrVal)0, "Packing failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- dlData = NULLP;
- }
- if (SPkS16(spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU024, (ErrVal)0, "Packing failed");
-#endif
- if (dlData != NULLP);
- {
- SPutSBuf(pst->region, pst->pool,
- (Data *)dlData, sizeof(RlcMacData));
- }
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- pst->event = (Event) EVTRLCDLDAT;
- RETVALUE(SPstTsk(pst,mBuf));
-}
-
-\f
-/**
-* @brief Request from RLC to MAC for forwarding SDUs on
- * dedicated channel for transmission
-*
-* @details
-*
-* Function : unpackDlData
-*
-* @param[in] Pst* pst
-* @param[in] SpId spId
-* @param[in] RguDDatReqInfo * datReq
-* @return S16
-* -# ROK
-**/
-PUBLIC S16 unpackDlData
-(
-RlcMacDlData func,
-Pst *pst,
-Buffer *mBuf
-)
-{
- SpId spId;
- RlcMacData *dlData;
-
- TRC3(unpackDlData)
-
- if (SUnpkS16(&spId, mBuf) != ROK) {
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKUNPK(cmUnpkPtr,(PTR *) &dlData, mBuf);
- }
- else
- {
- if ((SGetSBuf(pst->region, pst->pool,
- (Data **)&dlData, sizeof(RlcMacData))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU026, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- cmMemset((U8*)dlData, (U8)0, sizeof(RlcMacData));
- /*rgu_c_001.main_5 - ADD - L2M Support */
-#ifdef LTE_L2_MEAS
- if (unpackRlcMacDataInfo(pst,dlData, mBuf) != ROK)
-#else
- if (unpackRlcMacDataInfo(dlData, mBuf) != ROK)
-#endif
- {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU027, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- SPutSBuf(pst->region, pst->pool, (Data *)dlData,
- sizeof(RlcMacData));
- RETVALUE(RFAILED);
- }
- }
- SPutMsg(mBuf);
-
- /* TODO : change function call to send RlcMacData as below: */
- RETVALUE((*func)(pst, spId, dlData));
-
- //RETVALUE((*func)(pst, spId, datReq));
-}
-
-\f
-/**
-* @brief Data Indication from MAC to RLC to
- * forward the data received for dedicated channels
-*
-* @details
-*
-* Function : packRcvdUlData
-*
-* @param[in] Pst* pst
-* @param[in] SuId suId
-* @param[in] RlcMacData *ulData
-* @return S16
-* -# ROK
-**/
-#ifdef ANSI
-PUBLIC S16 packRcvdUlData
-(
-Pst* pst,
-SuId suId,
-RlcMacData *ulData
-)
-#else
-PUBLIC S16 packRcvdUlData(pst, suId, ulData)
-Pst* pst;
-SuId suId;
-RlcMacData *ulData;
-#endif
-{
- Buffer *mBuf = NULLP;
- TRC3(packRcvdUlData)
-
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU035, (ErrVal)0, "Packing failed");
-#endif
- SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0);
- RETVALUE(RFAILED);
- }
-
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKPK(cmPkPtr,(PTR)ulData, mBuf);
- }
- else
- {
- if (packRlcMacDataInfo(ulData, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU036, (ErrVal)0, "Packing failed");
-#endif
- SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0);
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- if (SPutStaticBuffer(pst->region, pst->pool,
- (Data *)ulData, sizeof(RlcMacData),0) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU038, (ErrVal)0, "Packing failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- ulData = NULLP;
- }
- if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU037, (ErrVal)0, "Packing failed");
-#endif
- SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0);
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- pst->event = (Event) EVTRLCULDAT;
- RETVALUE(SPstTsk(pst,mBuf));
-}
-
-\f
-/**
-* @brief Data Indication from MAC to RLC to
- * forward the data received for dedicated channels
-*
-* @details
-*
-* Function : unpackRcvdUlData
-*
-* @param[in] Pst* pst
-* @param[in] SuId suId
-* @param[in] RlcMacData *ulData
-* @return S16
-* -# ROK
-**/
-PUBLIC S16 unpackRcvdUlData
-(
-RlcMacUlData func,
-Pst *pst,
-Buffer *mBuf
-)
-{
- SuId suId;
- RlcMacData *ulData;
-
- TRC3(unpackRcvdUlData)
-
- if (SUnpkS16(&suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU039, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKUNPK(cmUnpkPtr,(PTR *) &ulData, mBuf);
- }
- else
- {
- if ((SGetStaticBuffer(pst->region, pst->pool,
- (Data **)&ulData, sizeof(RlcMacData),0)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU040, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- if (unpackRlcMacDataInfo(ulData, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU041, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- SPutStaticBuffer(pst->region, pst->pool,
- (Data *)ulData, sizeof(RlcMacData),0);
- RETVALUE(RFAILED);
- }
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, ulData));
+ return ((*func)(pst, suId, status));
}
-
/*rgu_c_001.main_5 - ADD - L2M & R9 Support */
#ifdef LTE_L2_MEAS
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguL2MUlThrpMeasReqInfo
+S16 cmPkRguL2MUlThrpMeasReqInfo
(
RguL2MUlThrpMeasReqInfo* param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguL2MUlThrpMeasReqInfo(param, mBuf)
-RguL2MUlThrpMeasReqInfo* param;
-Buffer *mBuf;
-#endif
{
S32 loop;
- TRC3(cmPkRguL2MUlThrpMeasReqInfo);
- CMCHKPK(SPkU8, param->enbMeas, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->enbMeas, mBuf);
for (loop=param->numLcId-1; loop >= 0; loop--)
{
- CMCHKPK(SPkU8, param->lcId[loop], mBuf);
+ CMCHKPK(oduUnpackUInt8, param->lcId[loop], mBuf);
}
CMCHKPK(cmPkLteLcId, param->numLcId, mBuf);
CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguL2MUlThrpMeasReqInfo
+S16 cmUnpkRguL2MUlThrpMeasReqInfo
(
RguL2MUlThrpMeasReqInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguL2MUlThrpMeasReqInfo(param, mBuf)
-RguL2MUlThrpMeasReqInfo *param;
-Buffer *mBuf;
-#endif
{
- U8 loop;
- TRC3(cmUnpkRguL2MUlThrpMeasReqInfo);
+ uint8_t loop;
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf);
CMCHKUNPK(cmUnpkLteLcId, ¶m->numLcId, mBuf);
for (loop=0; loop<param->numLcId; loop++)
{
- CMCHKUNPK(SUnpkU8, ¶m->lcId[loop], mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->lcId[loop], mBuf);
}
- CMCHKUNPK(SUnpkU8, ¶m->enbMeas, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->enbMeas, mBuf);
+ return ROK;
}
/**
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguL2MUlThrpMeasReq
+S16 cmPkRguL2MUlThrpMeasReq
(
Pst* pst,
SpId spId,
RguL2MUlThrpMeasReqInfo* measReq
)
-#else
-PUBLIC S16 cmPkRguL2MUlThrpMeasReq(pst, spId, measReq)
-Pst* pst;
-SpId spId;
-RguL2MUlThrpMeasReqInfo* measReq;
-#endif
{
Buffer *mBuf = NULLP;
- TRC3(cmPkRguL2MUlThrpMeasReq)
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU049, (ErrVal)0, "Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKPK(cmPkPtr,(PTR) measReq, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) measReq, mBuf);
}
else
{
SPutSBuf(pst->region, pst->pool, (Data *)measReq,
sizeof(RguL2MUlThrpMeasReqInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPutSBuf(pst->region, pst->pool, (Data *)measReq,
sizeof(RguL2MUlThrpMeasReqInfo)) != ROK) {
(ErrVal)ERGU052, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
measReq = NULLP;
}
sizeof(RguL2MUlThrpMeasReqInfo));
}
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTRGUL2MULTHRPMEASREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguL2MUlThrpMeasReq
+S16 cmUnpkRguL2MUlThrpMeasReq
(
RguL2MUlThrpMeasReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguL2MUlThrpMeasReq(func, pst, mBuf)
-RguL2MUlThrpMeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SpId spId;
RguL2MUlThrpMeasReqInfo* measReq;
- TRC3(cmUnpkRguL2MUlThrpMeasReq)
if (SUnpkS16(&spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU053, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &measReq, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &measReq, mBuf);
}
else
{
(ErrVal)ERGU054, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SPutMsg(mBuf);
SPutSBuf(pst->region, pst->pool, (Data *)measReq,
sizeof(RguL2MUlThrpMeasReqInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, measReq));
+ return ((*func)(pst, spId, measReq));
}
#endif
-
-\f
-/**
-* @brief Primitive invoked from RLC to MAC to
- * inform the BO report for dedicated channels
-*
-* @details
-*
-* Function : packBOStatus,
-*
-* @param[in] Pst* pst
-* @param[in] SpId spId
-* @param[in] RlcMacBOStatus * staRsp
-* @return S16
-* -# ROK
-**/
-PUBLIC uint16_t packBOStatus
-(
-Pst* pst,
-SpId spId,
-RlcMacBOStatus *boStatus
-)
-{
- RlcMacBOStatus *boStaInfo = NULL;
- Buffer *mBuf = NULLP;
-
- if(SGetSBuf(pst->region, pst->pool, (Data **)&boStaInfo, sizeof(RlcMacBOStatus)) != ROK)
- {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU056, (ErrVal)0, "Packing failed");
-#endif
- RETVALUE(RFAILED);
- }
-#ifdef ERRCLS_KW
- /* boStaInfo cant be NULL here */
- if (boStaInfo == NULLP)
- {
- RETVALUE(RFAILED);
- }
-#endif
- cmMemcpy((U8 *)boStaInfo, (U8 *)boStatus, sizeof(RlcMacBOStatus));
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU056, (ErrVal)0, "Packing failed");
-#endif
- SPutSBuf(pst->region, pst->pool, (Data *)boStaInfo, sizeof(RlcMacBOStatus));
-
- RETVALUE(RFAILED);
- }
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKPK(cmPkPtr,(PTR) boStaInfo, mBuf);
- }
- else
- {
- if (packBOStatusInfo(boStatus, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU057, (ErrVal)0, "Packing failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- }
- if (SPkS16(spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU058, (ErrVal)0, "Packing failed");
-#endif
- if (boStaInfo != NULLP)
- {
- SPutSBuf(pst->region, pst->pool, (Data *)boStaInfo, sizeof(RlcMacBOStatus));
- }
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- pst->event = (Event)EVTRLCBOSTA;
- RETVALUE(SPstTsk(pst,mBuf));
- SPutMsg(mBuf);
-}
-
-\f
-/**
-* @brief Primitive invoked from RLC to MAC to
-* inform the BO report for dedicated channels
-*
-* @details
-*
-* Function : unpackBOStatus
-*
-* @param[in] Pst* pst
-* @param[in] SpId spId
-* @param[in] RlcMacBOStatus * staRsp
-* @return S16
-* -# ROK
-**/
-PUBLIC uint16_t unpackBOStatus
-(
-RlcMacBoStatus func,
-Pst *pst,
-Buffer *mBuf
-)
-{
- SpId spId;
- RlcMacBOStatus *boSta;
-
- TRC3(unpackBOStatus)
-
- if (SUnpkS16(&spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU060, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKUNPK(cmUnpkPtr,(PTR *) &boSta, mBuf);
- }
- else
- {
- if ((SGetSBuf(pst->region, pst->pool, (Data **)&boSta,
- sizeof(RlcMacBOStatus))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU061, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- if (unpackBOStatusInfo(boSta, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU062, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- SPutSBuf(pst->region, pst->pool, (Data *)boSta, sizeof(RlcMacBOStatus));
- RETVALUE(RFAILED);
- }
- }
- SPutMsg(mBuf);
- // (*func)(pst, spId, boSta);
- SPutSBuf(pst->region, pst->pool, (Data *)boSta, sizeof(RlcMacBOStatus));
- RETVALUE(ROK);
-}
-
-
/*rgu_c_001.main_5 - ADD - L2M Support */
#ifdef LTE_L2_MEAS
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguHqStaInd
+S16 cmPkRguHqStaInd
(
Pst* pst,
SuId suId,
RguHarqStatusInd *harqStatusInd
)
-#else
-PUBLIC S16 cmPkRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
{
Buffer *mBuf;
- U8 idx;
+ uint8_t idx;
RguHarqStatusInd *harqStaInd = NULL;
- TRC3(cmPkRguHqStaInd)
#ifdef XEON_SPECIFIC_CHANGES
if (SGetSBuf(pst->region, pst->pool, (Data **)&harqStaInd, sizeof(RguHarqStatusInd)) != ROK)
#else
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU070, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- cmMemcpy((U8 *)harqStaInd, (U8 *)harqStatusInd, sizeof(RguHarqStatusInd));
+ memcpy(harqStaInd, harqStatusInd, sizeof(RguHarqStatusInd));
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#else
SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd), 0);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKPK(cmPkPtr,(PTR) harqStaInd, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) harqStaInd, mBuf);
}
else
{
for(idx = 0; idx < harqStaInd->numTbs; idx++)
{
- CMCHKPK(SPkU16, harqStaInd->status[idx], mBuf);
+ CMCHKPK(oduUnpackUInt16, harqStaInd->status[idx], mBuf);
}
for(idx = 0; idx < harqStaInd->numTbs; idx++)
{
- CMCHKPK(SPkU32, harqStaInd->tbId[idx], mBuf);
+ CMCHKPK(oduUnpackUInt32, harqStaInd->tbId[idx], mBuf);
}
- CMCHKPK(SPkU8, harqStaInd->numTbs, mBuf);
+ CMCHKPK(oduUnpackUInt8, harqStaInd->numTbs, mBuf);
CMCHKPK(cmPkLteRnti, harqStaInd->ueId, mBuf);
CMCHKPK(cmPkLteCellId, harqStaInd->cellId, mBuf);
}
SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd), 0);
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef XEON_SPECIFIC_CHANGES
if (SPutSBuf(pst->region, pst->pool, (Data *)harqStaInd,
sizeof(RguHarqStatusInd)) != ROK) {
#else
- if (pst->selector != RGU_SEL_LWLC)
+ if (pst->selector != ODU_SELECTOR_LWLC)
{
if(SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd,
sizeof(RguHarqStatusInd), 0) != ROK)
(ErrVal)ERGU072, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifndef XEON_SPECIFIC_CHANGES
}
#endif
pst->event = (Event) EVTRGUHQSTAIND;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguHqStaInd
+S16 cmUnpkRguHqStaInd
(
RguHqStaInd func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguHqStaInd(func, pst, mBuf)
-RguHqStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
RguHarqStatusInd *hqStaInd;
- SuId suId;
- U8 idx;
-
- TRC3(cmUnpkRguHqStaInd)
+ SuId suId;
+ uint8_t idx;
if (SUnpkS16(&suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU073, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef XEON_SPECIFIC_CHANGES
if ((SGetSBuf(pst->region, pst->pool, (Data **)&hqStaInd,
sizeof(RguHarqStatusInd))) != ROK) {
#else
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &hqStaInd, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &hqStaInd, mBuf);
}
else
{
(ErrVal)ERGU074, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKUNPK(cmUnpkLteCellId, &hqStaInd->cellId, mBuf);
CMCHKUNPK(cmUnpkLteRnti, &hqStaInd->ueId, mBuf);
- CMCHKUNPK(SUnpkU8, &hqStaInd->numTbs, mBuf);
+ CMCHKUNPK(oduPackUInt8, &hqStaInd->numTbs, mBuf);
for(idx = hqStaInd->numTbs; idx > 0; idx--)
{
- CMCHKUNPK(SUnpkU32, &hqStaInd->tbId[idx - 1], mBuf);
+ CMCHKUNPK(oduPackUInt32, &hqStaInd->tbId[idx - 1], mBuf);
}
for(idx = hqStaInd->numTbs; idx > 0; idx--)
{
- CMCHKUNPK(SUnpkU16, &hqStaInd->status[idx - 1], mBuf);
+ CMCHKUNPK(oduPackUInt16, &hqStaInd->status[idx - 1], mBuf);
}
#ifndef XEON_SPECIFIC_CHANGES
}
(*func)(pst, suId, hqStaInd);
#ifdef XEON_SPECIFIC_CHANGES
SPutSBuf(pst->region, pst->pool, (Data *)hqStaInd, sizeof(RguHarqStatusInd));
-#else
- SPutStaticBuffer(pst->region, pst->pool, (Data *)hqStaInd, sizeof(RguHarqStatusInd), 0);
-#endif
- RETVALUE(ROK);
-}
-#endif /* LTE_L2_MEAS */
-
-\f
-/**
-* @brief Status Indication from MAC to RLC
- * as a response to the staRsp primitive from RLC.
- * Informs RLC of the totalBufferSize and Timing Info
- * for the transmission on dedicated channels.
-*
-* @details
-*
-* Function : packSchedRep
-*
-* @param[in] Pst* pst
-* @param[in] SuId suId
-* @param[in] RlcMacSchedRep* schRep
-* @return S16
-* -# ROK
-**/
-PUBLIC S16 packSchedRep
-(
-Pst* pst,
-SuId suId,
-RlcMacSchedRepInfo * schRep
-)
-{
- Buffer *mBuf = NULLP;
- TRC3(packSchedRep)
-
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU076, (ErrVal)0, "Packing failed");
-#endif
- SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
- RETVALUE(RFAILED);
- }
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKPK(cmPkPtr,(PTR) schRep, mBuf);
- }
- else
- {
- if (packSchedRepInfo(schRep, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU077, (ErrVal)0, "Packing failed");
-#endif
- SPutSBuf(pst->region, pst->pool, (Data *)schRep,
- sizeof(RlcMacSchedRepInfo));
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- if (SPutSBuf(pst->region, pst->pool, (Data *)schRep,
- sizeof(RlcMacSchedRepInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU079, (ErrVal)0, "Packing failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- schRep= NULLP;
- }
- if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU078, (ErrVal)0, "Packing failed");
-#endif
- if (schRep != NULLP)
- {
- SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
- }
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- pst->event = (Event) EVTSCHREP;
- RETVALUE(SPstTsk(pst,mBuf));
-}
-
-\f
-/**
-* @brief Status Indication from MAC to RLC
- * as a response to the staRsp primitive from RLC.
- * Informs RLC of the totalBufferSize and Timing Info
- * for the transmission on dedicated channels.
-*
-* @details
-*
-* Function : unpackSchedRep
-*
-* @param[in] Pst* pst
-* @param[in] SuId suId
-* @param[in] RguDStaIndInfo * staInd
-* @return S16
-* -# ROK
-**/
-PUBLIC S16 unpackSchedRep
-(
-RlcMacSchedRep func,
-Pst *pst,
-Buffer *mBuf
-)
-{
- SuId suId;
- RlcMacSchedRepInfo *schRep;
-
- TRC3(unpackSchedRep)
-
- if (SUnpkS16(&suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU080, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- if (pst->selector == RGU_SEL_LWLC)
- {
- CMCHKUNPK(cmUnpkPtr,(PTR *) &schRep, mBuf);
- }
- else
- {
- if ((SGetSBuf(pst->region, pst->pool, (Data **)&schRep, sizeof(RlcMacSchedRepInfo))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU081, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
- if (unpackSchedRepInfo(schRep, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ERGU082, (ErrVal)0, "UnPacking failed");
-#endif
- SPutMsg(mBuf);
- SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
- RETVALUE(RFAILED);
- }
- }
- SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, schRep));
+#else
+ SPutStaticBuffer(pst->region, pst->pool, (Data *)hqStaInd, sizeof(RguHarqStatusInd), 0);
+#endif
+ return ROK;
}
+#endif /* LTE_L2_MEAS */
-#ifdef ANSI
-PUBLIC S16 cmPkRguLcFlowCntrlInfo
+S16 cmPkRguLcFlowCntrlInfo
(
RguLcFlowCntrlInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguLcFlowCntrlInfo (param,mBuf)
-RguLcFlowCntrlInfo *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguLcFlowCntrlInfo);
- CMCHKPK(SPkU32, param->maxBo4FlowCtrl, mBuf);
- CMCHKPK(SPkU32, param->pktAdmitCnt, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
-#ifdef ANSI
-PUBLIC S16 cmPkRguUeFlowCntrlInfo
+S16 cmPkRguUeFlowCntrlInfo
(
RguUeFlowCntrlInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguUeFlowCntrlInfo (param,mBuf)
-RguUeFlowCntrlInfo *param;
-Buffer *mBuf;
-#endif
{
- U32 idx;
+ uint32_t idx;
- TRC3(cmPkRguUeFlowCntrlInfo);
for(idx=(param->numLcs - 1); idx >= 0; idx--)
{
cmPkRguLcFlowCntrlInfo(¶m->lcInfo[idx],mBuf);
}
- CMCHKPK(SPkU32, param->numLcs, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->numLcs, mBuf);
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
-#ifdef ANSI
-PUBLIC S16 cmPkRguFlowCntrlInfo
+S16 cmPkRguFlowCntrlInfo
(
RguFlowCntrlInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguFlowCntrlInfo(flowCntrlInd, mBuf)
-RguFlowCntrlInd *param;
-Buffer *mBuf;
-#endif
{
- U32 idx;
-
- TRC3(cmPkRguFlowCntrlInfo);
+ uint32_t idx;
for (idx=(param->numUes - 1); idx >= 0; idx--)
{
cmPkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf);
}
- CMCHKPK(SPkU32, param->numUes, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->numUes, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
/**
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmPkRguFlowCntrlInd
+S16 cmPkRguFlowCntrlInd
(
Pst* pst,
SuId suId,
RguFlowCntrlInd *flowCntrlInd
)
-#else
-PUBLIC S16 cmPkRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst* pst;
-SuId suId;
-RguFlowCntrlInd *flowCntrlInd;
-#endif
{
Buffer *mBuf = NULLP;
- TRC3(cmPkRguFlowCntrlInd);
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERGU076, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKPK(cmPkPtr,(PTR) flowCntrlInd, mBuf);
+ CMCHKPK(oduPackPointer,(PTR) flowCntrlInd, mBuf);
}
else
{
(ErrVal)ERGU077, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (SPkS16(suId, mBuf) != ROK) {
(ErrVal)ERGU078, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTRGUFLOWCNTRLIND;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguLcFlowCntrlInfo
+S16 cmUnpkRguLcFlowCntrlInfo
(
RguLcFlowCntrlInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguLcFlowCntrlInfo (param,mBuf)
-RguLcFlowCntrlInfo *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguLcFlowCntrlInfo);
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->pktAdmitCnt, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->maxBo4FlowCtrl, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->maxBo4FlowCtrl, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguUeFlowCntrlInfo
+S16 cmUnpkRguUeFlowCntrlInfo
(
RguUeFlowCntrlInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguUeFlowCntrlInfo (param,mBuf)
-RguUeFlowCntrlInfo *param;
-Buffer *mBuf;
-#endif
{
- U32 idx;
- TRC3(cmUnpkRguUeFlowCntrlInfo);
+ uint32_t idx;
CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->numLcs, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->numLcs, mBuf);
for(idx=0; idx < param->numLcs; idx++)
{
cmUnpkRguLcFlowCntrlInfo(¶m->lcInfo[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguFlowCntrlInfo
+S16 cmUnpkRguFlowCntrlInfo
(
RguFlowCntrlInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguFlowCntrlInfo(flowCntrlInfo, mBuf)
-RguFlowCntrlInd *param;
-Buffer *mBuf;
-#endif
{
- U32 idx;
+ uint32_t idx;
- TRC3(cmUnpkRguFlowCntrlInfo);
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->numUes, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->numUes, mBuf);
for (idx=0; idx < param->numUes; idx++)
{
cmUnpkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/**
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguFlowCntrlInd
+S16 cmUnpkRguFlowCntrlInd
(
RguFlowCntrlIndInfo func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguFlowCntrlInd(func, pst, mBuf)
-RguFlowCntrlIndInfo func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SuId suId;
RguFlowCntrlInd *flowCntrlInd;
-
- TRC3(cmUnpkRguFlowCntrlInd)
if (SUnpkS16(&suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ERGU080, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (pst->selector == RGU_SEL_LWLC)
+ if (pst->selector == ODU_SELECTOR_LWLC)
{
- CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInd, mBuf);
+ CMCHKUNPK(oduUnpackPointer,(PTR *) &flowCntrlInd, mBuf);
}
else
{
(ErrVal)ERGU081, (ErrVal)0, "UnPacking failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkRguFlowCntrlInfo(flowCntrlInd, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutMsg(mBuf);
SPutSBuf(pst->region, pst->pool, (Data *)flowCntrlInd, sizeof(RguFlowCntrlInd));
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, flowCntrlInd));
+ return ((*func)(pst, suId, flowCntrlInd));
}
/***********************************************************
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguPduInfo
+S16 cmPkRguPduInfo
(
RguPduInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguPduInfo(param, mBuf)
-RguPduInfo *param;
-Buffer *mBuf;
-#endif
{
S32 i;
- TRC3(cmPkRguPduInfo);
-
for (i=param->numPdu-1; i >= 0; i--) {
/* rgu_c_001.main_3: ccpu00111328: S16 is renamed as MsgLen */
MsgLen msgLen = 0;
if (SFndLenMsg(param->mBuf[i], &msgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SCatMsg(mBuf, param->mBuf[i], M1M2) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
SPutMsg(param->mBuf[i]);
CMCHKPK(cmPkMsgLen, msgLen, mBuf);
}
- CMCHKPK(SPkU8, param->numPdu, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->numPdu, mBuf);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguPduInfo
+S16 cmUnpkRguPduInfo
(
RguPduInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguPduInfo(param, mBuf)
-RguPduInfo *param;
-Buffer *mBuf;
-#endif
{
S32 i;
- TRC3(cmUnpkRguPduInfo);
- CMCHKUNPK(SUnpkU8, ¶m->numPdu, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numPdu, mBuf);
for (i=0; i<param->numPdu; i++) {
MsgLen msgLen, totalMsgLen;
CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->mBuf[i]) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguDBoReport
+S16 cmPkRguDBoReport
(
RguDBoReport *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguDBoReport(param, mBuf)
-RguDBoReport *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguDBoReport);
-
- CMCHKPK(SPkU32, param->oldestSduArrTime, mBuf);
- CMCHKPK(SPkU32, param->staPduBo, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf);
#ifdef CCPU_OPT
- CMCHKPK(SPkU8, param->staPduPrsnt, mBuf);
- CMCHKPK(SPkU16, param->estRlcHdrSz, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->staPduPrsnt, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->estRlcHdrSz, mBuf);
#endif
CMCHKPK(SPkS32, param->bo, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguDBoReport
+S16 cmUnpkRguDBoReport
(
RguDBoReport *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguDBoReport(param, mBuf)
-RguDBoReport *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguDBoReport);
CMCHKUNPK(SUnpkS32, ¶m->bo, mBuf);
#ifdef CCPU_OPT
- CMCHKUNPK(SUnpkU16, ¶m->estRlcHdrSz, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->staPduPrsnt, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->estRlcHdrSz, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->staPduPrsnt, mBuf);
#endif
- CMCHKUNPK(SUnpkU32, ¶m->staPduBo, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->oldestSduArrTime, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt32, ¶m->staPduBo, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->oldestSduArrTime, mBuf);
+ return ROK;
}
\f
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguCDatReqInfo
+S16 cmPkRguCDatReqInfo
(
RguCDatReqInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguCDatReqInfo(param, mBuf)
-RguCDatReqInfo *param;
-Buffer *mBuf;
-#endif
{
MsgLen msgLen;
- TRC3(cmPkRguCDatReqInfo);
-
if (param->pdu != NULLP)
{
if (SFndLenMsg(param->pdu, &msgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SCatMsg(mBuf, param->pdu, M1M2) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
SPutMsg(param->pdu);
CMCHKPK(cmPkMsgLen, msgLen, mBuf);
}
case CM_LTE_LCH_PCCH:
CMCHKPK(cmPkLteTimingInfo, ¶m->u.timeToTx, mBuf);
#ifdef EMTC_ENABLE
- CMCHKPK(SPkU8,param->pnb,mBuf);
+ CMCHKPK(oduUnpackUInt8,param->pnb,mBuf);
#endif
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU32, param->transId, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->transId, mBuf);
CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguCDatReqInfo
+S16 cmUnpkRguCDatReqInfo
(
RguCDatReqInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguCDatReqInfo(param, mBuf)
-RguCDatReqInfo *param;
-Buffer *mBuf;
-#endif
{
MsgLen msgLen, totalMsgLen;
- TRC3(cmUnpkRguCDatReqInfo);
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->transId, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->transId, mBuf);
switch(param->lcType) {
case CM_LTE_LCH_BCCH:
case CM_LTE_LCH_PCCH:
#ifdef EMTC_ENABLE
- CMCHKUNPK(SUnpkU8,¶m->pnb, mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->pnb, mBuf);
#endif
CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->u.timeToTx, mBuf);
break;
CMCHKUNPK(cmUnpkLteRnti, ¶m->u.rnti, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
SFndLenMsg(mBuf, &msgLen);
if (msgLen > 0)
{
CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguLchDatReq
+S16 cmPkRguLchDatReq
(
RguLchDatReq *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguLchDatReq(param, mBuf)
-RguLchDatReq *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguLchDatReq);
-
#ifdef L2_OPTMZ
- CMCHKPK(SPkU8, param->freeBuff, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf);
#endif
- CMCHKPK(SPkU8, param->setMaxUlPrio, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->setMaxUlPrio, mBuf);
CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf);
CMCHKPK(cmPkRguDBoReport, ¶m->boReport, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguLchDatReq
+S16 cmUnpkRguLchDatReq
(
RguLchDatReq *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguLchDatReq(param, mBuf)
-RguLchDatReq *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguLchDatReq);
-
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
CMCHKUNPK(cmUnpkRguDBoReport, ¶m->boReport, mBuf);
CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->setMaxUlPrio, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->setMaxUlPrio, mBuf);
#ifdef L2_OPTMZ
- CMCHKUNPK(SUnpkU8, ¶m->freeBuff, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->freeBuff, mBuf);
#endif
- RETVALUE(ROK);
+ return ROK;
}
\f
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguDatReqTb
+S16 cmPkRguDatReqTb
(
RguDatReqTb *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguDatReqTb(param, mBuf)
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
{
S32 i;
- TRC3(cmPkRguDatReqTb);
/*rgu_c_001.main_5 - ADD - L2M Support */
#ifdef LTE_L2_MEAS
- CMCHKPK(SPkU32, param->tbId, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->tbId, mBuf);
#endif
for (i=param->nmbLch-1; i >= 0; i--) {
CMCHKPK(cmPkRguLchDatReq, ¶m->lchData[i], mBuf);
}
- CMCHKPK(SPkU8, param->nmbLch, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf);
+ return ROK;
}
*
**********************************************************/
#ifdef LTE_L2_MEAS
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguDatReqTb
+S16 cmUnpkRguDatReqTb
(
Pst *pst,
RguDatReqTb *param,
Buffer *mBuf
)
#else
-PUBLIC S16 cmUnpkRguDatReqTb(pst, param, mBuf)
-Pst *pst;
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguDatReqTb
+S16 cmUnpkRguDatReqTb
(
RguDatReqTb *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguDatReqTb(param, mBuf)
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
#endif
{
S32 i;
- TRC3(cmUnpkRguDatReqTb);
- CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf);
for (i=0; i<param->nmbLch; i++) {
CMCHKUNPK(cmUnpkRguLchDatReq, ¶m->lchData[i], mBuf);
}
/*rgu_c_001.main_5 - ADD - L2M Support */
#ifdef LTE_L2_MEAS
- CMCHKUNPK(SUnpkU32, ¶m->tbId, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->tbId, mBuf);
#endif
- RETVALUE(ROK);
+ return ROK;
}
\f
**********************************************************/
/*rgu_c_001.main_5 - ADD - L2M Support */
#ifdef LTE_L2_MEAS
-#ifdef ANSI
-PUBLIC S16 cmPkRguDDatReqInfo
+S16 cmPkRguDDatReqInfo
(
Pst *pst,
RguDDatReqInfo *param,
Buffer *mBuf
)
#else
-PUBLIC S16 cmPkRguDDatReqInfo(pst, param, mBuf)
-Pst *pst;
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
-PUBLIC S16 cmPkRguDDatReqInfo
+S16 cmPkRguDDatReqInfo
(
RguDDatReqInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguDDatReqInfo(param, mBuf)
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
#endif
{
S32 i;
S32 idx;
- TRC3(cmPkRguDDatReqInfo);
for(idx = (param->nmbOfUeGrantPerTti-1); idx >= 0; idx--)
{
{
CMCHKPK(cmPkRguDatReqTb, &datReq->datReqTb[i], mBuf);
}
- CMCHKPK(SPkU8, datReq->nmbOfTbs, mBuf);
- CMCHKPK(SPkU32, datReq->transId, mBuf);
+ CMCHKPK(oduUnpackUInt8, datReq->nmbOfTbs, mBuf);
+ CMCHKPK(oduUnpackUInt32, datReq->transId, mBuf);
CMCHKPK(cmPkLteRnti, datReq->rnti, mBuf);
}
- CMCHKPK(SPkU8, param->nmbOfUeGrantPerTti, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nmbOfUeGrantPerTti, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
*
**********************************************************/
#ifdef LTE_L2_MEAS
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguDDatReqInfo
+S16 cmUnpkRguDDatReqInfo
(
Pst *pst,
RguDDatReqInfo *param,
Buffer *mBuf
)
#else
-PUBLIC S16 cmUnpkRguDDatReqInfo(pst, param, mBuf)
-Pst *pst;
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguDDatReqInfo
+S16 cmUnpkRguDDatReqInfo
(
RguDDatReqInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguDDatReqInfo(param, mBuf)
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
#endif
{
S32 i;
#endif
S32 idx;
- TRC3(cmUnpkRguDDatReqInfo);
/* After Merging from 2.1 to 2.2 */
/*rgu_c_001.main_5 - ADD - L2M Support */
retVal = ROK;
#endif
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nmbOfUeGrantPerTti, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nmbOfUeGrantPerTti, mBuf);
for(idx = 0; idx < param->nmbOfUeGrantPerTti; idx++)
{
RguDDatReqPerUe *datReq = ¶m->datReq[idx];
CMCHKUNPK(cmUnpkLteRnti, &datReq->rnti, mBuf);
- CMCHKUNPK(SUnpkU32, &datReq->transId, mBuf);
- CMCHKUNPK(SUnpkU8, &datReq->nmbOfTbs, mBuf);
+ CMCHKUNPK(oduPackUInt32, &datReq->transId, mBuf);
+ CMCHKUNPK(oduPackUInt8, &datReq->nmbOfTbs, mBuf);
/* rgu_c_001.main_4 - Changes for MIMO feature addition */
for (i=0; i<RGU_MAX_TB; i++)
{
retVal = cmUnpkRguDatReqTb(pst, &datReq->datReqTb[i], mBuf);
if(retVal != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
CMCHKUNPK(cmUnpkRguDatReqTb, &datReq->datReqTb[i], mBuf);
#endif
}
}
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguCDatIndInfo
+S16 cmPkRguCDatIndInfo
(
RguCDatIndInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguCDatIndInfo(param, mBuf)
-RguCDatIndInfo *param;
-Buffer *mBuf;
-#endif
{
MsgLen msgLen;
- TRC3(cmPkRguCDatIndInfo);
-
if (SFndLenMsg(param->pdu, &msgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SCatMsg(mBuf, param->pdu, M1M2) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
SPutMsg(param->pdu);
CMCHKPK(cmPkMsgLen, msgLen, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguCDatIndInfo
+S16 cmUnpkRguCDatIndInfo
(
RguCDatIndInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguCDatIndInfo(param, mBuf)
-RguCDatIndInfo *param;
-Buffer *mBuf;
-#endif
{
MsgLen msgLen, totalMsgLen;
- TRC3(cmUnpkRguCDatIndInfo);
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf);
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK)
- RETVALUE(RFAILED);
- RETVALUE(ROK);
+ return RFAILED;
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguLchDatInd
+S16 cmPkRguLchDatInd
(
RguLchDatInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguLchDatInd(param, mBuf)
-RguLchDatInd *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguLchDatInd);
- CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf);
+ CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguLchDatInd
+S16 cmUnpkRguLchDatInd
(
RguLchDatInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguLchDatInd(param, mBuf)
-RguLchDatInd *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguLchDatInd);
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf);
- RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-* Func : packRlcMacDataInfo
-*
-*
-* Desc : RlcMacData
- * Data Indication from MAC to RLC for dedicated channels of a UE
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 packRlcMacDataInfo
-(
-RlcMacData *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 packRlcMacDataInfo(param, mBuf)
-RlcMacData *param;
-Buffer *mBuf;
-#endif
-{
- S32 i;
- MsgLen msgLen;
-
- TRC3(packRlcMacDataInfo);
-
- for (i=param->nmbPdu-1; i >= 0; i--)
- {
- msgLen = 0;
- if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK)
- RETVALUE(RFAILED);
- if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK)
- RETVALUE(RFAILED);
- CMCHKPK(cmPkMsgLen, msgLen, mBuf);
- CMCHKPK(cmPkLteLcId, param->pduInfo[i].lcId, mBuf);
- CMCHKPK(cmPkBool, param->pduInfo[i].commCh, mBuf);
- }
- CMCHKPK(SPkU8, param->nmbPdu, mBuf);
- CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
- CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf);
- RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-* Func : unpackRlcMacDataInfo
-*
-*
-* Desc : RlcMacData
- * Data Indication from MAC to RLC for dedicated channels of a UE
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 unpackRlcMacDataInfo
-(
-RlcMacData *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 unpackRlcMacDataInfo(param, mBuf)
-RlcMacData *param;
-Buffer *mBuf;
-#endif
-{
- S32 i;
-
- TRC3(unpackRlcMacDataInfo);
-
- CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf);
- CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nmbPdu, mBuf);
- for (i=0; i<param->nmbPdu; i++)
- {
- MsgLen totalMsgLen;
-
- CMCHKUNPK(cmUnpkBool, ¶m->pduInfo[i].commCh, mBuf);
- CMCHKUNPK(cmUnpkLteLcId, ¶m->pduInfo[i].lcId, mBuf);
- CMCHKUNPK(cmUnpkMsgLen, ¶m->pduInfo[i].pduLen, mBuf);
- if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
- RETVALUE(RFAILED);
- if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, ¶m->pduInfo[i].pduBuf) != ROK)
- RETVALUE(RFAILED);
- }
- RETVALUE(ROK);
+ return ROK;
}
\f
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguCStaRspInfo
+S16 cmPkRguCStaRspInfo
(
RguCStaRspInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguCStaRspInfo(param, mBuf)
-RguCStaRspInfo *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguCStaRspInfo);
switch(param->lcType) {
case CM_LTE_LCH_CCCH:
case CM_LTE_LCH_PCCH:
CMCHKPK(cmPkLteTimingInfo, ¶m->u.timeToTx, mBuf);
#ifdef EMTC_ENABLE
- CMCHKPK(SPkU8,param->pnb,mBuf);
- CMCHKPK(SPkU8,param->emtcDiReason,mBuf);
+ CMCHKPK(oduUnpackUInt8,param->pnb,mBuf);
+ CMCHKPK(oduUnpackUInt8,param->emtcDiReason,mBuf);
#endif
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKPK(SPkS32, param->bo, mBuf);
CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguCStaRspInfo
+S16 cmUnpkRguCStaRspInfo
(
RguCStaRspInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguCStaRspInfo(param, mBuf)
-RguCStaRspInfo *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguCStaRspInfo);
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
case CM_LTE_LCH_BCCH:
case CM_LTE_LCH_PCCH:
#ifdef EMTC_ENABLE
- CMCHKUNPK(SUnpkU8,¶m->emtcDiReason , mBuf);
- CMCHKUNPK(SUnpkU8,¶m->pnb , mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->emtcDiReason , mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->pnb , mBuf);
#endif
CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->u.timeToTx, mBuf);
break;
CMCHKUNPK(cmUnpkLteRnti, ¶m->u.rnti, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
-
-\f
-/***********************************************************
-*
-* Func : packBOStatusInfo
-*
-*
-* Desc : RlcMacBOStatus
- * Status Response from RLC to MAC for dedicated logical channel
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 packBOStatusInfo
-(
-RlcMacBOStatus *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 packBOStatusInfo(param, mBuf)
-RlcMacBOStatus *param;
-Buffer *mBuf;
-#endif
-{
-
- TRC3(packBOStatusInfo);
-
- CMCHKPK(SPkS32, param->bo, mBuf);
- CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
- CMCHKPK(cmPkBool, param->commCh, mBuf);
- CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
- CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
-} /* End of packBOStatusInfo */
-
-
-\f
-/***********************************************************
-*
-* Func : unpackBOStatusInfo
-*
-*
-* Desc : RlcMacBOStatus
- * Status Response from RLC to MAC for dedicated logical channel
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 unpackBOStatusInfo
-(
-RlcMacBOStatus *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 unpackBOStatusInfo(param, mBuf)
-RlcMacBOStatus *param;
-Buffer *mBuf;
-#endif
-{
-
- TRC3(unpackBOStatusInfo);
-
- CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf);
- CMCHKUNPK(cmUnpkBool, ¶m->commCh, mBuf);
- CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
- CMCHKUNPK(SUnpkS32, ¶m->bo, mBuf);
- RETVALUE(ROK);
-} /* End of unpackBOStatusInfo */
-
\f
/***********************************************************
*
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguLchStaInd
+S16 cmPkRguLchStaInd
(
RguLchStaInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguLchStaInd(param, mBuf)
-RguLchStaInd *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmPkRguLchStaInd);
CMCHKPK(SPkS16, param->totBufSize, mBuf);
CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguLchStaInd
+S16 cmUnpkRguLchStaInd
(
RguLchStaInd *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguLchStaInd(param, mBuf)
-RguLchStaInd *param;
-Buffer *mBuf;
-#endif
{
- TRC3(cmUnpkRguLchStaInd);
-
CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->totBufSize, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkRguStaIndTb
+S16 cmPkRguStaIndTb
(
RguStaIndTb *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRguStaIndTb(param, mBuf)
-RguStaIndTb *param;
-Buffer *mBuf;
-#endif
{
S32 i;
- TRC3(cmPkRguStaIndTb);
#ifdef LTE_L2_MEAS
- CMCHKPK(SPkU16, param->status, mBuf);
- CMCHKPK(SPkU32, param->tbId, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->status, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->tbId, mBuf);
#endif
for (i=param->nmbLch-1; i >= 0; i--) {
CMCHKPK(cmPkRguLchStaInd, ¶m->lchStaInd[i], mBuf);
}
- CMCHKPK(SPkU8, param->nmbLch, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf);
+ return ROK;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRguStaIndTb
+S16 cmUnpkRguStaIndTb
(
RguStaIndTb *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRguStaIndTb(param, mBuf)
-RguStaIndTb *param;
-Buffer *mBuf;
-#endif
{
S32 i;
- TRC3(cmUnpkRguStaIndTb);
-
- CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf);
for (i=0; i<param->nmbLch; i++) {
CMCHKUNPK(cmUnpkRguLchStaInd, ¶m->lchStaInd[i], mBuf);
}
#ifdef LTE_L2_MEAS
- CMCHKUNPK(SUnpkU32, ¶m->tbId, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->status, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->tbId, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->status, mBuf);
#endif
- RETVALUE(ROK);
+ return ROK;
}
-\f
-/***********************************************************
-*
-* Func : packSchedRepInfo
-*
-*
-* Desc : RlcMacSchedRep
- * StaInd from MAC to RLC for dedicated logical channels of a UE
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-PUBLIC S16 packSchedRepInfo
-(
-RlcMacSchedRepInfo *param,
-Buffer *mBuf
-)
-{
- S32 idx;
-
- TRC3(packSchedRepInfo);
-
- for(idx = (param->nmbLch-1); idx >= 0; idx--)
- {
- CMCHKPK(cmPkRguLchStaInd, ¶m->lchSta[idx].lchStaInd, mBuf);
- CMCHKPK(cmPkBool, param->lchSta[idx].commCh, mBuf);
- }
- CMCHKPK(SPkU8, param->nmbLch, mBuf);
- CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
- CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf);
-
- RETVALUE(ROK);
-} /* End of packSchedRepInfo */
-
-
-\f
-/***********************************************************
-*
-* Func : unpackSchedRepInfo
-*
-*
-* Desc : RlcMacSchedRep
- * StaInd from MAC to RLC for dedicated logical channels of a UE
-*
-*
-* Ret : S16
-*
-* Notes:
-*
-* File :
-*
-**********************************************************/
-PUBLIC S16 unpackSchedRepInfo
-(
-RlcMacSchedRepInfo *param,
-Buffer *mBuf
-)
-{
- S32 idx;
-
- TRC3(unpackSchedRepInfo);
-
- CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf);
- CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf);
- for(idx = 0; idx < param->nmbLch; idx++)
- {
- CMCHKUNPK(cmUnpkBool, ¶m->lchSta[idx].commCh, mBuf);
- CMCHKUNPK(cmUnpkRguLchStaInd, ¶m->lchSta[idx].lchStaInd, mBuf);
- }
-
- RETVALUE(ROK);
-} /* End of unpackSchedRepInfo */
-
#endif
/**********************************************************************