X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=f08477f8959caa56f041c50b12ac148626dd8073;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=742a6d87ac7031f6aa51aa3d28b12ecb5fcfb54c;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git diff --git a/src/cm/rgr.c b/src/cm/rgr.c index 742a6d87a..f08477f89 100755 --- a/src/cm/rgr.c +++ b/src/cm/rgr.c @@ -44,10 +44,11 @@ /*********************************************************** * -* Func : cmPkRgrBndReq +* Func : cmUnpkRgrCfgReq * * -* Desc : Request from RRM to MAC to bind the interface saps +* Desc : Configuration Request from RRM to MAC for + * configuring Cell/Ue/Lc * * * Ret : S16 @@ -57,59 +58,70 @@ * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrBndReq +S16 cmUnpkRgrCfgReq ( -Pst* pst, -SuId suId, -SpId spId +RgrCfgReq func, +Pst *pst, +Buffer *mBuf ) -#else -S16 cmPkRgrBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { + RgrCfgTransId transId; + RgrCfgReqInfo *cfgReqInfo; + +#if 0 + if (SUnpkS16(&spId, mBuf) != ROK) { + SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR001, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR021, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SPkS16(spId, mBuf) != ROK) { +#endif + + if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { + SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR002, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR022, (ErrVal)0, "Packing failed"); #endif - SPutMsg(mBuf); return RFAILED; } - if (SPkS16(suId, mBuf) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR003, (ErrVal)0, "Packing failed"); + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR023, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); return RFAILED; } - pst->event = (Event) EVTRGRBNDREQ; - return (SPstTsk(pst,mBuf)); + memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); + if (pst->selector == ODU_SELECTOR_LC) + if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) { + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)); + SPutMsg(mBuf); +#if (ERRCLASS & ERRCLS_ADD_RES) + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR024, (ErrVal)0, "Packing failed"); +#endif + return RFAILED; + } + SPutMsg(mBuf); + return ((*func)(pst, transId, cfgReqInfo)); } +/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ /*********************************************************** * -* Func : cmUnpkRgrBndReq +* Func : cmPkRgrTtiIndInfo * * -* Desc : Request from RRM to MAC to bind the interface saps +* Desc : Packs the TTI indication information. * * * Ret : S16 @@ -119,54 +131,50 @@ SpId spId; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrBndReq +S16 cmPkRgrTtiIndInfo ( -RgrBndReq func, -Pst *pst, +RgrTtiIndInfo *param, +Buffer *mBuf +) +{ + CMCHKPK(oduPackUInt16, param->sfn, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + return ROK; +} + +/*********************************************************** +* +* Func : cmUnpkRgrTtiIndInfo +* +* +* Desc : Unpacking for RgrTtiIndInfo +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmUnpkRgrTtiIndInfo +( +RgrTtiIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrBndReq(func, pst, mBuf) -RgrBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - SpId spId; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR004, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR005, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, spId)); + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->sfn, mBuf); + return ROK; } /*********************************************************** * -* Func : cmPkRgrBndCfm +* Func : cmPkRgrTtiInd * * -* Desc : Confirmation from MAC to RRM for the bind/Unbind - * request for the interface saps +* Desc : TTI indication from MAC to RRM * * * Ret : S16 @@ -176,19 +184,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrBndCfm +S16 cmPkRgrTtiInd ( Pst* pst, SuId suId, -U8 status +RgrTtiIndInfo *ttiInd ) -#else -S16 cmPkRgrBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -U8 status; -#endif { Buffer *mBuf = NULLP; @@ -196,16 +197,17 @@ U8 status; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR006, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR025, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (oduUnpackUInt8(status, mBuf) != ROK) { + if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR007, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR026, (ErrVal)0, "Packing failed"); #endif + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); return RFAILED; } @@ -213,23 +215,24 @@ U8 status; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR008, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR027, (ErrVal)0, "Packing failed"); #endif + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); return RFAILED; } - pst->event = (Event) EVTRGRBNDCFM; + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); + pst->event = (Event) EVTRGRTTIIND; return (SPstTsk(pst,mBuf)); } /*********************************************************** * -* Func : cmUnpkRgrBndCfm +* Func : cmUnpkRgrTtiInd * * -* Desc : Confirmation from MAC to RRM for the bind/Unbind - * request for the interface saps +* Desc : TTI indication from MAC to RRM * * * Ret : S16 @@ -239,22 +242,15 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrBndCfm +S16 cmUnpkRgrTtiInd ( -RgrBndCfm func, +RgrTtiInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrBndCfm(func, pst, mBuf) -RgrBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; - U8 status; + RgrTtiIndInfo *ttiInd; if (SUnpkS16(&suId, mBuf) != ROK) { @@ -262,30 +258,45 @@ Buffer *mBuf; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR009, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR028, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (oduPackUInt8(&status, mBuf) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) + { +#if (ERRCLASS & ERRCLS_ADD_RES) + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed"); +#endif + SPutMsg(mBuf); + return RFAILED; + } + + if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { + /*ccpu00114888- Memory Leak issue- Start*/ + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, + sizeof(RgrTtiIndInfo)); + /*ccpu00114888- Memory Leak issue- End*/ SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR010, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR030, (ErrVal)0, "Packing failed"); #endif return RFAILED; } SPutMsg(mBuf); - return ((*func)(pst, suId, status)); + return ((*func)(pst, suId, ttiInd)); } /*********************************************************** * -* Func : cmPkRgrUbndReq +* Func : cmPkRgrCfgCfm * * -* Desc : Request from RRM to MAC to Unbind the interface saps +* Desc : Configuration Confirm from MAC to RRM * * * Ret : S16 @@ -295,19 +306,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUbndReq +S16 cmPkRgrCfgCfm ( Pst* pst, -SpId spId, -Reason reason -) -#else -S16 cmPkRgrUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif +RgrCfgTransId transId, +uint8_t status +) { Buffer *mBuf = NULLP; @@ -315,39 +319,39 @@ Reason reason; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR011, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR031, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SPkS16(reason, 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)ERGR012, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR032, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); return RFAILED; } - if (SPkS16(spId, mBuf) != ROK) { + if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR013, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR033, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); return RFAILED; } - pst->event = (Event) EVTRGRUBNDREQ; + pst->event = (Event) EVTMACSCHCFGCFM; return (SPstTsk(pst,mBuf)); } /*********************************************************** * -* Func : cmUnpkRgrUbndReq +* Func : cmUnpkRgrCfgCfm * * -* Desc : Request from RRM to MAC to Unbind the interface saps +* Desc : Configuration Confirm from MAC to RRM * * * Ret : S16 @@ -357,54 +361,46 @@ Reason reason; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUbndReq +S16 cmUnpkRgrCfgCfm ( -RgrUbndReq func, +RgrCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUbndReq(func, pst, mBuf) -RgrUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - Reason reason; + RgrCfgTransId transId; + uint8_t status; - if (SUnpkS16(&spId, mBuf) != ROK) { + if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR014, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR036, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SUnpkS16(&reason, mBuf) != ROK) { + if (oduUnpackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR015, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR037, (ErrVal)0, "Packing failed"); #endif return RFAILED; } SPutMsg(mBuf); - return ((*func)(pst, spId, reason)); + return ((*func)(pst, transId, status)); } /*********************************************************** * -* Func : cmUnpkRgrCfgReq +* Func : cmPkRgrCfgTransId * * -* Desc : Configuration Request from RRM to MAC for - * configuring Cell/Ue/Lc +* Desc : Transaction ID between MAC and RRM * * * Ret : S16 @@ -414,77 +410,29 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgReq +S16 cmPkRgrCfgTransId ( -RgrCfgReq func, -Pst *pst, +RgrCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgReq(func, pst, mBuf) -RgrCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - RgrCfgReqInfo *cfgReqInfo; - -#if 0 - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR021, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } -#endif - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR022, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR023, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; + S32 i; + + for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { + CMCHKPK(oduPackUInt8, param->trans[i], mBuf); } - memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR024, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, transId, cfgReqInfo)); + return ROK; } -/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ + /*********************************************************** * -* Func : cmPkRgrTtiIndInfo +* Func : cmUnpkRgrCfgTransId * * -* Desc : Packs the TTI indication information. +* Desc : Transaction ID between MAC and RRM * * * Ret : S16 @@ -494,29 +442,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrTtiIndInfo +S16 cmUnpkRgrCfgTransId ( -RgrTtiIndInfo *param, -Buffer *mBuf +RgrCfgTransId *param, +Buffer *mBuf ) -#else -S16 cmPkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + + S32 i; + + for (i=0; itrans[i], mBuf); + } return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgrTtiIndInfo +* Func : cmPkRgrDlHqCfg * * -* Desc : Unpacking for RgrTtiIndInfo +* Desc : Downlink HARQ configuration per Cell +* * * Ret : S16 * @@ -525,31 +474,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrTtiIndInfo +S16 cmPkRgrDlHqCfg ( -RgrTtiIndInfo *param, +RgrDlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + + CMCHKPK(oduPackUInt8, param->maxMsg4HqTx, mBuf); + CMCHKPK(oduPackUInt8, param->maxDlHqTx, mBuf); return ROK; } + /*********************************************************** * -* Func : cmPkRgrTtiInd +* Func : cmUnpkRgrDlHqCfg * * -* Desc : TTI indication from MAC to RRM +* Desc : Downlink HARQ configuration per Cell * * * Ret : S16 @@ -559,62 +504,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrTtiInd +S16 cmUnpkRgrDlHqCfg ( -Pst* pst, -SuId suId, -RgrTtiIndInfo *ttiInd +RgrDlHqCfg *param, +Buffer *mBuf ) -#else -S16 cmPkRgrTtiInd(pst, suId, ttiInd) -Pst* pst; -SuId suId; -RgrTtiIndInfo *ttiInd; -#endif { - Buffer *mBuf = NULLP; - 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)ERGR025, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR026, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPkS16(suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR027, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - SPutMsg(mBuf); - return RFAILED; - } - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - pst->event = (Event) EVTRGRTTIIND; - return (SPstTsk(pst,mBuf)); + + CMCHKUNPK(oduUnpackUInt8, ¶m->maxDlHqTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxMsg4HqTx, mBuf); + return ROK; } + /*********************************************************** * -* Func : cmUnpkRgrTtiInd +* Func : cmPkRgrRntiCfg * * -* Desc : TTI indication from MAC to RRM +* Desc : Range of RNTIs managed by MAC * * * Ret : S16 @@ -624,68 +534,26 @@ RgrTtiIndInfo *ttiInd; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrTtiInd +S16 cmPkRgrRntiCfg ( -RgrTtiInd func, -Pst *pst, +RgrRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiInd(func, pst, mBuf) -RgrTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrTtiIndInfo *ttiInd; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR028, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { - /*ccpu00114888- Memory Leak issue- Start*/ - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, - sizeof(RgrTtiIndInfo)); - /*ccpu00114888- Memory Leak issue- End*/ - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR030, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, ttiInd)); + CMCHKPK(oduPackUInt16, param->size, mBuf); + CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); + return ROK; } + /*********************************************************** * -* Func : cmPkRgrCfgCfm +* Func : cmUnpkRgrRntiCfg * * -* Desc : Configuration Confirm from MAC to RRM +* Desc : Range of RNTIs managed by MAC * * * Ret : S16 @@ -695,59 +563,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgCfm +S16 cmUnpkRgrRntiCfg ( -Pst* pst, -RgrCfgTransId transId, -U8 status +RgrRntiCfg *param, +Buffer *mBuf ) -#else -S16 cmPkRgrCfgCfm(pst, transId, status) -Pst* pst; -RgrCfgTransId transId; -U8 status; -#endif { - Buffer *mBuf = NULLP; - 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)ERGR031, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduUnpackUInt8(status, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR032, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR033, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - pst->event = (Event) EVTMACSCHCFGCFM; - return (SPstTsk(pst,mBuf)); + + CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->size, mBuf); + return ROK; } - +#ifdef EMTC_ENABLE /*********************************************************** * -* Func : cmUnpkRgrCfgCfm +* Func : cmPkRgrEmtcRntiCfg * * -* Desc : Configuration Confirm from MAC to RRM +* Desc : Range of Emtc RNTIs managed by MAC * * * Ret : S16 @@ -757,54 +592,30 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgCfm +S16 cmPkRgrEmtcRntiCfg ( -RgrCfgCfm func, -Pst *pst, +RgrEmtcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgCfm(func, pst, mBuf) -RgrCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - U8 status; - - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR036, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduPackUInt8(&status, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR037, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, transId, status)); + + CMCHKPK(oduPackUInt16, param->size, mBuf); + CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf); + CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf); + CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf); + CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf); + return ROK; } -/* rgr_c_001.main_4: ADD-Added for SI Enhancement. */ -#ifdef RGR_SI_SCH + + /*********************************************************** * -* Func : cmPkRgrSiCfgCfm +* Func : cmUnpkRgrEmtcRntiCfg * * -* Desc : SI Configuration Confirm from MAC to RRM +* Desc : Range of Emtc RNTIs managed by MAC * * * Ret : S16 @@ -814,72 +625,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSiCfgCfm +S16 cmUnpkRgrEmtcRntiCfg ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -U8 status -) -#else -S16 cmPkRgrSiCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -U8 status; -#endif +RgrEmtcRntiCfg *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - 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)ERGR038, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduUnpackUInt8(status, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR039, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR040, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - if (SPkS16(suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR041, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } + CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeAStart, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeARange, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBStart, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBRange, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->size, mBuf); - pst->event = (Event) EVTRGRSICFGCFM; - return (SPstTsk(pst,mBuf)); + return ROK; } +#endif /*********************************************************** * -* Func : cmUnpkRgrSiCfgCfm +* Func : cmPkRgrDlCmnCodeRateCfg * * -* Desc : Configuration Confirm from MAC to RRM +* Desc : Downlink common channel code rate configuration per cell * * * Ret : S16 @@ -889,64 +659,27 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgCfm +S16 cmPkRgrDlCmnCodeRateCfg ( -RgrSiCfgCfm func, -Pst *pst, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf) -RgrSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrCfgTransId transId; - U8 status; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR042, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR043, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduPackUInt8(&status, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR044, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, transId, status)); + CMCHKPK(oduPackUInt8, param->ccchCqi, mBuf); + CMCHKPK(oduPackUInt16, param->pdcchCodeRate, mBuf); + CMCHKPK(oduPackUInt16, param->bcchPchRaCodeRate, mBuf); + return ROK; } -#endif/*RGR_SI_SCH*/ + /*********************************************************** * -* Func : cmPkRgrCfgTransId +* Func : cmUnpkRgrDlCmnCodeRateCfg * * -* Desc : Transaction ID between MAC and RRM +* Desc : Downlink common channel code rate configuration per cell * * * Ret : S16 @@ -956,24 +689,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgTransId +S16 cmUnpkRgrDlCmnCodeRateCfg ( -RgrCfgTransId *param, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - S32 i; - - for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); - } + CMCHKUNPK(oduUnpackUInt16, ¶m->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pdcchCodeRate, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -981,10 +706,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrCfgTransId +* Func : cmPkRgrCfiCfg * * -* Desc : Transaction ID between MAC and RRM +* Desc : Control Format Indicator (CFI) configuration per cell * * * Ret : S16 @@ -994,24 +719,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgTransId +S16 cmPkRgrCfiCfg ( -RgrCfgTransId *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - - S32 i; - - for (i=0; itrans[i], mBuf); - } + CMCHKPK(oduPackUInt8, param->cfi, mBuf); return ROK; } @@ -1019,10 +733,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrDlHqCfg +* Func : cmUnpkRgrCfiCfg * * -* Desc : Downlink HARQ configuration per Cell +* Desc : Control Format Indicator (CFI) configuration per cell * * * Ret : S16 @@ -1032,22 +746,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDlHqCfg +S16 cmUnpkRgrCfiCfg ( -RgrDlHqCfg *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfi, mBuf); return ROK; } @@ -1055,10 +761,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlHqCfg +* Func : cmPkRgrPuschSubBandCfg * * -* Desc : Downlink HARQ configuration per Cell +* Desc : PUSCH sub-band configuration per cell * * * Ret : S16 @@ -1068,22 +774,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDlHqCfg +S16 cmPkRgrPuschSubBandCfg ( -RgrDlHqCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { + S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->maxDlHqTx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxMsg4HqTx, mBuf); + for (i=param->numSubbands-1; i >= 0; i--) { + CMCHKPK(oduPackUInt8, param->dmrs[i], mBuf); + } + CMCHKPK(oduPackUInt8, param->size, mBuf); + CMCHKPK(oduPackUInt8, param->numSubbands, mBuf); + CMCHKPK(oduPackUInt8, param->subbandStart, mBuf); return ROK; } @@ -1091,10 +796,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrRntiCfg +* Func : cmUnpkRgrPuschSubBandCfg * * -* Desc : Range of RNTIs managed by MAC +* Desc : PUSCH sub-band configuration per cell * * * Ret : S16 @@ -1104,22 +809,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrRntiCfg +S16 cmUnpkRgrPuschSubBandCfg ( -RgrRntiCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt16, param->size, mBuf); - CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); + S32 i; + CMCHKUNPK(oduUnpackUInt8, ¶m->subbandStart, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSubbands, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->size, mBuf); + for (i=0; inumSubbands; i++) { + CMCHKUNPK(oduUnpackUInt8, ¶m->dmrs[i], mBuf); + } return ROK; } @@ -1127,10 +830,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrRntiCfg +* Func : cmPkRgrUlCmnCodeRateCfg * * -* Desc : Range of RNTIs managed by MAC +* Desc : Uplink common channel code rate configuration per cell * * * Ret : S16 @@ -1140,32 +843,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrRntiCfg +S16 cmPkRgrUlCmnCodeRateCfg ( -RgrRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKPK(oduPackUInt8, param->ccchCqi, mBuf); return ROK; } -#ifdef EMTC_ENABLE + + /*********************************************************** * -* Func : cmPkRgrEmtcRntiCfg +* Func : cmUnpkRgrUlCmnCodeRateCfg * * -* Desc : Range of Emtc RNTIs managed by MAC +* Desc : Uplink common channel code rate configuration per cell * * * Ret : S16 @@ -1175,25 +870,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrEmtcRntiCfg +S16 cmUnpkRgrUlCmnCodeRateCfg ( -RgrEmtcRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt16, param->size, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -1201,10 +885,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrEmtcRntiCfg +* Func : cmPkRgrUlTrgCqiCfg * * -* Desc : Range of Emtc RNTIs managed by MAC +* Desc : Target Uplink CQI to achieve through group power control configured per cell * * * Ret : S16 @@ -1214,37 +898,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrEmtcRntiCfg +S16 cmPkRgrUlTrgCqiCfg ( -RgrEmtcRntiCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeAStart, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeARange, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBStart, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBRange, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); - + CMCHKPK(oduPackUInt8, param->trgCqi, mBuf); return ROK; } -#endif + /*********************************************************** * -* Func : cmPkRgrDlCmnCodeRateCfg +* Func : cmUnpkRgrUlTrgCqiCfg * * -* Desc : Downlink common channel code rate configuration per cell +* Desc : Target Uplink CQI to achieve through group power control configured per cell * * * Ret : S16 @@ -1254,22 +925,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDlCmnCodeRateCfg +S16 cmUnpkRgrUlTrgCqiCfg ( -RgrDlCmnCodeRateCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); - CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); - CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -1277,10 +940,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlCmnCodeRateCfg +* Func : cmPkRgrBwCfg * * -* Desc : Downlink common channel code rate configuration per cell +* Desc : Bandwidth configuration per cell * * * Ret : S16 @@ -1290,547 +953,177 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDlCmnCodeRateCfg +S16 cmPkRgrBwCfg ( -RgrDlCmnCodeRateCfg *param, +RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); + CMCHKPK(oduPackUInt8, param->ulTotalBw, mBuf); + CMCHKPK(oduPackUInt8, param->dlTotalBw, mBuf); return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrCfiCfg -* -* -* Desc : Control Format Indicator (CFI) configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfiCfg +#ifdef EMTC_ENABLE +/* EMTC related pack changes start*/ + +S16 cmPkRgrEmtcSiCfg ( -RgrCfiCfg *param, +RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); - return ROK; + S32 i; + + CMCHKPK(oduPackUInt8, param->siHoppingEnable, mBuf); + CMCHKPK(oduPackUInt32, param->modPrd, mBuf); + CMCHKPK(oduPackUInt8, param->siWinSizeBr, mBuf); + CMCHKPK(oduPackUInt8, param->sib1Repetition, mBuf); + CMCHKPK(oduPackUInt8, param->siRepetition, mBuf); + + CMCHKPK(oduPackUInt16, param->startSymbolLc, mBuf); + //CMCHKPK(oduPackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + /*Changes by SIMRAN*/ + if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) + { + CMCHKPK(oduPackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); + } + else + { + //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf); + for (i=0; i<2; i++) { + CMCHKPK(oduPackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); + } + + } + CMCHKPK(oduPackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + //CMCHKPK(oduPackUInt16, param->fddDlOrTddSfBitmapBR, mBuf); + + for (i= (param->numSi-1); i >= 0; i--) { + CMCHKPK(oduPackUInt8, param->schdInfo[i].emtcSiNarrowBand, mBuf); + CMCHKPK(oduPackUInt16, param->schdInfo[i].emtcSiTbs, mBuf); + } + + for (i= (param->numSi-1); i >= 0; i--) { + CMCHKPK(oduPackUInt32, param->siPeriodicity[i], mBuf); + } + + CMCHKPK(oduPackUInt8, param->numSi, mBuf); + + return ROK; } - -/*********************************************************** -* -* Func : cmUnpkRgrCfiCfg -* -* -* Desc : Control Format Indicator (CFI) configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfiCfg + + +S16 cmPkRgrEmtcRachCfg ( -RgrCfiCfg *param, +RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); - return ROK; + S32 i; + + CMCHKPK(oduPackUInt8, param->emtcCeLvlSupported, mBuf); + + for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf); + CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf); + CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf); + CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf); + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf); + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf); + } + + return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrPuschSubBandCfg -* -* -* Desc : PUSCH sub-band configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrPuschSubBandCfg +S16 cmPkRgrEmtcPdschCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { - S32 i; + CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeB, mBuf); + + return ROK; +} - for (i=param->numSubbands-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf); - } - CMCHKPK(oduUnpackUInt8, param->size, mBuf); - CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf); - CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf); +S16 cmPkRgrEmtcPuschCfg +( +RgrEmtcPuschCfg*param, +Buffer *mBuf +) +{ + CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeB, mBuf); + CMCHKPK(oduPackUInt8, param->emtcHoppingOffset, mBuf); return ROK; } - -/*********************************************************** -* -* Func : cmUnpkRgrPuschSubBandCfg -* -* -* Desc : PUSCH sub-band configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrPuschSubBandCfg + +S16 cmPkRgrEmtcPucchCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { S32 i; - - CMCHKUNPK(oduPackUInt8, ¶m->subbandStart, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numSubbands, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); - for (i=0; inumSubbands; i++) { - CMCHKUNPK(oduPackUInt8, ¶m->dmrs[i], mBuf); - } - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrUlCmnCodeRateCfg -* -* -* Desc : Uplink common channel code rate configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUlCmnCodeRateCfg -( -RgrUlCmnCodeRateCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUlCmnCodeRateCfg -* -* -* Desc : Uplink common channel code rate configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUlCmnCodeRateCfg -( -RgrUlCmnCodeRateCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrUlTrgCqiCfg -* -* -* Desc : Target Uplink CQI to achieve through group power control configured per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUlTrgCqiCfg -( -RgrUlTrgCqiCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUlTrgCqiCfg -* -* -* Desc : Target Uplink CQI to achieve through group power control configured per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUlTrgCqiCfg -( -RgrUlTrgCqiCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrBwCfg -* -* -* Desc : Bandwidth configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrBwCfg -( -RgrBwCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); - return ROK; -} - - -#ifdef EMTC_ENABLE -/* EMTC related pack changes start*/ - -#ifdef ANSI -S16 cmPkRgrEmtcSiCfg -( -RgrEmtcSiCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - CMCHKPK(oduUnpackUInt8, param->siHoppingEnable, mBuf); - CMCHKPK(oduUnpackUInt32, param->modPrd, mBuf); - CMCHKPK(oduUnpackUInt8, param->siWinSizeBr, mBuf); - CMCHKPK(oduUnpackUInt8, param->sib1Repetition, mBuf); - CMCHKPK(oduUnpackUInt8, param->siRepetition, mBuf); - - CMCHKPK(oduUnpackUInt16, param->startSymbolLc, mBuf); - //CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); - /*Changes by SIMRAN*/ - if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) - { - CMCHKPK(oduUnpackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); - } - else + for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf); - for (i=0; i<2; i++) { - CMCHKPK(oduUnpackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); - } - + CMCHKPK(oduPackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); - //CMCHKPK(oduUnpackUInt16, param->fddDlOrTddSfBitmapBR, mBuf); - - for (i= (param->numSi-1); i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->schdInfo[i].emtcSiNarrowBand, mBuf); - CMCHKPK(oduUnpackUInt16, param->schdInfo[i].emtcSiTbs, mBuf); - } - - for (i= (param->numSi-1); i >= 0; i--) { - CMCHKPK(oduUnpackUInt32, param->siPeriodicity[i], mBuf); - } - - CMCHKPK(oduUnpackUInt8, param->numSi, mBuf); - - return ROK; -} - - - - -#ifdef ANSI -S16 cmPkRgrEmtcRachCfg -( -RgrEmtcRachCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf); - - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf); - } - - return ROK; -} - - -#ifdef ANSI -S16 cmPkRgrEmtcPdschCfg -( -RgrEmtcPdschCfg*param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - - return ROK; -} - -#ifdef ANSI -S16 cmPkRgrEmtcPuschCfg -( -RgrEmtcPuschCfg*param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); - return ROK; -} - - -#ifdef ANSI -S16 cmPkRgrEmtcPucchCfg -( -RgrEmtcPucchCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); - } - - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); return ROK; } -#ifdef ANSI S16 cmPkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcPrachStartSubFrame, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMaxPremAttemptCE, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcNumMpdcchNBtoMonitor, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[1], mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMpdcchNumRep, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachHoppingCfg, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPrachCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPrachFreqOffset, mBuf); + CMCHKPK(oduPackUInt16, param->emtcPrachStartSubFrame, mBuf); + CMCHKPK(oduPackUInt8, param->emtcMaxPremAttemptCE, mBuf); + CMCHKPK(oduPackUInt8, param->emtcNumRepPerPreambleAtt, mBuf); + CMCHKPK(oduPackUInt8, param->emtcNumMpdcchNBtoMonitor, mBuf); + CMCHKPK(oduPackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf); + CMCHKPK(oduPackUInt8, param->emtcMpdcchNBtoMonitor[1], mBuf); + CMCHKPK(oduPackUInt16, param->emtcMpdcchNumRep, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPrachHoppingCfg, mBuf); return ROK; } -#ifdef ANSI S16 cmPkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); + CMCHKPK(oduPackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPrachHopingOffset, mBuf); + CMCHKPK(oduPackUInt8, param->emtcInitialCElevel, mBuf); for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } @@ -1841,21 +1134,15 @@ Buffer *mBuf; -#ifdef ANSI S16 cmPkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->pci, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); + CMCHKPK(oduPackUInt16, param->pci, mBuf); + CMCHKPK(oduPackUInt32, param->emtcT300Tmr, mBuf); + CMCHKPK(oduPackUInt32, param->emtcT301Tmr, mBuf); CMCHKPK(cmPkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); CMCHKPK(cmPkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); CMCHKPK(cmPkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); @@ -1863,9 +1150,9 @@ Buffer *mBuf; CMCHKPK(cmPkRgrEmtcPrachCfg, ¶m->emtcPrachCfg, mBuf); CMCHKPK(cmPkRgrEmtcPucchCfg, ¶m->emtcPucchCfg, mBuf); CMCHKPK(cmPkRgrEmtcRntiCfg, ¶m->emtcMacRnti, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPdschNbIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNbIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPuschNbIdx, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPdschNbIdx, mBuf); + CMCHKPK(oduPackUInt8, param->emtcMpdcchNbIdx, mBuf); + CMCHKPK(oduPackUInt8, param->emtcPuschNbIdx, mBuf); return ROK; } @@ -1874,53 +1161,49 @@ Buffer *mBuf; /* EMTC related unpack changes start*/ -#ifdef ANSI S16 cmUnpkRgrEmtcSiCfg ( RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif { S32 i; - U32 tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); + uint32_t tmpEnum; + CMCHKUNPK(oduUnpackUInt8, ¶m->numSi, mBuf); - for (i=0; i < param->numSi ; i++) { - CMCHKUNPK(oduPackUInt32,(U32*)&tmpEnum,mBuf); - param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum; + for (i=0; i < param->numSi ; i++) + { + CMCHKUNPK(oduUnpackUInt32,(uint32_t*)&tmpEnum,mBuf); + param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum; } - for (i=0; i < param->numSi ; i++) { - CMCHKUNPK(oduPackUInt16, ¶m->schdInfo[i].emtcSiTbs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->schdInfo[i].emtcSiNarrowBand, mBuf); + for (i=0; i < param->numSi ; i++) + { + CMCHKUNPK(oduUnpackUInt16, ¶m->schdInfo[i].emtcSiTbs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->schdInfo[i].emtcSiNarrowBand, mBuf); } - //CMCHKUNPK(oduPackUInt16, ¶m->fddDlOrTddSfBitmapBR, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + //CMCHKUNPK(oduUnpackUInt16, ¶m->fddDlOrTddSfBitmapBR, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); /*Changes by SIMRAN*/ if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) { - CMCHKUNPK(oduPackUInt16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); } else { for (i=1; i>=0; i--) { - CMCHKUNPK(oduPackUInt32, ¶m->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); } } - CMCHKUNPK(oduPackUInt16, ¶m->startSymbolLc, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->siRepetition, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->sib1Repetition, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->siWinSizeBr, mBuf); - CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->startSymbolLc, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->siRepetition, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sib1Repetition, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->siWinSizeBr, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&tmpEnum, mBuf); param->modPrd = (RgrModPeriodicity) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->siHoppingEnable, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->siHoppingEnable, mBuf); return ROK; } @@ -1928,166 +1211,124 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcRachCfg ( RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif { S32 i; for (i=0; i < RGR_MAX_CE_LEVEL; i++) { - CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf); - CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf); - CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf); - CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf); - CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf); - CMCHKUNPK(oduPackUInt8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf); + CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf); + CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf); + CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf); + CMCHKUNPK(oduUnpackUInt8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->emtcCeLvlSupported, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcCeLvlSupported, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPdschCfg ( RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPuschCfg ( RgrEmtcPuschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcHoppingOffset, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPucchCfg ( RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl1, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl0, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl1, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl0, mBuf); for (i=0; i < RGR_MAX_CE_LEVEL ; i++) { - CMCHKUNPK(oduPackUInt16, ¶m->emtcN1pucchAnInfoLst[i], mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcN1pucchAnInfoLst[i], mBuf); } return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[0], mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcNumMpdcchNBtoMonitor, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcNumRepPerPreambleAtt, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcMaxPremAttemptCE, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->emtcPrachStartSubFrame, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachFreqOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcMpdcchNumRep, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcMpdcchNBtoMonitor[0], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcNumMpdcchNBtoMonitor, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcNumRepPerPreambleAtt, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcMaxPremAttemptCE, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->emtcPrachStartSubFrame, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPrachFreqOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPrachCfgIdx, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; for (i=0; i < RGR_MAX_CE_LEVEL; i++) { CMCHKUNPK(cmUnpkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->emtcInitialCElevel, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHopingOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchStartSFCssRaFdd, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcInitialCElevel, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPrachHopingOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcMpdcchStartSFCssRaFdd, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNbIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcPdschNbIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPuschNbIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcMpdcchNbIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcPdschNbIdx, mBuf); CMCHKUNPK(cmUnpkRgrEmtcRntiCfg, ¶m->emtcMacRnti, mBuf); CMCHKUNPK(cmUnpkRgrEmtcPucchCfg, ¶m->emtcPucchCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcPrachCfg, ¶m->emtcPrachCfg, mBuf); @@ -2095,9 +1336,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); - CMCHKUNPK(oduPackUInt32,¶m->emtcT301Tmr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->emtcT300Tmr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + CMCHKUNPK(oduUnpackUInt32,¶m->emtcT301Tmr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->emtcT300Tmr, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pci, mBuf); @@ -2127,21 +1368,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrBwCfg ( RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlTotalBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulTotalBw, mBuf); return ROK; } @@ -2162,21 +1397,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); - CMCHKPK(oduUnpackUInt32, param->ngEnum, mBuf); + CMCHKPK(oduPackUInt8, param->isDurExtend, mBuf); + CMCHKPK(oduPackUInt32, param->ngEnum, mBuf); return ROK; } @@ -2197,24 +1426,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ngEnum = (RgrPhichNg) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isDurExtend, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDurExtend, mBuf); return ROK; } @@ -2235,24 +1458,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); - CMCHKPK(oduUnpackUInt8, param->cyclicShift, mBuf); - CMCHKPK(oduUnpackUInt8, param->deltaShift, mBuf); - CMCHKPK(oduUnpackUInt16, param->n1PucchAn, mBuf); - CMCHKPK(oduUnpackUInt8, param->resourceSize, mBuf); + CMCHKPK(oduPackUInt8, param->maxPucchRb, mBuf); + CMCHKPK(oduPackUInt8, param->cyclicShift, mBuf); + CMCHKPK(oduPackUInt8, param->deltaShift, mBuf); + CMCHKPK(oduPackUInt16, param->n1PucchAn, mBuf); + CMCHKPK(oduPackUInt8, param->resourceSize, mBuf); return ROK; } @@ -2274,25 +1491,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->deltaShift, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cyclicShift, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxPucchRb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->resourceSize, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->n1PucchAn, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->deltaShift, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cyclicShift, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxPucchRb, mBuf); return ROK; } @@ -2314,24 +1524,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->srsSubFrameCfg, mBuf); - CMCHKPK(oduUnpackUInt32, param->srsBwEnum, mBuf); - CMCHKPK(oduUnpackUInt32, param->srsCfgPrdEnum, mBuf); - CMCHKPK(oduUnpackUInt8, param->isSrsCfgSetup, mBuf); + CMCHKPK(oduPackUInt8, param->srsSubFrameCfg, mBuf); + CMCHKPK(oduPackUInt32, param->srsBwEnum, mBuf); + CMCHKPK(oduPackUInt32, param->srsCfgPrdEnum, mBuf); + CMCHKPK(oduPackUInt8, param->isSrsCfgSetup, mBuf); return ROK; } @@ -2352,27 +1556,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; - + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isSrsCfgSetup, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsBwEnum = (RgrSrsBwCfg) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->srsSubFrameCfg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsSubFrameCfg, mBuf); return ROK; } @@ -2393,37 +1590,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt8, param->prachResource, mBuf); - CMCHKPK(oduUnpackUInt16, param->msgSizeGrpA, mBuf); - CMCHKPK(oduUnpackUInt8, param->sizeRaPreambleGrpA, mBuf); - CMCHKPK(oduUnpackUInt8, param->numRaPreamble, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf); + CMCHKPK(oduPackUInt8, param->prachResource, mBuf); + CMCHKPK(oduPackUInt16, param->msgSizeGrpA, mBuf); + CMCHKPK(oduPackUInt8, param->sizeRaPreambleGrpA, mBuf); + CMCHKPK(oduPackUInt8, param->numRaPreamble, mBuf); + CMCHKPK(oduPackUInt8, param->maxMsg3Tx, mBuf); for (i=param->raOccasion.size-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->raOccasion.subFrameNum[i], mBuf); + CMCHKPK(oduPackUInt8, param->raOccasion.subFrameNum[i], mBuf); } - CMCHKPK(oduUnpackUInt32, param->raOccasion.sfnEnum, mBuf); - CMCHKPK(oduUnpackUInt8, param->raOccasion.size, mBuf); - CMCHKPK(oduUnpackUInt8, param->raWinSize, mBuf); - CMCHKPK(oduUnpackUInt8, param->preambleFormat, mBuf); + CMCHKPK(oduPackUInt32, param->raOccasion.sfnEnum, mBuf); + CMCHKPK(oduPackUInt8, param->raOccasion.size, mBuf); + CMCHKPK(oduPackUInt8, param->raWinSize, mBuf); + CMCHKPK(oduPackUInt8, param->preambleFormat, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ - CMCHKPK(oduUnpackUInt8, param->contResTmr, mBuf); + CMCHKPK(oduPackUInt8, param->contResTmr, mBuf); #endif return ROK; } @@ -2445,39 +1636,33 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ - CMCHKUNPK(oduPackUInt8, ¶m->contResTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->contResTmr, mBuf); #endif - CMCHKUNPK(oduPackUInt8, ¶m->preambleFormat, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->raWinSize, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.size, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->preambleFormat, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->raWinSize, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->raOccasion.size, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum; for (i=0; iraOccasion.size; i++) { - CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.subFrameNum[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->raOccasion.subFrameNum[i], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3Tx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numRaPreamble, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->sizeRaPreambleGrpA, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->msgSizeGrpA, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->prachResource, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxMsg3Tx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numRaPreamble, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sizeRaPreambleGrpA, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->msgSizeGrpA, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachResource, mBuf); return ROK; } @@ -2498,17 +1683,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH @@ -2523,15 +1702,15 @@ Buffer *mBuf; sizeof(param->siPeriodicity[0]); for (idx=param->numSi-1; idx >= 0; idx--) { - /* Enum to be packed/unpacked as U32 instead of S32 */ - CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf); + /* Enum to be packed/unpacked as uint32_t instead of S32 */ + CMCHKPK(oduPackUInt32, param->siPeriodicity[idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numSi, mBuf); + CMCHKPK(oduPackUInt8, param->numSi, mBuf); /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKPK(oduUnpackUInt32, (U32)param->modPrd, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->modPrd, mBuf); #endif/*RGR_SI_SCH*/ - CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf); - CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf); + CMCHKPK(oduPackUInt8, param->retxCnt, mBuf); + CMCHKPK(oduPackUInt8, param->siWinSize, mBuf); return ROK; } @@ -2552,41 +1731,35 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH S16 idx; #endif/*RGR_SI_SCH*/ - CMCHKUNPK(oduPackUInt8, ¶m->siWinSize, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->retxCnt, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->siWinSize, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->retxCnt, mBuf); #ifdef RGR_SI_SCH /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->modPrd = (RgrModPeriodicity) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSi, mBuf); if(param->numSi > sizeof(param->siPeriodicity)/ sizeof(param->siPeriodicity[0])) param->numSi = sizeof(param->siPeriodicity)/ sizeof(param->siPeriodicity[0]); - /* Enum to be packed/unpacked as U32 instead of S32 */ + /* Enum to be packed/unpacked as uint32_t instead of S32 */ for (idx=0; idx < param->numSi; idx++) { - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum; } #endif/*RGR_SI_SCH*/ @@ -2611,21 +1784,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->size, mBuf); + CMCHKPK(oduPackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startTpcRnti, mBuf); return ROK; } @@ -2647,22 +1814,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteRnti, ¶m->startTpcRnti, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->size, mBuf); return ROK; } @@ -2683,27 +1844,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3, mBuf); CMCHKPK(SPkS8, param->deltaPreambleMsg3, mBuf); CMCHKPK(SPkS8, param->p0NominalPucch, mBuf); - CMCHKPK(oduUnpackUInt32, param->alpha, mBuf); + CMCHKPK(oduPackUInt32, param->alpha, mBuf); CMCHKPK(SPkS8, param->p0NominalPusch, mBuf); return ROK; } @@ -2725,23 +1879,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; CMCHKUNPK(SUnpkS8, ¶m->p0NominalPusch, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->alpha = (RgrPwrAlpha) tmpEnum; CMCHKUNPK(SUnpkS8, ¶m->p0NominalPucch, mBuf); CMCHKUNPK(SUnpkS8, ¶m->deltaPreambleMsg3, mBuf); @@ -2769,23 +1917,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->hopOffst, mBuf); - CMCHKPK(oduUnpackUInt8, param->isIntraHop, mBuf); - CMCHKPK(oduUnpackUInt8, param->numSubBands, mBuf); + CMCHKPK(oduPackUInt8, param->hopOffst, mBuf); + CMCHKPK(oduPackUInt8, param->isIntraHop, mBuf); + CMCHKPK(oduPackUInt8, param->numSubBands, mBuf); return ROK; } @@ -2806,23 +1948,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->numSubBands, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isIntraHop, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->hopOffst, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSubBands, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isIntraHop, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->hopOffst, mBuf); return ROK; } @@ -2843,25 +1979,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; for (i=1-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt32, param->pmiBitMap[i], mBuf); + CMCHKPK(oduPackUInt32, param->pmiBitMap[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -2882,24 +2012,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); for (i=0; i<1; i++) { - CMCHKUNPK(oduPackUInt32, ¶m->pmiBitMap[i], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->pmiBitMap[i], mBuf); } return ROK; } @@ -2921,23 +2045,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->size, mBuf); - CMCHKPK(oduUnpackUInt8, param->start, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->size, mBuf); + CMCHKPK(oduPackUInt8, param->start, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -2958,23 +2076,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->start, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->start, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->size, mBuf); return ROK; } @@ -2995,23 +2107,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); - CMCHKPK(oduUnpackUInt8, param->dir, mBuf); + CMCHKPK(oduPackUInt8, param->ulTrchType, mBuf); + CMCHKPK(oduPackUInt8, param->dlTrchType, mBuf); + CMCHKPK(oduPackUInt8, param->dir, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); return ROK; @@ -3034,25 +2139,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dir, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulTrchType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dir, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlTrchType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulTrchType, mBuf); return ROK; } @@ -3073,22 +2172,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->thresholdCqi, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDlFreqSel, mBuf); + CMCHKPK(oduPackUInt8, param->thresholdCqi, mBuf); + CMCHKPK(oduPackUInt8, param->isDlFreqSel, mBuf); return ROK; } @@ -3109,22 +2202,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->isDlFreqSel, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->thresholdCqi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDlFreqSel, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->thresholdCqi, mBuf); return ROK; } @@ -3149,24 +2236,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ulStartSfIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->halfFrm, mBuf); - CMCHKPK(oduUnpackUInt32, param->sfn, mBuf); - CMCHKPK(oduUnpackUInt8, param->freqIdx, mBuf); + CMCHKPK(oduPackUInt8, param->ulStartSfIdx, mBuf); + CMCHKPK(oduPackUInt8, param->halfFrm, mBuf); + CMCHKPK(oduPackUInt32, param->sfn, mBuf); + CMCHKPK(oduPackUInt8, param->freqIdx, mBuf); return ROK; } @@ -3187,26 +2268,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->freqIdx, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->freqIdx, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->sfn = tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->halfFrm, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulStartSfIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->halfFrm, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulStartSfIdx, mBuf); return ROK; } @@ -3227,17 +2302,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -3245,7 +2314,7 @@ Buffer *mBuf; for (i=param->numRsc-1; i >= 0; i--) { CMCHKPK(cmPkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numRsc, mBuf); + CMCHKPK(oduPackUInt8, param->numRsc, mBuf); return ROK; } @@ -3266,22 +2335,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->numRsc, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numRsc, mBuf); for (i=0; inumRsc; i++) { CMCHKUNPK(cmUnpkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); } @@ -3309,25 +2372,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmPkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) { - CMCHKPK(oduUnpackUInt32, param->qciWgt[idx], mBuf); + CMCHKPK(oduPackUInt32, param->qciWgt[idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->fairCoeffi, mBuf); - CMCHKPK(oduUnpackUInt8, param->tptCoeffi, mBuf); + CMCHKPK(oduPackUInt8, param->fairCoeffi, mBuf); + CMCHKPK(oduPackUInt8, param->tptCoeffi, mBuf); return ROK; } @@ -3349,25 +2406,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; - CMCHKUNPK(oduPackUInt8, ¶m->tptCoeffi, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->fairCoeffi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->tptCoeffi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->fairCoeffi, mBuf); for(idx = 0; idx < RGR_MAX_NUM_QCI; idx++) { - CMCHKUNPK(oduPackUInt32, ¶m->qciWgt[idx], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->qciWgt[idx], mBuf); } return ROK; } @@ -3390,22 +2441,16 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSpsCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSpsCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); - CMCHKPK(oduUnpackUInt16, param->maxSpsUePerDlSf, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxSpsDlBw, mBuf); + CMCHKPK(oduPackUInt16, param->maxSpsUePerUlSf, mBuf); + CMCHKPK(oduPackUInt16, param->maxSpsUePerDlSf, mBuf); + CMCHKPK(oduPackUInt8, param->maxSpsDlBw, mBuf); return ROK; } @@ -3428,23 +2473,17 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSpsDlCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSpsDlCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->maxSpsDlBw, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerDlSf, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerUlSf, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxSpsDlBw, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->maxSpsUePerDlSf, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->maxSpsUePerUlSf, mBuf); return ROK; } @@ -3460,14 +2499,14 @@ Buffer *mBuf for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx) { - CMCHKPK(oduUnpackUInt32, param->dynConfig[(U8)idx], mBuf); + CMCHKPK(oduPackUInt32, param->dynConfig[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf); - CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf); - CMCHKPK(oduUnpackUInt8, param->numUes, mBuf); - CMCHKPK(oduUnpackUInt8, param->numOfCC, mBuf); - CMCHKPK(oduUnpackUInt8, param->bwPerCC, mBuf); - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); + CMCHKPK(oduPackUInt8, param->uePerGrp, mBuf); + CMCHKPK(oduPackUInt8, param->ueGrpPerTti, mBuf); + CMCHKPK(oduPackUInt8, param->numUes, mBuf); + CMCHKPK(oduPackUInt8, param->numOfCC, mBuf); + CMCHKPK(oduPackUInt8, param->bwPerCC, mBuf); + CMCHKPK(oduPackUInt8, param->cfi, mBuf); return ROK; } @@ -3479,16 +2518,16 @@ Buffer *mBuf { S8 idx = 0; - CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bwPerCC, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numOfCC, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numUes, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ueGrpPerTti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->uePerGrp, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->bwPerCC, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numOfCC, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numUes, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueGrpPerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->uePerGrp, mBuf); for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx) { - CMCHKUNPK(oduPackUInt32, ¶m->dynConfig[(U8)idx], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->dynConfig[(uint8_t)idx], mBuf); } return ROK; } @@ -3511,20 +2550,14 @@ Buffer *mBuf * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkRgrLteUCellCfg +static S16 cmPkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); + CMCHKPK(oduPackUInt8, param->isLaaCell, mBuf); return ROK; } @@ -3544,21 +2577,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnpkRgrLteUCellCfg +static S16 cmUnpkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->isLaaCell, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isLaaCell, mBuf); return ROK; } @@ -3579,22 +2606,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { - CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAbsUe, mBuf); - CMCHKPK(oduUnpackUInt32, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->isUeCellEdge, mBuf); + CMCHKPK(oduPackUInt8, param->isAbsUe, mBuf); + CMCHKPK(oduPackUInt32, param->pres, mBuf); return ROK; } @@ -3613,22 +2634,16 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { - CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isAbsUe, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isUeCellEdge, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAbsUe, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isUeCellEdge, mBuf); return ROK; } @@ -3647,28 +2662,22 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf); for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) { - CMCHKPK(oduUnpackUInt8, param->absPattern[(U8)indx], mBuf); + CMCHKPK(oduPackUInt8, param->absPattern[(uint8_t)indx], mBuf); } - CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf); - CMCHKPK(oduUnpackUInt32, param->absLoadPeriodicity, mBuf); + CMCHKPK(oduPackUInt32, param->absPatternType, mBuf); + CMCHKPK(oduPackUInt32, param->absLoadPeriodicity, mBuf); return ROK; @@ -3688,26 +2697,20 @@ S16 cmPkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf); #ifdef TFU_UPGRADE - CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf); - CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf); + CMCHKPK(oduPackUInt32, param->pwrThreshold.pHigh, mBuf); + CMCHKPK(oduPackUInt32, param->pwrThreshold.pLow, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.endRb, mBuf); - CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.startRb, mBuf); + CMCHKPK(oduPackUInt8, param->cellEdgeRbRange.endRb, mBuf); + CMCHKPK(oduPackUInt8, param->cellEdgeRbRange.startRb, mBuf); return ROK; @@ -3729,20 +2732,14 @@ S16 cmPkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf); return ROK; @@ -3764,20 +2761,14 @@ S16 cmPkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->status, mBuf); return ROK; } @@ -3798,20 +2789,15 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI + S16 cmPkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { - CMCHKPK(oduUnpackUInt32, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->pres, mBuf); CMCHKPK(cmPkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ CMCHKPK(cmPkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKPK(cmPkRgrAbsConfig, ¶m->absCfg, mBuf); @@ -3836,28 +2822,22 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; - CMCHKUNPK(oduPackUInt32, ¶m->absLoadPeriodicity, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->absPatternType, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->absLoadPeriodicity, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->absPatternType, mBuf); for (indx = 0; indx absPattern[(U8)indx], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->absPattern[(uint8_t)indx], mBuf); } - CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->status, mBuf); return ROK; @@ -3878,27 +2858,21 @@ S16 cmUnpkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { - CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.startRb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.endRb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cellEdgeRbRange.startRb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cellEdgeRbRange.endRb, mBuf); #ifdef TFU_UPGRADE - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pLow, mBuf); - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pHigh, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->pwrThreshold.pLow, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->pwrThreshold.pHigh, mBuf); #endif - CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->status, mBuf); return ROK; } @@ -3918,23 +2892,17 @@ S16 cmUnpkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); CMCHKUNPK(cmUnpkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKUNPK(cmUnpkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ - CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->pres, mBuf); return ROK; } @@ -3954,25 +2922,19 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmPkMacSchedGnbCfg(param, mBuf) -RgrSchedEnbCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUlUePerTti, mBuf); - CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlSchdType, mBuf); - CMCHKPK(oduUnpackUInt8, param->ulSchdType, mBuf); - CMCHKPK(oduUnpackUInt8, param->numTxAntPorts, mBuf); + CMCHKPK(oduPackUInt8, param->maxDlUePerTti, mBuf); + CMCHKPK(oduPackUInt8, param->maxUlUePerTti, mBuf); + CMCHKPK(oduPackUInt8, param->numCells, mBuf); + CMCHKPK(oduPackUInt8, param->dlSchdType, mBuf); + CMCHKPK(oduPackUInt8, param->ulSchdType, mBuf); + CMCHKPK(oduPackUInt8, param->numTxAntPorts, mBuf); return ROK; } /* cmPkRgrSchedEnbCfg */ @@ -3991,26 +2953,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkMacSchedGnbCfg(param, mBuf) -MacSchedGnbCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->numTxAntPorts, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulSchdType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dlSchdType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxUlUePerTti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxDlUePerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numTxAntPorts, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulSchdType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlSchdType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCells, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUlUePerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxDlUePerTti, mBuf); return ROK; } /* cmUnpkMacSchedGnbCfg */ @@ -4030,17 +2986,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4056,35 +3006,35 @@ Buffer *mBuf; CMCHKPK(cmPkRgr5gtfCellCfg, ¶m->Cell5gtfCfg, mBuf); #endif #ifdef LTE_ADV - CMCHKPK(oduUnpackUInt8, param->isPucchFormat3Sptd, mBuf); + CMCHKPK(oduPackUInt8, param->isPucchFormat3Sptd, mBuf); #endif /*LAA: Pack LAA params*/ CMCHKPK(cmPkRgrLteUCellCfg, ¶m->lteUCfg, mBuf); - CMCHKPK(oduUnpackUInt32, param->msg4pAVal, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); - CMCHKPK(oduUnpackUInt16, param->phichTxPwrOffset, mBuf); - CMCHKPK(oduUnpackUInt16, param->rarTxPwrOffset, mBuf); - CMCHKPK(oduUnpackUInt16, param->pcchTxPwrOffset, mBuf); - CMCHKPK(oduUnpackUInt16, param->bcchTxPwrOffset, mBuf); - - CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); + CMCHKPK(oduPackUInt32, param->msg4pAVal, mBuf); + CMCHKPK(oduPackUInt8, param->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduPackUInt8, param->isDynCfiEnb, mBuf); + CMCHKPK(oduPackUInt16, param->phichTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, param->rarTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, param->pcchTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, param->bcchTxPwrOffset, mBuf); + + CMCHKPK(oduPackUInt16, param->t300TmrVal, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKPK(cmPkRgrSpsCellCfg, ¶m->spsCfg, mBuf); /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ - CMCHKPK(oduUnpackUInt8, param->rrmTtiIndPrd, mBuf); + CMCHKPK(oduPackUInt8, param->rrmTtiIndPrd, mBuf); #ifdef LTE_TDD CMCHKPK(cmPkRgrTddPrachRscInfo, ¶m->prachRscInfo, mBuf); - CMCHKPK(oduUnpackUInt8, param->spclSfCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->ulDlCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->spclSfCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->ulDlCfgIdx, mBuf); #endif CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); for (i=param->numCmnLcs-1; i >= 0; i--) { CMCHKPK(cmPkRgrCmnLchCfg, ¶m->cmnLcCfg[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numCmnLcs, mBuf); + CMCHKPK(oduPackUInt8, param->numCmnLcs, mBuf); CMCHKPK(cmPkRgrPreambleSetCfg, ¶m->macPreambleSet, mBuf); CMCHKPK(cmPkRgrPuschCfg, ¶m->puschCfg, mBuf); CMCHKPK(cmPkRgrUlPwrCfg, ¶m->pwrCfg, mBuf); @@ -4105,31 +3055,31 @@ Buffer *mBuf; CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiCfg, mBuf); CMCHKPK(cmPkRgrRntiCfg, ¶m->macRnti, mBuf); CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlfsSchdType, mBuf); + CMCHKPK(oduPackUInt8, param->dlfsSchdType, mBuf); CMCHKPK(SPkS8, param->pMax, mBuf); - CMCHKPK(oduUnpackUInt8, param->cellModSchm, mBuf); - CMCHKPK(oduUnpackUInt8, param->isCpDlExtend, mBuf); - CMCHKPK(oduUnpackUInt8, param->isCpUlExtend, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUlUeNewTxPerTti, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlUeNewTxPerTti, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlRetxBw, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlBwPerUe, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUlBwPerUe, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxCcchPerDlSf, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUePerDlSf, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUePerUlSf, mBuf); + CMCHKPK(oduPackUInt8, param->cellModSchm, mBuf); + CMCHKPK(oduPackUInt8, param->isCpDlExtend, mBuf); + CMCHKPK(oduPackUInt8, param->isCpUlExtend, mBuf); + CMCHKPK(oduPackUInt8, param->maxUlUeNewTxPerTti, mBuf); + CMCHKPK(oduPackUInt8, param->maxDlUeNewTxPerTti, mBuf); + CMCHKPK(oduPackUInt8, param->maxDlRetxBw, mBuf); + CMCHKPK(oduPackUInt8, param->maxDlBwPerUe, mBuf); + CMCHKPK(oduPackUInt8, param->maxUlBwPerUe, mBuf); + CMCHKPK(oduPackUInt8, param->maxCcchPerDlSf, mBuf); + CMCHKPK(oduPackUInt8, param->maxUePerDlSf, mBuf); + CMCHKPK(oduPackUInt8, param->maxUePerUlSf, mBuf); #ifdef RGR_V1 /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number of MSG3s */ - CMCHKPK(oduUnpackUInt8, param->maxMsg3PerUlSf, mBuf); + CMCHKPK(oduPackUInt8, param->maxMsg3PerUlSf, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->macInst, mBuf); + CMCHKPK(oduPackUInt8, param->macInst, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); #ifdef EMTC_ENABLE /* EMTC related changes start*/ - CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); + CMCHKPK(oduPackUInt8, param->emtcEnable, mBuf); CMCHKPK(cmPkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); /* EMTC related changes ends*/ #endif @@ -4154,17 +3104,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4172,30 +3116,30 @@ Buffer *mBuf; #ifdef EMTC_ENABLE /* EMTC related changes start*/ CMCHKUNPK(cmUnpkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->emtcEnable, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->emtcEnable, mBuf); /* EMTC related changes ends*/ #endif CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->macInst, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->macInst, mBuf); #ifdef RGR_V1 /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number of MSG3s */ - CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3PerUlSf, mBuf); -#endif - CMCHKUNPK(oduPackUInt8, ¶m->maxUePerUlSf, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxUePerDlSf, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxCcchPerDlSf, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxUlBwPerUe, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxDlBwPerUe, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxDlRetxBw, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxDlUeNewTxPerTti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxUlUeNewTxPerTti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isCpUlExtend, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isCpDlExtend, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cellModSchm, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxMsg3PerUlSf, mBuf); +#endif + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUePerUlSf, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUePerDlSf, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxCcchPerDlSf, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUlBwPerUe, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxDlBwPerUe, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxDlRetxBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxDlUeNewTxPerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUlUeNewTxPerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isCpUlExtend, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isCpDlExtend, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cellModSchm, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pMax, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dlfsSchdType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlfsSchdType, mBuf); CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqCfg, mBuf); CMCHKUNPK(cmUnpkRgrRntiCfg, ¶m->macRnti, mBuf); CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiCfg, mBuf); @@ -4216,35 +3160,35 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrUlPwrCfg, ¶m->pwrCfg, mBuf); CMCHKUNPK(cmUnpkRgrPuschCfg, ¶m->puschCfg, mBuf); CMCHKUNPK(cmUnpkRgrPreambleSetCfg, ¶m->macPreambleSet, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCmnLcs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCmnLcs, mBuf); for (i=0; inumCmnLcs; i++) { CMCHKUNPK(cmUnpkRgrCmnLchCfg, ¶m->cmnLcCfg[i], mBuf); } CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); #ifdef LTE_TDD - CMCHKUNPK(oduPackUInt8, ¶m->ulDlCfgIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->spclSfCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulDlCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->spclSfCfgIdx, mBuf); CMCHKUNPK(cmUnpkRgrTddPrachRscInfo, ¶m->prachRscInfo, mBuf); #endif /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ - CMCHKUNPK(oduPackUInt8, ¶m->rrmTtiIndPrd, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rrmTtiIndPrd, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKUNPK(cmUnpkRgrSpsDlCellCfg, ¶m->spsCfg, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->t300TmrVal, mBuf); - CMCHKPK(oduPackUInt16, ¶m->bcchTxPwrOffset, mBuf); - CMCHKPK(oduPackUInt16, ¶m->pcchTxPwrOffset, mBuf); - CMCHKPK(oduPackUInt16, ¶m->rarTxPwrOffset, mBuf); - CMCHKPK(oduPackUInt16, ¶m->phichTxPwrOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isDynCfiEnb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isAutoCfgModeEnb, mBuf); - CMCHKPK(oduPackUInt32, (U32*)¶m->msg4pAVal, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->t300TmrVal, mBuf); + CMCHKPK(oduUnpackUInt16, ¶m->bcchTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, ¶m->pcchTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, ¶m->rarTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, ¶m->phichTxPwrOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDynCfiEnb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduUnpackUInt32, (uint32_t*)¶m->msg4pAVal, mBuf); /*LAA: Unpack LAA Cell params*/ CMCHKUNPK(cmUnpkRgrLteUCellCfg, ¶m->lteUCfg, mBuf); #ifdef LTE_ADV - CMCHKUNPK(oduPackUInt8, ¶m->isPucchFormat3Sptd, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isPucchFormat3Sptd, mBuf); #endif #ifdef RG_5GTF CMCHKUNPK(cmUnPkRgr5gtfCellCfg, ¶m->Cell5gtfCfg, mBuf); @@ -4269,27 +3213,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { /*Pack Aperiodic Trigger List only for Pcell */ #ifdef LTE_ADV - CMCHKPK(oduUnpackUInt8, param->triggerSet2, mBuf); - CMCHKPK(oduUnpackUInt8, param->triggerSet1, mBuf); + CMCHKPK(oduPackUInt8, param->triggerSet2, mBuf); + CMCHKPK(oduPackUInt8, param->triggerSet1, mBuf); #endif - CMCHKPK(oduUnpackUInt32, param->aprdModeEnum, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->aprdModeEnum, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4310,28 +3248,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum; #ifdef LTE_ADV - CMCHKUNPK(oduPackUInt8, ¶m->triggerSet1, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->triggerSet2, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->triggerSet1, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->triggerSet2, mBuf); #endif return ROK; @@ -4357,27 +3289,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->cqiPmiCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->k, mBuf); + CMCHKPK(oduPackUInt16, param->cqiPmiCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->k, mBuf); CMCHKPK(SPkS8, param->cqiOffst, mBuf); - CMCHKPK(oduUnpackUInt8, param->subframeOffst, mBuf); - CMCHKPK(oduUnpackUInt32, param->prdicityEnum, mBuf); - CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->subframeOffst, mBuf); + CMCHKPK(oduPackUInt32, param->prdicityEnum, mBuf); + CMCHKPK(oduPackUInt32, param->prdModeEnum, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4398,30 +3324,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdModeEnum = tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdicityEnum = tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->subframeOffst, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->subframeOffst, mBuf); CMCHKUNPK(SUnpkS8, ¶m->cqiOffst, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->k, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->cqiPmiCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->k, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiPmiCfgIdx, mBuf); return ROK; } @@ -4445,29 +3365,23 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); - CMCHKPK(oduUnpackUInt8, param->sANCQI, mBuf); + CMCHKPK(oduPackUInt32, param->prdModeEnum, mBuf); + CMCHKPK(oduPackUInt8, param->sANCQI, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKPK(oduUnpackUInt16, param->riCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->riEna, mBuf); - CMCHKPK(oduUnpackUInt8, param->k, mBuf); - CMCHKPK(oduUnpackUInt8, param->cqiRepType, mBuf); - CMCHKPK(oduUnpackUInt16, param->cqiPCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt16, param->cqiPResIdx, mBuf); + CMCHKPK(oduPackUInt16, param->riCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->riEna, mBuf); + CMCHKPK(oduPackUInt8, param->k, mBuf); + CMCHKPK(oduPackUInt8, param->cqiRepType, mBuf); + CMCHKPK(oduPackUInt16, param->cqiPCfgIdx, mBuf); + CMCHKPK(oduPackUInt16, param->cqiPResIdx, mBuf); return ROK; } @@ -4488,30 +3402,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt16, ¶m->cqiPResIdx, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->cqiPCfgIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cqiRepType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->k, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->riEna, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiPResIdx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiPCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiRepType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->k, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->riEna, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKUNPK(oduPackUInt16, ¶m->riCfgIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->sANCQI, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->riCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sANCQI, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdModeEnum = (RgrPrdCqiMode) tmpEnum; return ROK; } @@ -4533,22 +3441,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); - CMCHKPK(oduUnpackUInt8, param->type, mBuf); + CMCHKPK(oduPackUInt8, param->type, mBuf); return ROK; } @@ -4569,21 +3471,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); return ROK; } @@ -4606,29 +3502,23 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->fDomPosi, mBuf); - CMCHKPK(oduUnpackUInt8, param->txComb, mBuf); - CMCHKPK(oduUnpackUInt8, param->sANSrs, mBuf); - CMCHKPK(oduUnpackUInt8, param->duration, mBuf); - CMCHKPK(oduUnpackUInt32, param->cycShift, mBuf); - CMCHKPK(oduUnpackUInt32, param->srsHopBw, mBuf); - CMCHKPK(oduUnpackUInt32, param->srsBw, mBuf); + CMCHKPK(oduPackUInt8, param->fDomPosi, mBuf); + CMCHKPK(oduPackUInt8, param->txComb, mBuf); + CMCHKPK(oduPackUInt8, param->sANSrs, mBuf); + CMCHKPK(oduPackUInt8, param->duration, mBuf); + CMCHKPK(oduPackUInt32, param->cycShift, mBuf); + CMCHKPK(oduPackUInt32, param->srsHopBw, mBuf); + CMCHKPK(oduPackUInt32, param->srsBw, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf); + CMCHKPK(oduPackUInt16, param->srsCfgIdx, mBuf); return ROK; } @@ -4650,33 +3540,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->srsCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsBw = (RgrUlSrsBwInfo) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->duration, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->sANSrs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->txComb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->fDomPosi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->duration, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sANSrs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->txComb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->fDomPosi, mBuf); return ROK; } @@ -4697,24 +3581,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { /* ccpu00131601:DEL - dTMax Packing removed since this param will not * be required by Scheduler*/ - CMCHKPK(oduUnpackUInt8, param->srCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt16, param->srResIdx, mBuf); + CMCHKPK(oduPackUInt8, param->srCfgIdx, mBuf); + CMCHKPK(oduPackUInt16, param->srResIdx, mBuf); return ROK; } @@ -4735,21 +3613,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->srCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->srResIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srCfgIdx, mBuf); /* ccpu00131601:DEL - dTMax UnPacking removed since this param will not * be required by Scheduler*/ return ROK; @@ -4772,22 +3644,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); - CMCHKPK(oduUnpackUInt8, param->type, mBuf); + CMCHKPK(oduPackUInt8, param->type, mBuf); return ROK; } @@ -4808,21 +3674,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); return ROK; } @@ -4845,23 +3705,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKPK(cmPkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); - CMCHKPK(oduUnpackUInt8, param->type, mBuf); + CMCHKPK(oduPackUInt8, param->type, mBuf); return ROK; } @@ -4883,21 +3737,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->type, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKUNPK(cmUnpkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); return ROK; @@ -4922,17 +3770,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4967,17 +3809,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -5003,23 +3839,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->gapOffst, mBuf); - CMCHKPK(oduUnpackUInt8, param->gapPrd, mBuf); - CMCHKPK(oduUnpackUInt8, param->isMesGapEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->gapOffst, mBuf); + CMCHKPK(oduPackUInt8, param->gapPrd, mBuf); + CMCHKPK(oduPackUInt8, param->isMesGapEnabled, mBuf); return ROK; } @@ -5040,23 +3870,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->isMesGapEnabled, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->gapPrd, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->gapOffst, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isMesGapEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->gapPrd, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->gapOffst, mBuf); return ROK; } @@ -5077,22 +3901,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->drxStartOffst, mBuf); - CMCHKPK(oduUnpackUInt16, param->longDrxCycle, mBuf); + CMCHKPK(oduPackUInt16, param->drxStartOffst, mBuf); + CMCHKPK(oduPackUInt16, param->longDrxCycle, mBuf); return ROK; } @@ -5113,22 +3931,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->longDrxCycle, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->drxStartOffst, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->longDrxCycle, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->drxStartOffst, mBuf); return ROK; } @@ -5149,23 +3961,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->drxShortCycleTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->shortDrxCycle, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->drxShortCycleTmr, mBuf); + CMCHKPK(oduPackUInt16, param->shortDrxCycle, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5186,23 +3992,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->shortDrxCycle, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->drxShortCycleTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->shortDrxCycle, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->drxShortCycleTmr, mBuf); return ROK; } @@ -5221,31 +4021,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); CMCHKPK(cmPkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); - CMCHKPK(oduUnpackUInt16, param->drxRetxTmr, mBuf); + CMCHKPK(oduPackUInt16, param->drxRetxTmr, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(oduUnpackUInt8, param->drxRetxTmrR13Pres, mBuf); - CMCHKPK(oduUnpackUInt8, param->drxOnDurTmrR13Pres, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcDrxUlRetxTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); + CMCHKPK(oduPackUInt8, param->drxRetxTmrR13Pres, mBuf); + CMCHKPK(oduPackUInt8, param->drxOnDurTmrR13Pres, mBuf); + CMCHKPK(oduPackUInt16, param->emtcDrxUlRetxTmr, mBuf); + CMCHKPK(oduPackUInt8, param->isEmtcUe, mBuf); #endif - CMCHKPK(oduUnpackUInt16, param->drxInactvTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->drxOnDurTmr, mBuf); + CMCHKPK(oduPackUInt16, param->drxInactvTmr, mBuf); + CMCHKPK(oduPackUInt16, param->drxOnDurTmr, mBuf); /*rgr_c_001.main_9 ADD added changes for R9*/ #ifdef LTEMAC_R9 CMCHKPK(cmPkTknS32, ¶m->cqiMask, mBuf); @@ -5270,17 +4064,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { @@ -5288,15 +4076,15 @@ Buffer *mBuf; #ifdef LTEMAC_R9 CMCHKUNPK(cmUnpkTknS32, ¶m->cqiMask, mBuf); #endif - CMCHKUNPK(oduPackUInt16, ¶m->drxOnDurTmr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->drxInactvTmr, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->drxOnDurTmr, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->drxInactvTmr, mBuf); #ifdef EMTC_ENABLE - CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf); - CMCHKUNPK(oduPackUInt16,¶m->emtcDrxUlRetxTmr, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->drxOnDurTmrR13Pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->drxRetxTmrR13Pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isEmtcUe, mBuf); + CMCHKUNPK(oduUnpackUInt16,¶m->emtcDrxUlRetxTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->drxOnDurTmrR13Pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->drxRetxTmrR13Pres, mBuf); #endif - CMCHKUNPK(oduPackUInt16, ¶m->drxRetxTmr, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->drxRetxTmr, mBuf); CMCHKUNPK(cmUnpkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); CMCHKUNPK(cmUnpkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); return ROK; @@ -5319,25 +4107,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->txAntSel, mBuf); - CMCHKPK(oduUnpackUInt8, param->simCqiAckNack, mBuf); - CMCHKPK(oduUnpackUInt8, param->resAloocType1, mBuf); - CMCHKPK(oduUnpackUInt8, param->intraSfFeqHop, mBuf); - CMCHKPK(oduUnpackUInt8, param->pwrClass, mBuf); + CMCHKPK(oduPackUInt8, param->txAntSel, mBuf); + CMCHKPK(oduPackUInt8, param->simCqiAckNack, mBuf); + CMCHKPK(oduPackUInt8, param->resAloocType1, mBuf); + CMCHKPK(oduPackUInt8, param->intraSfFeqHop, mBuf); + CMCHKPK(oduPackUInt8, param->pwrClass, mBuf); return ROK; } @@ -5358,25 +4140,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pwrClass, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->intraSfFeqHop, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->resAloocType1, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->simCqiAckNack, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->txAntSel, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pwrClass, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->intraSfFeqHop, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->resAloocType1, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->simCqiAckNack, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->txAntSel, mBuf); return ROK; } @@ -5397,23 +4173,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->ackNackRepFactor, mBuf); - CMCHKPK(oduUnpackUInt16, param->pucchAckNackRep, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAckNackEnabled, mBuf); + CMCHKPK(oduPackUInt32, param->ackNackRepFactor, mBuf); + CMCHKPK(oduPackUInt16, param->pucchAckNackRep, mBuf); + CMCHKPK(oduPackUInt8, param->isAckNackEnabled, mBuf); return ROK; } @@ -5434,24 +4204,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isAckNackEnabled, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pucchAckNackRep, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAckNackEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchAckNackRep, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum; return ROK; } @@ -5473,23 +4237,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->txModeEnum, mBuf); - CMCHKPK(oduUnpackUInt32, param->tmTrnstnState, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->txModeEnum, mBuf); + CMCHKPK(oduPackUInt32, param->tmTrnstnState, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5511,26 +4269,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->txModeEnum = (RgrTxMode) tmpEnum; return ROK; } @@ -5552,22 +4304,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->deltaHqOffst, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); + CMCHKPK(oduPackUInt8, param->deltaHqOffst, mBuf); + CMCHKPK(oduPackUInt8, param->maxUlHqTx, mBuf); return ROK; } @@ -5588,22 +4334,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->deltaHqOffst, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxUlHqTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->deltaHqOffst, mBuf); return ROK; } @@ -5624,23 +4364,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->idx, mBuf); + CMCHKPK(oduPackUInt8, param->idx, mBuf); CMCHKPK(cmPkLteRnti, param->tpcRnti, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5661,23 +4395,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->tpcRnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->idx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->idx, mBuf); return ROK; } @@ -5699,28 +4427,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt16, param->explicitRelCnt, mBuf); - CMCHKPK(oduUnpackUInt32, param->dlSpsPrdctyEnum, mBuf); + CMCHKPK(oduPackUInt16, param->explicitRelCnt, mBuf); + CMCHKPK(oduPackUInt32, param->dlSpsPrdctyEnum, mBuf); for (i=param->numPucchVal-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt32, param->n1PucchVal[i], mBuf); + CMCHKPK(oduPackUInt32, param->n1PucchVal[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numPucchVal, mBuf); - CMCHKPK(oduUnpackUInt8, param->numSpsHqProc, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDlSpsEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->numPucchVal, mBuf); + CMCHKPK(oduPackUInt8, param->numSpsHqProc, mBuf); + CMCHKPK(oduPackUInt8, param->isDlSpsEnabled, mBuf); return ROK; } @@ -5741,31 +4463,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->isDlSpsEnabled, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numSpsHqProc, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numPucchVal, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDlSpsEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSpsHqProc, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numPucchVal, mBuf); for (i=0; inumPucchVal; i++) { - CMCHKUNPK(oduPackUInt32, ¶m->n1PucchVal[i], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->n1PucchVal[i], mBuf); } - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->dlSpsPrdctyEnum = tmpEnum; - CMCHKUNPK(oduPackUInt16, ¶m->explicitRelCnt, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->explicitRelCnt, mBuf); return ROK; } @@ -5786,40 +4502,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt8, param->isLcSRMaskEnab, mBuf); + CMCHKPK(oduPackUInt8, param->isLcSRMaskEnab, mBuf); for (i=param->lcCnt-1; i >= 0; i--) { /* SPS Changes starts */ - CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].isSpsEnabled, mBuf); - CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].lcId, mBuf); + CMCHKPK(oduPackUInt8, param->spsLcInfo[i].isSpsEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->spsLcInfo[i].lcId, mBuf); /* SPS Changes ends */ } - CMCHKPK(oduUnpackUInt8, param->lcCnt, mBuf); - CMCHKPK(oduUnpackUInt32, param->ulSpsPrdctyEnum, mBuf); + CMCHKPK(oduPackUInt8, param->lcCnt, mBuf); + CMCHKPK(oduPackUInt32, param->ulSpsPrdctyEnum, mBuf); CMCHKPK(SPkS8, param->pwrCfg.p0UePuschVal, mBuf); CMCHKPK(SPkS8, param->pwrCfg.p0NominalPuschVal, mBuf); - CMCHKPK(oduUnpackUInt8, param->pwrCfgPres, mBuf); + CMCHKPK(oduPackUInt8, param->pwrCfgPres, mBuf); #ifdef LTE_TDD - CMCHKPK(oduUnpackUInt8, param->twoIntervalCfg, mBuf); + CMCHKPK(oduPackUInt8, param->twoIntervalCfg, mBuf); #endif - CMCHKPK(oduUnpackUInt32, param->implicitRelCnt, mBuf); - CMCHKPK(oduUnpackUInt8, param->isUlSpsEnabled, mBuf); + CMCHKPK(oduPackUInt32, param->implicitRelCnt, mBuf); + CMCHKPK(oduPackUInt8, param->isUlSpsEnabled, mBuf); return ROK; } @@ -5840,41 +4550,35 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->isUlSpsEnabled, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isUlSpsEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->implicitRelCnt = tmpEnum; #ifdef LTE_TDD - CMCHKUNPK(oduPackUInt8, ¶m->twoIntervalCfg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->twoIntervalCfg, mBuf); #endif - CMCHKUNPK(oduPackUInt8, ¶m->pwrCfgPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pwrCfgPres, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0NominalPuschVal, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0UePuschVal, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ulSpsPrdctyEnum = tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->lcCnt, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcCnt, mBuf); for (i=0; ilcCnt; i++) { - CMCHKUNPK(oduPackUInt8, ¶m->spsLcInfo[i].lcId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->spsLcInfo[i].isSpsEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->spsLcInfo[i].lcId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->spsLcInfo[i].isSpsEnabled, mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->isLcSRMaskEnab, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isLcSRMaskEnab, mBuf); return ROK; } @@ -5895,17 +4599,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5932,17 +4630,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5968,26 +4660,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); - CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); + CMCHKPK(oduPackUInt8, param->trgCqi, mBuf); + CMCHKPK(oduPackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePucch, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); + CMCHKPK(oduPackUInt8, param->isDeltaMCSEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isAccumulated, mBuf); CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); return ROK; @@ -6010,28 +4696,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAccumulated, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDeltaMCSEnabled, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePucch, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pSRSOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -6052,23 +4732,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); - CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); - CMCHKPK(oduUnpackUInt8, param->ambrPres, mBuf); + CMCHKPK(oduPackUInt32, param->ueBr, mBuf); + CMCHKPK(oduPackUInt32, param->dlAmbr, mBuf); + CMCHKPK(oduPackUInt8, param->ambrPres, mBuf); return ROK; } @@ -6089,23 +4763,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->ueBr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ambrPres, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->dlAmbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->ueBr, mBuf); return ROK; } @@ -6124,24 +4792,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->bACKIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->bCQIIdx, mBuf); + CMCHKPK(oduPackUInt8, param->bRIIdx, mBuf); + CMCHKPK(oduPackUInt8, param->bACKIdx, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6162,24 +4824,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bRIIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bCQIIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->bACKIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->bRIIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->bCQIIdx, mBuf); return ROK; } @@ -6198,22 +4854,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->selType, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->selType, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6234,23 +4884,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->selType = (RgrUeTxAntSelType) tmpEnum; return ROK; } @@ -6271,22 +4915,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt16, param->taTmr, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6307,38 +4945,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->taTmr, mBuf); return ROK; } #ifdef EMTC_ENABLE -#ifdef ANSI S16 cmUnpkRgrEmtcUeCfg ( RgrUeEmtcCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcUeCfg(param, mBuf) -RgrUeEmtcCfg *param; -Buffer *mBuf; -#endif { S32 indx=0; S32 idx=0; @@ -6346,45 +4972,45 @@ Buffer *mBuf; RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); RgrEpdcchAddModLst *epdcchAddModLst; - CMCHKUNPK(oduPackUInt8,¶m->pdschReptLevModeA,mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->pdschReptLevModeA,mBuf); /*UnPacking PUCCH Rep */ - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); for(indx = 0; indx < RGR_MAX_EPDCCH_SET; indx++) { epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); - CMCHKUNPK(oduPackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); - CMCHKUNPK(cmUnpkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); - CMCHKUNPK(cmUnpkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); - CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf); - CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf); + CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); + CMCHKUNPK(oduUnpackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); + CMCHKUNPK(cmUnpkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); + CMCHKUNPK(cmUnpkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); + CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf); + CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf); for(idx = 0; idx < 5; idx++) { - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); } - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->transmissionType),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->transmissionType),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->setConfigId),mBuf); } - CMCHKUNPK(cmUnpkTknU32,&(emtcEpdcchCfg->startSymbolr11),mBuf); + CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf); for(indx = 0; indx < 5; indx++) { - CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); + CMCHKUNPK(oduUnpackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); } - CMCHKUNPK(oduPackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); - CMCHKUNPK(oduPackUInt8, &(param->pres), mBuf); - CMCHKUNPK(oduPackUInt8, &(param->isHdFddEnbld), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(param->pres), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(param->isHdFddEnbld), mBuf); #ifdef EMTC_DEBUG_CONSOLE_PRINTS printf("\n EMTC RGR UE unpack\n"); @@ -6442,42 +5068,42 @@ S16 cmPkRgrEmtcUeCfg RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); RgrEpdcchAddModLst *epdcchAddModLst; - CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - CMCHKPK(oduUnpackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf); + CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf); for(indx = 4; indx >=0; indx--) { - CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); + CMCHKPK(oduPackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); } - CMCHKPK(cmPkTknU32,&emtcEpdcchCfg->startSymbolr11,mBuf); + CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf); for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--) { epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->setConfigId,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->transmissionType,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->setConfigId,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->transmissionType,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); for(idx = 4; idx >= 0; idx--) { - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); } - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf); - CMCHKPK(cmPkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); - CMCHKPK(cmPkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); - CMCHKPK(oduUnpackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); + CMCHKPK(oduPackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); + CMCHKPK(oduPackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf); + CMCHKPK(cmPkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); + CMCHKPK(cmPkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf); + CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); + CMCHKPK(oduPackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); + CMCHKPK(oduPackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); } /*Packing PUCCH Rep */ - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf); - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); - CMCHKPK(oduUnpackUInt8,param->pdschReptLevModeA,mBuf); + CMCHKPK(oduPackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf); + CMCHKPK(oduPackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); + CMCHKPK(oduPackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); + CMCHKPK(oduPackUInt8,param->pdschReptLevModeA,mBuf); #ifdef EMTC_DEBUG_CONSOLE_PRINTS printf("\n EMTC RGR UE pack\n"); @@ -6531,11 +5157,11 @@ S16 cmUnpkRgr5gtfUeCfg Buffer *mBuf ) { - CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->BeamId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCC, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxPrb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->grpId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->BeamId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCC, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->maxPrb, mBuf); return ROK; } @@ -6545,11 +5171,11 @@ S16 cmPkRgr5gtfUeCfg Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt8, param->maxPrb, mBuf); - CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); - CMCHKPK(oduUnpackUInt8, param->numCC, mBuf); - CMCHKPK(oduUnpackUInt8, param->BeamId, mBuf); - CMCHKPK(oduUnpackUInt8, param->grpId, mBuf); + CMCHKPK(oduPackUInt8, param->maxPrb, mBuf); + CMCHKPK(oduPackUInt8, param->mcs, mBuf); + CMCHKPK(oduPackUInt8, param->numCC, mBuf); + CMCHKPK(oduPackUInt8, param->BeamId, mBuf); + CMCHKPK(oduPackUInt8, param->grpId, mBuf); return ROK; } #endif @@ -6570,17 +5196,11 @@ S16 cmPkRgr5gtfUeCfg * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCfg ( RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { #ifdef RG_5GTF @@ -6589,9 +5209,9 @@ Buffer *mBuf; #ifdef EMTC_ENABLE CMCHKPK(cmPkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); + CMCHKPK(oduPackUInt8, param->csgMmbrSta, mBuf); - CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); + CMCHKPK(oduPackUInt32, param->accessStratumRls, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKPK(cmPkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ @@ -6611,7 +5231,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf); #endif #ifdef TFU_UPGRADE @@ -6624,15 +5244,15 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); #ifdef LTE_TDD - CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf); + CMCHKPK(oduPackUInt32, param->ackNackModeEnum, mBuf); #endif - CMCHKPK(cmPkTknU8, ¶m->dedPreambleId, mBuf); + CMCHKPK(cmPkTknUInt8, ¶m->dedPreambleId, mBuf); CMCHKPK(cmPkRgrCodeBookRstCfg, ¶m->ueCodeBookRstCfg, mBuf); CMCHKPK(cmPkRgrUeCapCfg, ¶m->ueCapCfg, mBuf); CMCHKPK(cmPkRgrUeMeasGapCfg, ¶m->ueMesGapCfg, mBuf); CMCHKPK(cmPkRgrUeAckNackRepCfg, ¶m->ueAckNackCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isTtiBundlEnabled, mBuf); /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Pack only if DRX is enabled */ @@ -6640,9 +5260,9 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if + CMCHKPK(oduPackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if DRX is disabled */ - CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); + CMCHKPK(oduPackUInt32, param->ueCatEnum, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and * retxBSR-timer */ @@ -6676,19 +5296,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCfg ( RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -6704,25 +5318,25 @@ Buffer *mBuf; * retxBSR-timer */ CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); #endif - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ueCatEnum = (CmLteUeCategory) tmpEnum; /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Unpack only if DRX is enabled */ - CMCHKUNPK(oduPackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); if(TRUE == param->ueDrxCfg.isDrxEnabled) { CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->isTtiBundlEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isTtiBundlEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, ¶m->ueAckNackCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, ¶m->ueMesGapCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeCapCfg, ¶m->ueCapCfg, mBuf); CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, ¶m->ueCodeBookRstCfg, mBuf); - CMCHKUNPK(cmUnpkTknU8, ¶m->dedPreambleId, mBuf); + CMCHKUNPK(cmUnpkTknUInt8, ¶m->dedPreambleId, mBuf); #ifdef LTE_TDD - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ackNackModeEnum = tmpEnum; #endif @@ -6736,7 +5350,7 @@ Buffer *mBuf; #endif /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isHdFddEnbld, mBuf); #endif CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); @@ -6751,8 +5365,8 @@ Buffer *mBuf; /* LTE_ADV_FLAG_REMOVED_START */ CMCHKUNPK(cmUnpkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->accessStratumRls, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->accessStratumRls, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->csgMmbrSta, mBuf); #ifdef EMTC_ENABLE CMCHKUNPK(cmUnpkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); @@ -6782,23 +5396,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchQosCfg ( RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(oduPackUInt32, param->mbr, mBuf); + CMCHKPK(oduPackUInt32, param->gbr, mBuf); + CMCHKPK(oduPackUInt8, param->qci, mBuf); return ROK; } @@ -6819,23 +5427,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchQosCfg ( RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->mbr, mBuf); return ROK; } /*rgr_c_001.main_7 - Added support for SPS*/ @@ -6856,22 +5458,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchSpsCfg ( RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { /* SPS_DEV */ - CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isSpsEnabled, mBuf); return ROK; } @@ -6892,21 +5488,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchSpsCfg ( RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isSpsEnabled, mBuf); return ROK; } @@ -6927,25 +5517,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlLchCfg ( RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); + CMCHKPK(oduPackUInt8, param->rlcReorderTmr, mBuf); CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); + CMCHKPK(oduPackUInt8, param->dlTrchType, mBuf); return ROK; } @@ -6966,25 +5550,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlLchCfg ( RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlTrchType, mBuf); CMCHKUNPK(cmUnpkRgrLchQosCfg, ¶m->dlQos, mBuf); /*rgr_c_001.main_7 - Added support for SPs*/ CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rlcReorderTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rlcReorderTmr, mBuf); return ROK; } @@ -7009,21 +5587,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlLchCfg ( RgrUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(oduPackUInt8, param->qci, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); return ROK; } @@ -7046,22 +5618,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlLchCfg ( RgrUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->qci, mBuf); return ROK; } @@ -7083,25 +5649,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlLcgCfg ( RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ #ifdef LTE_L2_MEAS S32 i; #endif - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); + CMCHKPK(oduPackUInt32, param->mbr, mBuf); + CMCHKPK(oduPackUInt32, param->gbr, mBuf); /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ #ifdef LTE_L2_MEAS @@ -7109,9 +5669,9 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numLch, mBuf); + CMCHKPK(oduPackUInt8, param->numLch, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->lcgId, mBuf); return ROK; } @@ -7132,17 +5692,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlLcgCfg ( RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ @@ -7150,53 +5704,41 @@ Buffer *mBuf; S32 i; #endif - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcgId, mBuf); /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ #ifdef LTE_L2_MEAS - CMCHKUNPK(oduPackUInt8, ¶m->numLch, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numLch, mBuf); for (i = 0; i< param->numLch; i++) { CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); } #endif - CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->mbr, mBuf); return ROK; } -#ifdef ANSI S16 cmPkRgrUlLchQciCfg ( RgrUlLchQciCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->lcId, mBuf); + CMCHKPK(oduPackUInt8, param->qci, mBuf); + CMCHKPK(oduPackUInt8, param->lcgId, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrUlLchQciCfg ( RgrUlLchQciCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcId, mBuf); return ROK; } @@ -7216,20 +5758,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchCfg ( RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->lcgId, mBuf); CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); CMCHKPK(cmPkRgrDlLchCfg, ¶m->dlInfo, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); @@ -7256,17 +5792,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchCfg ( RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif { @@ -7276,22 +5806,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); CMCHKUNPK(cmUnpkRgrDlLchCfg, ¶m->dlInfo, mBuf); CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcgId, mBuf); return ROK; } -#ifdef ANSI S16 cmPkRgrLcgCfg ( RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif { @@ -7302,17 +5826,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrLcgCfg ( RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif { @@ -7339,17 +5857,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfg ( RgrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { @@ -7372,7 +5884,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + CMCHKPK(oduPackUInt8, param->cfgType, mBuf); return ROK; } @@ -7393,21 +5905,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfg ( RgrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case MAC_GNB_CFG: CMCHKUNPK(cmUnpkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); @@ -7447,22 +5953,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrActvTime ( RgrActvTime *param, Buffer *mBuf ) -#else -S16 cmPkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -7483,21 +5983,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrActvTime ( RgrActvTime *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); return ROK; } @@ -7519,27 +6013,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellRecfg ( RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduPackUInt8, param->isDynCfiEnb, mBuf); + CMCHKPK(oduPackUInt8, param->isAutoCfgModeEnb, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKPK(cmPkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); + CMCHKPK(oduPackUInt16, param->t300TmrVal, mBuf); /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH CMCHKPK(cmPkRgrSiCfg, ¶m->siReCfg, mBuf); @@ -7555,7 +6043,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiRecfg, mBuf); CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); CMCHKPK(cmPkRgrActvTime, ¶m->recfgActvTime, mBuf); - CMCHKPK(oduUnpackUInt32, param->recfgTypes, mBuf); + CMCHKPK(oduPackUInt32, param->recfgTypes, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -7577,22 +6065,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellRecfg ( RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->recfgTypes, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->recfgTypes, mBuf); CMCHKUNPK(cmUnpkRgrActvTime, ¶m->recfgActvTime, mBuf); CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiRecfg, mBuf); @@ -7608,12 +6090,12 @@ Buffer *mBuf; #ifdef RGR_SI_SCH CMCHKUNPK(cmUnpkRgrSiCfg, ¶m->siReCfg, mBuf); #endif /* RGR_SI_SCH */ - CMCHKUNPK(oduPackUInt16, ¶m->t300TmrVal, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->t300TmrVal, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKUNPK(cmUnpkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(oduPackUInt8, ¶m->isAutoCfgModeEnb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isDynCfiEnb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAutoCfgModeEnb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDynCfiEnb, mBuf); CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); CMCHKUNPK(cmUnpkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); @@ -7637,36 +6119,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeRecfg ( RgrUeRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE /* Note: As we add more members to emtcUeRecfg, create a new function for pkUnpk */ - CMCHKPK(oduUnpackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf); + CMCHKPK(oduPackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); + CMCHKPK(oduPackUInt8, param->csgMmbrSta, mBuf); - CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); + CMCHKPK(oduPackUInt32, param->accessStratumRls, mBuf); #ifdef LTE_ADV - CMCHKPK(oduUnpackUInt8, param->simulAckNackCQIFormat3, mBuf); + CMCHKPK(oduPackUInt8, param->simulAckNackCQIFormat3, mBuf); CMCHKPK(cmPkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); CMCHKPK(cmPkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isUeCellEdge, mBuf); - CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isAbsUe, mBuf); - CMCHKPK(oduUnpackUInt32, param->ueLteAdvCfg.pres, mBuf); + CMCHKPK(oduPackUInt8, param->ueLteAdvCfg.isUeCellEdge, mBuf); + CMCHKPK(oduPackUInt8, param->ueLteAdvCfg.isAbsUe, mBuf); + CMCHKPK(oduPackUInt32, param->ueLteAdvCfg.pres, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ /*ccpu00130497: Removed the duplicate packing*/ #ifdef TFU_UPGRADE @@ -7683,7 +6159,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf); #endif #ifdef TFU_UPGRADE @@ -7697,13 +6173,13 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ - CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); + CMCHKPK(oduPackUInt32, param->ueCatEnum, mBuf); CMCHKPK(cmPkRgrCodeBookRstCfg, ¶m->ueCodeBookRstRecfg, mBuf); CMCHKPK(cmPkRgrUeMeasGapCfg, ¶m->ueMeasGapRecfg, mBuf); CMCHKPK(cmPkRgrUeCapCfg, ¶m->ueCapRecfg, mBuf); CMCHKPK(cmPkRgrUeAckNackRepCfg, ¶m->ueAckNackRecfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isTtiBundlEnabled, mBuf); /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Pack only if DRX is enabled */ @@ -7711,7 +6187,7 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if + CMCHKPK(oduPackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if DRX is disabled */ CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); #ifdef RGR_V1 @@ -7729,10 +6205,10 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeAprdDlCqiCfg, ¶m->aprdDlCqiRecfg, mBuf); CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); - /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */ + /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */ /* LTE_ADV_FLAG_REMOVED_START */ /* KW fix for LTE_ADV */ - CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf); + CMCHKPK(oduPackUInt32, param->ueRecfgTypes, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf); CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf); @@ -7757,28 +6233,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeRecfg ( RgrUeRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->newCrnti, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ - /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */ + /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */ /* KW fix for LTE_ADV */ - CMCHKUNPK(oduPackUInt32, ¶m->ueRecfgTypes, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->ueRecfgTypes, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); @@ -7800,18 +6270,18 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Unpack only if DRX is enabled */ - CMCHKUNPK(oduPackUInt8, ¶m->ueDrxRecfg.isDrxEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueDrxRecfg.isDrxEnabled, mBuf); if(TRUE == param->ueDrxRecfg.isDrxEnabled) { CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->isTtiBundlEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isTtiBundlEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, ¶m->ueAckNackRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUeCapCfg, ¶m->ueCapRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, ¶m->ueMeasGapRecfg, mBuf); CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, ¶m->ueCodeBookRstRecfg, mBuf); /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ueCatEnum = (CmLteUeCategory) tmpEnum; CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ @@ -7826,7 +6296,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isHdFddEnbld, mBuf); #endif CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); @@ -7841,20 +6311,20 @@ Buffer *mBuf; #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(oduPackUInt32, ¶m->ueLteAdvCfg.pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ueLteAdvCfg.isAbsUe, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ueLteAdvCfg.isUeCellEdge, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->ueLteAdvCfg.pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueLteAdvCfg.isAbsUe, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueLteAdvCfg.isUeCellEdge, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ #ifdef LTE_ADV CMCHKUNPK(cmUnpkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->simulAckNackCQIFormat3, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->simulAckNackCQIFormat3, mBuf); #endif - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->accessStratumRls, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->accessStratumRls, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->csgMmbrSta, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(oduPackUInt8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); #endif return ROK; @@ -7877,21 +6347,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchRecfg ( RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->lcgId, mBuf); CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); @@ -7920,17 +6384,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchRecfg ( RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { @@ -7942,54 +6400,42 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lcgId, mBuf); return ROK; } -#ifdef ANSI S16 cmPkRgrLcgRecfg ( RgrLcgRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { #ifdef RG_UNUSED S32 i; #endif - CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf); + CMCHKPK(oduPackUInt32, param->ulRecfg.mbr, mBuf); + CMCHKPK(oduPackUInt32, param->ulRecfg.gbr, mBuf); #ifdef RG_UNUSED for (i = param->ulRecfg.numLch - 1; i >= 0; i--) { CMCHKPK(cmPkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->ulRecfg.numLch, mBuf); + CMCHKPK(oduPackUInt8, param->ulRecfg.numLch, mBuf); #endif - CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->ulRecfg.lcgId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrLcgRecfg ( RgrLcgRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { #ifdef RG_UNUSED S32 i; @@ -7997,17 +6443,17 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulRecfg.lcgId, mBuf); #ifdef RG_UNUSED - CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.numLch, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ulRecfg.numLch, mBuf); for (i = 0; i < param->ulRecfg.numLch; i++) { CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); } #endif - CMCHKUNPK(oduPackUInt32, ¶m->ulRecfg.gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->ulRecfg.mbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->ulRecfg.gbr, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->ulRecfg.mbr, mBuf); return ROK; } @@ -8029,17 +6475,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRecfg ( RgrRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { @@ -8059,7 +6499,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); + CMCHKPK(oduPackUInt8, param->recfgType, mBuf); return ROK; } @@ -8080,21 +6520,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRecfg ( RgrRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { case RGR_CELL_CFG: CMCHKUNPK(cmUnpkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); @@ -8130,20 +6564,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlSecCellRelInfo ( RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + CMCHKPK(oduPackUInt16, param->sCellId, mBuf); + CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf); return ROK; } @@ -8162,24 +6590,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSecCellRelInfo ( RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) { - CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(U8)idx],mBuf); + CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(uint8_t)idx],mBuf); } - CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); + CMCHKPK(oduPackUInt8, param->numSCells, mBuf); return ROK; } @@ -8201,28 +6623,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDel ( RgrDel *param, Buffer *mBuf ) -#else -S16 cmPkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { switch(param->delType) { case RGR_LCG_CFG: - CMCHKPK(oduUnpackUInt8, param->u.lcgDel.lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->u.lcgDel.lcgId, mBuf); CMCHKPK(cmPkLteRnti, param->u.lcgDel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.lcgDel.cellId, mBuf); break; case RGR_LCH_CFG: - CMCHKPK(oduUnpackUInt8, param->u.lchDel.lcgId, mBuf); + CMCHKPK(oduPackUInt8, param->u.lchDel.lcgId, mBuf); CMCHKPK(cmPkLteLcId, param->u.lchDel.lcId, mBuf); CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf); @@ -8237,7 +6653,7 @@ Buffer *mBuf; #ifdef LTE_ADV case RGR_SCELL_UE_CFG: CMCHKPK(cmPkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); - CMCHKPK(oduUnpackUInt32, param->u.ueScellRel.ueDelTypes, mBuf); + CMCHKPK(oduPackUInt32, param->u.ueScellRel.ueDelTypes, mBuf); CMCHKPK(cmPkLteRnti, param->u.ueScellRel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.ueScellRel.cellId, mBuf); break; @@ -8245,7 +6661,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->delType, mBuf); + CMCHKPK(oduPackUInt8, param->delType, mBuf); return ROK; } @@ -8267,20 +6683,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlSecCellRelInfo ( RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->sCellId, mBuf); return ROK; } @@ -8300,21 +6710,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSecCellRelInfo ( RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSCells, mBuf); for(idx = 0; idx < param->numSCells;idx++) { @@ -8339,21 +6743,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDel ( RgrDel *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->delType, mBuf); switch(param->delType) { case RGR_CELL_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.cellDel.cellId, mBuf); @@ -8366,18 +6764,18 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->u.lchDel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.lchDel.crnti, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->u.lchDel.lcId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->u.lchDel.lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.lchDel.lcgId, mBuf); break; case RGR_LCG_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.lcgDel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.lcgDel.crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->u.lcgDel.lcgId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.lcgDel.lcgId, mBuf); break; #ifdef LTE_ADV case RGR_SCELL_UE_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.ueScellRel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.ueScellRel.crnti, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->u.ueScellRel.ueDelTypes, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->u.ueScellRel.ueDelTypes, mBuf); CMCHKUNPK(cmUnpkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); break; #endif @@ -8401,22 +6799,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSonPrbCfg ( RgrPrbCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { S32 count; for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) { - CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); + CMCHKPK(oduPackUInt32, param->paLevelPerPrb[count], mBuf); } for(count = param->numCellCentreUEs - 1; count >= 0; count --) { @@ -8426,9 +6818,9 @@ Buffer *mBuf; { CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf); - CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf); - CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf); + CMCHKPK(oduPackUInt8, param->numCellCentreUEs, mBuf); + CMCHKPK(oduPackUInt8, param->numCellEdgeUEs, mBuf); + CMCHKPK(oduPackUInt8, param->isSonIcicEnable, mBuf); return ROK; } @@ -8447,22 +6839,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSonPrbCfg ( RgrPrbCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { S32 count; - CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isSonIcicEnable, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCellEdgeUEs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCellCentreUEs, mBuf); for (count = 0; count < param->numCellEdgeUEs; count++) { CMCHKUNPK(cmUnpkLteRnti, ¶m->cellEdgeUe[count], mBuf); @@ -8471,1003 +6857,89 @@ Buffer *mBuf; { CMCHKUNPK(cmUnpkLteRnti, ¶m->cellCentreUe[count], mBuf); } - for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++) - { - CMCHKUNPK(oduPackUInt32,(U32 *) ¶m->paLevelPerPrb[count], mBuf); - } - return ROK; -} -/*********************************************************** -* -* Func : cmPkRgrSonCfg -* -* -* Desc : SON Configuration info for MAC -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrSonCfg -( -RgrSonCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif -{ - - switch(param->cfgType) - { - case RGR_SON_PRB_CFG : - CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmUnpkRgrSon -* -* -* Desc : SON configuration info for MAC -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSonCfg -( -RgrSonCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->cfgType, mBuf); - switch(param->cfgType) - { - case RGR_SON_PRB_CFG : - { - CMCHKUNPK(cmUnpkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } - } - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgrRst -* -* -* Desc : UE RESET info for MAC -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrRst -( -RgrRst *param, -Buffer *mBuf -) -#else -S16 cmPkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrRst -* -* -* Desc : UE RESET info for MAC -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrRst -( -RgrRst *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - return ROK; -} -#ifdef LTE_ADV -/*********************************************************** -* -* Func : cmUnPkRgrSCellActDeactInfo -* -* -* Desc : SCell Activation information of the UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnPkRgrSCellActDeactInfo -( -RgrSCellActDeactInfo *param, -Buffer *mBuf -) -#else -PRIVATE S16 cmUnPkRgrSCellActInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif -{ - - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmUnPkRgrSCellActDeactEvnt -* -* -* Desc : SCell Activation Configuration structure to SCH -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnPkRgrSCellActDeactEvnt -( -RgrSCellActDeactEvnt *param, -Buffer *mBuf -) -#else -S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif -{ - - U8 idx; - - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numOfSCells, mBuf); - - for(idx = 0; idx < param->numOfSCells;idx++) - { - CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[idx],mBuf); - } - - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgrSCellActInfo -* -* -* Desc : SCell Activation information of the UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkRgrSCellActDeactInfo -( -RgrSCellActDeactInfo *param, -Buffer *mBuf -) -#else -PRIVATE S16 cmPkRgrSCellActDeactInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - - return ROK; -} - -/*********************************************************** -* -* Func : cmPkRgrSCellActDeactEvnt -* -* -* Desc : Basic Configuration structure at SCH -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrSCellActDeactEvnt -( -RgrSCellActDeactEvnt *param, -Buffer *mBuf -) -#else -S16 cmPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif -{ - - - S8 idx; - for(idx = param->numOfSCells - 1; idx >= 0; idx--) - { - CMCHKPK(cmPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[(U8)idx], mBuf); - } - - CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - - return ROK; -} - - -#endif /* LTE_ADV */ - -/*********************************************************** -* -* Func : cmPkRgrCfgReqInfo -* -* -* Desc : Basic RGR configuration/reconfiguration info at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgReqInfo -( -RgrCfgReqInfo *param, -Buffer *mBuf -) -#else -S16 cmPkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif -{ - - - switch(param->action) { - case RGR_SON_CFG: - CMCHKPK(cmPkRgrSonCfg, ¶m->u.sonCfg, mBuf); - break; - case RGR_RESET: - CMCHKPK(cmPkRgrRst, ¶m->u.rstInfo, mBuf); - break; - case RGR_DELETE: - CMCHKPK(cmPkRgrDel, ¶m->u.delInfo, mBuf); - break; - case RGR_RECONFIG: - CMCHKPK(cmPkRgrRecfg, ¶m->u.recfgInfo, mBuf); - break; - case SCH_CONFIG: - CMCHKPK(cmPkRgrCfg, ¶m->u.cfgInfo, mBuf); - break; -#ifdef LTE_ADV - case RGR_SCELL_ACT: - case RGR_SCELL_DEACT: - case RGR_SCELL_READY: - CMCHKPK(cmPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); - break; -#endif - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->action, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrCfgReqInfo -* -* -* Desc : Basic RGR configuration/reconfiguration info at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgReqInfo -( -RgrCfgReqInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); - switch(param->action) { - case SCH_CONFIG: - CMCHKUNPK(cmUnpkRgrCfg, ¶m->u.cfgInfo, mBuf); - break; - case RGR_RECONFIG: - CMCHKUNPK(cmUnpkRgrRecfg, ¶m->u.recfgInfo, mBuf); - break; - case RGR_DELETE: - CMCHKUNPK(cmUnpkRgrDel, ¶m->u.delInfo, mBuf); - break; - case RGR_RESET: - CMCHKUNPK(cmUnpkRgrRst, ¶m->u.rstInfo, mBuf); - break; - case RGR_SON_CFG: - CMCHKUNPK(cmUnpkRgrSonCfg, ¶m->u.sonCfg, mBuf); - break; -#ifdef LTE_ADV - case RGR_SCELL_ACT: - case RGR_SCELL_DEACT: - case RGR_SCELL_READY: - CMCHKUNPK(cmUnPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); - break; -#endif /* LTE_ADV */ - default : - return RFAILED; - } - return ROK; -} -#ifdef RGR_V1 -/* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and - * retxBSR-timer */ -/*********************************************************** -* -* Func : cmPkRgrUeBsrTmrCfg -* -* -* Desc : BSR timer configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeBsrTmrCfg -( -RgrUeBsrTmrCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmUnpkRgrUeBsrTmrCfg -* -* -* Desc : BSR timer configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeBsrTmrCfg -( -RgrUeBsrTmrCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prdBsrTmr, mBuf); - return ROK; -} -#endif /* RGR_V1 */ -/* rgr_c_001.main_4-ADD-Added for SI Enhancement. */ -#ifdef RGR_SI_SCH -/*********************************************************** -* -* Func : cmPkRgrSiCfgReq -* -* -* Desc : SI Configuration Request from RRM to MAC for -* configuring SI -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrSiCfgReq -( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrSiCfgReqInfo * cfgReqInfo -) -#else -S16 cmPkRgrSiCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrSiCfgReqInfo * cfgReqInfo; -#endif -{ - Buffer *mBuf = NULLP; - - - 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)ERGR045, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - return RFAILED; - } - if (cmPkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR046, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR047, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - SPutMsg(mBuf); - return 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)ERGR048, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR049, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - pst->event = (Event) EVTRGRSICFGREQ; - return (SPstTsk(pst,mBuf)); -} - -/*********************************************************** -* -* Func : cmUnpkRgrSiCfgReq -* -* -* Desc : SI Configuration Request from RRM to MAC for -* configuring SI -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgReq -( -RgrSiCfgReq func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkRgrSiCfgReq(func, pst, mBuf) -RgrSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SpId spId; - RgrCfgTransId transId; - RgrSiCfgReqInfo *cfgReqInfo; - - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, - sizeof(RgrSiCfgReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - memset(cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - - return ((*func)(pst, spId, transId, cfgReqInfo)); -} - -/*********************************************************** -* -* Func : cmPkRgrSiCfgReqInfo -* -* -* Desc : Basic SI configuration/reconfiguration info at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrSiCfgReqInfo -( -RgrSiCfgReqInfo *param, -Buffer *mBuf -) -#else -S16 cmPkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif -{ - /* ccpu00111328: S16 is renamed as MsgLen */ - MsgLen msgLen; - - - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkS32, param->cfgType, mBuf); - CMCHKPK(oduUnpackUInt8, param->siId, mBuf); - - if(NULLP != param->pdu) - { - if (SFndLenMsg(param->pdu, &msgLen) != ROK) - return RFAILED; - if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) - return RFAILED; - SPutMsg(param->pdu); - CMCHKPK(cmPkMsgLen, msgLen, mBuf); - } - /*ccpu00140789*/ - else - { - CMCHKPK(cmPkMsgLen, 0, mBuf); - } - - return ROK; -} - -/*********************************************************** -* -* Func : cmUnpkRgrSiCfgReqInfo -* -* -* Desc : Basic SI configuration/reconfiguration info at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgReqInfo -( -RgrSiCfgReqInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif -{ - MsgLen msgLen, totalMsgLen; - /*Merge from Mohit Changes*/ - S32 cfgType; - - - SFndLenMsg(mBuf, &msgLen); - if(msgLen > 0) - { - CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); - /*ccpu00140789*/ - if(msgLen > 0) - { - if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - return RFAILED; - if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK) - return RFAILED; - } - else - { - param->pdu = NULLP; - } - } - - CMCHKUNPK(oduPackUInt8, ¶m->siId, mBuf); - /*CMCHKUNPK(SUnpkS32, (S32 *)¶m->cfgType, mBuf);*/ - /*Merge from Mohit Changes*/ - CMCHKUNPK(SUnpkS32,(S32 *)&cfgType, mBuf); - param->cfgType = (RgrSiCfgType) cfgType; - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrWarningSiCfgReq -* -* -* Desc : SI Configuration Request from RRM to MAC for -* configuring warning SI -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgReq -( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo -) -#else -S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; -#endif -{ - Buffer *mBuf = NULLP; - - - 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)ERGR061, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - return RFAILED; - } - - if (cmPkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR062, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR063, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return 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)ERGR064, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - - /* if the application wants to retain this structure, the below - * code should be removed */ - if (SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)) != ROK) + for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR065, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; + CMCHKUNPK(oduUnpackUInt32,(uint32_t *) ¶m->paLevelPerPrb[count], mBuf); } - - pst->event = (Event) EVTRGRWARNINGSICFGREQ; - return (SPstTsk(pst,mBuf)); -}/*cmPkRgrWarningSiCfgReq*/ - - + return ROK; +} /*********************************************************** * -* Func : cmUnpkRgrWarningSiCfgReq +* Func : cmPkRgrSonCfg * * -* Desc : SI Configuration Request from RRM to MAC for -* configuring warning SI +* Desc : SON Configuration info for MAC * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiCfgReq +S16 cmPkRgrSonCfg ( -RgrWarningSiCfgReq func, -Pst *pst, +RgrSonCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf) -RgrWarningSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; - - - if (SUnpkS16(&spId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR066, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR067, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if ((SGetSBuf(pst->region, pst->pool, (Data **)&warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo))) != ROK) + switch(param->cfgType) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR068, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); + case RGR_SON_PRB_CFG : + CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); + break; + default : return RFAILED; } + CMCHKPK(oduPackUInt32, param->cfgType, mBuf); + return ROK; +} +/*********************************************************** +* +* Func : cmUnpkRgrSon +* +* +* Desc : SON configuration info for MAC +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmUnpkRgrSonCfg +( +RgrSonCfg *param, +Buffer *mBuf +) +{ - if (pst->selector == ODU_SELECTOR_LC) + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->cfgType, mBuf); + switch(param->cfgType) { - if (cmUnpkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) + case RGR_SON_PRB_CFG : { - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR069, (ErrVal)0, "Packing failed"); -#endif + CMCHKUNPK(cmUnpkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); + break; + default : return RFAILED; } } - SPutMsg(mBuf); - - return ((*func)(pst, spId, transId, warningSiCfgReqInfo)); -} /* cmUnpkRgrWarningSiCfgReq */ + return ROK; +} /*********************************************************** * -* Func : cmPkRgrWarningSiCfgReqInfo +* Func : cmPkRgrRst * * -* Desc : Basic warning SI configuration/reconfiguration -* info at RRM +* Desc : UE RESET info for MAC * * * Ret : S16 @@ -9477,63 +6949,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgReqInfo +S16 cmPkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen; - U32 count; - CmLList *node, *prevNode; - RgrSegmentInfo *pdu; - - CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->siId, mBuf); - - count = param->siPduLst.count; - node = param->siPduLst.last; - while (node) - { - pdu = (RgrSegmentInfo *)node->node; - prevNode= node->prev; - if(NULLP != pdu) - { - if (SFndLenMsg(pdu->pdu, &msgLen) != ROK) - return RFAILED; - if (SCatMsg(mBuf, pdu->pdu, M1M2) != ROK) - return RFAILED; - /* The PDU is not Released. This has to be done by - * the caller of the packing function */ - CMCHKPK(cmPkMsgLen, msgLen, mBuf); - SPutMsg(pdu->pdu); - } - cmLListDelFrm(¶m->siPduLst, node); - SPutSBuf(pst->region, pst->pool, (Data *)node, sizeof(RgrSegmentInfo)); - node= prevNode; - } - CMCHKPK(oduUnpackUInt32, count, mBuf); return ROK; } + /*********************************************************** * -* Func : cmUnpkRgrWarningSiCfgReqInfo +* Func : cmUnpkRgrRst * * -* Desc : Unpack warning SI configuration info at SCH +* Desc : UE RESET info for MAC * * * Ret : S16 @@ -9543,205 +6979,87 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiCfgReqInfo +S16 cmUnpkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen, totalMsgLen; - U32 count, loopCnt; - Buffer *pdu; - CmLList *node; - - - cmLListInit(¶m->siPduLst); - CMCHKUNPK(oduPackUInt32, &count, mBuf); - for (loopCnt=0; loopCnt 0) - { - CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); - if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - { - return RFAILED; - } - if (SSegMsg(mBuf, totalMsgLen-msgLen, &pdu) != ROK) - { - return RFAILED; - } - } - else - { - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&node, - sizeof(CmLList))) != ROK) - return RFAILED; - node->node = (PTR)pdu; - cmLListAdd2Tail(¶m->siPduLst, node); - } - CMCHKUNPK(oduPackUInt8, ¶m->siId, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKPK(oduPackUInt8, ¶m->emtcEnable, mBuf); - + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); return ROK; } - - +#ifdef LTE_ADV /*********************************************************** * -* Func : cmPkRgrWarningSiStopReq +* Func : cmUnPkRgrSCellActDeactInfo +* +* +* Desc : SCell Activation information of the UE * -* Desc : To stop the broadcast for SIB10, SIB11 and SIB12. * * Ret : S16 * * Notes: * * File : +* **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiStopReq +static S16 cmUnPkRgrSCellActDeactInfo ( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -U8 siId -) -#else -S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -U8 siId; -#endif +RgrSCellActDeactInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - - - 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)ERGR070, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - CMCHKPK(oduUnpackUInt8, siId, mBuf); - - - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR082, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } + CMCHKUNPK(oduUnpackUInt8, ¶m->sCellIdx, mBuf); + return ROK; +} - if (SPkS16(spId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR071, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - pst->event = (Event) EVTRGRWARNINGSISTOPREQ; - return (SPstTsk(pst,mBuf)); -}/*cmPkRgrWarningSiStopReq */ - - /*********************************************************** * -* Func : cmUnpkRgrWarningSiStopReq +* Func : cmUnPkRgrSCellActDeactEvnt +* +* +* Desc : SCell Activation Configuration structure to SCH * -* Desc : To stop the broadcast for SIB10, SIB11 and SIB12. * * Ret : S16 * * Notes: * * File : +* **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiStopReq +S16 cmUnPkRgrSCellActDeactEvnt ( -RgrWarningSiStopReq func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiStopReq(param, mBuf) -RgrWarningSiStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - U8 siId; - RgrCfgTransId transId; + uint8_t idx; - if (SUnpkS16(&spId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR072, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numOfSCells, mBuf); - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) + for(idx = 0; idx < param->numOfSCells;idx++) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR083, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; + CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[idx],mBuf); } - - CMCHKUNPK(oduPackUInt8, &siId, mBuf); - SPutMsg(mBuf); + return ROK; +} - return ((*func)(pst, spId, transId, siId)); -} /*cmUnpkRgrWarningSiStopReq */ - /*********************************************************** * -* Func : cmPkRgrWarningSiCfgCfm +* Func : cmPkRgrSCellActInfo * * -* Desc : Warning SI Configuration Confirm from MAC to RRM +* Desc : SCell Activation information of the UE * * * Ret : S16 @@ -9751,92 +7069,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgCfm +static S16 cmPkRgrSCellActDeactInfo ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -U8 siId, -U8 status -) -#else -S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -U8 siId; -U8 status; -#endif -{ - Buffer *mBuf = NULLP; - - - 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)ERGR073, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if (oduUnpackUInt8(status, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR074, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - if (oduUnpackUInt8(siId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR075, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR076, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - if (SPkS16(suId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR077, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } +RgrSCellActDeactInfo *param, +Buffer *mBuf +) +{ - pst->event = (Event) EVTRGRWARNINGSICFGCFM; - return (SPstTsk(pst,mBuf)); -} /* cmPkRgrWarningSiCfgCfm */ + CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf); + + return ROK; +} - /*********************************************************** * -* Func : cmUnpkRgrwarningSiCfgCfm +* Func : cmPkRgrSCellActDeactEvnt * * -* Desc : Warning SI Configuration Confirm from MAC to RRM +* Desc : Basic Configuration structure at SCH * * * Ret : S16 @@ -9846,176 +7096,90 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiCfgCfm +S16 cmPkRgrSCellActDeactEvnt ( -RgrWarningSiCfgCfm func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf) -RgrWarningSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - U8 siId; - RgrCfgTransId transId; - U8 status; - if (SUnpkS16(&suId, mBuf) != ROK) + S8 idx; + for(idx = param->numOfSCells - 1; idx >= 0; idx--) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR078, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; + CMCHKPK(cmPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[(uint8_t)idx], mBuf); } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR079, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } + CMCHKPK(oduPackUInt8, param->numOfSCells, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - if (oduPackUInt8(&siId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR080, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } + return ROK; +} - if (oduPackUInt8(&status, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR081, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, transId, siId, status)); -}/* cmUnpkRgrwarningSiCfgCfm */ -#endif/*RGR_SI_SCH*/ -/* LTE_ADV_FLAG_REMOVED_START */ +#endif /* LTE_ADV */ + /*********************************************************** * -* Func : cmPkRgrLoadInfReq +* Func : cmPkRgrCfgReqInfo * * -* Desc : LOAD INF Configuration Request from RRM to MAC for -* configuring RNTP, ABS etc +* Desc : Basic RGR configuration/reconfiguration info at RRM * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLoadInfReq +S16 cmPkRgrCfgReqInfo ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrLoadInfReqInfo * loadInfReq -) -#else -S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrLoadInfReqInfo * loadInfReq; -#endif +RgrCfgReqInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - 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)ERGR045, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - return RFAILED; - } - if (cmPkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR046, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR047, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return 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)ERGR048, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR049, (ErrVal)0, "Packing failed"); + switch(param->action) { + case RGR_SON_CFG: + CMCHKPK(cmPkRgrSonCfg, ¶m->u.sonCfg, mBuf); + break; + case RGR_RESET: + CMCHKPK(cmPkRgrRst, ¶m->u.rstInfo, mBuf); + break; + case RGR_DELETE: + CMCHKPK(cmPkRgrDel, ¶m->u.delInfo, mBuf); + break; + case RGR_RECONFIG: + CMCHKPK(cmPkRgrRecfg, ¶m->u.recfgInfo, mBuf); + break; + case SCH_CONFIG: + CMCHKPK(cmPkRgrCfg, ¶m->u.cfgInfo, mBuf); + break; +#ifdef LTE_ADV + case RGR_SCELL_ACT: + case RGR_SCELL_DEACT: + case RGR_SCELL_READY: + CMCHKPK(cmPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); + break; #endif - SPutMsg(mBuf); - return RFAILED; - } - - pst->event = (Event) EVTRGRLOADINFREQ; - return (SPstTsk(pst,mBuf)); + default : + return RFAILED; + } + CMCHKPK(oduPackUInt8, param->action, mBuf); + return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgrLoadInfReq +* Func : cmUnpkRgrCfgReqInfo * * -* Desc : LOAD INF Configuration Request from RRM to MAC for -* configuring RNTP, ABS etc +* Desc : Basic RGR configuration/reconfiguration info at RRM * * * Ret : S16 @@ -10025,81 +7189,52 @@ RgrLoadInfReqInfo * loadInfReq; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLoadInfReq +S16 cmUnpkRgrCfgReqInfo ( -RgrLoadInfReq func, -Pst *pst, +RgrCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReq(func, pst, mBuf) -RgrLoadInfReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrLoadInfReqInfo *loadInfReq; - - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfReq, - sizeof(RgrLoadInfReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - memset(loadInfReq, 0, sizeof(RgrLoadInfReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; + CMCHKUNPK(oduUnpackUInt8, ¶m->action, mBuf); + switch(param->action) { + case SCH_CONFIG: + CMCHKUNPK(cmUnpkRgrCfg, ¶m->u.cfgInfo, mBuf); + break; + case RGR_RECONFIG: + CMCHKUNPK(cmUnpkRgrRecfg, ¶m->u.recfgInfo, mBuf); + break; + case RGR_DELETE: + CMCHKUNPK(cmUnpkRgrDel, ¶m->u.delInfo, mBuf); + break; + case RGR_RESET: + CMCHKUNPK(cmUnpkRgrRst, ¶m->u.rstInfo, mBuf); + break; + case RGR_SON_CFG: + CMCHKUNPK(cmUnpkRgrSonCfg, ¶m->u.sonCfg, mBuf); + break; +#ifdef LTE_ADV + case RGR_SCELL_ACT: + case RGR_SCELL_DEACT: + case RGR_SCELL_READY: + CMCHKUNPK(cmUnPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); + break; +#endif /* LTE_ADV */ + default : + return RFAILED; } - SPutMsg(mBuf); - - return ((*func)(pst, spId, transId, loadInfReq)); + return ROK; } - +#ifdef RGR_V1 +/* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and + * retxBSR-timer */ /*********************************************************** * -* Func : cmPkRgrLoadInfReqInfo +* Func : cmPkRgrUeBsrTmrCfg * * -* Desc : Basic LOAD INF configuration/reconfiguration info at RRM +* Desc : BSR timer configuration per UE * * * Ret : S16 @@ -10109,32 +7244,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLoadInfReqInfo +S16 cmPkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighEndRb, mBuf); + CMCHKPK(oduPackUInt16, param->prdBsrTmr, mBuf); + CMCHKPK(oduPackUInt16, param->retxBsrTmr, mBuf); + CMCHKPK(oduPackUInt8, param->isPrdBsrTmrPres, mBuf); return ROK; } - + /*********************************************************** * -* Func : cmUnpkRgrLoadInfReqInfo +* Func : cmUnpkRgrUeBsrTmrCfg * * -* Desc : Basic LOAD INF configuration/reconfiguration info at RRM +* Desc : BSR timer configuration per UE * * * Ret : S16 @@ -10144,26 +7273,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLoadInfReqInfo +S16 cmUnpkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighStartRb, mBuf); - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isPrdBsrTmrPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->retxBsrTmr, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->prdBsrTmr, mBuf); return ROK; } -/* LTE_ADV_FLAG_REMOVED_END */ +#endif /* RGR_V1 */ /*rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ @@ -10184,20 +7307,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); + CMCHKPK(oduPackUInt8, param->numColltdCqiRept, mBuf); return ROK; } @@ -10219,20 +7336,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numColltdCqiRept, mBuf); return ROK; } @@ -10254,19 +7365,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaInd ( Pst* pst, SuId suId, RgrStaIndInfo* staInd ) -#else -S16 cmPkRgrStaInd(pst, suId, staInd) -Pst* pst; -SuId suId; -RgrStaIndInfo* staInd; -#endif { Buffer *mBuf = NULLP; @@ -10277,7 +7381,7 @@ RgrStaIndInfo* staInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR054, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)staInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); return RFAILED; } @@ -10289,7 +7393,7 @@ RgrStaIndInfo* staInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR055, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); SPutMsg(mBuf); return RFAILED; } @@ -10301,13 +7405,13 @@ RgrStaIndInfo* staInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR056, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)staInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); SPutMsg(mBuf); return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, (Data *)staInd, + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10338,19 +7442,12 @@ RgrStaIndInfo* staInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaInd ( RgrStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaInd(func, pst, mBuf) -RgrStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrStaIndInfo *staInd; @@ -10367,7 +7464,7 @@ Buffer *mBuf; return RFAILED; } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&staInd, + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&staInd, sizeof(RgrStaIndInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10381,7 +7478,7 @@ Buffer *mBuf; if (cmUnpkRgrStaIndInfo(staInd, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)staInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10411,17 +7508,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10446,17 +7537,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10481,17 +7566,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -10500,7 +7579,7 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeCqiRept, ¶m->cqiRept[idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numCqiRept, mBuf); + CMCHKPK(oduPackUInt8, param->numCqiRept, mBuf); return ROK; } /* cmPkRgrUeCqiInfo */ @@ -10520,22 +7599,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numCqiRept, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCqiRept, mBuf); for (idx = 0; idx < param->numCqiRept; idx++) { CMCHKUNPK(cmUnpkRgrUeCqiRept, ¶m->cqiRept[idx], mBuf); @@ -10558,23 +7631,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); - CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); - CMCHKPK(oduUnpackUInt8, param->subBandIdx, mBuf); + CMCHKPK(oduPackUInt8, param->cqi[0], mBuf); + CMCHKPK(oduPackUInt8, param->cqi[1], mBuf); + CMCHKPK(oduPackUInt8, param->subBandIdx, mBuf); return ROK; } /* cmPkRgrSubBandCqiInfo */ @@ -10594,31 +7661,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { S8 idx; - U8 count; + uint8_t count; - CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); - CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); - CMCHKPK(oduUnpackUInt8, param->cqiMode, mBuf); + CMCHKPK(oduPackUInt8, param->cqi[0], mBuf); + CMCHKPK(oduPackUInt8, param->cqi[1], mBuf); + CMCHKPK(oduPackUInt8, param->cqiMode, mBuf); for (idx = param->numSubBand - 1; idx >= 0; idx--) { count = idx; CMCHKPK(cmPkRgrSubBandCqiInfo, ¶m->sbCqiInfo[count], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numSubBand, mBuf); + CMCHKPK(oduPackUInt8, param->numSubBand, mBuf); return ROK; } /* cmPkRgrUeCqiRept */ @@ -10636,23 +7697,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->subBandIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cqi[0], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->subBandIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqi[1], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqi[0], mBuf); return ROK; } /* cmUnpkRgrSubBandCqiInfo*/ @@ -10672,28 +7727,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numSubBand, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSubBand, mBuf); for (idx = 0; idx < param->numSubBand; idx++) { CMCHKUNPK(cmUnpkRgrSubBandCqiInfo, ¶m->sbCqiInfo[idx], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->cqiMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cqi[0], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqi[1], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqi[0], mBuf); return ROK; } /* cmUnpkRgrUeCqiRept */ @@ -10715,19 +7764,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfInd ( Pst* pst, SuId suId, RgrLoadInfIndInfo* loadInfInd ) -#else -S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd) -Pst* pst; -SuId suId; -RgrLoadInfIndInfo* loadInfInd; -#endif { Buffer *mBuf = NULLP; @@ -10738,7 +7780,7 @@ RgrLoadInfIndInfo* loadInfInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR054, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); return RFAILED; } @@ -10750,7 +7792,7 @@ RgrLoadInfIndInfo* loadInfInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR055, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); SPutMsg(mBuf); @@ -10764,13 +7806,13 @@ RgrLoadInfIndInfo* loadInfInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR056, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); SPutMsg(mBuf); return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10800,19 +7842,12 @@ RgrLoadInfIndInfo* loadInfInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfInd ( RgrLoadInfInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfInd(func, pst, mBuf) -RgrLoadInfInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ @@ -10829,7 +7864,7 @@ Buffer *mBuf; return RFAILED; } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfInd, + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&loadInfInd, sizeof(RgrLoadInfIndInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10844,7 +7879,7 @@ Buffer *mBuf; /* dsfr_pal_fixes ** 22-March-2013 ** SKS */ if (cmUnpkRgrLoadInfIndInfo(loadInfInd, pst, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10874,27 +7909,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfIndInfo(param, mBuf) -RgrLoadInfIndInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt16, param->bw, mBuf); + CMCHKPK(oduPackUInt16, param->bw, mBuf); if(RGR_ABS == param->type) { for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++) { - CMCHKPK(oduUnpackUInt32, param->u.absLoadInfo[idx], mBuf); + CMCHKPK(oduPackUInt32, param->u.absLoadInfo[idx], mBuf); } } else @@ -10902,7 +7931,7 @@ Buffer *mBuf; CMCHKPK(cmPkTknStrOSXL, ¶m->u.rntpInfo, mBuf); } - CMCHKPK(oduUnpackUInt32, param->type, mBuf); + CMCHKPK(oduPackUInt32, param->type, mBuf); return ROK; } @@ -10921,33 +7950,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfIndInfo(param, pst, mBuf) -RgrLoadInfIndInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { S8 idx; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ TknStrOSXL *tknStr; - U16 ndx; + uint16_t ndx; - CMCHKUNPK(oduPackUInt32, ¶m->type, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->type, mBuf); if(RGR_ABS == param->type) { for(idx = RGR_ABS_PATTERN_LEN -1 ; idx >= 0; idx--) { - CMCHKUNPK(oduPackUInt32, ¶m->u.absLoadInfo[(U8)idx], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->u.absLoadInfo[(uint8_t)idx], mBuf); } } else @@ -10956,14 +7978,14 @@ Buffer *mBuf; /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** Start */ tknStr = ¶m->u.rntpInfo; - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf); - if ((SGetSBuf(pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, @@ -10976,14 +7998,14 @@ Buffer *mBuf; /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); } } } /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** End */ /* dsfr_pal_fixes ** 22-March-2013 ** SKS */ - CMCHKUNPK(oduPackUInt16, ¶m->bw, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->bw, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -11008,24 +8030,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { if(param->pAPrsnt) { - CMCHKPK(oduUnpackUInt32, param->pA, mBuf); + CMCHKPK(oduPackUInt32, param->pA, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pAPrsnt, mBuf); + CMCHKPK(oduPackUInt8, param->pAPrsnt, mBuf); return ROK; } @@ -11047,24 +8063,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, (U8 *)¶m->pAPrsnt, mBuf); + CMCHKUNPK(oduUnpackUInt8, (uint8_t *)¶m->pAPrsnt, mBuf); if (param->pAPrsnt) { - CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&tmpEnum, mBuf); param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum; } @@ -11087,17 +8097,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11122,17 +8126,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11159,22 +8157,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg +static S16 cmPkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); + CMCHKPK(oduPackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); + CMCHKPK(oduPackUInt8, param->isDeltaMCSEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isAccumulated, mBuf); return ROK; } @@ -11194,24 +8186,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg +static S16 cmUnpkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isAccumulated, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isDeltaMCSEnabled, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pSRSOffset, mBuf); return ROK; } @@ -11233,29 +8219,23 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkRgrUeSecCellCfg +static S16 cmPkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,¶m->ueSCellUlDedPwrCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->isUlCaEnabled, mBuf); CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); #ifdef TFU_UPGRADE /*rgr_c_001.main_9 ADD PDSCH ded cfg*/ CMCHKPK(cmPkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); #endif CMCHKPK(cmPkRgrUeDlCqiCfg,¶m->ueSCellDlCqiCfg, mBuf); - CMCHKPK(cmPkTknU32, ¶m->sCellDeActTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + CMCHKPK(cmPkTknUInt32, ¶m->sCellDeActTmr, mBuf); + CMCHKPK(oduPackUInt16, param->sCellId, mBuf); + CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf); return ROK; } @@ -11277,27 +8257,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) { - CMCHKPK(cmPkRgrUeSecCellCfg, ¶m->ueSCellDedCfg[(U8)idx],mBuf); + CMCHKPK(cmPkRgrUeSecCellCfg, ¶m->ueSCellDedCfg[(uint8_t)idx],mBuf); } - CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); + CMCHKPK(oduPackUInt8, param->numSCells, mBuf); - CMCHKPK(oduUnpackUInt8, param->useExtBSRSizes, mBuf); + CMCHKPK(oduPackUInt8, param->useExtBSRSizes, mBuf); return ROK; } @@ -11318,27 +8292,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnpkRgrUeSecCellCfg +static S16 cmUnpkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); - CMCHKUNPK(cmUnpkTknU32, ¶m->sCellDeActTmr, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->sCellId, mBuf); + CMCHKUNPK(cmUnpkTknUInt32, ¶m->sCellDeActTmr, mBuf); CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, ¶m->ueSCellDlCqiCfg, mBuf); #ifdef TFU_UPGRADE CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); #endif CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isUlCaEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isUlCaEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeUlPwrDedSCellCfg, ¶m->ueSCellUlDedPwrCfg, mBuf); return ROK; @@ -11362,22 +8330,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->useExtBSRSizes, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->useExtBSRSizes, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSCells, mBuf); for(idx = 0; idx < param->numSCells;idx++) { @@ -11402,17 +8364,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { S8 idx; @@ -11420,35 +8376,35 @@ Buffer *mBuf; { for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf); + CMCHKPK(oduPackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); + CMCHKPK(oduPackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); for(idx = param->u.format1Bcs.sCellAckN1ResTb1Count - 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(U8)idx], mBuf); + CMCHKPK(oduPackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); + CMCHKPK(oduPackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); } else { for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf); + CMCHKPK(oduPackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf); + CMCHKPK(oduPackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf); for(idx = param->u.format3.sCellAckN3ResAntP0Count- 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(U8)idx], mBuf); + CMCHKPK(oduPackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf); + CMCHKPK(oduPackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf); } - CMCHKPK(oduUnpackUInt32, param->pucchFormatType, mBuf); + CMCHKPK(oduPackUInt32, param->pucchFormatType, mBuf); return ROK; } @@ -11468,53 +8424,47 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pucchFormatType, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->pucchFormatType, mBuf); //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS) if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B) { - CMCHKUNPK(oduPackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb1Count; idx++) { - CMCHKUNPK(oduPackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb2Count; idx++) { - CMCHKUNPK(oduPackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf); } } else { - CMCHKUNPK(oduPackUInt8, ¶m->u.format3.sCellAckN3ResAntP0Count, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.format3.sCellAckN3ResAntP0Count, mBuf); for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP0Count; idx++) { - CMCHKUNPK(oduPackUInt16, ¶m->u.format3.sCellAckN3ResAntP0[idx], mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->u.format3.sCellAckN3ResAntP0[idx], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->u.format3.sCellAckN3ResAntP1Count, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->u.format3.sCellAckN3ResAntP1Count, mBuf); for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP1Count; idx++) { - CMCHKUNPK(oduPackUInt16, ¶m->u.format3.sCellAckN3ResAntP1[idx], mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->u.format3.sCellAckN3ResAntP1[idx], mBuf); } } @@ -11542,19 +8492,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaInd ( Pst* pst, SuId suId, RgrUeStaIndInfo* ueStaInd ) -#else -S16 cmPkRgrUeStaInd(pst, suId, ueStaInd) -Pst* pst; -SuId suId; -RgrUeStaIndInfo* ueStaInd; -#endif { Buffer *mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) @@ -11564,7 +8507,7 @@ RgrUeStaIndInfo* ueStaInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR054, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); return RFAILED; } @@ -11576,7 +8519,7 @@ RgrUeStaIndInfo* ueStaInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR055, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); SPutMsg(mBuf); return RFAILED; @@ -11589,13 +8532,13 @@ RgrUeStaIndInfo* ueStaInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR056, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); SPutMsg(mBuf); return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11626,19 +8569,12 @@ RgrUeStaIndInfo* ueStaInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaInd ( RgrUeStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaInd(func, pst, mBuf) -RgrUeStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrUeStaIndInfo *ueStaInd; @@ -11655,7 +8591,7 @@ Buffer *mBuf; return RFAILED; } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueStaInd, + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueStaInd, sizeof(RgrUeStaIndInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11669,7 +8605,7 @@ Buffer *mBuf; if (cmUnpkRgrUeStaIndInfo(ueStaInd, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11698,23 +8634,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(oduUnpackUInt8, param->status, mBuf); + CMCHKPK(oduPackUInt8, param->status, mBuf); return ROK; } @@ -11732,21 +8662,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->status, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -11769,22 +8693,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->minUlResNonCsg, mBuf); - CMCHKPK(oduUnpackUInt8, param->minDlResNonCsg, mBuf); + CMCHKPK(oduPackUInt8, param->minUlResNonCsg, mBuf); + CMCHKPK(oduPackUInt8, param->minDlResNonCsg, mBuf); return ROK; } @@ -11803,22 +8721,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->minDlResNonCsg, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->minUlResNonCsg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->minDlResNonCsg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->minUlResNonCsg, mBuf); return ROK; } @@ -11837,32 +8749,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { switch(param->cmdType) { case RGR_CNTRL_CMD_RACH_OVRLD: - CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffVal, mBuf); - CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf); + CMCHKUNPK(oduPackUInt8, param->cmdDesc.rachOvrLd.backOffVal, mBuf); + CMCHKUNPK(oduPackUInt8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf); break; case RGR_CNTRL_CMD_CPU_OVRLD: - CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.cpuOvrLd.instruction, mBuf); + CMCHKUNPK(oduPackUInt8, param->cmdDesc.cpuOvrLd.instruction, mBuf); break; default: break; } - CMCHKUNPK(oduUnpackUInt32, param->cmdType, mBuf); + CMCHKUNPK(oduPackUInt32, param->cmdType, mBuf); return ROK; } @@ -11880,31 +8786,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, &tmpEnum, mBuf); param->cmdType = (RgrCellCntrlCmdType) tmpEnum; switch(param->cmdType) { case RGR_CNTRL_CMD_RACH_OVRLD: - CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.rachOvrLd.backOffEnb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.rachOvrLd.backOffVal, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cmdDesc.rachOvrLd.backOffEnb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cmdDesc.rachOvrLd.backOffVal, mBuf); break; case RGR_CNTRL_CMD_CPU_OVRLD: - CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.cpuOvrLd.instruction, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cmdDesc.cpuOvrLd.instruction, mBuf); break; default: break;