X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=070d06b01447a945d6377bf6c67cb63d60134442;hb=b3d5c17f74361fcdcb9b9febff450292197e3a57;hp=ff345fd840d81d05151e6e1ec91ae83434191815;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/cm/rgr.c b/src/cm/rgr.c index ff345fd84..070d06b01 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,60 +58,70 @@ * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrBndReq +S16 cmUnpkRgrCfgReq ( -Pst* pst, -SuId suId, -SpId spId +RgrCfgReq func, +Pst *pst, +Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { - Buffer *mBuf = NULLP; - TRC3(cmPkRgrBndReq) - - 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 @@ -120,55 +131,50 @@ SpId spId; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrBndReq +S16 cmPkRgrTtiIndInfo ( -RgrBndReq func, -Pst *pst, +RgrTtiIndInfo *param, +Buffer *mBuf +) +{ + CMCHKPK(oduUnpackUInt16, 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 -PUBLIC S16 cmUnpkRgrBndReq(func, pst, mBuf) -RgrBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - SpId spId; - - TRC3(cmUnpkRgrBndReq) - 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(oduPackUInt16, ¶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 @@ -178,37 +184,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrBndCfm +S16 cmPkRgrTtiInd ( Pst* pst, SuId suId, -U8 status +RgrTtiIndInfo *ttiInd ) -#else -PUBLIC S16 cmPkRgrBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -U8 status; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrBndCfm) 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)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; } @@ -216,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 @@ -242,54 +242,61 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrBndCfm +S16 cmUnpkRgrTtiInd ( -RgrBndCfm func, +RgrTtiInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrBndCfm(func, pst, mBuf) -RgrBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; - U8 status; + RgrTtiIndInfo *ttiInd; - TRC3(cmUnpkRgrBndCfm) 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)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 @@ -299,60 +306,52 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUbndReq +S16 cmPkRgrCfgCfm ( Pst* pst, -SpId spId, -Reason reason -) -#else -PUBLIC S16 cmPkRgrUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif +RgrCfgTransId transId, +uint8_t status +) { Buffer *mBuf = NULLP; - TRC3(cmPkRgrUbndReq) 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)ERGR011, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR031, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SPkS16(reason, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)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 @@ -362,55 +361,46 @@ Reason reason; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUbndReq +S16 cmUnpkRgrCfgCfm ( -RgrUbndReq func, +RgrCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUbndReq(func, pst, mBuf) -RgrUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - Reason reason; + RgrCfgTransId transId; + uint8_t status; - TRC3(cmUnpkRgrUbndReq) - 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 (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)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 @@ -420,78 +410,29 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfgReq +S16 cmPkRgrCfgTransId ( -RgrCfgReq func, -Pst *pst, +RgrCfgTransId *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCfgReq(func, pst, mBuf) -RgrCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - RgrCfgReqInfo *cfgReqInfo; - - TRC3(cmUnpkRgrCfgReq) -#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(oduUnpackUInt8, param->trans[i], mBuf); } - cmMemset((U8 *)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 @@ -501,30 +442,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrTtiIndInfo +S16 cmUnpkRgrCfgTransId ( -RgrTtiIndInfo *param, -Buffer *mBuf +RgrCfgTransId *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrTtiInd) - 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 * @@ -533,32 +474,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrTtiIndInfo +S16 cmPkRgrDlHqCfg ( -RgrTtiIndInfo *param, +RgrDlHqCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrTtiIndInfo) - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + + CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); return ROK; } + /*********************************************************** * -* Func : cmPkRgrTtiInd +* Func : cmUnpkRgrDlHqCfg * * -* Desc : TTI indication from MAC to RRM +* Desc : Downlink HARQ configuration per Cell * * * Ret : S16 @@ -568,63 +504,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrTtiInd +S16 cmUnpkRgrDlHqCfg ( -Pst* pst, -SuId suId, -RgrTtiIndInfo *ttiInd +RgrDlHqCfg *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrTtiInd(pst, suId, ttiInd) -Pst* pst; -SuId suId; -RgrTtiIndInfo *ttiInd; -#endif { - Buffer *mBuf = NULLP; - TRC3(cmPkRgrTtiInd) - 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(oduPackUInt8, ¶m->maxDlHqTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶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 @@ -634,69 +534,26 @@ RgrTtiIndInfo *ttiInd; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrTtiInd +S16 cmPkRgrRntiCfg ( -RgrTtiInd func, -Pst *pst, +RgrRntiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrTtiInd(func, pst, mBuf) -RgrTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrTtiIndInfo *ttiInd; - - TRC3(cmUnpkRgrTtiInd) - 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(oduUnpackUInt16, 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 @@ -706,60 +563,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCfgCfm +S16 cmUnpkRgrRntiCfg ( -Pst* pst, -RgrCfgTransId transId, -U8 status +RgrRntiCfg *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCfgCfm(pst, transId, status) -Pst* pst; -RgrCfgTransId transId; -U8 status; -#endif { - Buffer *mBuf = NULLP; - TRC3(cmPkRgrCfgCfm) - 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(oduPackUInt16, ¶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 @@ -769,55 +592,30 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfgCfm +S16 cmPkRgrEmtcRntiCfg ( -RgrCfgCfm func, -Pst *pst, +RgrEmtcRntiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCfgCfm(func, pst, mBuf) -RgrCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - U8 status; - - TRC3(cmUnpkRgrCfgCfm) - 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(oduUnpackUInt16, 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 @@ -827,73 +625,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSiCfgCfm +S16 cmUnpkRgrEmtcRntiCfg ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -U8 status -) -#else -PUBLIC S16 cmPkRgrSiCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -U8 status; -#endif +RgrEmtcRntiCfg *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - TRC3(cmPkRgrSiCfgCfm) - 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(oduPackUInt16, ¶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 @@ -903,65 +659,27 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSiCfgCfm +S16 cmPkRgrDlCmnCodeRateCfg ( -RgrSiCfgCfm func, -Pst *pst, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf) -RgrSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrCfgTransId transId; - U8 status; - - TRC3(cmUnpkRgrSiCfgCfm) - 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(oduUnpackUInt8, param->ccchCqi, mBuf); + CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); + CMCHKPK(oduUnpackUInt16, 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 @@ -971,25 +689,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCfgTransId +S16 cmUnpkRgrDlCmnCodeRateCfg ( -RgrCfgTransId *param, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - S32 i; - TRC3(cmPkRgrCfgTransId) - - for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); - } + CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -997,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 @@ -1010,25 +719,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfgTransId +S16 cmPkRgrCfiCfg ( -RgrCfgTransId *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - - S32 i; - TRC3(cmUnpkRgrCfgTransId) - - for (i=0; itrans[i], mBuf); - } + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); return ROK; } @@ -1036,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 @@ -1049,23 +746,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDlHqCfg +S16 cmUnpkRgrCfiCfg ( -RgrDlHqCfg *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDlHqCfg) - - CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); return ROK; } @@ -1073,10 +761,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlHqCfg +* Func : cmPkRgrPuschSubBandCfg * * -* Desc : Downlink HARQ configuration per Cell +* Desc : PUSCH sub-band configuration per cell * * * Ret : S16 @@ -1086,23 +774,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDlHqCfg +S16 cmPkRgrPuschSubBandCfg ( -RgrDlHqCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDlHqCfg) + S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->maxDlHqTx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxMsg4HqTx, mBuf); + 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); return ROK; } @@ -1110,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 @@ -1123,23 +809,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrRntiCfg +S16 cmUnpkRgrPuschSubBandCfg ( -RgrRntiCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrRntiCfg) - - CMCHKPK(oduUnpackUInt16, param->size, mBuf); - CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); + 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; } @@ -1147,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 @@ -1160,33 +843,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrRntiCfg +S16 cmPkRgrUlCmnCodeRateCfg ( -RgrRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - - TRC3(cmUnpkRgrRntiCfg) - - CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKPK(oduUnpackUInt8, 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 @@ -1196,26 +870,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcRntiCfg +S16 cmUnpkRgrUlCmnCodeRateCfg ( -RgrEmtcRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrEmtcRntiCfg) - - 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(oduPackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -1223,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 @@ -1236,38 +898,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcRntiCfg +S16 cmPkRgrUlTrgCqiCfg ( -RgrEmtcRntiCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - - TRC3(cmUnpkRgrEmtcRntiCfg) - - 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(oduUnpackUInt8, 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 @@ -1277,24 +925,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDlCmnCodeRateCfg +S16 cmUnpkRgrUlTrgCqiCfg ( -RgrDlCmnCodeRateCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDlCmnCodeRateCfg) - - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); - CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); - CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -1302,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 @@ -1315,731 +953,303 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDlCmnCodeRateCfg +S16 cmPkRgrBwCfg ( -RgrDlCmnCodeRateCfg *param, +RgrBwCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDlCmnCodeRateCfg) - - CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrCfiCfg -* -* -* Desc : Control Format Indicator (CFI) configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCfiCfg +#ifdef EMTC_ENABLE +/* EMTC related pack changes start*/ + +S16 cmPkRgrEmtcSiCfg ( -RgrCfiCfg *param, +RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrCfiCfg) + 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 + { + //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf); + for (i=0; i<2; i++) { + CMCHKPK(oduUnpackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); + } - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); - return ROK; + } + 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; } - -/*********************************************************** -* -* Func : cmUnpkRgrCfiCfg -* -* -* Desc : Control Format Indicator (CFI) configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfiCfg + + +S16 cmPkRgrEmtcRachCfg ( -RgrCfiCfg *param, +RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrCfiCfg) + S32 i; + + CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); - return ROK; + 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; } - -/*********************************************************** -* -* Func : cmPkRgrPuschSubBandCfg -* -* -* Desc : PUSCH sub-band configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrPuschSubBandCfg +S16 cmPkRgrEmtcPdschCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { - S32 i; - TRC3(cmPkRgrPuschSubBandCfg) - - 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); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); + + return ROK; +} + +S16 cmPkRgrEmtcPuschCfg +( +RgrEmtcPuschCfg*param, +Buffer *mBuf +) +{ + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); return ROK; } - -/*********************************************************** -* -* Func : cmUnpkRgrPuschSubBandCfg -* -* -* Desc : PUSCH sub-band configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrPuschSubBandCfg + +S16 cmPkRgrEmtcPucchCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrPuschSubBandCfg) - - 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); + for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) + { + CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); } - return ROK; + + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); + + return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrUlCmnCodeRateCfg -* -* -* Desc : Uplink common channel code rate configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUlCmnCodeRateCfg +S16 cmPkRgrEmtcPrachCeParamCfg ( -RgrUlCmnCodeRateCfg *param, +RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - - TRC3(cmPkRgrUlCmnCodeRateCfg) - - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); + 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); return ROK; } - -/*********************************************************** -* -* Func : cmUnpkRgrUlCmnCodeRateCfg -* -* -* Desc : Uplink common channel code rate configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlCmnCodeRateCfg + +S16 cmPkRgrEmtcPrachCfg ( -RgrUlCmnCodeRateCfg *param, +RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUlCmnCodeRateCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); - return ROK; + S32 i; + CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); + for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { + CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); + } + + return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrUlTrgCqiCfg -* -* -* Desc : Target Uplink CQI to achieve through group power control configured per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUlTrgCqiCfg + + +S16 cmPkRgrEmtcCfg ( -RgrUlTrgCqiCfg *param, +RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { - - TRC3(cmPkRgrUlTrgCqiCfg) - - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); + CMCHKPK(oduUnpackUInt16, param->pci, mBuf); + CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); + CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); + CMCHKPK(cmPkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); + CMCHKPK(cmPkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); + CMCHKPK(cmPkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); + CMCHKPK(cmPkRgrEmtcPuschCfg, ¶m->emtcPuschCfg, 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); + return ROK; } +/* EMTC related pack changes end*/ - -/*********************************************************** -* -* Func : cmUnpkRgrUlTrgCqiCfg -* -* -* Desc : Target Uplink CQI to achieve through group power control configured per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlTrgCqiCfg +/* EMTC related unpack changes start*/ + +S16 cmUnpkRgrEmtcSiCfg ( -RgrUlTrgCqiCfg *param, +RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUlTrgCqiCfg) + S32 i; + uint32_t tmpEnum; + CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); - return ROK; + for (i=0; i < param->numSi ; i++) + { + CMCHKUNPK(oduPackUInt32,(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); + } + //CMCHKUNPK(oduPackUInt16, ¶m->fddDlOrTddSfBitmapBR, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + /*Changes by SIMRAN*/ + if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) + { + CMCHKUNPK(oduPackUInt16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); + } + else + { + for (i=1; i>=0; i--) { + CMCHKUNPK(oduPackUInt32, ¶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, (uint32_t*)&tmpEnum, mBuf); + param->modPrd = (RgrModPeriodicity) tmpEnum; + CMCHKUNPK(oduPackUInt8, ¶m->siHoppingEnable, mBuf); + + return ROK; } - -/*********************************************************** -* -* Func : cmPkRgrBwCfg -* -* -* Desc : Bandwidth configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrBwCfg + + +S16 cmUnpkRgrEmtcRachCfg ( -RgrBwCfg *param, +RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrBwCfg) - - CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); - return ROK; + 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(oduPackUInt8, ¶m->emtcCeLvlSupported, mBuf); + return ROK; } -#ifdef EMTC_ENABLE -/* EMTC related pack changes start*/ - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcSiCfg +S16 cmUnpkRgrEmtcPdschCfg ( -RgrEmtcSiCfg *param, +RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif { - S32 i; - TRC3(cmPkRgrEmtcSiCfg) - - 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 - { - //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf); - for (i=0; i<2; i++) { - CMCHKPK(oduUnpackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[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 -PUBLIC S16 cmPkRgrEmtcRachCfg -( -RgrEmtcRachCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmPkRgrEmtcRachCfg) - - 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 -PUBLIC S16 cmPkRgrEmtcPdschCfg -( -RgrEmtcPdschCfg*param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrEmtcPdschCfg) - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - - return ROK; -} - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcPuschCfg -( -RgrEmtcPuschCfg*param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif -{ - TRC3(cmPkRgrEmtcPuschCfg) - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); - return ROK; -} - - - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcPucchCfg -( -RgrEmtcPucchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - TRC3(cmPkRgrEmtcPucchCfg) - 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); - - return ROK; -} - - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcPrachCeParamCfg -( -RgrEmtcPrachCEParamLst *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif -{ - TRC3(cmPkRgrEmtcPrachCeParamCfg) - 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); - return ROK; -} - - - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcPrachCfg -( -RgrEmtcPrachCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmPkRgrEmtcPrachCfg) - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); - } - - return ROK; -} - - - - -#ifdef ANSI -PUBLIC S16 cmPkRgrEmtcCfg -( -RgrEmtcCellCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif -{ - TRC3(cmPkRgrEmtcCfg) - CMCHKPK(oduUnpackUInt16, param->pci, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); - CMCHKPK(cmPkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); - CMCHKPK(cmPkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); - CMCHKPK(cmPkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); - CMCHKPK(cmPkRgrEmtcPuschCfg, ¶m->emtcPuschCfg, 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); - - return ROK; -} - -/* EMTC related pack changes end*/ - -/* EMTC related unpack changes start*/ - -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcSiCfg -( -RgrEmtcSiCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - U32 tmpEnum; - TRC3(cmUnpkRgrEmtcSiCfg) - CMCHKUNPK(oduPackUInt8, ¶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(oduPackUInt16, ¶m->schdInfo[i].emtcSiTbs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->schdInfo[i].emtcSiNarrowBand, mBuf); - } - //CMCHKUNPK(oduPackUInt16, ¶m->fddDlOrTddSfBitmapBR, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); - /*Changes by SIMRAN*/ - if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) - { - CMCHKUNPK(oduPackUInt16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); - } - else - { - for (i=1; i>=0; i--) { - CMCHKUNPK(oduPackUInt32, ¶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); - param->modPrd = (RgrModPeriodicity) tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->siHoppingEnable, mBuf); - - return ROK; -} - - - - -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcRachCfg -( -RgrEmtcRachCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmUnpkRgrEmtcRachCfg) - 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(oduPackUInt8, ¶m->emtcCeLvlSupported, mBuf); - return ROK; -} - - -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcPdschCfg -( -RgrEmtcPdschCfg*param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrEmtcPdschCfg) CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); return ROK; } -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcPuschCfg +S16 cmUnpkRgrEmtcPuschCfg ( RgrEmtcPuschCfg*param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrEmtcPuschCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); @@ -2048,22 +1258,15 @@ Buffer *mBuf; -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcPucchCfg +S16 cmUnpkRgrEmtcPucchCfg ( RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrEmtcPucchCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); @@ -2077,19 +1280,12 @@ Buffer *mBuf; } -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcPrachCeParamCfg +S16 cmUnpkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrEmtcPrachCeParamCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); @@ -2105,21 +1301,14 @@ Buffer *mBuf; -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcPrachCfg +S16 cmUnpkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrEmtcPrachCfg) for (i=0; i < RGR_MAX_CE_LEVEL; i++) { CMCHKUNPK(cmUnpkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } @@ -2130,20 +1319,13 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcCfg +S16 cmUnpkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrEmtcCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNbIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcPdschNbIdx, mBuf); @@ -2186,21 +1368,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrBwCfg +S16 cmUnpkRgrBwCfg ( RgrBwCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrBwCfg) - CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); return ROK; @@ -2223,21 +1397,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrPhichCfg +S16 cmPkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrPhichCfg) - CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); CMCHKPK(oduUnpackUInt32, param->ngEnum, mBuf); return ROK; @@ -2260,23 +1426,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrPhichCfg +S16 cmUnpkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrPhichCfg) - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ngEnum = (RgrPhichNg) tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->isDurExtend, mBuf); return ROK; @@ -2299,21 +1458,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrPucchCfg +S16 cmPkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrPucchCfg) - CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); CMCHKPK(oduUnpackUInt8, param->cyclicShift, mBuf); CMCHKPK(oduUnpackUInt8, param->deltaShift, mBuf); @@ -2340,21 +1491,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrPucchCfg +S16 cmUnpkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrPucchCfg) - CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->deltaShift, mBuf); @@ -2381,20 +1524,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSrsCfg +S16 cmPkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSrsCfg) CMCHKPK(oduUnpackUInt8, param->srsSubFrameCfg, mBuf); CMCHKPK(oduUnpackUInt32, param->srsBwEnum, mBuf); @@ -2420,26 +1556,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSrsCfg +S16 cmUnpkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; - - TRC3(cmUnpkRgrSrsCfg) + uint32_t tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsBwEnum = (RgrSrsBwCfg) tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->srsSubFrameCfg, mBuf); return ROK; @@ -2462,21 +1590,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrRachCfg +S16 cmPkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrRachCfg) CMCHKPK(oduUnpackUInt8, param->prachResource, mBuf); CMCHKPK(oduUnpackUInt16, param->msgSizeGrpA, mBuf); @@ -2515,22 +1636,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrRachCfg +S16 cmUnpkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; - TRC3(cmUnpkRgrRachCfg) #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ @@ -2539,7 +1653,7 @@ Buffer *mBuf; CMCHKUNPK(oduPackUInt8, ¶m->preambleFormat, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->raWinSize, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.size, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum; for (i=0; iraOccasion.size; i++) { CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.subFrameNum[i], mBuf); @@ -2569,24 +1683,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSiCfg +S16 cmPkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH S16 idx; #endif/*RGR_SI_SCH*/ - TRC3(cmPkRgrSiCfg) #ifdef RGR_SI_SCH if(param->numSi > sizeof(param->siPeriodicity)/ @@ -2595,12 +1702,12 @@ Buffer *mBuf; sizeof(param->siPeriodicity[0]); for (idx=param->numSi-1; idx >= 0; idx--) { - /* Enum to be packed/unpacked as U32 instead of S32 */ + /* Enum to be packed/unpacked as uint32_t instead of S32 */ CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf); } CMCHKPK(oduUnpackUInt8, param->numSi, mBuf); /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKPK(oduUnpackUInt32, (U32)param->modPrd, mBuf); + CMCHKPK(oduUnpackUInt32, (uint32_t)param->modPrd, mBuf); #endif/*RGR_SI_SCH*/ CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf); CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf); @@ -2624,31 +1731,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSiCfg +S16 cmUnpkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -PUBLIC 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*/ - TRC3(cmUnpkRgrSiCfg) CMCHKUNPK(oduPackUInt8, ¶m->siWinSize, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->retxCnt, mBuf); #ifdef RGR_SI_SCH /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->modPrd = (RgrModPeriodicity) tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); @@ -2657,9 +1757,9 @@ Buffer *mBuf; 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(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum; } #endif/*RGR_SI_SCH*/ @@ -2684,20 +1784,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrTpcRntiCfg +S16 cmPkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrTpcRntiCfg) CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startTpcRnti, mBuf); @@ -2721,20 +1814,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrTpcRntiCfg +S16 cmUnpkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrTpcRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->startTpcRnti, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); @@ -2758,21 +1844,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUlPwrCfg +S16 cmPkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUlPwrCfg) - CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3a, mBuf); @@ -2801,24 +1879,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlPwrCfg +S16 cmUnpkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUlPwrCfg) CMCHKUNPK(SUnpkS8, ¶m->p0NominalPusch, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->alpha = (RgrPwrAlpha) tmpEnum; CMCHKUNPK(SUnpkS8, ¶m->p0NominalPucch, mBuf); CMCHKUNPK(SUnpkS8, ¶m->deltaPreambleMsg3, mBuf); @@ -2846,20 +1917,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrPuschCfg +S16 cmPkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrPuschCfg) CMCHKPK(oduUnpackUInt8, param->hopOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->isIntraHop, mBuf); @@ -2884,20 +1948,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrPuschCfg +S16 cmUnpkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrPuschCfg) CMCHKUNPK(oduPackUInt8, ¶m->numSubBands, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isIntraHop, mBuf); @@ -2922,21 +1979,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCodeBookRstCfg +S16 cmPkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrCodeBookRstCfg) for (i=1-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt32, param->pmiBitMap[i], mBuf); @@ -2962,21 +2012,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCodeBookRstCfg +S16 cmUnpkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrCodeBookRstCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); for (i=0; i<1; i++) { @@ -3002,20 +2045,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrPreambleSetCfg +S16 cmPkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrPreambleSetCfg) CMCHKPK(oduUnpackUInt8, param->size, mBuf); CMCHKPK(oduUnpackUInt8, param->start, mBuf); @@ -3040,20 +2076,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrPreambleSetCfg +S16 cmUnpkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrPreambleSetCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->start, mBuf); @@ -3078,21 +2107,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCmnLchCfg +S16 cmPkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrCmnLchCfg) - CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dir, mBuf); @@ -3118,20 +2139,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCmnLchCfg +S16 cmUnpkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrCmnLchCfg) CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); @@ -3158,20 +2172,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDlfsCfg +S16 cmPkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDlfsCfg) CMCHKPK(oduUnpackUInt8, param->thresholdCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->isDlFreqSel, mBuf); @@ -3195,20 +2202,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDlfsCfg +S16 cmUnpkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDlfsCfg) CMCHKUNPK(oduPackUInt8, ¶m->isDlFreqSel, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->thresholdCqi, mBuf); @@ -3236,20 +2236,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrTddPrachInfo +S16 cmPkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrTddPrachInfo) CMCHKPK(oduUnpackUInt8, param->ulStartSfIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->halfFrm, mBuf); @@ -3275,24 +2268,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrTddPrachInfo +S16 cmUnpkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrTddPrachInfo) CMCHKUNPK(oduPackUInt8, ¶m->freqIdx, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->sfn = tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->halfFrm, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulStartSfIdx, mBuf); @@ -3316,21 +2302,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrTddPrachRscInfo +S16 cmPkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrTddPrachRscInfo) for (i=param->numRsc-1; i >= 0; i--) { CMCHKPK(cmPkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); @@ -3356,21 +2335,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrTddPrachRscInfo +S16 cmUnpkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrTddPrachRscInfo) CMCHKUNPK(oduPackUInt8, ¶m->numRsc, mBuf); for (i=0; inumRsc; i++) { @@ -3400,20 +2372,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrEnbPfs +S16 cmPkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; - TRC3(cmPkRgrEnbPfs) for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) { CMCHKPK(oduUnpackUInt32, param->qciWgt[idx], mBuf); @@ -3441,20 +2406,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEnbPfs +S16 cmUnpkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; - TRC3(cmUnpkRgrEnbPfs) CMCHKUNPK(oduPackUInt8, ¶m->tptCoeffi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->fairCoeffi, mBuf); @@ -3483,20 +2441,13 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSpsCellCfg +S16 cmPkRgrSpsCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSpsCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSpsCellCfg) CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); CMCHKPK(oduUnpackUInt16, param->maxSpsUePerDlSf, mBuf); CMCHKPK(oduUnpackUInt8, param->maxSpsDlBw, mBuf); @@ -3522,20 +2473,13 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSpsDlCellCfg +S16 cmUnpkRgrSpsDlCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSpsDlCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrSpsDlCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxSpsDlBw, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerDlSf, mBuf); @@ -3545,7 +2489,7 @@ Buffer *mBuf; } #ifdef RG_5GTF -PUBLIC S16 cmPkRgr5gtfCellCfg +S16 cmPkRgr5gtfCellCfg ( Rgr5gtfCellCfg *param, Buffer *mBuf @@ -3555,7 +2499,7 @@ Buffer *mBuf for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx) { - CMCHKPK(oduUnpackUInt32, param->dynConfig[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->dynConfig[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf); CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf); @@ -3566,7 +2510,7 @@ Buffer *mBuf return ROK; } -PUBLIC S16 cmUnPkRgr5gtfCellCfg +S16 cmUnPkRgr5gtfCellCfg ( Rgr5gtfCellCfg *param, Buffer *mBuf @@ -3583,7 +2527,7 @@ Buffer *mBuf for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx) { - CMCHKUNPK(oduPackUInt32, ¶m->dynConfig[(U8)idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->dynConfig[(uint8_t)idx], mBuf); } return ROK; } @@ -3606,20 +2550,13 @@ 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 { - TRC3(cmPkRgrlteUCellCfg) CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); return ROK; @@ -3640,20 +2577,13 @@ 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 { - TRC3(cmUnpkRgrLteUCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->isLaaCell, mBuf); @@ -3676,20 +2606,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLteAdvancedUeConfig +S16 cmPkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { - TRC3(cmPkRgrLteAdvancedUeConfig) CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); CMCHKPK(oduUnpackUInt8, param->isAbsUe, mBuf); CMCHKPK(oduUnpackUInt32, param->pres, mBuf); @@ -3711,20 +2634,13 @@ PUBLIC S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLteAdvancedUeConfig +S16 cmUnpkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { - TRC3(cmUnpkRgrLteAdvancedUeConfig) CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isAbsUe, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isUeCellEdge, mBuf); @@ -3746,25 +2662,18 @@ PUBLIC S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrAbsConfig +S16 cmPkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmPkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; - TRC3(cmPkRgrAbsConfig) - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) { - CMCHKPK(oduUnpackUInt8, param->absPattern[(U8)indx], mBuf); + CMCHKPK(oduUnpackUInt8, param->absPattern[(uint8_t)indx], mBuf); } CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf); @@ -3788,21 +2697,14 @@ PUBLIC S16 cmPkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSfrConfig +S16 cmPkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmPkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { - TRC3(cmPkRgrSfrConfig) - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); #ifdef TFU_UPGRADE CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf); CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf); @@ -3830,21 +2732,14 @@ PUBLIC S16 cmPkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDsfrConfig +S16 cmPkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmPkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { - TRC3(cmPkRgrDsfrConfig) - CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); return ROK; @@ -3866,21 +2761,14 @@ PUBLIC S16 cmPkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDsfrConfig +S16 cmUnpkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmUnpkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { - TRC3(cmUnpkRgrDsfrConfig) - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->status, mBuf); return ROK; } @@ -3901,19 +2789,13 @@ PUBLIC S16 cmUnpkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCellLteAdvancedFeatureCfg + +S16 cmPkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { - TRC3(cmPkRgrCellLteAdvancedFeatureCfg) CMCHKPK(oduUnpackUInt32, param->pres, mBuf); CMCHKPK(cmPkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ @@ -3940,29 +2822,22 @@ PUBLIC S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrAbsConfig +S16 cmUnpkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmUnpkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; - TRC3(cmUnpkRgrAbsConfig) CMCHKUNPK(oduPackUInt32, ¶m->absLoadPeriodicity, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->absPatternType, mBuf); for (indx = 0; indx absPattern[(U8)indx], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->absPattern[(uint8_t)indx], mBuf); } - CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t*)¶m->status, mBuf); return ROK; @@ -3983,28 +2858,21 @@ PUBLIC S16 cmUnpkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSfrConfig +S16 cmUnpkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmUnpkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { - TRC3(cmUnpkRgrSfrConfig) CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.startRb, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.endRb, mBuf); #ifdef TFU_UPGRADE - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pLow, mBuf); - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pHigh, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t*)¶m->pwrThreshold.pLow, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t*)¶m->pwrThreshold.pHigh, mBuf); #endif - CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t*)¶m->status, mBuf); return ROK; } @@ -4024,20 +2892,13 @@ PUBLIC S16 cmUnpkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg +S16 cmUnpkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { - TRC3(cmUnpkRgrCellLteAdvancedFeatureCfg) CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); CMCHKUNPK(cmUnpkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKUNPK(cmUnpkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ @@ -4061,19 +2922,12 @@ PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkMacSchedGnbCfg +S16 cmPkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkMacSchedGnbCfg(param, mBuf) -RgrSchedEnbCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkMacSchedGnbCfg) CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); CMCHKPK(oduUnpackUInt8, param->maxUlUePerTti, mBuf); @@ -4099,20 +2953,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkMacSchedGnbCfg +S16 cmUnpkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkMacSchedGnbCfg(param, mBuf) -MacSchedGnbCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkMacSchedGnbCfg) CMCHKUNPK(oduPackUInt8, ¶m->numTxAntPorts, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulSchdType, mBuf); @@ -4139,21 +2986,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCellCfg +S16 cmPkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrCellCfg) #ifdef EMTC_ENABLE /* EMTC related changes start*/ @@ -4264,22 +3104,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCellCfg +S16 cmUnpkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgrCellCfg) #ifdef EMTC_ENABLE /* EMTC related changes start*/ CMCHKUNPK(cmUnpkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); @@ -4351,7 +3184,7 @@ Buffer *mBuf; CMCHKPK(oduPackUInt16, ¶m->phichTxPwrOffset, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isDynCfiEnb, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isAutoCfgModeEnb, mBuf); - CMCHKPK(oduPackUInt32, (U32*)¶m->msg4pAVal, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t*)¶m->msg4pAVal, mBuf); /*LAA: Unpack LAA Cell params*/ CMCHKUNPK(cmUnpkRgrLteUCellCfg, ¶m->lteUCfg, mBuf); #ifdef LTE_ADV @@ -4380,20 +3213,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeAprdDlCqiCfg +S16 cmPkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeAprdDlCqiCfg) /*Pack Aperiodic Trigger List only for Pcell */ #ifdef LTE_ADV CMCHKPK(oduUnpackUInt8, param->triggerSet2, mBuf); @@ -4422,24 +3248,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeAprdDlCqiCfg +S16 cmUnpkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeAprdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum; #ifdef LTE_ADV @@ -4470,20 +3289,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUePrdDlCqiCfg +S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUePrdDlCqiCfg) CMCHKPK(oduUnpackUInt16, param->cqiPmiCfgIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->k, mBuf); @@ -4512,26 +3324,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUePrdDlCqiCfg +S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUePrdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdModeEnum = tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdicityEnum = tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->subframeOffst, mBuf); CMCHKUNPK(SUnpkS8, ¶m->cqiOffst, mBuf); @@ -4560,20 +3365,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeDlPCqiSetup +S16 cmPkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeDlPCqiSetup) CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); CMCHKPK(oduUnpackUInt8, param->sANCQI, mBuf); @@ -4604,21 +3402,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeDlPCqiSetup +S16 cmUnpkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeDlPCqiSetup) CMCHKUNPK(oduPackUInt16, ¶m->cqiPResIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->cqiPCfgIdx, mBuf); @@ -4628,7 +3419,7 @@ Buffer *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(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->prdModeEnum = (RgrPrdCqiMode) tmpEnum; return ROK; } @@ -4650,20 +3441,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUePrdDlCqiCfg +S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUePrdDlCqiCfg) CMCHKPK(cmPkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); CMCHKPK(oduUnpackUInt8, param->type, mBuf); @@ -4687,20 +3471,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUePrdDlCqiCfg +S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUePrdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); @@ -4725,20 +3502,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeUlSrsSetupCfg +S16 cmPkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeUlSrsSetupCfg) CMCHKPK(oduUnpackUInt8, param->fDomPosi, mBuf); CMCHKPK(oduUnpackUInt8, param->txComb, mBuf); @@ -4770,29 +3540,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeUlSrsSetupCfg +S16 cmUnpkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeUlSrsSetupCfg) /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsBw = (RgrUlSrsBwInfo) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->duration, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->sANSrs, mBuf); @@ -4818,20 +3581,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSrSetupCfg +S16 cmPkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeSrSetupCfg) /* ccpu00131601:DEL - dTMax Packing removed since this param will not * be required by Scheduler*/ @@ -4857,19 +3613,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSrSetupCfg +S16 cmUnpkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeSrSetupCfg) CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->srCfgIdx, mBuf); @@ -4895,20 +3644,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSrCfg +S16 cmPkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeSrCfg) CMCHKPK(cmPkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); CMCHKPK(oduUnpackUInt8, param->type, mBuf); @@ -4932,20 +3674,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSrCfg +S16 cmUnpkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeSrCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); @@ -4970,20 +3705,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeUlSrsCfg +S16 cmPkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeUlSrsCfg) /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKPK(cmPkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); @@ -5009,20 +3737,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeUlSrsCfg +S16 cmUnpkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeUlSrsCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ @@ -5049,20 +3770,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeDlCqiCfg +S16 cmPkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeDlCqiCfg) /* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ @@ -5095,20 +3809,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeDlCqiCfg +S16 cmUnpkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeDlCqiCfg) CMCHKUNPK(cmUnpkRgrUeAprdDlCqiCfg, ¶m->aprdCqiCfg, mBuf); CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->prdCqiCfg, mBuf); @@ -5132,20 +3839,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeMeasGapCfg +S16 cmPkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeMeasGapCfg) CMCHKPK(oduUnpackUInt8, param->gapOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->gapPrd, mBuf); @@ -5170,20 +3870,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeMeasGapCfg +S16 cmUnpkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeMeasGapCfg) CMCHKUNPK(oduPackUInt8, ¶m->isMesGapEnabled, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->gapPrd, mBuf); @@ -5208,20 +3901,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDrxLongCycleOffst +S16 cmPkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDrxLongCycleOffst) CMCHKPK(oduUnpackUInt16, param->drxStartOffst, mBuf); CMCHKPK(oduUnpackUInt16, param->longDrxCycle, mBuf); @@ -5245,20 +3931,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDrxLongCycleOffst +S16 cmUnpkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDrxLongCycleOffst) CMCHKUNPK(oduPackUInt16, ¶m->longDrxCycle, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->drxStartOffst, mBuf); @@ -5282,20 +3961,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDrxShortDrx +S16 cmPkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDrxShortDrx) CMCHKPK(oduUnpackUInt8, param->drxShortCycleTmr, mBuf); CMCHKPK(oduUnpackUInt16, param->shortDrxCycle, mBuf); @@ -5320,20 +3992,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDrxShortDrx +S16 cmUnpkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDrxShortDrx) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->shortDrxCycle, mBuf); @@ -5356,20 +4021,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeDrxCfg +S16 cmPkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeDrxCfg) CMCHKPK(cmPkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); CMCHKPK(cmPkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); @@ -5406,20 +4064,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeDrxCfg +S16 cmUnpkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeDrxCfg) /*rgr_c_001.main_9 ADD added changes for R9*/ #ifdef LTEMAC_R9 @@ -5456,20 +4107,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeCapCfg +S16 cmPkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeCapCfg) CMCHKPK(oduUnpackUInt8, param->txAntSel, mBuf); CMCHKPK(oduUnpackUInt8, param->simCqiAckNack, mBuf); @@ -5496,20 +4140,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeCapCfg +S16 cmUnpkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeCapCfg) CMCHKUNPK(oduPackUInt8, ¶m->pwrClass, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->intraSfFeqHop, mBuf); @@ -5536,20 +4173,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeAckNackRepCfg +S16 cmPkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeAckNackRepCfg) CMCHKPK(oduUnpackUInt32, param->ackNackRepFactor, mBuf); CMCHKPK(oduUnpackUInt16, param->pucchAckNackRep, mBuf); @@ -5574,25 +4204,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeAckNackRepCfg +S16 cmUnpkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeAckNackRepCfg) CMCHKUNPK(oduPackUInt8, ¶m->isAckNackEnabled, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->pucchAckNackRep, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum; return ROK; } @@ -5614,20 +4237,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeTxModeCfg +S16 cmPkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeTxModeCfg) CMCHKPK(oduUnpackUInt32, param->txModeEnum, mBuf); CMCHKPK(oduUnpackUInt32, param->tmTrnstnState, mBuf); @@ -5653,27 +4269,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeTxModeCfg +S16 cmUnpkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeTxModeCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->txModeEnum = (RgrTxMode) tmpEnum; return ROK; } @@ -5695,20 +4304,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeUlHqCfg +S16 cmPkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeUlHqCfg) CMCHKPK(oduUnpackUInt8, param->deltaHqOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); @@ -5732,20 +4334,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeUlHqCfg +S16 cmUnpkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeUlHqCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->deltaHqOffst, mBuf); @@ -5769,20 +4364,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeGrpPwrCfg +S16 cmPkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeGrpPwrCfg) CMCHKPK(oduUnpackUInt8, param->idx, mBuf); CMCHKPK(cmPkLteRnti, param->tpcRnti, mBuf); @@ -5807,20 +4395,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeGrpPwrCfg +S16 cmUnpkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeGrpPwrCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->tpcRnti, mBuf); @@ -5846,21 +4427,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSpsDlCfg +S16 cmPkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrUeSpsDlCfg) CMCHKPK(oduUnpackUInt16, param->explicitRelCnt, mBuf); CMCHKPK(oduUnpackUInt32, param->dlSpsPrdctyEnum, mBuf); for (i=param->numPucchVal-1; i >= 0; i--) { @@ -5889,22 +4463,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSpsDlCfg +S16 cmUnpkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; - TRC3(cmUnpkRgrUeSpsDlCfg) CMCHKUNPK(oduPackUInt8, ¶m->isDlSpsEnabled, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSpsHqProc, mBuf); @@ -5912,7 +4479,7 @@ Buffer *mBuf; for (i=0; inumPucchVal; i++) { CMCHKUNPK(oduPackUInt32, ¶m->n1PucchVal[i], mBuf); } - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->dlSpsPrdctyEnum = tmpEnum; CMCHKUNPK(oduPackUInt16, ¶m->explicitRelCnt, mBuf); return ROK; @@ -5935,21 +4502,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSpsUlCfg +S16 cmPkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmPkRgrUeSpsUlCfg) CMCHKPK(oduUnpackUInt8, param->isLcSRMaskEnab, mBuf); for (i=param->lcCnt-1; i >= 0; i--) { @@ -5990,25 +4550,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSpsUlCfg +S16 cmUnpkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; S32 i; - TRC3(cmUnpkRgrUeSpsUlCfg) CMCHKUNPK(oduPackUInt8, ¶m->isUlSpsEnabled, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->implicitRelCnt = tmpEnum; #ifdef LTE_TDD @@ -6018,7 +4571,7 @@ Buffer *mBuf; CMCHKUNPK(oduPackUInt8, ¶m->pwrCfgPres, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0NominalPuschVal, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0UePuschVal, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ulSpsPrdctyEnum = tmpEnum; CMCHKUNPK(oduPackUInt8, ¶m->lcCnt, mBuf); for (i=0; ilcCnt; i++) { @@ -6046,20 +4599,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSpsCfg +S16 cmPkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeSpsCfg) CMCHKPK(cmPkRgrUeSpsUlCfg, ¶m->ulSpsCfg, mBuf); CMCHKPK(cmPkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); @@ -6084,20 +4630,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSpsCfg +S16 cmUnpkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeSpsCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->spsRnti, mBuf); CMCHKUNPK(cmUnpkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); @@ -6121,20 +4660,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeUlPwrCfg +S16 cmPkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeUlPwrCfg) CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); @@ -6164,20 +4696,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeUlPwrCfg +S16 cmUnpkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeUlPwrCfg) CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); @@ -6207,20 +4732,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeQosCfg +S16 cmPkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeQosCfg) CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); @@ -6245,20 +4763,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeQosCfg +S16 cmUnpkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeQosCfg) CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); @@ -6281,20 +4792,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUePuschDedCfg +S16 cmPkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUePuschDedCfg) CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); @@ -6320,20 +4824,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUePuschDedCfg +S16 cmUnpkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUePuschDedCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); @@ -6357,20 +4854,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeTxAntSelCfg +S16 cmPkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeTxAntSelCfg) CMCHKPK(oduUnpackUInt32, param->selType, mBuf); CMCHKPK(oduUnpackUInt8, param->pres, mBuf); @@ -6394,24 +4884,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeTxAntSelCfg +S16 cmUnpkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeTxAntSelCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->selType = (RgrUeTxAntSelType) tmpEnum; return ROK; } @@ -6432,20 +4915,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeTaTmrCfg +S16 cmPkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeTaTmrCfg) CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); CMCHKPK(oduUnpackUInt8, param->pres, mBuf); @@ -6469,20 +4945,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeTaTmrCfg +S16 cmUnpkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeTaTmrCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); @@ -6491,17 +4960,11 @@ Buffer *mBuf; #ifdef EMTC_ENABLE -#ifdef ANSI -PUBLIC S16 cmUnpkRgrEmtcUeCfg +S16 cmUnpkRgrEmtcUeCfg ( RgrUeEmtcCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrEmtcUeCfg(param, mBuf) -RgrUeEmtcCfg *param; -Buffer *mBuf; -#endif { S32 indx=0; S32 idx=0; @@ -6526,8 +4989,8 @@ Buffer *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(cmUnpkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); + CMCHKUNPK(cmUnpkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf); CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf); for(idx = 0; idx < 5; idx++) @@ -6540,7 +5003,7 @@ Buffer *mBuf; CMCHKUNPK(oduPackUInt8,&(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); @@ -6593,7 +5056,7 @@ Buffer *mBuf; -PUBLIC S16 cmPkRgrEmtcUeCfg +S16 cmPkRgrEmtcUeCfg ( RgrUeEmtcCfg *param, Buffer *mBuf @@ -6612,7 +5075,7 @@ PUBLIC S16 cmPkRgrEmtcUeCfg { CMCHKPK(oduUnpackUInt8,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]); @@ -6626,8 +5089,8 @@ PUBLIC S16 cmPkRgrEmtcUeCfg } CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf); - CMCHKPK(cmPkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); - CMCHKPK(cmPkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); + CMCHKPK(cmPkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); + CMCHKPK(cmPkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf); CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf); CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf); @@ -6688,7 +5151,7 @@ PUBLIC S16 cmPkRgrEmtcUeCfg #endif #ifdef RG_5GTF -PUBLIC S16 cmUnpkRgr5gtfUeCfg +S16 cmUnpkRgr5gtfUeCfg ( RgrUe5gtfCfg *param, Buffer *mBuf @@ -6702,1117 +5165,28 @@ PUBLIC S16 cmUnpkRgr5gtfUeCfg return ROK; } -PUBLIC S16 cmPkRgr5gtfUeCfg -( - RgrUe5gtfCfg *param, - 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); - return ROK; -} -#endif - - -/*********************************************************** -* -* Func : cmPkRgrUeCfg -* -* -* Desc : UE configuration -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeCfg +S16 cmPkRgr5gtfUeCfg ( -RgrUeCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrUeCfg) -#ifdef RG_5GTF - CMCHKPK(cmPkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); -#endif -#ifdef EMTC_ENABLE - CMCHKPK(cmPkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); -#endif - CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); - - CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); - /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(cmPkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); - /* LTE_ADV_FLAG_REMOVED_END */ -#ifdef TFU_UPGRADE -/*rgr_c_001.main_9 ADD PDSCH ded cfg*/ - CMCHKPK(cmPkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); -#endif - /*rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from - RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ -#ifdef RGR_CQI_REPT - CMCHKPK(cmPkRgrUeCqiReptCfg, ¶m->ueCqiReptCfg, mBuf); -#endif - CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); - -/* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ - CMCHKPK(cmPkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); - -/*rgr_c_001.main_9 ADD added changes for HDFDD*/ -#ifdef LTEMAC_HDFDD - CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); -#endif - -#ifdef TFU_UPGRADE - CMCHKPK(cmPkRgrUeSrCfg, ¶m->srCfg, mBuf); - CMCHKPK(cmPkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); -#endif - - - - CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); - -#ifdef LTE_TDD - CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf); - -#endif - CMCHKPK(cmPkTknU8, ¶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); -/*rgr_c_001.main_9 ADD added changes for DRX*/ - - /* Anshika - Pack only if DRX is enabled */ - if(TRUE == param->ueDrxCfg.isDrxEnabled) - { - CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); - } - CMCHKPK(oduUnpackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if - DRX is disabled */ - CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); -#ifdef RGR_V1 - /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and - * retxBSR-timer */ - CMCHKPK(cmPkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); -#endif - CMCHKPK(cmPkRgrUeTaTmrCfg, ¶m->ueTaTmrCfg, mBuf); - CMCHKPK(cmPkRgrUeQosCfg, ¶m->ueQosCfg, mBuf); - CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrCfg, mBuf); - CMCHKPK(cmPkRgrUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); - CMCHKPK(cmPkRgrUeDlCqiCfg, ¶m->ueDlCqiCfg, mBuf); - CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUeCfg -* -* -* Desc : UE configuration -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeCfg -( -RgrUeCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif -{ - U32 tmpEnum; - - TRC3(cmUnpkRgrUeCfg) - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); - CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, ¶m->ueDlCqiCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeUlPwrCfg, ¶m->ueUlPwrCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeQosCfg, ¶m->ueQosCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeTaTmrCfg, ¶m->ueTaTmrCfg, mBuf); -#ifdef RGR_V1 - /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and - * retxBSR-timer */ - CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); -#endif - CMCHKUNPK(oduPackUInt32, (U32 *)&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); - if(TRUE == param->ueDrxCfg.isDrxEnabled) - { - CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); - } - CMCHKUNPK(oduPackUInt8, ¶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); - -#ifdef LTE_TDD - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); - param->ackNackModeEnum = tmpEnum; - -#endif - /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKUNPK(cmUnpkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); - -/* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ -#ifdef TFU_UPGRADE - CMCHKUNPK(cmUnpkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeSrCfg, ¶m->srCfg, mBuf); -#endif -/*rgr_c_001.main_9 ADD added changes for HDFDD*/ -#ifdef LTEMAC_HDFDD - CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); -#endif - CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); -/* rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from - RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ -#ifdef RGR_CQI_REPT - CMCHKUNPK(cmUnpkRgrUeCqiReptCfg, ¶m->ueCqiReptCfg, mBuf); -#endif -#ifdef TFU_UPGRADE - CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); -#endif - /* 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); - -#ifdef EMTC_ENABLE - CMCHKUNPK(cmUnpkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); -#endif - -#ifdef RG_5GTF - CMCHKUNPK(cmUnpkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); -#endif - - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrLchQosCfg -* -* -* Desc : QCI, GBR and MBR configuration for dedicated logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLchQosCfg -( -RgrLchQosCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrLchQosCfg) - - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrLchQosCfg -* -* -* Desc : QCI, GBR and MBR configuration for dedicated logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLchQosCfg -( -RgrLchQosCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrLchQosCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); - return ROK; -} -/*rgr_c_001.main_7 - Added support for SPS*/ - - -/*********************************************************** -* -* Func : cmPkRgrLchSpsCfg -* -* -* Desc : SPS related configuration for logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLchSpsCfg -( -RgrLchSpsCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrLchSpsCfg) - - /* SPS_DEV */ - CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrLchSpsCfg -* -* -* Desc : SPS related configuration for logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLchSpsCfg -( -RgrLchSpsCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrLchSpsCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); - - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgrDlLchCfg -* -* -* Desc : Logical channel configuration info for downlink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDlLchCfg -( -RgrDlLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrDlLchCfg) -/*rgr_c_001.main_7 - Added support for SPS*/ - - CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); - CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); - CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrDlLchCfg -* -* -* Desc : Logical channel configuration info for downlink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDlLchCfg -( -RgrDlLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrDlLchCfg) - - CMCHKUNPK(oduPackUInt8, ¶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); - - return ROK; -} - - -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -#ifdef LTE_L2_MEAS - - -/*********************************************************** -* -* Func : cmPkRgrUlLchCfg -* -* -* Desc : Logical channel configuration information for uplink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUlLchCfg -( -RgrUlLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrUlLchCfg) - - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - return ROK; -} - - - -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -/*********************************************************** -* -* Func : cmUnpkRgrUlLchCfg -* -* -* Desc : Logical channel configuration information for uplink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlLchCfg -( -RgrUlLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrUlLchCfg) - - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - return ROK; -} - - -#endif - -/*********************************************************** -* -* Func : cmPkRgrUlLcgCfg -* -* -* Desc : Logical channel configuration info for uplink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUlLcgCfg -( -RgrUlLcgCfg *param, -Buffer *mBuf -) -#else -PUBLIC 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 - TRC3(cmPkRgrUlLcgCfg) - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); - -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -#ifdef LTE_L2_MEAS - for (i = param->numLch - 1; i >= 0; i--) - { - CMCHKPK(cmPkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); - } - CMCHKPK(oduUnpackUInt8, param->numLch, mBuf); -#endif - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUlLcgCfg -* -* -* Desc : Logical channel configuration info for uplink logical channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlLcgCfg -( -RgrUlLcgCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrUlLcgCfg(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 - TRC3(cmUnpkRgrUlLcgCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -#ifdef LTE_L2_MEAS - CMCHKUNPK(oduPackUInt8, ¶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); - return ROK; -} - -#ifdef ANSI -PUBLIC S16 cmPkRgrUlLchQciCfg -( -RgrUlLchQciCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - return ROK; -} -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUlLchQciCfg -( -RgrUlLchQciCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcId, mBuf); - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgrLchCfg -* -* -* Desc : Logical channel configuration info for dedicated channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLchCfg -( -RgrLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrLchCfg) - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKPK(cmPkRgrDlLchCfg, ¶m->dlInfo, mBuf); - CMCHKPK(cmPkLteLcType, param->lcType, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrLchCfg -* -* -* Desc : Logical channel configuration info for dedicated channels -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLchCfg -( -RgrLchCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrLchCfg) - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); - CMCHKUNPK(cmUnpkRgrDlLchCfg, ¶m->dlInfo, mBuf); - CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); - return ROK; -} - - -#ifdef ANSI -PUBLIC S16 cmPkRgrLcgCfg -( -RgrLcgCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrLcgCfg) - - CMCHKPK(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLcgCfg -( -RgrLcgCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrLcgCfg) - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(cmUnpkRgrUlLcgCfg, ¶m->ulInfo, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrCfg -* -* -* Desc : Basic Configuration structure at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCfg -( -RgrCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrCfg) - - switch(param->cfgType) { - case RGR_LCG_CFG: - CMCHKPK(cmPkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); - break; - case RGR_LCH_CFG: - CMCHKPK(cmPkRgrLchCfg, ¶m->u.lchCfg, mBuf); - break; - case RGR_UE_CFG: - CMCHKPK(cmPkRgrUeCfg, ¶m->u.ueCfg, mBuf); - break; - case RGR_CELL_CFG: - CMCHKPK(cmPkRgrCellCfg, ¶m->u.cellCfg, mBuf); - break; - case MAC_GNB_CFG: - CMCHKPK(cmPkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); - break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrCfg -* -* -* Desc : Basic Configuration structure at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfg -( -RgrCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); - switch(param->cfgType) { - case MAC_GNB_CFG: - CMCHKUNPK(cmUnpkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); - break; - case RGR_CELL_CFG: - CMCHKUNPK(cmUnpkRgrCellCfg, ¶m->u.cellCfg, mBuf); - break; - case RGR_UE_CFG: - CMCHKUNPK(cmUnpkRgrUeCfg, ¶m->u.ueCfg, mBuf); - break; - case RGR_LCH_CFG: - CMCHKUNPK(cmUnpkRgrLchCfg, ¶m->u.lchCfg, mBuf); - break; - case RGR_LCG_CFG: - CMCHKUNPK(cmUnpkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); - break; - default : - return RFAILED; - } - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrActvTime -* -* -* Desc : Activation time information -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrActvTime -( -RgrActvTime *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrActvTime) - - CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrActvTime -* -* -* Desc : Activation time information -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrActvTime -( -RgrActvTime *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrActvTime) - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrCellRecfg -* -* -* Desc : Cell reconfiguration structure at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCellRecfg -( -RgrCellRecfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgrCellRecfg) - CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); - CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); - /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(cmPkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); - /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); - /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ -#ifdef RGR_SI_SCH - CMCHKPK(cmPkRgrSiCfg, ¶m->siReCfg, mBuf); -#endif /* RGR_SI_SCH */ - CMCHKPK(cmPkRgrDlfsCfg, ¶m->dlfsRecfg, mBuf); - CMCHKPK(cmPkRgrRachCfg, ¶m->rachRecfg, mBuf); - CMCHKPK(cmPkRgrSrsCfg, ¶m->srsRecfg, mBuf); - CMCHKPK(cmPkRgrPucchCfg, ¶m->pucchRecfg, mBuf); - CMCHKPK(cmPkRgrUlCmnCodeRateCfg, ¶m->ulCmnCodeRate, mBuf); - CMCHKPK(cmPkRgrPuschSubBandCfg, ¶m->puschSubBand, mBuf); - CMCHKPK(cmPkRgrDlCmnCodeRateCfg, ¶m->dlCmnCodeRate, mBuf); - CMCHKPK(cmPkRgrUlTrgCqiCfg, ¶m->trgUlCqi, mBuf); - CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiRecfg, mBuf); - CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); - CMCHKPK(cmPkRgrActvTime, ¶m->recfgActvTime, mBuf); - CMCHKPK(oduUnpackUInt32, param->recfgTypes, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrCellRecfg -* -* -* Desc : Cell reconfiguration structure at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCellRecfg -( -RgrCellRecfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgrCellRecfg) - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->recfgTypes, mBuf); - CMCHKUNPK(cmUnpkRgrActvTime, ¶m->recfgActvTime, mBuf); - CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrUlTrgCqiCfg, ¶m->trgUlCqi, mBuf); - CMCHKUNPK(cmUnpkRgrDlCmnCodeRateCfg, ¶m->dlCmnCodeRate, mBuf); - CMCHKUNPK(cmUnpkRgrPuschSubBandCfg, ¶m->puschSubBand, mBuf); - CMCHKUNPK(cmUnpkRgrUlCmnCodeRateCfg, ¶m->ulCmnCodeRate, mBuf); - CMCHKUNPK(cmUnpkRgrPucchCfg, ¶m->pucchRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrSrsCfg, ¶m->srsRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrRachCfg, ¶m->rachRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrDlfsCfg, ¶m->dlfsRecfg, mBuf); - /* rgr_c_001.main_4-MOD-Modified for SI Enhancement. */ -#ifdef RGR_SI_SCH - CMCHKUNPK(cmUnpkRgrSiCfg, ¶m->siReCfg, mBuf); -#endif /* RGR_SI_SCH */ - CMCHKUNPK(oduPackUInt16, ¶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(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); - CMCHKUNPK(cmUnpkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); - + RgrUe5gtfCfg *param, + 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); return ROK; } - +#endif /*********************************************************** * -* Func : cmPkRgrUeRecfg +* Func : cmPkRgrUeCfg * * -* Desc : UE reconfiguration info +* Desc : UE configuration * * * Ret : S16 @@ -7822,47 +5196,35 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeRecfg +S16 cmPkRgrUeCfg ( -RgrUeRecfg *param, +RgrUeCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeRecfg) +#ifdef RG_5GTF + CMCHKPK(cmPkRgr5gtfUeCfg, ¶m->ue5gtfCfg, 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(cmPkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); #endif CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); - + CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); -#ifdef LTE_ADV - CMCHKPK(oduUnpackUInt8, 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(cmPkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - /*ccpu00130497: Removed the duplicate packing*/ #ifdef TFU_UPGRADE +/*rgr_c_001.main_9 ADD PDSCH ded cfg*/ CMCHKPK(cmPkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); #endif - /* rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from + /*rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT CMCHKPK(cmPkRgrUeCqiReptCfg, ¶m->ueCqiReptCfg, mBuf); #endif + CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ CMCHKPK(cmPkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); @@ -7875,53 +5237,44 @@ Buffer *mBuf; #ifdef TFU_UPGRADE CMCHKPK(cmPkRgrUeSrCfg, ¶m->srCfg, mBuf); CMCHKPK(cmPkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); - CMCHKPK(cmPkRgrUePrdDlCqiCfg, ¶m->cqiCfg, mBuf); -#endif +#endif - /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsRecfg, mBuf); - CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); - /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ - CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); - CMCHKPK(cmPkRgrCodeBookRstCfg, ¶m->ueCodeBookRstRecfg, mBuf); - CMCHKPK(cmPkRgrUeMeasGapCfg, ¶m->ueMeasGapRecfg, mBuf); - CMCHKPK(cmPkRgrUeCapCfg, ¶m->ueCapRecfg, mBuf); - CMCHKPK(cmPkRgrUeAckNackRepCfg, ¶m->ueAckNackRecfg, mBuf); + CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); + +#ifdef LTE_TDD + CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf); + +#endif + 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); /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Pack only if DRX is enabled */ - if(TRUE == param->ueDrxRecfg.isDrxEnabled) - { - CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + if(TRUE == param->ueDrxCfg.isDrxEnabled) + { + CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if + CMCHKPK(oduUnpackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if DRX is disabled */ - CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and * retxBSR-timer */ - CMCHKPK(cmPkRgrUeBsrTmrCfg, ¶m->ueBsrTmrRecfg, mBuf); -#endif - CMCHKPK(cmPkRgrUeTaTmrCfg, ¶m->ueTaTmrRecfg, mBuf); - CMCHKPK(cmPkRgrUeQosCfg, ¶m->ueQosRecfg, mBuf); - CMCHKPK(cmPkRgrUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); - -#ifndef TFU_UPGRADE - CMCHKPK(cmPkRgrUePrdDlCqiCfg, ¶m->prdDlCqiRecfg, mBuf); + CMCHKPK(cmPkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); #endif - - CMCHKPK(cmPkRgrUeAprdDlCqiCfg, ¶m->aprdDlCqiRecfg, mBuf); + CMCHKPK(cmPkRgrUeTaTmrCfg, ¶m->ueTaTmrCfg, mBuf); + CMCHKPK(cmPkRgrUeQosCfg, ¶m->ueQosCfg, mBuf); + CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrCfg, mBuf); + CMCHKPK(cmPkRgrUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); + CMCHKPK(cmPkRgrUeDlCqiCfg, ¶m->ueDlCqiCfg, mBuf); CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); - /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */ - /* LTE_ADV_FLAG_REMOVED_START */ - /* KW fix for LTE_ADV */ - CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf); - /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf); - CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -7930,10 +5283,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrUeRecfg +* Func : cmUnpkRgrUeCfg * * -* Desc : UE reconfiguration info +* Desc : UE configuration * * * Ret : S16 @@ -7943,81 +5296,64 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeRecfg +S16 cmUnpkRgrUeCfg ( -RgrUeRecfg *param, +RgrUeCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrUeRecfg) 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 */ - /* KW fix for LTE_ADV */ - CMCHKUNPK(oduPackUInt32, ¶m->ueRecfgTypes, mBuf); - /* LTE_ADV_FLAG_REMOVED_END */ + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); - - CMCHKUNPK(cmUnpkRgrUeAprdDlCqiCfg, ¶m->aprdDlCqiRecfg, mBuf); - -#ifndef TFU_UPGRADE - CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->prdDlCqiRecfg, mBuf); -#endif - - CMCHKUNPK(cmUnpkRgrUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeQosCfg, ¶m->ueQosRecfg, mBuf); - CMCHKUNPK(cmUnpkRgrUeTaTmrCfg, ¶m->ueTaTmrRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, ¶m->ueDlCqiCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeUlPwrCfg, ¶m->ueUlPwrCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeQosCfg, ¶m->ueQosCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeTaTmrCfg, ¶m->ueTaTmrCfg, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and * retxBSR-timer */ - CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); #endif - CMCHKUNPK(cmUnpkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); + CMCHKUNPK(oduPackUInt32, (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->ueDrxRecfg.isDrxEnabled, mBuf); - if(TRUE == param->ueDrxRecfg.isDrxEnabled) + CMCHKUNPK(oduPackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); + if(TRUE == param->ueDrxCfg.isDrxEnabled) { - CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } CMCHKUNPK(oduPackUInt8, ¶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); - param->ueCatEnum = (CmLteUeCategory) tmpEnum; - CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); + CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, ¶m->ueAckNackCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, ¶m->ueMesGapCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeCapCfg, ¶m->ueCapCfg, mBuf); + CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, ¶m->ueCodeBookRstCfg, mBuf); + CMCHKUNPK(cmUnpkTknUInt8, ¶m->dedPreambleId, mBuf); + +#ifdef LTE_TDD + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); + param->ackNackModeEnum = tmpEnum; + +#endif /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKUNPK(cmUnpkRgrUeSpsCfg, ¶m->ueSpsRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); /* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->cqiCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeSrCfg, ¶m->srCfg, mBuf); #endif - /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); #endif - CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); - + CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /* rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT @@ -8026,22 +5362,18 @@ Buffer *mBuf; #ifdef TFU_UPGRADE CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, 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(cmUnpkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ -#ifdef LTE_ADV - CMCHKUNPK(cmUnpkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); - CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->simulAckNackCQIFormat3, mBuf); -#endif - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->accessStratumRls, mBuf); - + CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->accessStratumRls, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); + #ifdef EMTC_ENABLE - CMCHKPK(oduPackUInt8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); + CMCHKUNPK(cmUnpkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); +#endif + +#ifdef RG_5GTF + CMCHKUNPK(cmUnpkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); #endif return ROK; @@ -8051,10 +5383,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrLchRecfg +* Func : cmPkRgrLchQosCfg * * -* Desc : Logical channel reconfiguration info for dedicated channels only +* Desc : QCI, GBR and MBR configuration for dedicated logical channels * * * Ret : S16 @@ -8064,30 +5396,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLchRecfg +S16 cmPkRgrLchQosCfg ( -RgrLchRecfg *param, +RgrLchQosCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrLchRecfg) -/*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - - CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); - - CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlRecfg.dlQos, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + + CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); return ROK; } @@ -8095,10 +5414,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrLchRecfg +* Func : cmUnpkRgrLchQosCfg * * -* Desc : Logical channel reconfiguration info for dedicated channels only +* Desc : QCI, GBR and MBR configuration for dedicated logical channels * * * Ret : S16 @@ -8108,98 +5427,109 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLchRecfg +S16 cmUnpkRgrLchQosCfg ( -RgrLchRecfg *param, +RgrLchQosCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrLchRecfg) - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(cmUnpkRgrLchQosCfg, ¶m->dlRecfg.dlQos, mBuf); - /*rgr_c_001.main_7 - Added support for SPs*/ - CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + return ROK; +} +/*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + +/*********************************************************** +* +* Func : cmPkRgrLchSpsCfg +* +* +* Desc : SPS related configuration for logical channels +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrLchSpsCfg +( +RgrLchSpsCfg *param, +Buffer *mBuf +) +{ + + + /* SPS_DEV */ + CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); return ROK; } -#ifdef ANSI -PUBLIC S16 cmPkRgrLcgRecfg + +/*********************************************************** +* +* Func : cmUnpkRgrLchSpsCfg +* +* +* Desc : SPS related configuration for logical channels +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmUnpkRgrLchSpsCfg ( -RgrLcgRecfg *param, +RgrLchSpsCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { -#ifdef RG_UNUSED - S32 i; -#endif - TRC3(cmPkRgrLcgRecfg) - CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); - CMCHKPK(oduUnpackUInt32, 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); -#endif - CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + + CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); + return ROK; } -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLcgRecfg +/*********************************************************** +* +* Func : cmPkRgrDlLchCfg +* +* +* Desc : Logical channel configuration info for downlink logical channels +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrDlLchCfg ( -RgrLcgRecfg *param, +RgrDlLchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { -#ifdef RG_UNUSED - S32 i; -#endif - TRC3(cmUnpkRgrLcgRecfg) - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); -#ifdef RG_UNUSED - CMCHKUNPK(oduPackUInt8, ¶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); +/*rgr_c_001.main_7 - Added support for SPS*/ + CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); + CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); + CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); return ROK; } @@ -8207,10 +5537,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrRecfg +* Func : cmUnpkRgrDlLchCfg * * -* Desc : Basic reconfiguration structure at RRM +* Desc : Logical channel configuration info for downlink logical channels * * * Ret : S16 @@ -8220,49 +5550,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrRecfg +S16 cmUnpkRgrDlLchCfg ( -RgrRecfg *param, +RgrDlLchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrRecfg) - switch(param->recfgType) { - case RGR_LCG_CFG: - CMCHKPK(cmPkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); - break; - case RGR_LCH_CFG: - CMCHKPK(cmPkRgrLchRecfg, ¶m->u.lchRecfg, mBuf); - break; - case RGR_UE_CFG: - CMCHKPK(cmPkRgrUeRecfg, ¶m->u.ueRecfg, mBuf); - break; - case RGR_CELL_CFG: - CMCHKPK(cmPkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); - break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶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); + return ROK; } +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + /*********************************************************** * -* Func : cmUnpkRgrRecfg +* Func : cmPkRgrUlLchCfg * * -* Desc : Basic reconfiguration structure at RRM +* Desc : Logical channel configuration information for uplink logical channels * * * Ret : S16 @@ -8272,48 +5587,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrRecfg +S16 cmPkRgrUlLchCfg ( -RgrRecfg *param, +RgrUlLchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrRecfg) - CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); - switch(param->recfgType) { - case RGR_CELL_CFG: - CMCHKUNPK(cmUnpkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); - break; - case RGR_UE_CFG: - CMCHKUNPK(cmUnpkRgrUeRecfg, ¶m->u.ueRecfg, mBuf); - break; - case RGR_LCH_CFG: - CMCHKUNPK(cmUnpkRgrLchRecfg, ¶m->u.lchRecfg, mBuf); - break; - case RGR_LCG_CFG: - CMCHKUNPK(cmUnpkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); - break; - default : - return RFAILED; - } + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(cmPkLteLcId, param->lcId, mBuf); return ROK; } -#ifdef LTE_ADV + + +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ /*********************************************************** * -* Func : cmPkRgrUeDlSecCellRelInfo +* Func : cmUnpkRgrUlLchCfg * * -* Desc : DL Secondary Cell information of the UE +* Desc : Logical channel configuration information for uplink logical channels * * * Ret : S16 @@ -8323,29 +5618,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeDlSecCellRelInfo +S16 cmUnpkRgrUlLchCfg ( -RgrUeDlSecCellRelInfo *param, +RgrUlLchCfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + + + CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); return ROK; } + + +#endif /*********************************************************** * -* Func : cmPkRgrUeSecCellRelInfo +* Func : cmPkRgrUlLcgCfg * * -* Desc : Secondary Cell Delete information of the UE +* Desc : Logical channel configuration info for uplink logical channels * * * Ret : S16 @@ -8355,36 +5649,40 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSecCellRelInfo +S16 cmPkRgrUlLcgCfg ( -RgrUeSecCellRelInfo *param, +RgrUlLcgCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { - S8 idx; - for(idx = param->numSCells - 1; idx >= 0; idx--) + +/*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); + +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + for (i = param->numLch - 1; i >= 0; i--) { - CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(U8)idx],mBuf); + CMCHKPK(cmPkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - + CMCHKPK(oduUnpackUInt8, param->numLch, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); return ROK; } -#endif + /*********************************************************** * -* Func : cmPkRgrDel +* Func : cmUnpkRgrUlLcgCfg * * -* Desc : Basic Delete info for MAC +* Desc : Logical channel configuration info for uplink logical channels * * * Ret : S16 @@ -8394,64 +5692,97 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrDel +S16 cmUnpkRgrUlLcgCfg ( -RgrDel *param, +RgrUlLcgCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrDel) +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + S32 i; +#endif + + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + CMCHKUNPK(oduPackUInt8, ¶m->numLch, mBuf); + for (i = 0; i< param->numLch; i++) + { + CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); + } - switch(param->delType) { - case RGR_LCG_CFG: - CMCHKPK(oduUnpackUInt8, 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(cmPkLteLcId, param->u.lchDel.lcId, mBuf); - CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf); - break; - case RGR_UE_CFG: - CMCHKPK(cmPkLteRnti, param->u.ueDel.crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->u.ueDel.cellId, mBuf); - break; - case RGR_CELL_CFG: - CMCHKPK(cmPkLteCellId, param->u.cellDel.cellId, mBuf); - break; -#ifdef LTE_ADV - case RGR_SCELL_UE_CFG: - CMCHKPK(cmPkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); - CMCHKPK(oduUnpackUInt32, param->u.ueScellRel.ueDelTypes, mBuf); - CMCHKPK(cmPkLteRnti, param->u.ueScellRel.crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->u.ueScellRel.cellId, mBuf); - break; #endif - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->delType, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + return ROK; +} + +S16 cmPkRgrUlLchQciCfg +( +RgrUlLchQciCfg *param, +Buffer *mBuf +) +{ + CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + return ROK; +} +S16 cmUnpkRgrUlLchQciCfg +( +RgrUlLchQciCfg *param, +Buffer *mBuf +) +{ + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcId, mBuf); + return ROK; +} + + +/*********************************************************** +* +* Func : cmPkRgrLchCfg +* +* +* Desc : Logical channel configuration info for dedicated channels +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrLchCfg +( +RgrLchCfg *param, +Buffer *mBuf +) +{ + + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); + CMCHKPK(cmPkRgrDlLchCfg, ¶m->dlInfo, mBuf); + CMCHKPK(cmPkLteLcType, param->lcType, mBuf); + CMCHKPK(cmPkLteLcId, param->lcId, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } -#ifdef LTE_ADV /*********************************************************** * -* Func : cmUnpkRgrUeDlSecCellRelInfo +* Func : cmUnpkRgrLchCfg * * -* Desc : DL Secondary Cell information of the UE +* Desc : Logical channel configuration info for dedicated channels * * * Ret : S16 @@ -8461,30 +5792,62 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeDlSecCellRelInfo +S16 cmUnpkRgrLchCfg ( -RgrUeDlSecCellRelInfo *param, +RgrLchCfg *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(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); + CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); + CMCHKUNPK(cmUnpkRgrDlLchCfg, ¶m->dlInfo, mBuf); + CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + return ROK; +} + + +S16 cmPkRgrLcgCfg +( +RgrLcgCfg *param, +Buffer *mBuf +) +{ + + + CMCHKPK(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + return ROK; +} + + +S16 cmUnpkRgrLcgCfg +( +RgrLcgCfg *param, +Buffer *mBuf +) +{ + + + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(cmUnpkRgrUlLcgCfg, ¶m->ulInfo, mBuf); return ROK; } + /*********************************************************** * -* Func : cmUnpkRgrUeSecCellRelInfo +* Func : cmPkRgrCfg * * -* Desc : Secondary Cell information of the UE +* Desc : Basic Configuration structure at RRM * * * Ret : S16 @@ -8494,36 +5857,45 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSecCellRelInfo +S16 cmPkRgrCfg ( -RgrUeSecCellRelInfo *param, +RgrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { - U8 idx; - CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); - for(idx = 0; idx < param->numSCells;idx++) - { - CMCHKUNPK(cmUnpkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[idx],mBuf); - } + switch(param->cfgType) { + case RGR_LCG_CFG: + CMCHKPK(cmPkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); + break; + case RGR_LCH_CFG: + CMCHKPK(cmPkRgrLchCfg, ¶m->u.lchCfg, mBuf); + break; + case RGR_UE_CFG: + CMCHKPK(cmPkRgrUeCfg, ¶m->u.ueCfg, mBuf); + break; + case RGR_CELL_CFG: + CMCHKPK(cmPkRgrCellCfg, ¶m->u.cellCfg, mBuf); + break; + case MAC_GNB_CFG: + CMCHKPK(cmPkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); + break; + default : + return RFAILED; + } + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); return ROK; } -#endif + + /*********************************************************** * -* Func : cmUnpkRgrDel +* Func : cmUnpkRgrCfg * * -* Desc : Basic Delete info for MAC +* Desc : Basic Configuration structure at RRM * * * Ret : S16 @@ -8533,238 +5905,211 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrDel +S16 cmUnpkRgrCfg ( -RgrDel *param, +RgrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrDel) - CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); - switch(param->delType) { + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); + switch(param->cfgType) { + case MAC_GNB_CFG: + CMCHKUNPK(cmUnpkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); + break; case RGR_CELL_CFG: - CMCHKUNPK(cmUnpkLteCellId, ¶m->u.cellDel.cellId, mBuf); - break; + CMCHKUNPK(cmUnpkRgrCellCfg, ¶m->u.cellCfg, mBuf); + break; case RGR_UE_CFG: - CMCHKUNPK(cmUnpkLteCellId, ¶m->u.ueDel.cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->u.ueDel.crnti, mBuf); - break; + CMCHKUNPK(cmUnpkRgrUeCfg, ¶m->u.ueCfg, mBuf); + break; case RGR_LCH_CFG: - 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); - break; + CMCHKUNPK(cmUnpkRgrLchCfg, ¶m->u.lchCfg, 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); - 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(cmUnpkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); - break; -#endif + CMCHKUNPK(cmUnpkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); + break; default : return RFAILED; } return ROK; } + + + /*********************************************************** * -* Func : cmPkRgrSonPrbCfg +* Func : cmPkRgrActvTime * * -* Desc : SON PRB Configuration info for MAC +* Desc : Activation time information * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSonPrbCfg +S16 cmPkRgrActvTime ( -RgrPrbCfg *param, +RgrActvTime *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { - S32 count; - TRC3(cmPkRgrPrbCfg) - for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) - { - CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); - } - for(count = param->numCellCentreUEs - 1; count >= 0; count --) - { - CMCHKPK(cmPkLteRnti, param->cellCentreUe[count], mBuf); - } - for(count = param->numCellEdgeUEs - 1; count >= 0; count --) - { - CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf); - } - CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf); - CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf); - CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf); + + + CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgrSon +* Func : cmUnpkRgrActvTime * * -* Desc : SON configuration info for MAC +* Desc : Activation time information * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSonPrbCfg +S16 cmUnpkRgrActvTime ( -RgrPrbCfg *param, -Buffer *mBuf +RgrActvTime *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { - S32 count; - TRC3(cmUnpkRgrSonPrbCfg) - CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); - for (count = 0; count < param->numCellEdgeUEs; count++) - { - CMCHKUNPK(cmUnpkLteRnti, ¶m->cellEdgeUe[count], mBuf); - } - for (count = 0; count < param->numCellCentreUEs; count++) - { - CMCHKUNPK(cmUnpkLteRnti, ¶m->cellCentreUe[count], mBuf); - } - for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++) - { - CMCHKUNPK(oduPackUInt32,(U32 *) ¶m->paLevelPerPrb[count], mBuf); - } + + + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); return ROK; } + + + /*********************************************************** * -* Func : cmPkRgrSonCfg +* Func : cmPkRgrCellRecfg * * -* Desc : SON Configuration info for MAC +* Desc : Cell reconfiguration structure at RRM * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSonCfg +S16 cmPkRgrCellRecfg ( -RgrSonCfg *param, +RgrCellRecfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSonCfg) - switch(param->cfgType) - { - case RGR_SON_PRB_CFG : - CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf); + CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); + CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); + /* LTE_ADV_FLAG_REMOVED_START */ + CMCHKPK(cmPkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); + /* LTE_ADV_FLAG_REMOVED_END */ + CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); + /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ +#ifdef RGR_SI_SCH + CMCHKPK(cmPkRgrSiCfg, ¶m->siReCfg, mBuf); +#endif /* RGR_SI_SCH */ + CMCHKPK(cmPkRgrDlfsCfg, ¶m->dlfsRecfg, mBuf); + CMCHKPK(cmPkRgrRachCfg, ¶m->rachRecfg, mBuf); + CMCHKPK(cmPkRgrSrsCfg, ¶m->srsRecfg, mBuf); + CMCHKPK(cmPkRgrPucchCfg, ¶m->pucchRecfg, mBuf); + CMCHKPK(cmPkRgrUlCmnCodeRateCfg, ¶m->ulCmnCodeRate, mBuf); + CMCHKPK(cmPkRgrPuschSubBandCfg, ¶m->puschSubBand, mBuf); + CMCHKPK(cmPkRgrDlCmnCodeRateCfg, ¶m->dlCmnCodeRate, mBuf); + CMCHKPK(cmPkRgrUlTrgCqiCfg, ¶m->trgUlCqi, mBuf); + CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiRecfg, mBuf); + CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); + CMCHKPK(cmPkRgrActvTime, ¶m->recfgActvTime, mBuf); + CMCHKPK(oduUnpackUInt32, param->recfgTypes, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgrSon +* Func : cmUnpkRgrCellRecfg * * -* Desc : SON configuration info for MAC +* Desc : Cell reconfiguration structure at RRM * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSonCfg +S16 cmUnpkRgrCellRecfg ( -RgrSonCfg *param, -Buffer *mBuf +RgrCellRecfg *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrSonCfg) - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->cfgType, mBuf); - switch(param->cfgType) - { - case RGR_SON_PRB_CFG : - { - CMCHKUNPK(cmUnpkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } - } + + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->recfgTypes, mBuf); + CMCHKUNPK(cmUnpkRgrActvTime, ¶m->recfgActvTime, mBuf); + CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUlTrgCqiCfg, ¶m->trgUlCqi, mBuf); + CMCHKUNPK(cmUnpkRgrDlCmnCodeRateCfg, ¶m->dlCmnCodeRate, mBuf); + CMCHKUNPK(cmUnpkRgrPuschSubBandCfg, ¶m->puschSubBand, mBuf); + CMCHKUNPK(cmUnpkRgrUlCmnCodeRateCfg, ¶m->ulCmnCodeRate, mBuf); + CMCHKUNPK(cmUnpkRgrPucchCfg, ¶m->pucchRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrSrsCfg, ¶m->srsRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrRachCfg, ¶m->rachRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrDlfsCfg, ¶m->dlfsRecfg, mBuf); + /* rgr_c_001.main_4-MOD-Modified for SI Enhancement. */ +#ifdef RGR_SI_SCH + CMCHKUNPK(cmUnpkRgrSiCfg, ¶m->siReCfg, mBuf); +#endif /* RGR_SI_SCH */ + CMCHKUNPK(oduPackUInt16, ¶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(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); + CMCHKUNPK(cmUnpkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); + return ROK; } + /*********************************************************** * -* Func : cmPkRgrRst +* Func : cmPkRgrUeRecfg * * -* Desc : UE RESET info for MAC +* Desc : UE reconfiguration info * * * Ret : S16 @@ -8774,22 +6119,99 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrRst +S16 cmPkRgrUeRecfg ( -RgrRst *param, +RgrUeRecfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrRst) +#ifdef EMTC_ENABLE + /* Note: As we add more members to emtcUeRecfg, + create a new function for pkUnpk */ + CMCHKPK(oduUnpackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); + + CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); +#ifdef LTE_ADV + CMCHKPK(oduUnpackUInt8, 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); + /* LTE_ADV_FLAG_REMOVED_END */ + /*ccpu00130497: Removed the duplicate packing*/ +#ifdef TFU_UPGRADE + CMCHKPK(cmPkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); +#endif + /* rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from + RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ +#ifdef RGR_CQI_REPT + CMCHKPK(cmPkRgrUeCqiReptCfg, ¶m->ueCqiReptCfg, mBuf); +#endif + +/* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ + CMCHKPK(cmPkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); + +/*rgr_c_001.main_9 ADD added changes for HDFDD*/ +#ifdef LTEMAC_HDFDD + CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); +#endif - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); +#ifdef TFU_UPGRADE + CMCHKPK(cmPkRgrUeSrCfg, ¶m->srCfg, mBuf); + CMCHKPK(cmPkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); + CMCHKPK(cmPkRgrUePrdDlCqiCfg, ¶m->cqiCfg, mBuf); +#endif + + /*rgr_c_001.main_7 - Added support for SPS*/ + CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsRecfg, mBuf); + CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); + + /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ + CMCHKPK(oduUnpackUInt32, 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); +/*rgr_c_001.main_9 ADD added changes for DRX*/ + + /* Anshika - Pack only if DRX is enabled */ + if(TRUE == param->ueDrxRecfg.isDrxEnabled) + { + CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + } + CMCHKPK(oduUnpackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if + DRX is disabled */ + CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); +#ifdef RGR_V1 + /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and + * retxBSR-timer */ + CMCHKPK(cmPkRgrUeBsrTmrCfg, ¶m->ueBsrTmrRecfg, mBuf); +#endif + CMCHKPK(cmPkRgrUeTaTmrCfg, ¶m->ueTaTmrRecfg, mBuf); + CMCHKPK(cmPkRgrUeQosCfg, ¶m->ueQosRecfg, mBuf); + CMCHKPK(cmPkRgrUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); + +#ifndef TFU_UPGRADE + CMCHKPK(cmPkRgrUePrdDlCqiCfg, ¶m->prdDlCqiRecfg, mBuf); +#endif + + CMCHKPK(cmPkRgrUeAprdDlCqiCfg, ¶m->aprdDlCqiRecfg, mBuf); + CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); + /*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); + /* LTE_ADV_FLAG_REMOVED_END */ + CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf); + CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -8798,10 +6220,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrRst +* Func : cmUnpkRgrUeRecfg * * -* Desc : UE RESET info for MAC +* Desc : UE reconfiguration info * * * Ret : S16 @@ -8811,32 +6233,111 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrRst +S16 cmUnpkRgrUeRecfg ( -RgrRst *param, +RgrUeRecfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { + uint32_t tmpEnum; - TRC3(cmUnpkRgrRst) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->newCrnti, mBuf); + /* LTE_ADV_FLAG_REMOVED_START */ + /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */ + /* KW fix for LTE_ADV */ + CMCHKUNPK(oduPackUInt32, ¶m->ueRecfgTypes, mBuf); + /* LTE_ADV_FLAG_REMOVED_END */ + CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); + + CMCHKUNPK(cmUnpkRgrUeAprdDlCqiCfg, ¶m->aprdDlCqiRecfg, mBuf); + +#ifndef TFU_UPGRADE + CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->prdDlCqiRecfg, mBuf); +#endif + + CMCHKUNPK(cmUnpkRgrUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeQosCfg, ¶m->ueQosRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeTaTmrCfg, ¶m->ueTaTmrRecfg, mBuf); +#ifdef RGR_V1 + /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and + * retxBSR-timer */ + CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrRecfg, mBuf); +#endif + CMCHKUNPK(cmUnpkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); +/*rgr_c_001.main_9 ADD added changes for DRX*/ + + /* Anshika - Unpack only if DRX is enabled */ + CMCHKUNPK(oduPackUInt8, ¶m->ueDrxRecfg.isDrxEnabled, mBuf); + if(TRUE == param->ueDrxRecfg.isDrxEnabled) + { + CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + } + CMCHKUNPK(oduPackUInt8, ¶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, (uint32_t *)&tmpEnum, mBuf); + param->ueCatEnum = (CmLteUeCategory) tmpEnum; + CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); + /*rgr_c_001.main_7 - Added support for SPS*/ + CMCHKUNPK(cmUnpkRgrUeSpsCfg, ¶m->ueSpsRecfg, mBuf); + +/* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ +#ifdef TFU_UPGRADE + CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->cqiCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeUlSrsCfg, ¶m->srsCfg, mBuf); + CMCHKUNPK(cmUnpkRgrUeSrCfg, ¶m->srCfg, mBuf); +#endif + +/*rgr_c_001.main_9 ADD added changes for HDFDD*/ +#ifdef LTEMAC_HDFDD + CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); +#endif + + CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); + +/* rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from + RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ +#ifdef RGR_CQI_REPT + CMCHKUNPK(cmUnpkRgrUeCqiReptCfg, ¶m->ueCqiReptCfg, mBuf); +#endif +#ifdef TFU_UPGRADE + CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, 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); + /* LTE_ADV_FLAG_REMOVED_END */ +#ifdef LTE_ADV + CMCHKUNPK(cmUnpkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); + CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->simulAckNackCQIFormat3, mBuf); +#endif + CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->accessStratumRls, mBuf); + + CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); +#ifdef EMTC_ENABLE + CMCHKPK(oduPackUInt8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); +#endif + return ROK; } -#ifdef LTE_ADV + + + /*********************************************************** * -* Func : cmUnPkRgrSCellActDeactInfo +* Func : cmPkRgrLchRecfg * * -* Desc : SCell Activation information of the UE +* Desc : Logical channel reconfiguration info for dedicated channels only * * * Ret : S16 @@ -8846,30 +6347,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnPkRgrSCellActDeactInfo +S16 cmPkRgrLchRecfg ( -RgrSCellActDeactInfo *param, +RgrLchRecfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnPkRgrSCellActInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnPkRgrSCellActDeactInfo) - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); +/*rgr_c_001.main_7 - Added support for SPS*/ + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + + CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); + CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); + + CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlRecfg.dlQos, mBuf); + CMCHKPK(cmPkLteLcId, param->lcId, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } + + /*********************************************************** * -* Func : cmUnPkRgrSCellActDeactEvnt +* Func : cmUnpkRgrLchRecfg * * -* Desc : SCell Activation Configuration structure to SCH +* Desc : Logical channel reconfiguration info for dedicated channels only * * * Ret : S16 @@ -8879,40 +6384,88 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnPkRgrSCellActDeactEvnt +S16 cmUnpkRgrLchRecfg ( -RgrSCellActDeactEvnt *param, +RgrLchRecfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { - TRC3(cmUnPkRgrSCellActDeactEvnt) - U8 idx; + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numOfSCells, mBuf); + CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); + CMCHKUNPK(cmUnpkRgrLchQosCfg, ¶m->dlRecfg.dlQos, mBuf); + /*rgr_c_001.main_7 - Added support for SPs*/ + CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); - for(idx = 0; idx < param->numOfSCells;idx++) + CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + return ROK; +} + + +S16 cmPkRgrLcgRecfg +( +RgrLcgRecfg *param, +Buffer *mBuf +) +{ +#ifdef RG_UNUSED + S32 i; +#endif + + CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf); +#ifdef RG_UNUSED + for (i = param->ulRecfg.numLch - 1; i >= 0; i--) { - CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[idx],mBuf); + CMCHKPK(cmPkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); + } + CMCHKPK(oduUnpackUInt8, param->ulRecfg.numLch, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + return ROK; +} + + +S16 cmUnpkRgrLcgRecfg +( +RgrLcgRecfg *param, +Buffer *mBuf +) +{ +#ifdef RG_UNUSED + S32 i; +#endif + + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); + +#ifdef RG_UNUSED + CMCHKUNPK(oduPackUInt8, ¶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); return ROK; } + /*********************************************************** * -* Func : cmPkRgrSCellActInfo +* Func : cmPkRgrRecfg * * -* Desc : SCell Activation information of the UE +* Desc : Basic reconfiguration structure at RRM * * * Ret : S16 @@ -8922,31 +6475,42 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkRgrSCellActDeactInfo +S16 cmPkRgrRecfg ( -RgrSCellActDeactInfo *param, +RgrRecfg *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRgrSCellActDeactInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSCellActDeactInfo) - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + switch(param->recfgType) { + case RGR_LCG_CFG: + CMCHKPK(cmPkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); + break; + case RGR_LCH_CFG: + CMCHKPK(cmPkRgrLchRecfg, ¶m->u.lchRecfg, mBuf); + break; + case RGR_UE_CFG: + CMCHKPK(cmPkRgrUeRecfg, ¶m->u.ueRecfg, mBuf); + break; + case RGR_CELL_CFG: + CMCHKPK(cmPkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); + break; + default : + return RFAILED; + } + CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); return ROK; } + + /*********************************************************** * -* Func : cmPkRgrSCellActDeactEvnt +* Func : cmUnpkRgrRecfg * * -* Desc : Basic Configuration structure at SCH +* Desc : Basic reconfiguration structure at RRM * * * Ret : S16 @@ -8956,42 +6520,41 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSCellActDeactEvnt +S16 cmUnpkRgrRecfg ( -RgrSCellActDeactEvnt *param, +RgrRecfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSCellActDeactEvnt) - - 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); + CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); + switch(param->recfgType) { + case RGR_CELL_CFG: + CMCHKUNPK(cmUnpkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); + break; + case RGR_UE_CFG: + CMCHKUNPK(cmUnpkRgrUeRecfg, ¶m->u.ueRecfg, mBuf); + break; + case RGR_LCH_CFG: + CMCHKUNPK(cmUnpkRgrLchRecfg, ¶m->u.lchRecfg, mBuf); + break; + case RGR_LCG_CFG: + CMCHKUNPK(cmUnpkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); + break; + default : + return RFAILED; + } return ROK; } - -#endif /* LTE_ADV */ - +#ifdef LTE_ADV /*********************************************************** * -* Func : cmPkRgrCfgReqInfo +* Func : cmPkRgrUeDlSecCellRelInfo * * -* Desc : Basic RGR configuration/reconfiguration info at RRM +* Desc : DL Secondary Cell information of the UE * * * Ret : S16 @@ -9001,59 +6564,23 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCfgReqInfo +S16 cmPkRgrUeDlSecCellRelInfo ( -RgrCfgReqInfo *param, +RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif { - - TRC3(cmPkRgrCfgReqInfo) - - 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); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); return ROK; } - - /*********************************************************** * -* Func : cmUnpkRgrCfgReqInfo +* Func : cmPkRgrUeSecCellRelInfo * * -* Desc : Basic RGR configuration/reconfiguration info at RRM +* Desc : Secondary Cell Delete information of the UE * * * Ret : S16 @@ -9063,59 +6590,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCfgReqInfo +S16 cmPkRgrUeSecCellRelInfo ( -RgrCfgReqInfo *param, +RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif { + S8 idx; + for(idx = param->numSCells - 1; idx >= 0; idx--) + { + CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(uint8_t)idx],mBuf); + } + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - TRC3(cmUnpkRgrCfgReqInfo) - - 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 */ +#endif + + /*********************************************************** * -* Func : cmPkRgrUeBsrTmrCfg +* Func : cmPkRgrDel * * -* Desc : BSR timer configuration per UE +* Desc : Basic Delete info for MAC * * * Ret : S16 @@ -9125,33 +6623,57 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeBsrTmrCfg +S16 cmPkRgrDel ( -RgrUeBsrTmrCfg *param, +RgrDel *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeBsrTmrCfg) - CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf); + switch(param->delType) { + case RGR_LCG_CFG: + CMCHKPK(oduUnpackUInt8, 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(cmPkLteLcId, param->u.lchDel.lcId, mBuf); + CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf); + break; + case RGR_UE_CFG: + CMCHKPK(cmPkLteRnti, param->u.ueDel.crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->u.ueDel.cellId, mBuf); + break; + case RGR_CELL_CFG: + CMCHKPK(cmPkLteCellId, param->u.cellDel.cellId, mBuf); + break; +#ifdef LTE_ADV + case RGR_SCELL_UE_CFG: + CMCHKPK(cmPkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); + CMCHKPK(oduUnpackUInt32, param->u.ueScellRel.ueDelTypes, mBuf); + CMCHKPK(cmPkLteRnti, param->u.ueScellRel.crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->u.ueScellRel.cellId, mBuf); + break; +#endif + default : + return RFAILED; + } + CMCHKPK(oduUnpackUInt8, param->delType, mBuf); return ROK; } + +#ifdef LTE_ADV + /*********************************************************** * -* Func : cmUnpkRgrUeBsrTmrCfg +* Func : cmUnpkRgrUeDlSecCellRelInfo * * -* Desc : BSR timer configuration per UE +* Desc : DL Secondary Cell information of the UE * * * Ret : S16 @@ -9161,36 +6683,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeBsrTmrCfg +S16 cmUnpkRgrUeDlSecCellRelInfo ( -RgrUeBsrTmrCfg *param, +RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { - - TRC3(cmUnpkRgrUeBsrTmrCfg) - - CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prdBsrTmr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); return ROK; } -#endif /* RGR_V1 */ -/* rgr_c_001.main_4-ADD-Added for SI Enhancement. */ -#ifdef RGR_SI_SCH + + /*********************************************************** * -* Func : cmPkRgrSiCfgReq +* Func : cmUnpkRgrUeSecCellRelInfo * * -* Desc : SI Configuration Request from RRM to MAC for -* configuring SI +* Desc : Secondary Cell information of the UE * * * Ret : S16 @@ -9200,92 +6710,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSiCfgReq +S16 cmUnpkRgrUeSecCellRelInfo ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrSiCfgReqInfo * cfgReqInfo -) -#else -PUBLIC S16 cmPkRgrSiCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrSiCfgReqInfo * cfgReqInfo; -#endif +RgrUeSecCellRelInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; + uint8_t idx; - TRC3(cmPkRgrSiCfgReq) + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + for(idx = 0; idx < param->numSCells;idx++) { -#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; + CMCHKUNPK(cmUnpkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[idx],mBuf); } - - pst->event = (Event) EVTRGRSICFGREQ; - return (SPstTsk(pst,mBuf)); + return ROK; } +#endif /*********************************************************** * -* Func : cmUnpkRgrSiCfgReq +* Func : cmUnpkRgrDel * * -* Desc : SI Configuration Request from RRM to MAC for -* configuring SI +* Desc : Basic Delete info for MAC * * * Ret : S16 @@ -9295,394 +6743,203 @@ RgrSiCfgReqInfo * cfgReqInfo; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSiCfgReq +S16 cmUnpkRgrDel ( -RgrSiCfgReq func, -Pst *pst, +RgrDel *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSiCfgReq(func, pst, mBuf) -RgrSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrSiCfgReqInfo *cfgReqInfo; - - TRC3(cmUnpkRgrSiCfgReq) - 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; - } - cmMemset((U8 *)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"); + + CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); + switch(param->delType) { + case RGR_CELL_CFG: + CMCHKUNPK(cmUnpkLteCellId, ¶m->u.cellDel.cellId, mBuf); + break; + case RGR_UE_CFG: + CMCHKUNPK(cmUnpkLteCellId, ¶m->u.ueDel.cellId, mBuf); + CMCHKUNPK(cmUnpkLteRnti, ¶m->u.ueDel.crnti, mBuf); + break; + case RGR_LCH_CFG: + 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); + 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); + 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(cmUnpkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); + break; #endif - return RFAILED; + default : + return RFAILED; } - SPutMsg(mBuf); - - return ((*func)(pst, spId, transId, cfgReqInfo)); + return ROK; } - /*********************************************************** * -* Func : cmPkRgrSiCfgReqInfo +* Func : cmPkRgrSonPrbCfg * * -* Desc : Basic SI configuration/reconfiguration info at RRM +* Desc : SON PRB Configuration info for MAC * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSiCfgReqInfo +S16 cmPkRgrSonPrbCfg ( -RgrSiCfgReqInfo *param, +RgrPrbCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - /* ccpu00111328: S16 is renamed as MsgLen */ - MsgLen msgLen; - - TRC3(cmPkRgrSiCfgReqInfo) - - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkS32, param->cfgType, mBuf); - CMCHKPK(oduUnpackUInt8, param->siId, mBuf); - - if(NULLP != param->pdu) + S32 count; + for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) { - if (SFndLenMsg(param->pdu, &msgLen) != ROK) - return RFAILED; - if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) - return RFAILED; - SPutMsg(param->pdu); - CMCHKPK(cmPkMsgLen, msgLen, mBuf); + CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); } - /*ccpu00140789*/ - else + for(count = param->numCellCentreUEs - 1; count >= 0; count --) { - CMCHKPK(cmPkMsgLen, 0, mBuf); - } - - return ROK; -} - -/*********************************************************** -* -* Func : cmUnpkRgrSiCfgReqInfo -* -* -* Desc : Basic SI configuration/reconfiguration info at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSiCfgReqInfo -( -RgrSiCfgReqInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif -{ - MsgLen msgLen, totalMsgLen; - /*Merge from Mohit Changes*/ - S32 cfgType; - - TRC3(cmUnpkRgrSiCfgReqInfo) - - SFndLenMsg(mBuf, &msgLen); - if(msgLen > 0) + CMCHKPK(cmPkLteRnti, param->cellCentreUe[count], mBuf); + } + for(count = param->numCellEdgeUEs - 1; count >= 0; count --) { - 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; - } + CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf); } - - 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); - + CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf); return ROK; } - - /*********************************************************** * -* Func : cmPkRgrWarningSiCfgReq +* Func : cmUnpkRgrSon * * -* 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 -PUBLIC S16 cmPkRgrWarningSiCfgReq +S16 cmUnpkRgrSonPrbCfg ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo -) -#else -PUBLIC S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; -#endif +RgrPrbCfg *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - - TRC3(cmPkRgrWarningSiCfgReq) - - 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) + S32 count; + CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); + for (count = 0; count < param->numCellEdgeUEs; count++) { -#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; + CMCHKUNPK(cmUnpkLteRnti, ¶m->cellEdgeUe[count], mBuf); } - - if (SPkS16(spId, mBuf) != ROK) + for (count = 0; count < param->numCellCentreUEs; count++) { -#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; + CMCHKUNPK(cmUnpkLteRnti, ¶m->cellCentreUe[count], mBuf); } - - /* 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(oduPackUInt32,(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 -PUBLIC S16 cmUnpkRgrWarningSiCfgReq +S16 cmPkRgrSonCfg ( -RgrWarningSiCfgReq func, -Pst *pst, +RgrSonCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf) -RgrWarningSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; - - TRC3(cmUnpkRgrWarningSiCfgReq) - - 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(oduUnpackUInt32, 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(oduPackUInt32, (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 @@ -9692,64 +6949,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrWarningSiCfgReqInfo +S16 cmPkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen; - U32 count; - CmLList *node, *prevNode; - RgrSegmentInfo *pdu; - - TRC3(cmPkRgrWarningSiCfgReqInfo) - 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 @@ -9759,208 +6979,87 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrWarningSiCfgReqInfo +S16 cmUnpkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen, totalMsgLen; - U32 count, loopCnt; - Buffer *pdu; - CmLList *node; - - TRC3(cmUnpkRgrWarningSiCfgReqInfo) - - 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 -PUBLIC S16 cmPkRgrWarningSiStopReq +static S16 cmUnPkRgrSCellActDeactInfo ( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -U8 siId -) -#else -PUBLIC S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -U8 siId; -#endif +RgrSCellActDeactInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - - TRC3(cmPkRgrWarningSiStopReq) - - 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; - } - - - 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 */ + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + return ROK; +} - /*********************************************************** * -* 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 -PUBLIC S16 cmUnpkRgrWarningSiStopReq +S16 cmUnPkRgrSCellActDeactEvnt ( -RgrWarningSiStopReq func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrWarningSiStopReq(param, mBuf) -RgrWarningSiStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - U8 siId; - RgrCfgTransId transId; - TRC3(cmUnpkRgrWarningSiStopReq) + 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(oduPackUInt8, ¶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 @@ -9970,93 +7069,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrWarningSiCfgCfm +static S16 cmPkRgrSCellActDeactInfo ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -U8 siId, -U8 status -) -#else -PUBLIC S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -U8 siId; -U8 status; -#endif +RgrSCellActDeactInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - - TRC3(cmPkRgrWarningSiCfgCfm) - - 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; - } + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - pst->event = (Event) EVTRGRWARNINGSICFGCFM; - return (SPstTsk(pst,mBuf)); -} /* cmPkRgrWarningSiCfgCfm */ + return ROK; +} - /*********************************************************** * -* Func : cmUnpkRgrwarningSiCfgCfm +* Func : cmPkRgrSCellActDeactEvnt * * -* Desc : Warning SI Configuration Confirm from MAC to RRM +* Desc : Basic Configuration structure at SCH * * * Ret : S16 @@ -10066,178 +7096,90 @@ U8 status; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrWarningSiCfgCfm +S16 cmPkRgrSCellActDeactEvnt ( -RgrWarningSiCfgCfm func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf) -RgrWarningSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - U8 siId; - RgrCfgTransId transId; - U8 status; - TRC3(cmUnpkRgrWarningSiCfgCfm) - 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(oduUnpackUInt8, 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 -PUBLIC S16 cmPkRgrLoadInfReq +S16 cmPkRgrCfgReqInfo ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrLoadInfReqInfo * loadInfReq -) -#else -PUBLIC S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrLoadInfReqInfo * loadInfReq; -#endif +RgrCfgReqInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - TRC3(cmPkRgrLoadInfReq) - 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(oduUnpackUInt8, 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 @@ -10247,82 +7189,52 @@ RgrLoadInfReqInfo * loadInfReq; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLoadInfReq +S16 cmUnpkRgrCfgReqInfo ( -RgrLoadInfReq func, -Pst *pst, +RgrCfgReqInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrLoadInfReq(func, pst, mBuf) -RgrLoadInfReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrLoadInfReqInfo *loadInfReq; - - TRC3(cmUnpkRgrLoadInfReq) - - 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; - } - cmMemset((U8 *)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(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; } - 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 @@ -10332,33 +7244,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLoadInfReqInfo +S16 cmPkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrLoadInfReqInfo) - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighEndRb, mBuf); + CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); + CMCHKPK(oduUnpackUInt8, 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 @@ -10368,27 +7273,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLoadInfReqInfo +S16 cmUnpkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrLoadInfReqInfo) - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighStartRb, mBuf); - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶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 */ @@ -10409,19 +7307,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeCqiReptCfg +S16 cmPkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeCqiReptCfg) CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); @@ -10445,19 +7336,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeCqiReptCfg +S16 cmUnpkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeCqiReptCfg) CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); @@ -10481,22 +7365,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrStaInd +S16 cmPkRgrStaInd ( Pst* pst, SuId suId, RgrStaIndInfo* staInd ) -#else -PUBLIC S16 cmPkRgrStaInd(pst, suId, staInd) -Pst* pst; -SuId suId; -RgrStaIndInfo* staInd; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -10505,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; } @@ -10517,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; } @@ -10529,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) @@ -10566,24 +7442,16 @@ RgrStaIndInfo* staInd; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrStaInd +S16 cmUnpkRgrStaInd ( RgrStaInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrStaInd(func, pst, mBuf) -RgrStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrStaIndInfo *staInd; - TRC3(cmUnpkRgrStaInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -10596,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) @@ -10610,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) @@ -10640,20 +7508,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrStaIndInfo +S16 cmPkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrStaIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); @@ -10676,20 +7537,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrStaIndInfo +S16 cmUnpkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrStaIndInfo) CMCHKUNPK(cmUnpkRgrUeCqiInfo, ¶m->ueCqiInfo, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -10712,21 +7566,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeCqiInfo +S16 cmPkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { S16 idx; - TRC3(cmPkRgrUeCqiInfo) for (idx = param->numCqiRept - 1; idx >= 0; idx--) { @@ -10752,21 +7599,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeCqiInfo +S16 cmUnpkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { - U8 idx; - TRC3(cmUnpkRgrUeCqiInfo) + uint8_t idx; CMCHKUNPK(oduPackUInt8, ¶m->numCqiRept, mBuf); for (idx = 0; idx < param->numCqiRept; idx++) @@ -10791,20 +7631,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrSubBandCqiInfo +S16 cmPkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrSubBandCqiInfo) CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); @@ -10828,22 +7661,15 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeCqiRept +S16 cmPkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { S8 idx; - U8 count; + uint8_t count; - TRC3(cmPkRgrUeCqiRept) CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); @@ -10871,20 +7697,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrSubBandCqiInfo +S16 cmUnpkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrSubBandCqiInfo) CMCHKUNPK(oduPackUInt8, ¶m->subBandIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); @@ -10908,21 +7727,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeCqiRept +S16 cmUnpkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkRgrUeCqiRept) CMCHKUNPK(oduPackUInt8, ¶m->numSubBand, mBuf); for (idx = 0; idx < param->numSubBand; idx++) { @@ -10952,22 +7764,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLoadInfInd +S16 cmPkRgrLoadInfInd ( Pst* pst, SuId suId, RgrLoadInfIndInfo* loadInfInd ) -#else -PUBLIC S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd) -Pst* pst; -SuId suId; -RgrLoadInfIndInfo* loadInfInd; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrLoadInfInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -10976,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; } @@ -10988,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); @@ -11002,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) @@ -11038,24 +7842,16 @@ RgrLoadInfIndInfo* loadInfInd; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLoadInfInd +S16 cmUnpkRgrLoadInfInd ( RgrLoadInfInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrLoadInfInd(func, pst, mBuf) -RgrLoadInfInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ - TRC3(cmUnpkRgrLoadInfInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -11068,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) @@ -11083,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) @@ -11113,20 +7909,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrLoadInfIndInfo +S16 cmPkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrLoadInfIndInfo(param, mBuf) -RgrLoadInfIndInfo *param; -Buffer *mBuf; -#endif { - U8 idx; - TRC3(cmPkRgrLoadInfIndInfo) + uint8_t idx; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(oduUnpackUInt16, param->bw, mBuf); @@ -11161,34 +7950,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrLoadInfIndInfo +S16 cmUnpkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Pst *pst, Buffer *mBuf ) -#else -PUBLIC 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; - TRC3(cmUnpkRgrLoadInfIndInfo) CMCHKUNPK(oduPackUInt32, ¶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(oduPackUInt32, ¶m->u.absLoadInfo[(uint8_t)idx], mBuf); } } else @@ -11204,7 +7985,7 @@ Buffer *mBuf; /* Length */ CMCHKUNPK(oduPackUInt16, &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, @@ -11249,19 +8030,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUepACfg +S16 cmPkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUepACfg) if(param->pAPrsnt) { @@ -11289,25 +8063,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUepACfg +S16 cmUnpkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; - TRC3(cmUnpkRgrUepACfg) + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, (U8 *)¶m->pAPrsnt, mBuf); + CMCHKUNPK(oduPackUInt8, (uint8_t *)¶m->pAPrsnt, mBuf); if (param->pAPrsnt) { - CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf); param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum; } @@ -11330,19 +8097,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUePdschDedCfg +S16 cmPkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUePdschDedCfg) CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11366,19 +8126,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUePdschDedCfg +S16 cmUnpkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUePdschDedCfg) CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11404,19 +8157,12 @@ 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 { - TRC3(cmPkRgrUeUlPwrDedSCellCfg) CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); @@ -11440,20 +8186,13 @@ 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 { - TRC3(cmUnpkRgrUeUlPwrDedSCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); @@ -11480,17 +8219,11 @@ 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); @@ -11500,7 +8233,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); #endif CMCHKPK(cmPkRgrUeDlCqiCfg,¶m->ueSCellDlCqiCfg, mBuf); - CMCHKPK(cmPkTknU32, ¶m->sCellDeActTmr, mBuf); + CMCHKPK(cmPkTknUInt32, ¶m->sCellDeActTmr, mBuf); CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); @@ -11524,22 +8257,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSecCellInfo +S16 cmPkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -PUBLIC 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); @@ -11565,21 +8292,15 @@ 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(cmUnpkTknUInt32, ¶m->sCellDeActTmr, mBuf); CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, ¶m->ueSCellDlCqiCfg, mBuf); #ifdef TFU_UPGRADE CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); @@ -11609,19 +8330,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSecCellInfo +S16 cmUnpkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; CMCHKUNPK(oduPackUInt8, ¶m->useExtBSRSizes, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); @@ -11649,33 +8364,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeSCellAckPucchCfg +S16 cmPkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { S8 idx; - TRC3(cmPkRgrUeSCellAckPucchCfg); if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B) { for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, 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(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); @@ -11684,14 +8392,14 @@ Buffer *mBuf; { for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--) { - CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, 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(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf); @@ -11716,23 +8424,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeSCellAckPucchCfg +S16 cmUnpkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkRgrUeSCellAckPucchCfg); - CMCHKUNPK(oduPackUInt32, (U32*)¶m->pucchFormatType, mBuf); + CMCHKUNPK(oduPackUInt32, (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) { @@ -11791,22 +8492,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeStaInd +S16 cmPkRgrUeStaInd ( Pst* pst, SuId suId, RgrUeStaIndInfo* ueStaInd ) -#else -PUBLIC S16 cmPkRgrUeStaInd(pst, suId, ueStaInd) -Pst* pst; -SuId suId; -RgrUeStaIndInfo* ueStaInd; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrUeStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11814,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; } @@ -11826,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; @@ -11839,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) @@ -11876,24 +8569,16 @@ RgrUeStaIndInfo* ueStaInd; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeStaInd +S16 cmUnpkRgrUeStaInd ( RgrUeStaInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeStaInd(func, pst, mBuf) -RgrUeStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrUeStaIndInfo *ueStaInd; - TRC3(cmUnpkRgrUeStaInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -11906,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) @@ -11920,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) @@ -11949,20 +8634,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrUeStaIndInfo +S16 cmPkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrUeStaIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); @@ -11984,20 +8662,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrUeStaIndInfo +S16 cmUnpkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrUeStaIndInfo) CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -12022,20 +8693,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCellCsgParamCfg +S16 cmPkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrCellCsgParamCfg) CMCHKPK(oduUnpackUInt8, param->minUlResNonCsg, mBuf); CMCHKPK(oduUnpackUInt8, param->minDlResNonCsg, mBuf); @@ -12057,20 +8721,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCellCsgParamCfg +S16 cmUnpkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgrCellCsgParamCfg) CMCHKUNPK(oduPackUInt8, ¶m->minDlResNonCsg, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->minUlResNonCsg, mBuf); @@ -12092,19 +8749,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgrCellCntrlCmdCfg +S16 cmPkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgrCellCntrlCmdCfg) switch(param->cmdType) { @@ -12136,21 +8786,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgrCellCntrlCmdCfg +S16 cmUnpkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkRgrCellCntrlCmdCfg) CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf); param->cmdType = (RgrCellCntrlCmdType) tmpEnum;