X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgu.c;h=36392974ab15498c63087e52bdc0ec7e0a625aca;hb=7b22b6a99c6942021b2ac30383cd46d93d9354a6;hp=7a42dbf4beb077d08743ba959ffc09b7cc3a295d;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/cm/rgu.c b/src/cm/rgu.c index 7a42dbf4b..36392974a 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -35,25 +35,10 @@ */ /* 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 @@ -78,14 +63,14 @@ * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguBndReq +S16 cmPkRguBndReq ( Pst* pst, SuId suId, SpId spId ) #else -PUBLIC S16 cmPkRguBndReq(pst, suId, spId) +S16 cmPkRguBndReq(pst, suId, spId) Pst* pst; SuId suId; SpId spId; @@ -100,7 +85,7 @@ SpId spId; __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) @@ -109,7 +94,7 @@ SpId spId; (ErrVal)ERGU002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -118,10 +103,10 @@ SpId spId; (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)); } @@ -139,14 +124,14 @@ SpId spId; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguBndReq +S16 cmUnpkRguBndReq ( RguBndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguBndReq(func, pst, mBuf) +S16 cmUnpkRguBndReq(func, pst, mBuf) RguBndReq func; Pst *pst; Buffer *mBuf; @@ -164,7 +149,7 @@ Buffer *mBuf; (ErrVal)ERGU004, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -173,10 +158,10 @@ Buffer *mBuf; (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)); } @@ -194,14 +179,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguUbndReq +S16 cmPkRguUbndReq ( Pst* pst, SpId spId, Reason reason ) #else -PUBLIC S16 cmPkRguUbndReq(pst, spId, reason) +S16 cmPkRguUbndReq(pst, spId, reason) Pst* pst; SpId spId; Reason reason; @@ -216,7 +201,7 @@ Reason reason; __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) @@ -225,7 +210,7 @@ Reason reason; (ErrVal)ERGU007, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -234,10 +219,10 @@ Reason reason; (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)); } @@ -255,14 +240,14 @@ Reason reason; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguUbndReq +S16 cmUnpkRguUbndReq ( RguUbndReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguUbndReq(func, pst, mBuf) +S16 cmUnpkRguUbndReq(func, pst, mBuf) RguUbndReq func; Pst *pst; Buffer *mBuf; @@ -280,7 +265,7 @@ Buffer *mBuf; (ErrVal)ERGU009, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -289,10 +274,10 @@ Buffer *mBuf; (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)); } @@ -311,14 +296,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguBndCfm +S16 cmPkRguBndCfm ( Pst* pst, SuId suId, U8 status ) #else -PUBLIC S16 cmPkRguBndCfm(pst, suId, status) +S16 cmPkRguBndCfm(pst, suId, status) Pst* pst; SuId suId; U8 status; @@ -333,16 +318,16 @@ U8 status; __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) @@ -351,10 +336,10 @@ U8 status; (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)); } @@ -373,14 +358,14 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguBndCfm +S16 cmUnpkRguBndCfm ( RguBndCfm func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguBndCfm(func, pst, mBuf) +S16 cmUnpkRguBndCfm(func, pst, mBuf) RguBndCfm func; Pst *pst; Buffer *mBuf; @@ -398,896 +383,27 @@ Buffer *mBuf; (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); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); -} - - -/** -* @brief Request from RLC to MAC for forwarding SDUs on common - * channel for transmission -* -* @details -* -* Function : cmPkRguCDatReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguCDatReqInfo * datReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguCDatReq -( -Pst* pst, -SpId spId, -RguCDatReqInfo * datReq -) -#else -PUBLIC S16 cmPkRguCDatReq(pst, spId, datReq) -Pst* pst; -SpId spId; -RguCDatReqInfo * datReq; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguCDatReq) - - 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)ERGU016, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)datReq, sizeof(RguCDatReqInfo)); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) datReq, mBuf); - } - else - { - if (cmPkRguCDatReqInfo(datReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU017, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguCDatReqInfo)); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguCDatReqInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU019, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - datReq = 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)ERGU018, (ErrVal)0, "Packing failed"); -#endif - - if (datReq != NULLP) - { - SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguCDatReqInfo)); - } - - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUCDATREQ; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Request from RLC to MAC for forwarding SDUs on common - * channel for transmission -* -* @details -* -* Function : cmUnpkRguCDatReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguCDatReqInfo * datReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguCDatReq -( -RguCDatReq func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguCDatReq(func, pst, mBuf) -RguCDatReq func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SpId spId; - RguCDatReqInfo *datReq; - - TRC3(cmUnpkRguCDatReq) - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datReq, mBuf); - } - else - { - if ((SGetSBuf(pst->region, pst->pool, - (Data **)&datReq, sizeof(RguCDatReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU020, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - cmMemset((U8*)datReq, (U8)0, sizeof(RguCDatReqInfo)); - if (cmUnpkRguCDatReqInfo(datReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU021, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguCDatReqInfo)); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, datReq)); -} - - -/** -* @brief Request from RLC to MAC for forwarding SDUs on - * dedicated channel for transmission -* -* @details -* -* Function : cmPkRguDDatReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguDDatReqInfo * datReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguDDatReq -( -Pst* pst, -SpId spId, -RguDDatReqInfo * datReq -) -#else -PUBLIC S16 cmPkRguDDatReq(pst, spId, datReq) -Pst* pst; -SpId spId; -RguDDatReqInfo * datReq; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguDDatReq) - - 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 *)datReq, sizeof(RguDDatReqInfo)); - RETVALUE(RFAILED); - } - - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) datReq, mBuf); - } - else - { - /*rgu_c_001.main_5 - ADD - L2M Support */ -#ifdef LTE_L2_MEAS - if (cmPkRguDDatReqInfo(pst, datReq, mBuf) != ROK) -#else - if (cmPkRguDDatReqInfo(datReq, 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 *)datReq, - sizeof(RguDDatReqInfo)); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguDDatReqInfo)) != 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); - } - datReq = 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 (datReq != NULLP); - { - SPutSBuf(pst->region, pst->pool, - (Data *)datReq, sizeof(RguDDatReqInfo)); - } - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - pst->event = (Event) EVTRGUDDATREQ; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Request from RLC to MAC for forwarding SDUs on - * dedicated channel for transmission -* -* @details -* -* Function : cmUnpkRguDDatReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguDDatReqInfo * datReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDDatReq -( -RguDDatReq func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDDatReq(func, pst, mBuf) -RguDDatReq func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SpId spId; - RguDDatReqInfo *datReq; - - TRC3(cmUnpkRguDDatReq) - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datReq, mBuf); - } - else - { - if ((SGetSBuf(pst->region, pst->pool, - (Data **)&datReq, sizeof(RguDDatReqInfo))) != 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*)datReq, (U8)0, sizeof(RguDDatReqInfo)); - /*rgu_c_001.main_5 - ADD - L2M Support */ -#ifdef LTE_L2_MEAS - if (cmUnpkRguDDatReqInfo(pst,datReq, mBuf) != ROK) -#else - if (cmUnpkRguDDatReqInfo(datReq, 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 *)datReq, - sizeof(RguDDatReqInfo)); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, datReq)); -} - - -/** -* @brief Data Indication from MAC to RLC to - * forward the data received for common channels -* -* @details -* -* Function : cmPkRguCDatInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguCDatIndInfo * datInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguCDatInd -( -Pst* pst, -SuId suId, -RguCDatIndInfo * datInd -) -#else -PUBLIC S16 cmPkRguCDatInd(pst, suId, datInd) -Pst* pst; -SuId suId; -RguCDatIndInfo * datInd; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguCDatInd) - - 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)ERGU028, (ErrVal)0, "Packing failed"); -#endif - SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, sizeof(RguCDatIndInfo),0); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) datInd, mBuf); - } - else - { - if (cmPkRguCDatIndInfo(datInd, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU029, (ErrVal)0, "Packing failed"); -#endif - SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, - sizeof(RguCDatIndInfo),0); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, - sizeof(RguCDatIndInfo),0) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU031, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - datInd = 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)ERGU030, (ErrVal)0, "Packing failed"); -#endif - SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, sizeof(RguCDatIndInfo),0); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUCDATIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Data Indication from MAC to RLC to - * forward the data received for common channels -* -* @details -* -* Function : cmUnpkRguCDatInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguCDatIndInfo * datInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguCDatInd -( -RguCDatInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguCDatInd(func, pst, mBuf) -RguCDatInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SuId suId; - RguCDatIndInfo *datInd; - - TRC3(cmUnpkRguCDatInd) - - if (SUnpkS16(&suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU032, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datInd, mBuf); - } - else - { - if ((SGetStaticBuffer(pst->region, pst->pool, - (Data **)&datInd, sizeof(RguCDatIndInfo),0)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU033, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (cmUnpkRguCDatIndInfo(datInd, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU034, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, - sizeof(RguCDatIndInfo),0); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, datInd)); -} - - -/** -* @brief Data Indication from MAC to RLC to - * forward the data received for dedicated channels -* -* @details -* -* Function : cmPkRguDDatInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguDDatIndInfo * datInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguDDatInd -( -Pst* pst, -SuId suId, -RguDDatIndInfo * datInd -) -#else -PUBLIC S16 cmPkRguDDatInd(pst, suId, datInd) -Pst* pst; -SuId suId; -RguDDatIndInfo * datInd; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguDDatInd) - - 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 *)datInd, sizeof(RguDDatIndInfo),0); - RETVALUE(RFAILED); - } - - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) datInd, mBuf); - } - else - { - if (cmPkRguDDatIndInfo(datInd, 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 *)datInd, sizeof(RguDDatIndInfo),0); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (SPutStaticBuffer(pst->region, pst->pool, - (Data *)datInd, sizeof(RguDDatIndInfo),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); - } - datInd = 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 *)datInd, sizeof(RguDDatIndInfo),0); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUDDATIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Data Indication from MAC to RLC to - * forward the data received for dedicated channels -* -* @details -* -* Function : cmUnpkRguDDatInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguDDatIndInfo * datInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDDatInd -( -RguDDatInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDDatInd(func, pst, mBuf) -RguDDatInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SuId suId; - RguDDatIndInfo *datInd; - - TRC3(cmUnpkRguDDatInd) - - 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 *) &datInd, mBuf); - } - else - { - if ((SGetStaticBuffer(pst->region, pst->pool, - (Data **)&datInd, sizeof(RguDDatIndInfo),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 (cmUnpkRguDDatIndInfo(datInd, 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 *)datInd, sizeof(RguDDatIndInfo),0); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, datInd)); -} - - -/** -* @brief Primitive invoked from RLC to MAC to - * inform the BO report for common channels -* -* @details -* -* Function : cmPkRguCStaRsp -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguCStaRspInfo * staRsp -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguCStaRsp -( -Pst* pst, -SpId spId, -RguCStaRspInfo * staRsp -) -#else -PUBLIC S16 cmPkRguCStaRsp(pst, spId, staRsp) -Pst* pst; -SpId spId; -RguCStaRspInfo * staRsp; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguCStaRsp) - - 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)ERGU042, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)staRsp, sizeof(RguCStaRspInfo)); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) staRsp, mBuf); - } - else - { - if (cmPkRguCStaRspInfo(staRsp, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU043, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)staRsp, - sizeof(RguCStaRspInfo)); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (SPutSBuf(pst->region, pst->pool, (Data *)staRsp, - sizeof(RguCStaRspInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU045, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - staRsp = 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)ERGU044, (ErrVal)0, "Packing failed"); -#endif - if (staRsp != NULLP) - { - SPutSBuf(pst->region, pst->pool, - (Data *)staRsp, sizeof(RguCStaRspInfo)); - } - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUCSTARSP; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Primitive invoked from RLC to MAC to - * inform the BO report for common channels -* -* @details -* -* Function : cmUnpkRguCStaRsp -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguCStaRspInfo * staRsp -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguCStaRsp -( -RguCStaRsp func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguCStaRsp(func, pst, mBuf) -RguCStaRsp func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SpId spId; - RguCStaRspInfo *staRsp; - - TRC3(cmUnpkRguCStaRsp) - - if (SUnpkS16(&spId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU046, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &staRsp, mBuf); - } - else - { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&staRsp, - sizeof(RguCStaRspInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU047, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (cmUnpkRguCStaRspInfo(staRsp, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU048, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - SPutSBuf(pst->region, pst->pool, (Data *)staRsp, - sizeof(RguCStaRspInfo)); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, staRsp)); -} - -/*rgu_c_001.main_5 - ADD - L2M & R9 Support */ -#ifdef LTE_L2_MEAS - -/*********************************************************** -* -* Func :cmPkRguL2MUlThrpMeasReqInfo -* -* -* Status Response from RLC to MAC on UL dedicated logical channel for Uplink -* Scheduled throughput measurement -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC 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); - for (loop=param->numLcId-1; loop >= 0; loop--) - { - CMCHKPK(SPkU8, param->lcId[loop], mBuf); - } - CMCHKPK(cmPkLteLcId, param->numLcId, mBuf); - CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ((*func)(pst, suId, status)); } +/*rgu_c_001.main_5 - ADD - L2M & R9 Support */ +#ifdef LTE_L2_MEAS - /*********************************************************** * -* Func :cmUnpkRguL2MUlThrpMeasReqInfo +* Func :cmPkRguL2MUlThrpMeasReqInfo * * * Status Response from RLC to MAC on UL dedicated logical channel for Uplink @@ -1302,538 +418,244 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguL2MUlThrpMeasReqInfo -( -RguL2MUlThrpMeasReqInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguL2MUlThrpMeasReqInfo(param, mBuf) -RguL2MUlThrpMeasReqInfo *param; -Buffer *mBuf; -#endif -{ - U8 loop; - TRC3(cmUnpkRguL2MUlThrpMeasReqInfo); - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(cmUnpkLteLcId, ¶m->numLcId, mBuf); - for (loop=0; loopnumLcId; loop++) - { - CMCHKUNPK(SUnpkU8, ¶m->lcId[loop], mBuf); - } - CMCHKUNPK(SUnpkU8, ¶m->enbMeas, mBuf); - RETVALUE(ROK); -} - -/** -* @brief Primitive invoked from RLC to MAC to -* inform the On/Off status for Scheduled UL throughput -* measurment for dedicated channels -* -* @details -* -* Function :cmPkRguL2MUlThrpMeasReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguL2MUlThrpMeasReqInfo* measReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC 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) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU049, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) measReq, mBuf); - } - else - { - if (cmPkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU050, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)measReq, - sizeof(RguL2MUlThrpMeasReqInfo)); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (SPutSBuf(pst->region, pst->pool, (Data *)measReq, - sizeof(RguL2MUlThrpMeasReqInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU052, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - measReq = 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)ERGU051, (ErrVal)0, "Packing failed"); -#endif - if (measReq != NULLP) - { - SPutSBuf(pst->region, pst->pool, (Data *)measReq, - sizeof(RguL2MUlThrpMeasReqInfo)); - } - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUL2MULTHRPMEASREQ; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief Primitive invoked from RLC to MAC to -* inform the On/Off status for Scheduled UL throughput -* measurment for dedicated channels -* -* @details -* -* Function :cmUnpkRguL2MUlThrpMeasReq -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguL2MUlThrpMeasReqInfo * measReq -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguL2MUlThrpMeasReq +S16 cmPkRguL2MUlThrpMeasReqInfo ( -RguL2MUlThrpMeasReq func, -Pst *pst, +RguL2MUlThrpMeasReqInfo* param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguL2MUlThrpMeasReq(func, pst, mBuf) -RguL2MUlThrpMeasReq func; -Pst *pst; +S16 cmPkRguL2MUlThrpMeasReqInfo(param, mBuf) +RguL2MUlThrpMeasReqInfo* param; Buffer *mBuf; -#endif -{ - SpId spId; - RguL2MUlThrpMeasReqInfo* measReq; - - TRC3(cmUnpkRguL2MUlThrpMeasReq) - - if (SUnpkS16(&spId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU053, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &measReq, mBuf); - } - else - { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&measReq, - sizeof(RguL2MUlThrpMeasReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU054, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (cmUnpkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU055, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - SPutSBuf(pst->region, pst->pool, (Data *)measReq, - sizeof(RguL2MUlThrpMeasReqInfo)); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, measReq)); -} - -#endif - - - - -/** -* @brief Primitive invoked from RLC to MAC to - * inform the BO report for dedicated channels -* -* @details -* -* Function : cmPkRguDStaRsp -* -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguDStaRspInfo * staRsp -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguDStaRsp -( -Pst* pst, -SpId spId, -RguDStaRspInfo *staRsp -) -#else -PUBLIC S16 cmPkRguDStaRsp(pst, spId, staRsp) -Pst* pst; -SpId spId; -RguDStaRspInfo *staRsp; -#endif -{ - - RguDStaRspInfo *staRspInfo = NULL; - Buffer *mBuf = NULLP; - - if(SGetSBuf(pst->region, pst->pool, (Data **)&staRspInfo, sizeof(RguDStaRspInfo)) != 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 - /* staRspInfo cant be NULL here */ - if (staRspInfo == NULLP) - { - RETVALUE(RFAILED); - } -#endif - cmMemcpy((U8 *)staRspInfo, (U8 *)staRsp, sizeof(RguDStaRspInfo)); - 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 *)staRspInfo, sizeof(RguDStaRspInfo)); - - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) staRspInfo, mBuf); - } - else - { - if (cmPkRguDStaRspInfo(staRsp, 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 (staRspInfo != NULLP) - { - SPutSBuf(pst->region, pst->pool, (Data *)staRspInfo, sizeof(RguDStaRspInfo)); - } - SPutMsg(mBuf); - RETVALUE(RFAILED); - } +#endif +{ + S32 loop; + TRC3(cmPkRguL2MUlThrpMeasReqInfo); - pst->event = (Event) EVTRGUDSTARSP; - RETVALUE(SPstTsk(pst,mBuf)); - SPutMsg(mBuf); + CMCHKPK(oduUnpackUInt8, param->enbMeas, mBuf); + for (loop=param->numLcId-1; loop >= 0; loop--) + { + CMCHKPK(oduUnpackUInt8, param->lcId[loop], mBuf); + } + CMCHKPK(cmPkLteLcId, param->numLcId, mBuf); + CMCHKPK(cmPkLteRnti, param->rnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + return ROK; } + -/** -* @brief Primitive invoked from RLC to MAC to - * inform the BO report for dedicated channels +/*********************************************************** * -* @details +* Func :cmUnpkRguL2MUlThrpMeasReqInfo * -* Function : cmUnpkRguDStaRsp * -* @param[in] Pst* pst -* @param[in] SpId spId -* @param[in] RguDStaRspInfo * staRsp -* @return S16 -* -# ROK -**/ +* Status Response from RLC to MAC on UL dedicated logical channel for Uplink +* Scheduled throughput measurement +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguDStaRsp +S16 cmUnpkRguL2MUlThrpMeasReqInfo ( -RguDStaRsp func, -Pst *pst, +RguL2MUlThrpMeasReqInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguDStaRsp(func, pst, mBuf) -RguDStaRsp func; -Pst *pst; +S16 cmUnpkRguL2MUlThrpMeasReqInfo(param, mBuf) +RguL2MUlThrpMeasReqInfo *param; Buffer *mBuf; #endif { - SpId spId; - RguDStaRspInfo *staRsp; - - TRC3(cmUnpkRguDStaRsp) - - 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); - } + U8 loop; + TRC3(cmUnpkRguL2MUlThrpMeasReqInfo); - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKUNPK(cmUnpkPtr,(PTR *) &staRsp, mBuf); - } - else + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); + CMCHKUNPK(cmUnpkLteLcId, ¶m->numLcId, mBuf); + for (loop=0; loopnumLcId; loop++) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&staRsp, - sizeof(RguDStaRspInfo))) != 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 (cmUnpkRguDStaRspInfo(staRsp, 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 *)staRsp, sizeof(RguDStaRspInfo)); - RETVALUE(RFAILED); - } + CMCHKUNPK(oduPackUInt8, ¶m->lcId[loop], mBuf); } - SPutMsg(mBuf); - (*func)(pst, spId, staRsp); - SPutSBuf(pst->region, pst->pool, (Data *)staRsp, sizeof(RguDStaRspInfo)); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->enbMeas, mBuf); + return ROK; } - /** -* @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 common channels. +* @brief Primitive invoked from RLC to MAC to +* inform the On/Off status for Scheduled UL throughput +* measurment for dedicated channels * * @details * -* Function : cmPkRguCStaInd +* Function :cmPkRguL2MUlThrpMeasReq * * @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguCStaIndInfo * staInd +* @param[in] SpId spId +* @param[in] RguL2MUlThrpMeasReqInfo* measReq * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguCStaInd +S16 cmPkRguL2MUlThrpMeasReq ( Pst* pst, -SuId suId, -RguCStaIndInfo * staInd +SpId spId, +RguL2MUlThrpMeasReqInfo* measReq ) #else -PUBLIC S16 cmPkRguCStaInd(pst, suId, staInd) +S16 cmPkRguL2MUlThrpMeasReq(pst, spId, measReq) Pst* pst; -SuId suId; -RguCStaIndInfo * staInd; +SpId spId; +RguL2MUlThrpMeasReqInfo* measReq; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRguCStaInd) + TRC3(cmPkRguL2MUlThrpMeasReq) 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)ERGU063, (ErrVal)0, "Packing failed"); + (ErrVal)ERGU049, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RguCStaIndInfo)); - RETVALUE(RFAILED); + SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); + return RFAILED; } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) staInd, mBuf); + CMCHKPK(oduPackPointer,(PTR) measReq, mBuf); } else { - if (cmPkRguCStaIndInfo(staInd, mBuf) != ROK) { + if (cmPkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU064, (ErrVal)0, "Packing failed"); + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGU050, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RguCStaIndInfo)); + SPutSBuf(pst->region, pst->pool, (Data *)measReq, + sizeof(RguL2MUlThrpMeasReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, - (Data *)staInd, sizeof(RguCStaIndInfo)) != ROK) { + if (SPutSBuf(pst->region, pst->pool, (Data *)measReq, + sizeof(RguL2MUlThrpMeasReqInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU066, (ErrVal)0, "Packing failed"); + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGU052, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - staInd = NULLP; - } - if (SPkS16(suId,mBuf) != ROK) { + measReq = 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)ERGU065, (ErrVal)0, "Packing failed"); + (ErrVal)ERGU051, (ErrVal)0, "Packing failed"); #endif - if (staInd != NULLP) + if (measReq != NULLP) { - SPutSBuf(pst->region, pst->pool, (Data *)staInd, - sizeof(RguCStaIndInfo)); + SPutSBuf(pst->region, pst->pool, (Data *)measReq, + sizeof(RguL2MUlThrpMeasReqInfo)); } SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - pst->event = (Event) EVTRGUCSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + + pst->event = (Event) EVTRGUL2MULTHRPMEASREQ; + return (SPstTsk(pst,mBuf)); } /** -* @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 common channels. +* @brief Primitive invoked from RLC to MAC to +* inform the On/Off status for Scheduled UL throughput +* measurment for dedicated channels * * @details * -* Function : cmUnpkRguCStaInd +* Function :cmUnpkRguL2MUlThrpMeasReq * * @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguCStaIndInfo * staInd +* @param[in] SpId spId +* @param[in] RguL2MUlThrpMeasReqInfo * measReq * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguCStaInd +S16 cmUnpkRguL2MUlThrpMeasReq ( -RguCStaInd func, +RguL2MUlThrpMeasReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguCStaInd(func, pst, mBuf) -RguCStaInd func; +S16 cmUnpkRguL2MUlThrpMeasReq(func, pst, mBuf) +RguL2MUlThrpMeasReq func; Pst *pst; Buffer *mBuf; #endif { - SuId suId; - RguCStaIndInfo *staInd; + SpId spId; + RguL2MUlThrpMeasReqInfo* measReq; - TRC3(cmUnpkRguCStaInd) + TRC3(cmUnpkRguL2MUlThrpMeasReq) - if (SUnpkS16(&suId, mBuf) != ROK) { + if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU067, (ErrVal)0, "UnPacking failed"); + (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 *) &staInd, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &measReq, mBuf); } - else + else { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&staInd, sizeof(RguCStaIndInfo))) != ROK) { + if ((SGetSBuf(pst->region, pst->pool, (Data **)&measReq, + sizeof(RguL2MUlThrpMeasReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU068, (ErrVal)0, "UnPacking failed"); + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGU054, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (cmUnpkRguCStaIndInfo(staInd, mBuf) != ROK) { + if (cmUnpkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU069, (ErrVal)0, "UnPacking failed"); + (ErrVal)ERGU055, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RguCStaIndInfo)); - RETVALUE(RFAILED); + SPutSBuf(pst->region, pst->pool, (Data *)measReq, + sizeof(RguL2MUlThrpMeasReqInfo)); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, staInd)); + return ((*func)(pst, spId, measReq)); } +#endif + + /*rgu_c_001.main_5 - ADD - L2M Support */ #ifdef LTE_L2_MEAS @@ -1851,14 +673,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguHqStaInd +S16 cmPkRguHqStaInd ( Pst* pst, SuId suId, RguHarqStatusInd *harqStatusInd ) #else -PUBLIC S16 cmPkRguHqStaInd(pst, suId, harqStatusInd) +S16 cmPkRguHqStaInd(pst, suId, harqStatusInd) Pst* pst; SuId suId; RguHarqStatusInd *harqStatusInd; @@ -1882,7 +704,7 @@ RguHarqStatusInd *harqStatusInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU070, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } cmMemcpy((U8 *)harqStaInd, (U8 *)harqStatusInd, sizeof(RguHarqStatusInd)); @@ -1898,24 +720,24 @@ RguHarqStatusInd *harqStatusInd; #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); } @@ -1932,13 +754,13 @@ RguHarqStatusInd *harqStatusInd; 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) @@ -1950,14 +772,14 @@ RguHarqStatusInd *harqStatusInd; (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)); } @@ -1975,14 +797,14 @@ RguHarqStatusInd *harqStatusInd; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguHqStaInd +S16 cmUnpkRguHqStaInd ( RguHqStaInd func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguHqStaInd(func, pst, mBuf) +S16 cmUnpkRguHqStaInd(func, pst, mBuf) RguHqStaInd func; Pst *pst; Buffer *mBuf; @@ -2001,15 +823,15 @@ Buffer *mBuf; (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 { @@ -2023,18 +845,18 @@ Buffer *mBuf; (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 } @@ -2046,203 +868,38 @@ Buffer *mBuf; #else SPutStaticBuffer(pst->region, pst->pool, (Data *)hqStaInd, sizeof(RguHarqStatusInd), 0); #endif - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ - -/** -* @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 : cmPkRguDStaInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguDStaIndInfo * staInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkRguDStaInd -( -Pst* pst, -SuId suId, -RguDStaIndInfo * staInd -) -#else -PUBLIC S16 cmPkRguDStaInd(pst, suId, staInd) -Pst* pst; -SuId suId; -RguDStaIndInfo * staInd; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkRguDStaInd) - - 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 *)staInd, sizeof(RguDStaIndInfo)); - RETVALUE(RFAILED); - } - if (pst->selector == RGU_SEL_LWLC) - { - CMCHKPK(cmPkPtr,(PTR) staInd, mBuf); - } - else - { - if (cmPkRguDStaIndInfo(staInd, 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 *)staInd, - sizeof(RguDStaIndInfo)); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - if (SPutSBuf(pst->region, pst->pool, (Data *)staInd, - sizeof(RguDStaIndInfo)) != 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); - } - staInd = 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 (staInd != NULLP) - { - SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RguDStaIndInfo)); - } - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTRGUDSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @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 : cmUnpkRguDStaInd -* -* @param[in] Pst* pst -* @param[in] SuId suId -* @param[in] RguDStaIndInfo * staInd -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDStaInd -( -RguDStaInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDStaInd(func, pst, mBuf) -RguDStaInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SuId suId; - RguDStaIndInfo *staInd; - - TRC3(cmUnpkRguDStaInd) - - 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 *) &staInd, mBuf); - } - else - { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&staInd, sizeof(RguDStaIndInfo))) != 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 (cmUnpkRguDStaIndInfo(staInd, 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 *)staInd, sizeof(RguDStaIndInfo)); - RETVALUE(RFAILED); - } - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, staInd)); -} - #ifdef ANSI -PUBLIC S16 cmPkRguLcFlowCntrlInfo +S16 cmPkRguLcFlowCntrlInfo ( RguLcFlowCntrlInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguLcFlowCntrlInfo (param,mBuf) +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) +S16 cmPkRguUeFlowCntrlInfo (param,mBuf) RguUeFlowCntrlInfo *param; Buffer *mBuf; #endif @@ -2255,19 +912,19 @@ Buffer *mBuf; { 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) +S16 cmPkRguFlowCntrlInfo(flowCntrlInd, mBuf) RguFlowCntrlInd *param; Buffer *mBuf; #endif @@ -2280,9 +937,9 @@ Buffer *mBuf; { cmPkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf); } - CMCHKPK(SPkU32, param->numUes, mBuf); + CMCHKPK(oduUnpackUInt32, param->numUes, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -2301,14 +958,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmPkRguFlowCntrlInd +S16 cmPkRguFlowCntrlInd ( Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd ) #else -PUBLIC S16 cmPkRguFlowCntrlInd(pst, suId, flowCntrlInd) +S16 cmPkRguFlowCntrlInd(pst, suId, flowCntrlInd) Pst* pst; SuId suId; RguFlowCntrlInd *flowCntrlInd; @@ -2323,11 +980,11 @@ RguFlowCntrlInd *flowCntrlInd; __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 { @@ -2338,7 +995,7 @@ RguFlowCntrlInd *flowCntrlInd; (ErrVal)ERGU077, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (SPkS16(suId, mBuf) != ROK) { @@ -2348,21 +1005,21 @@ RguFlowCntrlInd *flowCntrlInd; (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) +S16 cmUnpkRguLcFlowCntrlInfo (param,mBuf) RguLcFlowCntrlInfo *param; Buffer *mBuf; #endif @@ -2370,19 +1027,19 @@ Buffer *mBuf; 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) +S16 cmUnpkRguUeFlowCntrlInfo (param,mBuf) RguUeFlowCntrlInfo *param; Buffer *mBuf; #endif @@ -2390,22 +1047,22 @@ Buffer *mBuf; U32 idx; TRC3(cmUnpkRguUeFlowCntrlInfo); 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) +S16 cmUnpkRguFlowCntrlInfo(flowCntrlInfo, mBuf) RguFlowCntrlInd *param; Buffer *mBuf; #endif @@ -2415,12 +1072,12 @@ Buffer *mBuf; 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; } /** @@ -2439,14 +1096,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 cmUnpkRguFlowCntrlInd +S16 cmUnpkRguFlowCntrlInd ( RguFlowCntrlIndInfo func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguFlowCntrlInd(func, pst, mBuf) +S16 cmUnpkRguFlowCntrlInd(func, pst, mBuf) RguFlowCntrlIndInfo func; Pst *pst; Buffer *mBuf; @@ -2464,11 +1121,11 @@ Buffer *mBuf; (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 { @@ -2479,7 +1136,7 @@ Buffer *mBuf; (ErrVal)ERGU081, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRguFlowCntrlInfo(flowCntrlInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2489,11 +1146,11 @@ Buffer *mBuf; #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)); } /*********************************************************** @@ -2513,13 +1170,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguPduInfo +S16 cmPkRguPduInfo ( RguPduInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguPduInfo(param, mBuf) +S16 cmPkRguPduInfo(param, mBuf) RguPduInfo *param; Buffer *mBuf; #endif @@ -2532,14 +1189,14 @@ Buffer *mBuf; /* 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; } @@ -2561,13 +1218,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguPduInfo +S16 cmUnpkRguPduInfo ( RguPduInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguPduInfo(param, mBuf) +S16 cmUnpkRguPduInfo(param, mBuf) RguPduInfo *param; Buffer *mBuf; #endif @@ -2576,16 +1233,16 @@ Buffer *mBuf; TRC3(cmUnpkRguPduInfo); - CMCHKUNPK(SUnpkU8, ¶m->numPdu, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPdu, mBuf); for (i=0; inumPdu; 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; } @@ -2607,13 +1264,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguDBoReport +S16 cmPkRguDBoReport ( RguDBoReport *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguDBoReport(param, mBuf) +S16 cmPkRguDBoReport(param, mBuf) RguDBoReport *param; Buffer *mBuf; #endif @@ -2621,14 +1278,14 @@ Buffer *mBuf; 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; } @@ -2650,13 +1307,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguDBoReport +S16 cmUnpkRguDBoReport ( RguDBoReport *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguDBoReport(param, mBuf) +S16 cmUnpkRguDBoReport(param, mBuf) RguDBoReport *param; Buffer *mBuf; #endif @@ -2666,13 +1323,13 @@ Buffer *mBuf; 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; } @@ -2693,13 +1350,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguCDatReqInfo +S16 cmPkRguCDatReqInfo ( RguCDatReqInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguCDatReqInfo(param, mBuf) +S16 cmPkRguCDatReqInfo(param, mBuf) RguCDatReqInfo *param; Buffer *mBuf; #endif @@ -2711,9 +1368,9 @@ Buffer *mBuf; 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); } @@ -2725,17 +1382,17 @@ Buffer *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; } @@ -2757,13 +1414,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguCDatReqInfo +S16 cmUnpkRguCDatReqInfo ( RguCDatReqInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguCDatReqInfo(param, mBuf) +S16 cmUnpkRguCDatReqInfo(param, mBuf) RguCDatReqInfo *param; Buffer *mBuf; #endif @@ -2775,12 +1432,12 @@ Buffer *mBuf; 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; @@ -2788,18 +1445,18 @@ Buffer *mBuf; 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; } @@ -2821,13 +1478,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguLchDatReq +S16 cmPkRguLchDatReq ( RguLchDatReq *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguLchDatReq(param, mBuf) +S16 cmPkRguLchDatReq(param, mBuf) RguLchDatReq *param; Buffer *mBuf; #endif @@ -2836,13 +1493,13 @@ Buffer *mBuf; 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; } @@ -2864,13 +1521,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguLchDatReq +S16 cmUnpkRguLchDatReq ( RguLchDatReq *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguLchDatReq(param, mBuf) +S16 cmUnpkRguLchDatReq(param, mBuf) RguLchDatReq *param; Buffer *mBuf; #endif @@ -2881,11 +1538,11 @@ Buffer *mBuf; 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; } @@ -2906,13 +1563,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguDatReqTb +S16 cmPkRguDatReqTb ( RguDatReqTb *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguDatReqTb(param, mBuf) +S16 cmPkRguDatReqTb(param, mBuf) RguDatReqTb *param; Buffer *mBuf; #endif @@ -2922,13 +1579,13 @@ Buffer *mBuf; 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; } @@ -2951,27 +1608,27 @@ Buffer *mBuf; **********************************************************/ #ifdef LTE_L2_MEAS #ifdef ANSI -PUBLIC S16 cmUnpkRguDatReqTb +S16 cmUnpkRguDatReqTb ( Pst *pst, RguDatReqTb *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguDatReqTb(pst, param, mBuf) +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) +S16 cmUnpkRguDatReqTb(param, mBuf) RguDatReqTb *param; Buffer *mBuf; #endif @@ -2981,15 +1638,15 @@ Buffer *mBuf; TRC3(cmUnpkRguDatReqTb); - CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; 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; } @@ -3012,27 +1669,27 @@ Buffer *mBuf; /*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) +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) +S16 cmPkRguDDatReqInfo(param, mBuf) RguDDatReqInfo *param; Buffer *mBuf; #endif @@ -3050,13 +1707,13 @@ Buffer *mBuf; { 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; } @@ -3079,27 +1736,27 @@ Buffer *mBuf; **********************************************************/ #ifdef LTE_L2_MEAS #ifdef ANSI -PUBLIC S16 cmUnpkRguDDatReqInfo +S16 cmUnpkRguDDatReqInfo ( Pst *pst, RguDDatReqInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguDDatReqInfo(pst, param, mBuf) +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) +S16 cmUnpkRguDDatReqInfo(param, mBuf) RguDDatReqInfo *param; Buffer *mBuf; #endif @@ -3121,13 +1778,13 @@ Buffer *mBuf; 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; idatReqTb[i], mBuf); if(retVal != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #else CMCHKUNPK(cmUnpkRguDatReqTb, &datReq->datReqTb[i], mBuf); #endif } } - RETVALUE(ROK); + return ROK; } @@ -3166,13 +1823,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguCDatIndInfo +S16 cmPkRguCDatIndInfo ( RguCDatIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguCDatIndInfo(param, mBuf) +S16 cmPkRguCDatIndInfo(param, mBuf) RguCDatIndInfo *param; Buffer *mBuf; #endif @@ -3182,15 +1839,15 @@ Buffer *mBuf; 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; } @@ -3212,13 +1869,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguCDatIndInfo +S16 cmUnpkRguCDatIndInfo ( RguCDatIndInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguCDatIndInfo(param, mBuf) +S16 cmUnpkRguCDatIndInfo(param, mBuf) RguCDatIndInfo *param; Buffer *mBuf; #endif @@ -3232,10 +1889,10 @@ Buffer *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; } @@ -3257,13 +1914,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguLchDatInd +S16 cmPkRguLchDatInd ( RguLchDatInd *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguLchDatInd(param, mBuf) +S16 cmPkRguLchDatInd(param, mBuf) RguLchDatInd *param; Buffer *mBuf; #endif @@ -3272,7 +1929,7 @@ Buffer *mBuf; CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3294,13 +1951,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguLchDatInd +S16 cmUnpkRguLchDatInd ( RguLchDatInd *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguLchDatInd(param, mBuf) +S16 cmUnpkRguLchDatInd(param, mBuf) RguLchDatInd *param; Buffer *mBuf; #endif @@ -3309,101 +1966,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmPkRguDDatIndInfo -* -* -* Desc : RguDDatIndInfo - * Data Indication from MAC to RLC for dedicated channels of a UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRguDDatIndInfo -( -RguDDatIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRguDDatIndInfo(param, mBuf) -RguDDatIndInfo *param; -Buffer *mBuf; -#endif -{ - S32 i; - - TRC3(cmPkRguDDatIndInfo); - -#ifdef LTE_L2_MEAS - CMCHKPK(SPkU8, param->burstInd, mBuf); - CMCHKPK(SPkU32, param->ttiCnt, mBuf); -#endif - for (i=param->numLch-1; i >= 0; i--) { - CMCHKPK(cmPkRguLchDatInd, ¶m->lchData[i], mBuf); - } - CMCHKPK(SPkU8, param->numLch, mBuf); - CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRguDDatIndInfo -* -* -* Desc : RguDDatIndInfo - * Data Indication from MAC to RLC for dedicated channels of a UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDDatIndInfo -( -RguDDatIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDDatIndInfo(param, mBuf) -RguDDatIndInfo *param; -Buffer *mBuf; -#endif -{ - S32 i; - - TRC3(cmUnpkRguDDatIndInfo); - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numLch, mBuf); - for (i=0; inumLch; i++) { - CMCHKUNPK(cmUnpkRguLchDatInd, ¶m->lchData[i], mBuf); - } -#ifdef LTE_L2_MEAS - CMCHKUNPK(SUnpkU32, ¶m->ttiCnt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->burstInd, mBuf); -#endif - RETVALUE(ROK); + return ROK; } @@ -3424,13 +1987,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguCStaRspInfo +S16 cmPkRguCStaRspInfo ( RguCStaRspInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguCStaRspInfo(param, mBuf) +S16 cmPkRguCStaRspInfo(param, mBuf) RguCStaRspInfo *param; Buffer *mBuf; #endif @@ -3446,18 +2009,18 @@ Buffer *mBuf; 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; } @@ -3479,13 +2042,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguCStaRspInfo +S16 cmUnpkRguCStaRspInfo ( RguCStaRspInfo *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguCStaRspInfo(param, mBuf) +S16 cmUnpkRguCStaRspInfo(param, mBuf) RguCStaRspInfo *param; Buffer *mBuf; #endif @@ -3501,8 +2064,8 @@ Buffer *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; @@ -3510,179 +2073,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->u.rnti, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmPkRguDStaRspInfo -* -* -* Desc : RguDStaRspInfo - * Status Response from RLC to MAC for dedicated logical channel -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRguDStaRspInfo -( -RguDStaRspInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRguDStaRspInfo(param, mBuf) -RguDStaRspInfo *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRguDStaRspInfo); - - CMCHKPK(cmPkRguDBoReport, ¶m->boReport, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRguDStaRspInfo -* -* -* Desc : RguDStaRspInfo - * Status Response from RLC to MAC for dedicated logical channel -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDStaRspInfo -( -RguDStaRspInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDStaRspInfo(param, mBuf) -RguDStaRspInfo *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRguDStaRspInfo); - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(cmUnpkRguDBoReport, ¶m->boReport, mBuf); - RETVALUE(ROK); + return ROK; } - - -/*********************************************************** -* -* Func : cmPkRguCStaIndInfo -* -* -* Desc : RguCStaIndInfo - * Status Indication from MAC to RLC for common logical channel -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRguCStaIndInfo -( -RguCStaIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRguCStaIndInfo(param, mBuf) -RguCStaIndInfo *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRguCStaIndInfo); -#ifdef EMTC_ENBALE - CMCHKPK(cmPkLteTimingInfo, ¶m->pagingTimingInfo, mBuf); - CMCHKPK(SPkU8, param->isEmtcPaging, mBuf); -#endif - CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - CMCHKPK(SPkU32, param->transId, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRguCStaIndInfo -* -* -* Desc : RguCStaIndInfo - * Status Indication from MAC to RLC for common logical channel -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguCStaIndInfo -( -RguCStaIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguCStaIndInfo(param, mBuf) -RguCStaIndInfo *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRguCStaIndInfo); - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->transId, mBuf); - /*TODO:Mukesh: Need to check why rnti unpacking is missing*/ -#ifdef EMTC_ENBALE - CMCHKUNPK(SUnpkU8, ¶m->isEmtcPaging, mBuf); - CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->pagingTimingInfo, mBuf); -#endif - RETVALUE(ROK); -} - - /*********************************************************** * @@ -3701,13 +2096,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguLchStaInd +S16 cmPkRguLchStaInd ( RguLchStaInd *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguLchStaInd(param, mBuf) +S16 cmPkRguLchStaInd(param, mBuf) RguLchStaInd *param; Buffer *mBuf; #endif @@ -3717,7 +2112,7 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->totBufSize, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3739,13 +2134,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguLchStaInd +S16 cmUnpkRguLchStaInd ( RguLchStaInd *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguLchStaInd(param, mBuf) +S16 cmUnpkRguLchStaInd(param, mBuf) RguLchStaInd *param; Buffer *mBuf; #endif @@ -3755,7 +2150,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->totBufSize, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3776,13 +2171,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmPkRguStaIndTb +S16 cmPkRguStaIndTb ( RguStaIndTb *param, Buffer *mBuf ) #else -PUBLIC S16 cmPkRguStaIndTb(param, mBuf) +S16 cmPkRguStaIndTb(param, mBuf) RguStaIndTb *param; Buffer *mBuf; #endif @@ -3792,14 +2187,14 @@ Buffer *mBuf; 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; } @@ -3821,13 +2216,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PUBLIC S16 cmUnpkRguStaIndTb +S16 cmUnpkRguStaIndTb ( RguStaIndTb *param, Buffer *mBuf ) #else -PUBLIC S16 cmUnpkRguStaIndTb(param, mBuf) +S16 cmUnpkRguStaIndTb(param, mBuf) RguStaIndTb *param; Buffer *mBuf; #endif @@ -3836,117 +2231,15 @@ Buffer *mBuf; TRC3(cmUnpkRguStaIndTb); - CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; 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); -} - - -/*********************************************************** -* -* Func : cmPkRguDStaIndInfo -* -* -* Desc : RguDStaIndInfo - * StaInd from MAC to RLC for dedicated logical channels of a UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRguDStaIndInfo -( -RguDStaIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRguDStaIndInfo(param, mBuf) -RguDStaIndInfo *param; -Buffer *mBuf; -#endif -{ - S32 i; - S32 idx; - - TRC3(cmPkRguDStaIndInfo); - - for(idx = (param->nmbOfUeGrantPerTti - 1); idx >= 0 ; idx--) - { - RguDStaIndPerUe *staInd = ¶m->staInd[idx]; - CMCHKPK(SPkU8, staInd->fillCtrlPdu, mBuf); - for (i=staInd->nmbOfTbs-1; i >= 0; i--) { - CMCHKPK(cmPkRguStaIndTb, &staInd->staIndTb[i], mBuf); - } - CMCHKPK(SPkU8, staInd->nmbOfTbs, mBuf); - CMCHKPK(SPkU32,staInd->transId, mBuf); - CMCHKPK(cmPkLteRnti, staInd->rnti, mBuf); - } - CMCHKPK(SPkU8, param->nmbOfUeGrantPerTti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRguDStaIndInfo -* -* -* Desc : RguDStaIndInfo - * StaInd from MAC to RLC for dedicated logical channels of a UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRguDStaIndInfo -( -RguDStaIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRguDStaIndInfo(param, mBuf) -RguDStaIndInfo *param; -Buffer *mBuf; -#endif -{ - S32 i; - S32 idx; - - TRC3(cmUnpkRguDStaIndInfo); - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfUeGrantPerTti, mBuf); - for(idx = 0; idx < param->nmbOfUeGrantPerTti; idx++) - { - RguDStaIndPerUe *staInd = ¶m->staInd[idx]; - CMCHKUNPK(cmUnpkLteRnti, &staInd->rnti, mBuf); - CMCHKUNPK(SUnpkU32, &staInd->transId, mBuf); - CMCHKUNPK(SUnpkU8, &staInd->nmbOfTbs, mBuf); - for (i=0; inmbOfTbs; i++) - { - CMCHKUNPK(cmUnpkRguStaIndTb, &staInd->staIndTb[i], mBuf); - } - CMCHKUNPK(SUnpkU8, &staInd->fillCtrlPdu, mBuf); - } - RETVALUE(ROK); + return ROK; } #endif