X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=070d06b01447a945d6377bf6c67cb63d60134442;hb=c1a71fadad9bca810391ab3eb4963147ef6f0502;hp=743f07ca76d8cdc637f19a59103d40b9c30aa7d2;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/cm/rgr.c b/src/cm/rgr.c index 743f07ca7..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,59 +58,70 @@ * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrBndReq +S16 cmUnpkRgrCfgReq ( -Pst* pst, -SuId suId, -SpId spId +RgrCfgReq func, +Pst *pst, +Buffer *mBuf ) -#else -S16 cmPkRgrBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { + RgrCfgTransId transId; + RgrCfgReqInfo *cfgReqInfo; + +#if 0 + if (SUnpkS16(&spId, mBuf) != ROK) { + SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR001, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR021, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SPkS16(spId, mBuf) != ROK) { +#endif + + if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { + SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR002, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR022, (ErrVal)0, "Packing failed"); #endif - SPutMsg(mBuf); return RFAILED; } - if (SPkS16(suId, mBuf) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR003, (ErrVal)0, "Packing failed"); + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR023, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); return RFAILED; } - pst->event = (Event) EVTRGRBNDREQ; - return (SPstTsk(pst,mBuf)); + memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); + if (pst->selector == ODU_SELECTOR_LC) + if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) { + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)); + SPutMsg(mBuf); +#if (ERRCLASS & ERRCLS_ADD_RES) + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR024, (ErrVal)0, "Packing failed"); +#endif + return RFAILED; + } + SPutMsg(mBuf); + return ((*func)(pst, transId, cfgReqInfo)); } +/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ /*********************************************************** * -* Func : cmUnpkRgrBndReq +* Func : cmPkRgrTtiIndInfo * * -* Desc : Request from RRM to MAC to bind the interface saps +* Desc : Packs the TTI indication information. * * * Ret : S16 @@ -119,54 +131,50 @@ SpId spId; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrBndReq +S16 cmPkRgrTtiIndInfo ( -RgrBndReq func, -Pst *pst, +RgrTtiIndInfo *param, +Buffer *mBuf +) +{ + CMCHKPK(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 -S16 cmUnpkRgrBndReq(func, pst, mBuf) -RgrBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - SpId spId; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR004, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR005, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, spId)); + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(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 @@ -176,19 +184,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrBndCfm +S16 cmPkRgrTtiInd ( Pst* pst, SuId suId, -uint8_t status +RgrTtiIndInfo *ttiInd ) -#else -S16 cmPkRgrBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -196,16 +197,17 @@ uint8_t status; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR006, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR025, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (oduUnpackUInt8(status, mBuf) != ROK) { + if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR007, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR026, (ErrVal)0, "Packing failed"); #endif + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); return RFAILED; } @@ -213,23 +215,24 @@ uint8_t status; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR008, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR027, (ErrVal)0, "Packing failed"); #endif + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); return RFAILED; } - pst->event = (Event) EVTRGRBNDCFM; + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); + pst->event = (Event) EVTRGRTTIIND; return (SPstTsk(pst,mBuf)); } /*********************************************************** * -* Func : cmUnpkRgrBndCfm +* Func : cmUnpkRgrTtiInd * * -* Desc : Confirmation from MAC to RRM for the bind/Unbind - * request for the interface saps +* Desc : TTI indication from MAC to RRM * * * Ret : S16 @@ -239,22 +242,15 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrBndCfm +S16 cmUnpkRgrTtiInd ( -RgrBndCfm func, +RgrTtiInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrBndCfm(func, pst, mBuf) -RgrBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; - uint8_t status; + RgrTtiIndInfo *ttiInd; if (SUnpkS16(&suId, mBuf) != ROK) { @@ -262,30 +258,45 @@ Buffer *mBuf; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR009, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR028, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (oduPackUInt8(&status, mBuf) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) + { +#if (ERRCLASS & ERRCLS_ADD_RES) + SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, + __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, + (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed"); +#endif + SPutMsg(mBuf); + return RFAILED; + } + + if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { + /*ccpu00114888- Memory Leak issue- Start*/ + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, + sizeof(RgrTtiIndInfo)); + /*ccpu00114888- Memory Leak issue- End*/ SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR010, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR030, (ErrVal)0, "Packing failed"); #endif return RFAILED; } SPutMsg(mBuf); - return ((*func)(pst, suId, status)); + return ((*func)(pst, suId, ttiInd)); } /*********************************************************** * -* Func : cmPkRgrUbndReq +* Func : cmPkRgrCfgCfm * * -* Desc : Request from RRM to MAC to Unbind the interface saps +* Desc : Configuration Confirm from MAC to RRM * * * Ret : S16 @@ -295,19 +306,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUbndReq +S16 cmPkRgrCfgCfm ( Pst* pst, -SpId spId, -Reason reason -) -#else -S16 cmPkRgrUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif +RgrCfgTransId transId, +uint8_t status +) { Buffer *mBuf = NULLP; @@ -315,39 +319,39 @@ Reason reason; #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR011, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR031, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SPkS16(reason, mBuf) != ROK) { + if (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 @@ -357,54 +361,46 @@ Reason reason; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUbndReq +S16 cmUnpkRgrCfgCfm ( -RgrUbndReq func, +RgrCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUbndReq(func, pst, mBuf) -RgrUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - Reason reason; + RgrCfgTransId transId; + uint8_t status; - if (SUnpkS16(&spId, mBuf) != ROK) { + if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR014, (ErrVal)0, "Packing failed"); + (ErrVal)ERGR036, (ErrVal)0, "Packing failed"); #endif return RFAILED; } - if (SUnpkS16(&reason, mBuf) != ROK) { + if (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 @@ -414,77 +410,29 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgReq +S16 cmPkRgrCfgTransId ( -RgrCfgReq func, -Pst *pst, +RgrCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgReq(func, pst, mBuf) -RgrCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - RgrCfgReqInfo *cfgReqInfo; - -#if 0 - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR021, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } -#endif - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR022, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR023, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; + S32 i; + + for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { + CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } - memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR024, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, transId, cfgReqInfo)); + return ROK; } -/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ + /*********************************************************** * -* Func : cmPkRgrTtiIndInfo +* Func : cmUnpkRgrCfgTransId * * -* Desc : Packs the TTI indication information. +* Desc : Transaction ID between MAC and RRM * * * Ret : S16 @@ -494,29 +442,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrTtiIndInfo +S16 cmUnpkRgrCfgTransId ( -RgrTtiIndInfo *param, -Buffer *mBuf +RgrCfgTransId *param, +Buffer *mBuf ) -#else -S16 cmPkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); + + S32 i; + + for (i=0; itrans[i], mBuf); + } return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgrTtiIndInfo +* Func : cmPkRgrDlHqCfg * * -* Desc : Unpacking for RgrTtiIndInfo +* Desc : Downlink HARQ configuration per Cell +* * * Ret : S16 * @@ -525,31 +474,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrTtiIndInfo +S16 cmPkRgrDlHqCfg ( -RgrTtiIndInfo *param, +RgrDlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); - return ROK; + + 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 @@ -559,62 +504,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrTtiInd +S16 cmUnpkRgrDlHqCfg ( -Pst* pst, -SuId suId, -RgrTtiIndInfo *ttiInd +RgrDlHqCfg *param, +Buffer *mBuf ) -#else -S16 cmPkRgrTtiInd(pst, suId, ttiInd) -Pst* pst; -SuId suId; -RgrTtiIndInfo *ttiInd; -#endif { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR025, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR026, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPkS16(suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR027, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - SPutMsg(mBuf); - return RFAILED; - } - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); - pst->event = (Event) EVTRGRTTIIND; - return (SPstTsk(pst,mBuf)); + + CMCHKUNPK(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 @@ -624,68 +534,26 @@ RgrTtiIndInfo *ttiInd; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrTtiInd +S16 cmPkRgrRntiCfg ( -RgrTtiInd func, -Pst *pst, +RgrRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiInd(func, pst, mBuf) -RgrTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrTtiIndInfo *ttiInd; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR028, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - - if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { - /*ccpu00114888- Memory Leak issue- Start*/ - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, - sizeof(RgrTtiIndInfo)); - /*ccpu00114888- Memory Leak issue- End*/ - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR030, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, ttiInd)); + CMCHKPK(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 @@ -695,59 +563,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgCfm +S16 cmUnpkRgrRntiCfg ( -Pst* pst, -RgrCfgTransId transId, -uint8_t status +RgrRntiCfg *param, +Buffer *mBuf ) -#else -S16 cmPkRgrCfgCfm(pst, transId, status) -Pst* pst; -RgrCfgTransId transId; -uint8_t status; -#endif { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR031, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduUnpackUInt8(status, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR032, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR033, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - pst->event = (Event) EVTMACSCHCFGCFM; - return (SPstTsk(pst,mBuf)); + + CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); + CMCHKUNPK(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 @@ -757,54 +592,30 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgCfm +S16 cmPkRgrEmtcRntiCfg ( -RgrCfgCfm func, -Pst *pst, +RgrEmtcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgCfm(func, pst, mBuf) -RgrCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - RgrCfgTransId transId; - uint8_t status; - - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR036, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduPackUInt8(&status, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR037, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, transId, status)); + + CMCHKPK(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 @@ -814,72 +625,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSiCfgCfm +S16 cmUnpkRgrEmtcRntiCfg ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -uint8_t status +RgrEmtcRntiCfg *param, +Buffer *mBuf ) -#else -S16 cmPkRgrSiCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -uint8_t status; -#endif { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)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 @@ -889,64 +659,27 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgCfm +S16 cmPkRgrDlCmnCodeRateCfg ( -RgrSiCfgCfm func, -Pst *pst, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf) -RgrSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - RgrCfgTransId transId; - uint8_t status; - - if (SUnpkS16(&suId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR042, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR043, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (oduPackUInt8(&status, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR044, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, suId, transId, status)); + CMCHKPK(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 @@ -956,24 +689,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgTransId +S16 cmUnpkRgrDlCmnCodeRateCfg ( -RgrCfgTransId *param, +RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - S32 i; - - for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); - } + CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -981,10 +706,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrCfgTransId +* Func : cmPkRgrCfiCfg * * -* Desc : Transaction ID between MAC and RRM +* Desc : Control Format Indicator (CFI) configuration per cell * * * Ret : S16 @@ -994,24 +719,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgTransId +S16 cmPkRgrCfiCfg ( -RgrCfgTransId *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { - - S32 i; - - for (i=0; itrans[i], mBuf); - } + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); return ROK; } @@ -1019,10 +733,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrDlHqCfg +* Func : cmUnpkRgrCfiCfg * * -* Desc : Downlink HARQ configuration per Cell +* Desc : Control Format Indicator (CFI) configuration per cell * * * Ret : S16 @@ -1032,22 +746,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDlHqCfg +S16 cmUnpkRgrCfiCfg ( -RgrDlHqCfg *param, +RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); - CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); return ROK; } @@ -1055,10 +761,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlHqCfg +* Func : cmPkRgrPuschSubBandCfg * * -* Desc : Downlink HARQ configuration per Cell +* Desc : PUSCH sub-band configuration per cell * * * Ret : S16 @@ -1068,22 +774,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDlHqCfg +S16 cmPkRgrPuschSubBandCfg ( -RgrDlHqCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { + S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->maxDlHqTx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxMsg4HqTx, mBuf); + for (i=param->numSubbands-1; i >= 0; i--) { + CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf); + } + CMCHKPK(oduUnpackUInt8, param->size, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf); + CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf); return ROK; } @@ -1091,10 +796,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrRntiCfg +* Func : cmUnpkRgrPuschSubBandCfg * * -* Desc : Range of RNTIs managed by MAC +* Desc : PUSCH sub-band configuration per cell * * * Ret : S16 @@ -1104,22 +809,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrRntiCfg +S16 cmUnpkRgrPuschSubBandCfg ( -RgrRntiCfg *param, +RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt16, param->size, mBuf); - CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); + S32 i; + CMCHKUNPK(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; } @@ -1127,10 +830,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrRntiCfg +* Func : cmPkRgrUlCmnCodeRateCfg * * -* Desc : Range of RNTIs managed by MAC +* Desc : Uplink common channel code rate configuration per cell * * * Ret : S16 @@ -1140,32 +843,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrRntiCfg +S16 cmPkRgrUlCmnCodeRateCfg ( -RgrRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKPK(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 @@ -1175,25 +870,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrEmtcRntiCfg +S16 cmUnpkRgrUlCmnCodeRateCfg ( -RgrEmtcRntiCfg *param, +RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt16, param->size, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf); - CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -1201,10 +885,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrEmtcRntiCfg +* Func : cmPkRgrUlTrgCqiCfg * * -* Desc : Range of Emtc RNTIs managed by MAC +* Desc : Target Uplink CQI to achieve through group power control configured per cell * * * Ret : S16 @@ -1214,37 +898,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrEmtcRntiCfg +S16 cmPkRgrUlTrgCqiCfg ( -RgrEmtcRntiCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeAStart, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeARange, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBStart, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBRange, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); - + CMCHKPK(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 @@ -1254,22 +925,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDlCmnCodeRateCfg +S16 cmUnpkRgrUlTrgCqiCfg ( -RgrDlCmnCodeRateCfg *param, +RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); - CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); - CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -1277,10 +940,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlCmnCodeRateCfg +* Func : cmPkRgrBwCfg * * -* Desc : Downlink common channel code rate configuration per cell +* Desc : Bandwidth configuration per cell * * * Ret : S16 @@ -1290,606 +953,224 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDlCmnCodeRateCfg +S16 cmPkRgrBwCfg ( -RgrDlCmnCodeRateCfg *param, +RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); + CMCHKPK(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 -S16 cmPkRgrCfiCfg +#ifdef EMTC_ENABLE +/* EMTC related pack changes start*/ + +S16 cmPkRgrEmtcSiCfg ( -RgrCfiCfg *param, +RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); - return ROK; + S32 i; + + CMCHKPK(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; } - -/*********************************************************** -* -* Func : cmUnpkRgrCfiCfg -* -* -* Desc : Control Format Indicator (CFI) configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfiCfg + + +S16 cmPkRgrEmtcRachCfg ( -RgrCfiCfg *param, +RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); - return ROK; + S32 i; + + CMCHKPK(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; } - -/*********************************************************** -* -* Func : cmPkRgrPuschSubBandCfg -* -* -* Desc : PUSCH sub-band configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrPuschSubBandCfg +S16 cmPkRgrEmtcPdschCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { - S32 i; + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); + + return ROK; +} - for (i=param->numSubbands-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf); - } - CMCHKPK(oduUnpackUInt8, param->size, mBuf); - CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf); - CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf); +S16 cmPkRgrEmtcPuschCfg +( +RgrEmtcPuschCfg*param, +Buffer *mBuf +) +{ + CMCHKPK(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 -S16 cmUnpkRgrPuschSubBandCfg + +S16 cmPkRgrEmtcPucchCfg ( -RgrPuschSubBandCfg *param, +RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { S32 i; - - CMCHKUNPK(oduPackUInt8, ¶m->subbandStart, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numSubbands, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); - for (i=0; inumSubbands; i++) { - CMCHKUNPK(oduPackUInt8, ¶m->dmrs[i], mBuf); + 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 -S16 cmPkRgrUlCmnCodeRateCfg +S16 cmPkRgrEmtcPrachCeParamCfg ( -RgrUlCmnCodeRateCfg *param, +RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - - 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 -S16 cmUnpkRgrUlCmnCodeRateCfg + +S16 cmPkRgrEmtcPrachCfg ( -RgrUlCmnCodeRateCfg *param, +RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - 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 -S16 cmPkRgrUlTrgCqiCfg + + +S16 cmPkRgrEmtcCfg ( -RgrUlTrgCqiCfg *param, +RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { - - 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 -S16 cmUnpkRgrUlTrgCqiCfg +/* EMTC related unpack changes start*/ + +S16 cmUnpkRgrEmtcSiCfg ( -RgrUlTrgCqiCfg *param, +RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrBwCfg -* -* -* Desc : Bandwidth configuration per cell -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrBwCfg -( -RgrBwCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); - return ROK; -} - - -#ifdef EMTC_ENABLE -/* EMTC related pack changes start*/ - -#ifdef ANSI -S16 cmPkRgrEmtcSiCfg -( -RgrEmtcSiCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - CMCHKPK(oduUnpackUInt8, param->siHoppingEnable, mBuf); - CMCHKPK(oduUnpackUInt32, param->modPrd, mBuf); - CMCHKPK(oduUnpackUInt8, param->siWinSizeBr, mBuf); - CMCHKPK(oduUnpackUInt8, param->sib1Repetition, mBuf); - CMCHKPK(oduUnpackUInt8, param->siRepetition, mBuf); - - CMCHKPK(oduUnpackUInt16, param->startSymbolLc, mBuf); - //CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); - /*Changes by SIMRAN*/ - if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) - { - CMCHKPK(oduUnpackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); - } - else - { - //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 -S16 cmPkRgrEmtcRachCfg -( -RgrEmtcRachCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf); - - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf); - } - - return ROK; -} - - -#ifdef ANSI -S16 cmPkRgrEmtcPdschCfg -( -RgrEmtcPdschCfg*param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - - return ROK; -} - -#ifdef ANSI -S16 cmPkRgrEmtcPuschCfg -( -RgrEmtcPuschCfg*param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); - return ROK; -} - - - -#ifdef ANSI -S16 cmPkRgrEmtcPucchCfg -( -RgrEmtcPucchCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); - } - - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); - - return ROK; -} - - -#ifdef ANSI -S16 cmPkRgrEmtcPrachCeParamCfg -( -RgrEmtcPrachCEParamLst *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcPrachStartSubFrame, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMaxPremAttemptCE, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcNumMpdcchNBtoMonitor, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[1], mBuf); - CMCHKPK(oduUnpackUInt16, param->emtcMpdcchNumRep, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachHoppingCfg, mBuf); - return ROK; -} - - - -#ifdef ANSI -S16 cmPkRgrEmtcPrachCfg -( -RgrEmtcPrachCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); - CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); - } - - return ROK; -} - - - - -#ifdef ANSI -S16 cmPkRgrEmtcCfg -( -RgrEmtcCellCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt16, param->pci, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); - CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); - CMCHKPK(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 -S16 cmUnpkRgrEmtcSiCfg -( -RgrEmtcSiCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif -{ - - S32 i; - uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); + S32 i; + uint32_t tmpEnum; + CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); for (i=0; i < param->numSi ; i++) { @@ -1930,17 +1211,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcRachCfg ( RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1957,17 +1232,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrEmtcPdschCfg ( RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); @@ -1975,17 +1244,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPuschCfg ( RgrEmtcPuschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); @@ -1995,17 +1258,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcPucchCfg ( RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2023,17 +1280,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); @@ -2050,17 +1301,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2074,17 +1319,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); @@ -2129,17 +1368,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrBwCfg ( RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); @@ -2164,17 +1397,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); @@ -2199,17 +1426,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2237,17 +1458,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); @@ -2276,20 +1491,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->deltaShift, mBuf); @@ -2316,17 +1524,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { @@ -2354,21 +1556,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum; @@ -2395,17 +1590,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2447,17 +1636,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2500,17 +1683,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH @@ -2554,17 +1731,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ @@ -2613,17 +1784,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -2649,17 +1814,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -2685,20 +1844,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3a, mBuf); @@ -2727,17 +1879,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2771,17 +1917,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { @@ -2808,17 +1948,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { @@ -2845,17 +1979,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2884,17 +2012,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2923,17 +2045,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { @@ -2960,17 +2076,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { @@ -2997,20 +2107,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dir, mBuf); @@ -3036,17 +2139,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { @@ -3075,17 +2172,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { @@ -3111,17 +2202,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { @@ -3151,17 +2236,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { @@ -3189,17 +2268,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -3229,17 +2302,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -3268,17 +2335,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -3311,17 +2372,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmPkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) @@ -3351,17 +2406,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; @@ -3392,17 +2441,11 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSpsCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSpsCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); @@ -3430,17 +2473,11 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSpsDlCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSpsDlCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { @@ -3513,17 +2550,11 @@ Buffer *mBuf * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); @@ -3546,17 +2577,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { @@ -3581,17 +2606,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); @@ -3615,17 +2634,11 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); @@ -3649,17 +2662,11 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; @@ -3690,17 +2697,11 @@ S16 cmPkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); @@ -3731,17 +2732,11 @@ S16 cmPkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); @@ -3766,17 +2761,11 @@ S16 cmPkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->status, mBuf); @@ -3800,17 +2789,12 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI + S16 cmPkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, param->pres, mBuf); @@ -3838,17 +2822,11 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; @@ -3880,17 +2858,11 @@ S16 cmUnpkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { @@ -3920,17 +2892,11 @@ S16 cmUnpkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); @@ -3956,17 +2922,11 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmPkMacSchedGnbCfg(param, mBuf) -RgrSchedEnbCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); @@ -3993,17 +2953,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkMacSchedGnbCfg(param, mBuf) -MacSchedGnbCfg *param; -Buffer *mBuf; -#endif { @@ -4032,17 +2986,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4156,17 +3104,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4271,17 +3213,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { /*Pack Aperiodic Trigger List only for Pcell */ @@ -4312,17 +3248,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4359,17 +3289,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4400,17 +3324,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4447,17 +3365,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { @@ -4490,17 +3402,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4535,17 +3441,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4571,17 +3471,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4608,17 +3502,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { @@ -4652,17 +3540,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4699,17 +3581,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { @@ -4737,17 +3613,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); @@ -4774,17 +3644,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { @@ -4810,17 +3674,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { @@ -4847,17 +3705,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { @@ -4885,17 +3737,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { @@ -4924,17 +3770,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4969,17 +3809,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -5005,17 +3839,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { @@ -5042,17 +3870,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { @@ -5079,17 +3901,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { @@ -5115,17 +3931,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { @@ -5151,17 +3961,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { @@ -5188,17 +3992,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { @@ -5223,17 +4021,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { @@ -5272,17 +4064,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { @@ -5321,17 +4107,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { @@ -5360,17 +4140,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { @@ -5399,17 +4173,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { @@ -5436,17 +4204,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5475,17 +4237,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { @@ -5513,17 +4269,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5554,17 +4304,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -5590,17 +4334,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -5626,17 +4364,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { @@ -5663,17 +4395,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { @@ -5701,17 +4427,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -5743,17 +4463,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5788,17 +4502,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -5842,17 +4550,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5897,17 +4599,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5934,17 +4630,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5955,614 +4645,48 @@ Buffer *mBuf; } -/*********************************************************** -* -* Func : cmPkRgrUeUlPwrCfg -* -* -* Desc : Uplink power configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeUlPwrCfg -( -RgrUeUlPwrCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); - CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); - CMCHKPK(SPkS8, param->p0UePucch, mBuf); - CMCHKPK(SPkS8, param->p0UePusch, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); - CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); - CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUeUlPwrCfg -* -* -* Desc : Uplink power configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeUlPwrCfg -( -RgrUeUlPwrCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); - CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); - CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); - CMCHKUNPK(SUnpkS8, ¶m->p0UePucch, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgrUeQosCfg -* -* -* Desc : Downlink/Uplink QoS configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeQosCfg -( -RgrUeQosCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); - CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); - CMCHKPK(oduUnpackUInt8, param->ambrPres, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUeQosCfg -* -* -* Desc : Downlink/Uplink QoS configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeQosCfg -( -RgrUeQosCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->ueBr, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmPkRgrUePuschDedCfg -* -* -* Desc : PUSCH Config Dedication for UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUePuschDedCfg -( -RgrUePuschDedCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->bACKIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - return ROK; -} - - -/*********************************************************** -* -* Func : cmUnpkRgrUePuschDedCfg -* -* -* Desc : PUSCH Config Dedication for UE -* -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUePuschDedCfg -( -RgrUePuschDedCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bRIIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->bCQIIdx, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmPkRgrUeTxAntSelCfg -* -* -* Desc : UE Transmit Antenna selection related configuration -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeTxAntSelCfg -( -RgrUeTxAntSelCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt32, param->selType, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUeTxAntSelCfg -* -* -* Desc : UE Transmit Antenna selection related configuration -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeTxAntSelCfg -( -RgrUeTxAntSelCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif -{ - uint32_t tmpEnum; - - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); - param->selType = (RgrUeTxAntSelType) tmpEnum; - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgrUeTaTmrCfg -* -* -* Desc : Time Alignment timer configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeTaTmrCfg -( -RgrUeTaTmrCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrUeTaTmrCfg -* -* -* Desc : Time Alignment timer configuration per UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeTaTmrCfg -( -RgrUeTaTmrCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); - return ROK; -} - - -#ifdef EMTC_ENABLE -#ifdef ANSI -S16 cmUnpkRgrEmtcUeCfg -( -RgrUeEmtcCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrEmtcUeCfg(param, mBuf) -RgrUeEmtcCfg *param; -Buffer *mBuf; -#endif -{ - S32 indx=0; - S32 idx=0; - RgrEpdcchConfigRel11 *emtcEpdcchCfg = &(param->emtcEpdcchCfg); - RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); - RgrEpdcchAddModLst *epdcchAddModLst; - - CMCHKUNPK(oduPackUInt8,¶m->pdschReptLevModeA,mBuf); - /*UnPacking PUCCH Rep */ - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); - CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); - - - - for(indx = 0; indx < RGR_MAX_EPDCCH_SET; indx++) - { - epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); - CMCHKUNPK(oduPackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); - CMCHKUNPK(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++) - { - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); - } - - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->transmissionType),mBuf); - CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf); - - } - CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf); - for(indx = 0; indx < 5; indx++) - { - CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); - } - CMCHKUNPK(oduPackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); - CMCHKUNPK(oduPackUInt8, &(param->pres), mBuf); - CMCHKUNPK(oduPackUInt8, &(param->isHdFddEnbld), mBuf); - -#ifdef EMTC_DEBUG_CONSOLE_PRINTS - printf("\n EMTC RGR UE unpack\n"); - printf("\nemtcEpdcchCfg->sfPtn.pres %d ",emtcEpdcchCfg->sfPtn.pres); - - for(indx = 0; indx < 5; indx++) - { - printf("\nemtcEpdcchCfg->sfPtn.measSfPatFDD[%d] %d ",indx,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]); - } - printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.pres); - printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.val); - - for(indx = 0 ; indx < RGR_MAX_EPDCCH_SET; indx++) - { - epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.pres); - printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.val); - printf("\nepdcchAddModLst->setConfigId %d ", epdcchAddModLst->setConfigId); - printf("\nepdcchAddModLst->transmissionType %d ",epdcchAddModLst->transmissionType); - printf("\nepdcchAddModLst->resBlkAssignment.numPRBpairs %d ",epdcchAddModLst->resBlkAssignment.numPRBpairs); - for(idx = 0; idx < 5 ; idx++) - { - printf("\nepdcchAddModLst->resBlkAssignment.rbAssignment[idx] %d ",epdcchAddModLst->resBlkAssignment.rbAssignment[idx]); - } - printf("\nepdcchAddModLst->dmrsScrambSeq %d ",epdcchAddModLst->dmrsScrambSeq); - printf("\nepdcchAddModLst->pucchResStartoffset %d ",epdcchAddModLst->pucchResStartoffset); - printf("\nepdcchAddModLst->pdschRemapQLcfgId.pres %d ",epdcchAddModLst->pdschRemapQLcfgId.pres); - printf("\nepdcchAddModLst->pdschRemapQLcfgId.val %d ", epdcchAddModLst->pdschRemapQLcfgId.val); - printf("\nepdcchAddModLst->mpdcchNumPRBpair.pres %d ", epdcchAddModLst->mpdcchNumPRBpair.pres); - printf("\nepdcchAddModLst->mpdcchNumPRBpair.val %d ", epdcchAddModLst->mpdcchNumPRBpair.val); - printf("\nepdcchAddModLst->extaddgrp2.pres %d ", epdcchAddModLst->extaddgrp2.pres); - printf("\nepdcchAddModLst->extaddgrp2.csiNumRep %d ", epdcchAddModLst->extaddgrp2.csiNumRep); - printf("\nepdcchAddModLst->extaddgrp2.mpddchPdschHop %d ", epdcchAddModLst->extaddgrp2.mpddchPdschHop); - printf("\nepdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD %d ",epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD); - printf("\nepdcchAddModLst->extaddgrp2.mpdcchNumRep %d ", epdcchAddModLst->extaddgrp2.mpdcchNumRep); - printf("\nepdcchAddModLst->extaddgrp2.mpddchNB %d ", epdcchAddModLst->extaddgrp2.mpddchNB); - } - -#endif - - return ROK; -} - - - -S16 cmPkRgrEmtcUeCfg -( - RgrUeEmtcCfg *param, - Buffer *mBuf - ) -{ - S32 indx=0; - S32 idx=0; - RgrEpdcchConfigRel11 *emtcEpdcchCfg = &(param->emtcEpdcchCfg); - RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); - RgrEpdcchAddModLst *epdcchAddModLst; - - CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - CMCHKPK(oduUnpackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf); - for(indx = 4; indx >=0; indx--) - { - CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); - } - CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf); - for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--) - { - epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->setConfigId,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->transmissionType,mBuf); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); - for(idx = 4; idx >= 0; idx--) - { - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); - } - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,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); - CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); - CMCHKPK(oduUnpackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); - CMCHKPK(oduUnpackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); - } - -/*Packing PUCCH Rep */ - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf); - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); - CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); - CMCHKPK(oduUnpackUInt8,param->pdschReptLevModeA,mBuf); - -#ifdef EMTC_DEBUG_CONSOLE_PRINTS - printf("\n EMTC RGR UE pack\n"); - printf("\nemtcEpdcchCfg->sfPtn.pres %d ",emtcEpdcchCfg->sfPtn.pres); - - for(indx = 0; indx < 5; indx++) - { - printf("\nemtcEpdcchCfg->sfPtn.measSfPatFDD[%d] %d ",indx,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]); - } - printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.pres); - printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.val); - - for(indx = 0 ; indx < RGR_MAX_EPDCCH_SET; indx++) - { - epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - /* printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.pres); - printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.val);*/ - printf("\nepdcchAddModLst->setConfigId %d ", epdcchAddModLst->setConfigId); - printf("\nepdcchAddModLst->transmissionType %d ",epdcchAddModLst->transmissionType); - printf("\nepdcchAddModLst->resBlkAssignment.numPRBpairs %d ",epdcchAddModLst->resBlkAssignment.numPRBpairs); - for(idx = 0; idx < 5 ; idx++) - { - printf("\nepdcchAddModLst->resBlkAssignment.rbAssignment[idx] %d ",epdcchAddModLst->resBlkAssignment.rbAssignment[idx]); - } - printf("\nepdcchAddModLst->dmrsScrambSeq %d ",epdcchAddModLst->dmrsScrambSeq); - printf("\nepdcchAddModLst->pucchResStartoffset %d ",epdcchAddModLst->pucchResStartoffset); - printf("\nepdcchAddModLst->pdschRemapQLcfgId.pres %d ",epdcchAddModLst->pdschRemapQLcfgId.pres); - printf("\nepdcchAddModLst->pdschRemapQLcfgId.val %d ", epdcchAddModLst->pdschRemapQLcfgId.val); - printf("\nepdcchAddModLst->mpdcchNumPRBpair.pres %d ", epdcchAddModLst->mpdcchNumPRBpair.pres); - printf("\nepdcchAddModLst->mpdcchNumPRBpair.val %d ", epdcchAddModLst->mpdcchNumPRBpair.val); - printf("\nepdcchAddModLst->extaddgrp2.pres %d ", epdcchAddModLst->extaddgrp2.pres); - printf("\nepdcchAddModLst->extaddgrp2.csiNumRep %d ", epdcchAddModLst->extaddgrp2.csiNumRep); - printf("\nepdcchAddModLst->extaddgrp2.mpddchPdschHop %d ", epdcchAddModLst->extaddgrp2.mpddchPdschHop); - printf("\nepdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD %d ",epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD); - printf("\nepdcchAddModLst->extaddgrp2.mpdcchNumRep %d ", epdcchAddModLst->extaddgrp2.mpdcchNumRep); - printf("\nepdcchAddModLst->extaddgrp2.mpddchNB %d ", epdcchAddModLst->extaddgrp2.mpddchNB); - } - -#endif - - - - return ROK; -} -#endif - -#ifdef RG_5GTF -S16 cmUnpkRgr5gtfUeCfg -( - RgrUe5gtfCfg *param, - Buffer *mBuf -) -{ - CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->BeamId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCC, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->maxPrb, mBuf); - return ROK; -} - -S16 cmPkRgr5gtfUeCfg +/*********************************************************** +* +* Func : cmPkRgrUeUlPwrCfg +* +* +* Desc : Uplink power configuration per UE +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrUeUlPwrCfg ( - RgrUe5gtfCfg *param, - Buffer *mBuf +RgrUeUlPwrCfg *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); + + + CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); + CMCHKPK(SPkS8, param->p0UePucch, mBuf); + CMCHKPK(SPkS8, param->p0UePusch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); + CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); + CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); return ROK; } -#endif + /*********************************************************** * -* Func : cmPkRgrUeCfg +* Func : cmUnpkRgrUeUlPwrCfg * * -* Desc : UE configuration +* Desc : Uplink power configuration per UE * * * Ret : S16 @@ -6572,92 +4696,22 @@ S16 cmPkRgr5gtfUeCfg * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeCfg +S16 cmUnpkRgrUeUlPwrCfg ( -RgrUeCfg *param, +RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { -#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(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->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); + CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); + CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); + CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); + CMCHKUNPK(SUnpkS8, ¶m->p0UePucch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -6665,10 +4719,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrUeCfg +* Func : cmPkRgrUeQosCfg * * -* Desc : UE configuration +* Desc : Downlink/Uplink QoS configuration per UE * * * Ret : S16 @@ -6678,92 +4732,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeCfg +S16 cmPkRgrUeQosCfg ( -RgrUeCfg *param, +RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { - uint32_t tmpEnum; - - - 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, (uint32_t *)&tmpEnum, mBuf); - param->ueCatEnum = (CmLteUeCategory) tmpEnum; -/*rgr_c_001.main_9 ADD added changes for DRX*/ - - /* Anshika - Unpack only if DRX is enabled */ - CMCHKUNPK(oduPackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); - 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(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->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, (uint32_t *)¶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 + CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); + CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); + CMCHKPK(oduUnpackUInt8, param->ambrPres, mBuf); return ROK; } @@ -6771,10 +4750,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrLchQosCfg +* Func : cmUnpkRgrUeQosCfg * * -* Desc : QCI, GBR and MBR configuration for dedicated logical channels +* Desc : Downlink/Uplink QoS configuration per UE * * * Ret : S16 @@ -6784,34 +4763,58 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLchQosCfg +S16 cmUnpkRgrUeQosCfg ( -RgrLchQosCfg *param, +RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ueBr, mBuf); + return ROK; +} + +/*********************************************************** +* +* Func : cmPkRgrUePuschDedCfg +* +* +* Desc : PUSCH Config Dedication for UE +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrUePuschDedCfg +( +RgrUePuschDedCfg *param, +Buffer *mBuf +) +{ + + + CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->bACKIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); return ROK; } - /*********************************************************** * -* Func : cmUnpkRgrLchQosCfg +* Func : cmUnpkRgrUePuschDedCfg * * -* Desc : QCI, GBR and MBR configuration for dedicated logical channels +* Desc : PUSCH Config Dedication for UE +* * * * Ret : S16 @@ -6821,34 +4824,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLchQosCfg +S16 cmUnpkRgrUePuschDedCfg ( -RgrLchQosCfg *param, +RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bRIIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bCQIIdx, mBuf); return ROK; } -/*rgr_c_001.main_7 - Added support for SPS*/ - /*********************************************************** * -* Func : cmPkRgrLchSpsCfg +* Func : cmPkRgrUeTxAntSelCfg * * -* Desc : SPS related configuration for logical channels +* Desc : UE Transmit Antenna selection related configuration * * * Ret : S16 @@ -6858,22 +4854,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLchSpsCfg +S16 cmPkRgrUeTxAntSelCfg ( -RgrLchSpsCfg *param, +RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { - /* SPS_DEV */ - CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); + CMCHKPK(oduUnpackUInt32, param->selType, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); return ROK; } @@ -6881,10 +4871,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrLchSpsCfg +* Func : cmUnpkRgrUeTxAntSelCfg * * -* Desc : SPS related configuration for logical channels +* Desc : UE Transmit Antenna selection related configuration * * * Ret : S16 @@ -6894,32 +4884,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLchSpsCfg +S16 cmUnpkRgrUeTxAntSelCfg ( -RgrLchSpsCfg *param, +RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); - + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); + param->selType = (RgrUeTxAntSelType) tmpEnum; return ROK; } /*********************************************************** * -* Func : cmPkRgrDlLchCfg +* Func : cmPkRgrUeTaTmrCfg * * -* Desc : Logical channel configuration info for downlink logical channels +* Desc : Time Alignment timer configuration per UE * * * Ret : S16 @@ -6929,25 +4915,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDlLchCfg +S16 cmPkRgrUeTaTmrCfg ( -RgrDlLchCfg *param, +RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif { -/*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); - CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); - CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); + CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); return ROK; } @@ -6955,10 +4932,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrDlLchCfg +* Func : cmUnpkRgrUeTaTmrCfg * * -* Desc : Logical channel configuration info for downlink logical channels +* Desc : Time Alignment timer configuration per UE * * * Ret : S16 @@ -6968,114 +4945,248 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDlLchCfg +S16 cmUnpkRgrUeTaTmrCfg ( -RgrDlLchCfg *param, +RgrUeTaTmrCfg *param, +Buffer *mBuf +) +{ + + + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); + return ROK; +} + + +#ifdef EMTC_ENABLE +S16 cmUnpkRgrEmtcUeCfg +( +RgrUeEmtcCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; +{ + S32 indx=0; + S32 idx=0; + RgrEpdcchConfigRel11 *emtcEpdcchCfg = &(param->emtcEpdcchCfg); + RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); + RgrEpdcchAddModLst *epdcchAddModLst; + + CMCHKUNPK(oduPackUInt8,¶m->pdschReptLevModeA,mBuf); + /*UnPacking PUCCH Rep */ + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); + + + + for(indx = 0; indx < RGR_MAX_EPDCCH_SET; indx++) + { + epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); + CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); + CMCHKUNPK(oduPackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); + CMCHKUNPK(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++) + { + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); + } + + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->transmissionType),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf); + + } + CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf); + for(indx = 0; indx < 5; indx++) + { + CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); + } + CMCHKUNPK(oduPackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->pres), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->isHdFddEnbld), mBuf); + +#ifdef EMTC_DEBUG_CONSOLE_PRINTS + printf("\n EMTC RGR UE unpack\n"); + printf("\nemtcEpdcchCfg->sfPtn.pres %d ",emtcEpdcchCfg->sfPtn.pres); + + for(indx = 0; indx < 5; indx++) + { + printf("\nemtcEpdcchCfg->sfPtn.measSfPatFDD[%d] %d ",indx,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]); + } + printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.pres); + printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.val); + + for(indx = 0 ; indx < RGR_MAX_EPDCCH_SET; indx++) + { + epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); + printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.pres); + printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.val); + printf("\nepdcchAddModLst->setConfigId %d ", epdcchAddModLst->setConfigId); + printf("\nepdcchAddModLst->transmissionType %d ",epdcchAddModLst->transmissionType); + printf("\nepdcchAddModLst->resBlkAssignment.numPRBpairs %d ",epdcchAddModLst->resBlkAssignment.numPRBpairs); + for(idx = 0; idx < 5 ; idx++) + { + printf("\nepdcchAddModLst->resBlkAssignment.rbAssignment[idx] %d ",epdcchAddModLst->resBlkAssignment.rbAssignment[idx]); + } + printf("\nepdcchAddModLst->dmrsScrambSeq %d ",epdcchAddModLst->dmrsScrambSeq); + printf("\nepdcchAddModLst->pucchResStartoffset %d ",epdcchAddModLst->pucchResStartoffset); + printf("\nepdcchAddModLst->pdschRemapQLcfgId.pres %d ",epdcchAddModLst->pdschRemapQLcfgId.pres); + printf("\nepdcchAddModLst->pdschRemapQLcfgId.val %d ", epdcchAddModLst->pdschRemapQLcfgId.val); + printf("\nepdcchAddModLst->mpdcchNumPRBpair.pres %d ", epdcchAddModLst->mpdcchNumPRBpair.pres); + printf("\nepdcchAddModLst->mpdcchNumPRBpair.val %d ", epdcchAddModLst->mpdcchNumPRBpair.val); + printf("\nepdcchAddModLst->extaddgrp2.pres %d ", epdcchAddModLst->extaddgrp2.pres); + printf("\nepdcchAddModLst->extaddgrp2.csiNumRep %d ", epdcchAddModLst->extaddgrp2.csiNumRep); + printf("\nepdcchAddModLst->extaddgrp2.mpddchPdschHop %d ", epdcchAddModLst->extaddgrp2.mpddchPdschHop); + printf("\nepdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD %d ",epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD); + printf("\nepdcchAddModLst->extaddgrp2.mpdcchNumRep %d ", epdcchAddModLst->extaddgrp2.mpdcchNumRep); + printf("\nepdcchAddModLst->extaddgrp2.mpddchNB %d ", epdcchAddModLst->extaddgrp2.mpddchNB); + } + +#endif + + return ROK; +} + + + +S16 cmPkRgrEmtcUeCfg +( + RgrUeEmtcCfg *param, + Buffer *mBuf + ) +{ + S32 indx=0; + S32 idx=0; + RgrEpdcchConfigRel11 *emtcEpdcchCfg = &(param->emtcEpdcchCfg); + RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); + RgrEpdcchAddModLst *epdcchAddModLst; + + CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduUnpackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf); + for(indx = 4; indx >=0; indx--) + { + CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); + } + CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf); + for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--) + { + epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); + + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->setConfigId,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->transmissionType,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); + for(idx = 4; idx >= 0; idx--) + { + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); + } + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,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); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); + CMCHKPK(oduUnpackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); + } + +/*Packing PUCCH Rep */ + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf); + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); + CMCHKPK(oduUnpackUInt8,param->pdschReptLevModeA,mBuf); + +#ifdef EMTC_DEBUG_CONSOLE_PRINTS + printf("\n EMTC RGR UE pack\n"); + printf("\nemtcEpdcchCfg->sfPtn.pres %d ",emtcEpdcchCfg->sfPtn.pres); + + for(indx = 0; indx < 5; indx++) + { + printf("\nemtcEpdcchCfg->sfPtn.measSfPatFDD[%d] %d ",indx,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]); + } + printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.pres); + printf("\nemtcEpdcchCfg->startSymbolr11 %d ",emtcEpdcchCfg->startSymbolr11.val); + + for(indx = 0 ; indx < RGR_MAX_EPDCCH_SET; indx++) + { + epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); + /* printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.pres); + printf("\nemtcEpdcchCfg->epdcchRelLst[indx].setCfgId %d %d ", indx,emtcEpdcchCfg->epdcchRelLst[indx].setCfgId.val);*/ + printf("\nepdcchAddModLst->setConfigId %d ", epdcchAddModLst->setConfigId); + printf("\nepdcchAddModLst->transmissionType %d ",epdcchAddModLst->transmissionType); + printf("\nepdcchAddModLst->resBlkAssignment.numPRBpairs %d ",epdcchAddModLst->resBlkAssignment.numPRBpairs); + for(idx = 0; idx < 5 ; idx++) + { + printf("\nepdcchAddModLst->resBlkAssignment.rbAssignment[idx] %d ",epdcchAddModLst->resBlkAssignment.rbAssignment[idx]); + } + printf("\nepdcchAddModLst->dmrsScrambSeq %d ",epdcchAddModLst->dmrsScrambSeq); + printf("\nepdcchAddModLst->pucchResStartoffset %d ",epdcchAddModLst->pucchResStartoffset); + printf("\nepdcchAddModLst->pdschRemapQLcfgId.pres %d ",epdcchAddModLst->pdschRemapQLcfgId.pres); + printf("\nepdcchAddModLst->pdschRemapQLcfgId.val %d ", epdcchAddModLst->pdschRemapQLcfgId.val); + printf("\nepdcchAddModLst->mpdcchNumPRBpair.pres %d ", epdcchAddModLst->mpdcchNumPRBpair.pres); + printf("\nepdcchAddModLst->mpdcchNumPRBpair.val %d ", epdcchAddModLst->mpdcchNumPRBpair.val); + printf("\nepdcchAddModLst->extaddgrp2.pres %d ", epdcchAddModLst->extaddgrp2.pres); + printf("\nepdcchAddModLst->extaddgrp2.csiNumRep %d ", epdcchAddModLst->extaddgrp2.csiNumRep); + printf("\nepdcchAddModLst->extaddgrp2.mpddchPdschHop %d ", epdcchAddModLst->extaddgrp2.mpddchPdschHop); + printf("\nepdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD %d ",epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD); + printf("\nepdcchAddModLst->extaddgrp2.mpdcchNumRep %d ", epdcchAddModLst->extaddgrp2.mpdcchNumRep); + printf("\nepdcchAddModLst->extaddgrp2.mpddchNB %d ", epdcchAddModLst->extaddgrp2.mpddchNB); + } + #endif -{ - 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; } +#endif - -/*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 -S16 cmPkRgrUlLchCfg +#ifdef RG_5GTF +S16 cmUnpkRgr5gtfUeCfg ( -RgrUlLchCfg *param, -Buffer *mBuf + RgrUe5gtfCfg *param, + Buffer *mBuf ) -#else -S16 cmPkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - CMCHKPK(cmPkLteLcId, param->lcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->BeamId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCC, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxPrb, mBuf); 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 -S16 cmUnpkRgrUlLchCfg +S16 cmPkRgr5gtfUeCfg ( -RgrUlLchCfg *param, -Buffer *mBuf + RgrUe5gtfCfg *param, + Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, 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 : cmPkRgrUlLcgCfg +* Func : cmPkRgrUeCfg * * -* Desc : Logical channel configuration info for uplink logical channels +* Desc : UE configuration * * * Ret : S16 @@ -7085,35 +5196,86 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUlLcgCfg +S16 cmPkRgrUeCfg ( -RgrUlLcgCfg *param, +RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; -#endif { -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -#ifdef LTE_L2_MEAS - S32 i; +#ifdef RG_5GTF + CMCHKPK(cmPkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); #endif - CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); +#ifdef EMTC_ENABLE + CMCHKPK(cmPkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, 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(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(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->ueDrxCfg.isDrxEnabled) + { + CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->numLch, 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(oduUnpackUInt8, param->lcgId, 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); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -7121,10 +5283,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrUlLcgCfg +* Func : cmUnpkRgrUeCfg * * -* Desc : Logical channel configuration info for uplink logical channels +* Desc : UE configuration * * * Ret : S16 @@ -7134,81 +5296,97 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUlLcgCfg +S16 cmUnpkRgrUeCfg ( -RgrUlLcgCfg *param, +RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; +{ + uint32_t tmpEnum; + + + 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, (uint32_t *)&tmpEnum, mBuf); + param->ueCatEnum = (CmLteUeCategory) tmpEnum; +/*rgr_c_001.main_9 ADD added changes for DRX*/ + + /* Anshika - Unpack only if DRX is enabled */ + CMCHKUNPK(oduPackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); + 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(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->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, (uint32_t *)¶m->accessStratumRls, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); + +#ifdef EMTC_ENABLE + CMCHKUNPK(cmUnpkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); #endif -{ -/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ -#ifdef LTE_L2_MEAS - S32 i; +#ifdef RG_5GTF + CMCHKUNPK(cmUnpkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); #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); - } - -#endif - CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); return ROK; } -#ifdef ANSI -S16 cmPkRgrUlLchQciCfg -( -RgrUlLchQciCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); - CMCHKPK(oduUnpackUInt8, param->qci, mBuf); - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - return ROK; -} -#ifdef ANSI -S16 cmUnpkRgrUlLchQciCfg -( -RgrUlLchQciCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif -{ - CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->lcId, mBuf); - return ROK; -} /*********************************************************** * -* Func : cmPkRgrLchCfg +* Func : cmPkRgrLchQosCfg * * -* Desc : Logical channel configuration info for dedicated channels +* Desc : QCI, GBR and MBR configuration for dedicated logical channels * * * Ret : S16 @@ -7218,26 +5396,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLchCfg +S16 cmPkRgrLchQosCfg ( -RgrLchCfg *param, +RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif { - 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); + + CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); return ROK; } @@ -7245,10 +5414,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrLchCfg +* Func : cmUnpkRgrLchQosCfg * * -* Desc : Logical channel configuration info for dedicated channels +* Desc : QCI, GBR and MBR configuration for dedicated logical channels * * * Ret : S16 @@ -7258,80 +5427,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLchCfg -( -RgrLchCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif -{ - - - 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 -S16 cmPkRgrLcgCfg -( -RgrLcgCfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif -{ - - - CMCHKPK(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); - CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - return ROK; -} - - -#ifdef ANSI -S16 cmUnpkRgrLcgCfg +S16 cmUnpkRgrLchQosCfg ( -RgrLcgCfg *param, +RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(cmUnpkRgrUlLcgCfg, ¶m->ulInfo, 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*/ /*********************************************************** * -* Func : cmPkRgrCfg +* Func : cmPkRgrLchSpsCfg * * -* Desc : Basic Configuration structure at RRM +* Desc : SPS related configuration for logical channels * * * Ret : S16 @@ -7341,40 +5458,16 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfg +S16 cmPkRgrLchSpsCfg ( -RgrCfg *param, +RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { - 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); + /* SPS_DEV */ + CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); return ROK; } @@ -7382,10 +5475,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrCfg +* Func : cmUnpkRgrLchSpsCfg * * -* Desc : Basic Configuration structure at RRM +* Desc : SPS related configuration for logical channels * * * Ret : S16 @@ -7395,51 +5488,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfg +S16 cmUnpkRgrLchSpsCfg ( -RgrCfg *param, +RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { - 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; - } + CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); + return ROK; } - /*********************************************************** * -* Func : cmPkRgrActvTime +* Func : cmPkRgrDlLchCfg * * -* Desc : Activation time information +* Desc : Logical channel configuration info for downlink logical channels * * * Ret : S16 @@ -7449,22 +5517,19 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrActvTime +S16 cmPkRgrDlLchCfg ( -RgrActvTime *param, +RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { +/*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); + CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); + CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); return ROK; } @@ -7472,10 +5537,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrActvTime +* Func : cmUnpkRgrDlLchCfg * * -* Desc : Activation time information +* Desc : Logical channel configuration info for downlink logical channels * * * Ret : S16 @@ -7485,91 +5550,65 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrActvTime +S16 cmUnpkRgrDlLchCfg ( -RgrActvTime *param, +RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); - CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, 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 : cmPkRgrCellRecfg +* Func : cmPkRgrUlLchCfg * * -* Desc : Cell reconfiguration structure at RRM +* Desc : Logical channel configuration information for uplink logical channels * * * Ret : S16 * -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrCellRecfg -( -RgrCellRecfg *param, -Buffer *mBuf -) -#else -S16 cmPkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif -{ - - CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); - CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); - CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); - /* 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); +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgrUlLchCfg +( +RgrUlLchCfg *param, +Buffer *mBuf +) +{ + + + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(cmPkLteLcId, param->lcId, mBuf); return ROK; } +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ /*********************************************************** * -* Func : cmUnpkRgrCellRecfg +* Func : cmUnpkRgrUlLchCfg * * -* Desc : Cell reconfiguration structure at RRM +* Desc : Logical channel configuration information for uplink logical channels * * * Ret : S16 @@ -7579,57 +5618,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCellRecfg +S16 cmUnpkRgrUlLchCfg ( -RgrCellRecfg *param, +RgrUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif { - 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); - + CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); return ROK; } +#endif /*********************************************************** * -* Func : cmPkRgrUeRecfg +* Func : cmPkRgrUlLcgCfg * * -* Desc : UE reconfiguration info +* Desc : Logical channel configuration info for uplink logical channels * * * Ret : S16 @@ -7639,106 +5649,29 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeRecfg +S16 cmPkRgrUlLcgCfg ( -RgrUeRecfg *param, +RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { -#ifdef EMTC_ENABLE - /* Note: As we add more members to emtcUeRecfg, - create a new function for pkUnpk */ - CMCHKPK(oduUnpackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf); -#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); +/*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); -#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) +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + for (i = param->numLch - 1; i >= 0; i--) { - CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + CMCHKPK(cmPkRgrUlLchCfg, ¶m->lchUlCfg[i], 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); + CMCHKPK(oduUnpackUInt8, param->numLch, 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); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); return ROK; } @@ -7746,10 +5679,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrUeRecfg +* Func : cmUnpkRgrUlLcgCfg * * -* Desc : UE reconfiguration info +* Desc : Logical channel configuration info for uplink logical channels * * * Ret : S16 @@ -7759,117 +5692,63 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeRecfg +S16 cmUnpkRgrUlLcgCfg ( -RgrUeRecfg *param, +RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { - uint32_t tmpEnum; - - - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); - CMCHKUNPK(cmUnpkLteRnti, ¶m->newCrnti, mBuf); - /* LTE_ADV_FLAG_REMOVED_START */ - /*rgr_c_001.main_9: changing ueRecfgTypes to 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); +/*rgr_c_001.main_9 ADD added changes for L2 measurements*/ +#ifdef LTE_L2_MEAS + S32 i; #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(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(cmUnpkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); + CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->lchUlCfg[i], 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 - + 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 : cmPkRgrLchRecfg +* Func : cmPkRgrLchCfg * * -* Desc : Logical channel reconfiguration info for dedicated channels only +* Desc : Logical channel configuration info for dedicated channels * * * Ret : S16 @@ -7879,26 +5758,17 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLchRecfg +S16 cmPkRgrLchCfg ( -RgrLchRecfg *param, +RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { -/*rgr_c_001.main_7 - Added support for SPS*/ CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); - CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); - - CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlRecfg.dlQos, 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); @@ -7909,10 +5779,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrLchRecfg +* Func : cmUnpkRgrLchCfg * * -* Desc : Logical channel reconfiguration info for dedicated channels only +* Desc : Logical channel configuration info for dedicated channels * * * Ret : S16 @@ -7922,95 +5792,51 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLchRecfg +S16 cmUnpkRgrLchCfg ( -RgrLchRecfg *param, +RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { 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(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, 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 -S16 cmPkRgrLcgRecfg +S16 cmPkRgrLcgCfg ( -RgrLcgRecfg *param, +RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { -#ifdef RG_UNUSED - S32 i; -#endif - CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); - CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf); -#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(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } -#ifdef ANSI -S16 cmUnpkRgrLcgRecfg +S16 cmUnpkRgrLcgCfg ( -RgrLcgRecfg *param, +RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { -#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); - + CMCHKUNPK(cmUnpkRgrUlLcgCfg, ¶m->ulInfo, mBuf); return ROK; } @@ -8018,10 +5844,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmPkRgrRecfg +* Func : cmPkRgrCfg * * -* Desc : Basic reconfiguration structure at RRM +* Desc : Basic Configuration structure at RRM * * * Ret : S16 @@ -8031,169 +5857,45 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrRecfg +S16 cmPkRgrCfg ( -RgrRecfg *param, +RgrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { - switch(param->recfgType) { + switch(param->cfgType) { case RGR_LCG_CFG: - CMCHKPK(cmPkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); + CMCHKPK(cmPkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); break; case RGR_LCH_CFG: - CMCHKPK(cmPkRgrLchRecfg, ¶m->u.lchRecfg, mBuf); + CMCHKPK(cmPkRgrLchCfg, ¶m->u.lchCfg, mBuf); break; case RGR_UE_CFG: - CMCHKPK(cmPkRgrUeRecfg, ¶m->u.ueRecfg, mBuf); - break; - case RGR_CELL_CFG: - CMCHKPK(cmPkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); + CMCHKPK(cmPkRgrUeCfg, ¶m->u.ueCfg, mBuf); break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); - return ROK; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgrRecfg -* -* -* Desc : Basic reconfiguration structure at RRM -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrRecfg -( -RgrRecfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif -{ - - - 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); + CMCHKPK(cmPkRgrCellCfg, ¶m->u.cellCfg, mBuf); break; - case RGR_LCG_CFG: - CMCHKUNPK(cmUnpkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); + case MAC_GNB_CFG: + CMCHKPK(cmPkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); break; default : return RFAILED; } + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); return ROK; } -#ifdef LTE_ADV -/*********************************************************** -* -* Func : cmPkRgrUeDlSecCellRelInfo -* -* -* Desc : DL Secondary Cell information of the UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeDlSecCellRelInfo -( -RgrUeDlSecCellRelInfo *param, -Buffer *mBuf -) -#else -static S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif -{ - CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - return ROK; -} - -/*********************************************************** -* -* Func : cmPkRgrUeSecCellRelInfo -* -* -* Desc : Secondary Cell Delete information of the UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeSecCellRelInfo -( -RgrUeSecCellRelInfo *param, -Buffer *mBuf -) -#else -S16 cmPkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif -{ - S8 idx; - for(idx = param->numSCells - 1; idx >= 0; idx--) - { - CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(uint8_t)idx],mBuf); - } - CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - - return ROK; -} -#endif /*********************************************************** * -* Func : cmPkRgrDel +* Func : cmUnpkRgrCfg * * -* Desc : Basic Delete info for MAC +* Desc : Basic Configuration structure at RRM * * * Ret : S16 @@ -8203,63 +5905,45 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrDel -( -RgrDel *param, -Buffer *mBuf -) -#else -S16 cmPkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif -{ - - - switch(param->delType) { - case RGR_LCG_CFG: - CMCHKPK(oduUnpackUInt8, param->u.lcgDel.lcgId, mBuf); - CMCHKPK(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; +S16 cmUnpkRgrCfg +( +RgrCfg *param, +Buffer *mBuf +) +{ + + + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); + switch(param->cfgType) { + case MAC_GNB_CFG: + CMCHKUNPK(cmUnpkMacSchedGnbCfg, ¶m->u.schedGnbCfg, 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 + 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; } - CMCHKPK(oduUnpackUInt8, param->delType, mBuf); return ROK; } -#ifdef LTE_ADV /*********************************************************** * -* Func : cmUnpkRgrUeDlSecCellRelInfo +* Func : cmPkRgrActvTime * * -* Desc : DL Secondary Cell information of the UE +* Desc : Activation time information * * * Ret : S16 @@ -8269,30 +5953,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeDlSecCellRelInfo +S16 cmPkRgrActvTime ( -RgrUeDlSecCellRelInfo *param, +RgrActvTime *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); + + + CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); return ROK; } + /*********************************************************** * -* Func : cmUnpkRgrUeSecCellRelInfo +* Func : cmUnpkRgrActvTime * * -* Desc : Secondary Cell information of the UE +* Desc : Activation time information * * * Ret : S16 @@ -8302,36 +5983,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeSecCellRelInfo +S16 cmUnpkRgrActvTime ( -RgrUeSecCellRelInfo *param, +RgrActvTime *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { - uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); - for(idx = 0; idx < param->numSCells;idx++) - { - CMCHKUNPK(cmUnpkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[idx],mBuf); - } + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); return ROK; } -#endif + + /*********************************************************** * -* Func : cmUnpkRgrDel +* Func : cmPkRgrCellRecfg * * -* Desc : Basic Delete info for MAC +* Desc : Cell reconfiguration structure at RRM * * * Ret : S16 @@ -8341,233 +6013,331 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrDel +S16 cmPkRgrCellRecfg ( -RgrDel *param, +RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { - - 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 - default : - return RFAILED; - } + 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 : cmPkRgrSonPrbCfg +* Func : cmUnpkRgrCellRecfg * * -* Desc : SON PRB Configuration info for MAC +* Desc : Cell reconfiguration structure at RRM * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSonPrbCfg +S16 cmUnpkRgrCellRecfg ( -RgrPrbCfg *param, +RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { - S32 count; - for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) - { - CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); - } - 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); + + + 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 : cmUnpkRgrSon +* Func : cmPkRgrUeRecfg * * -* Desc : SON configuration info for MAC +* Desc : UE reconfiguration info * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSonPrbCfg +S16 cmPkRgrUeRecfg ( -RgrPrbCfg *param, -Buffer *mBuf +RgrUeRecfg *param, +Buffer *mBuf ) -#else -S16 cmUnpkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { - S32 count; - CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); - 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 ++) + +#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 + +#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) { - CMCHKUNPK(oduPackUInt32,(uint32_t *) ¶m->paLevelPerPrb[count], mBuf); + 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; } + + + /*********************************************************** * -* Func : cmPkRgrSonCfg +* Func : cmUnpkRgrUeRecfg * * -* Desc : SON Configuration info for MAC +* Desc : UE reconfiguration info * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSonCfg +S16 cmUnpkRgrUeRecfg ( -RgrSonCfg *param, +RgrUeRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif { + uint32_t tmpEnum; - switch(param->cfgType) - { - case RGR_SON_PRB_CFG : - CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf); - return ROK; -} -/*********************************************************** -* -* Func : cmUnpkRgrSon -* -* -* Desc : SON configuration info for MAC -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSonCfg -( -RgrSonCfg *param, -Buffer *mBuf -) -#else -S16 cmUnpkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; + 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 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(oduPackUInt32, (uint32_t *)¶m->cfgType, mBuf); - switch(param->cfgType) + 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) { - case RGR_SON_PRB_CFG : - { - CMCHKUNPK(cmUnpkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); - break; - default : - return RFAILED; - } + 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; } + /*********************************************************** * -* Func : cmPkRgrRst +* Func : cmPkRgrLchRecfg * * -* Desc : UE RESET info for MAC +* Desc : Logical channel reconfiguration info for dedicated channels only * * * Ret : S16 @@ -8577,20 +6347,21 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrRst +S16 cmPkRgrLchRecfg ( -RgrRst *param, +RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { - +/*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; @@ -8600,10 +6371,10 @@ Buffer *mBuf; /*********************************************************** * -* Func : cmUnpkRgrRst +* Func : cmUnpkRgrLchRecfg * * -* Desc : UE RESET info for MAC +* Desc : Logical channel reconfiguration info for dedicated channels only * * * Ret : S16 @@ -8613,105 +6384,88 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrRst +S16 cmUnpkRgrLchRecfg ( -RgrRst *param, +RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { 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(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); return ROK; } -#ifdef LTE_ADV -/*********************************************************** -* -* Func : cmUnPkRgrSCellActDeactInfo -* -* -* Desc : SCell Activation information of the UE -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -static S16 cmUnPkRgrSCellActDeactInfo + + +S16 cmPkRgrLcgRecfg ( -RgrSCellActDeactInfo *param, +RgrLcgRecfg *param, Buffer *mBuf ) -#else -static S16 cmUnPkRgrSCellActInfo(param, mBuf) -RgrSCellActDeactInfo *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--) + { + CMCHKPK(cmPkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); + } + CMCHKPK(oduUnpackUInt8, param->ulRecfg.numLch, mBuf); #endif -{ - - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); + CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } -/*********************************************************** -* -* Func : cmUnPkRgrSCellActDeactEvnt -* -* -* Desc : SCell Activation Configuration structure to SCH -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -S16 cmUnPkRgrSCellActDeactEvnt + +S16 cmUnpkRgrLcgRecfg ( -RgrSCellActDeactEvnt *param, +RgrLcgRecfg *param, Buffer *mBuf ) -#else -S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { +#ifdef RG_UNUSED + S32 i; +#endif - uint8_t idx; - + CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->numOfSCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); - for(idx = 0; idx < param->numOfSCells;idx++) +#ifdef RG_UNUSED + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.numLch, mBuf); + for (i = 0; i < param->ulRecfg.numLch; i++) { - CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[idx],mBuf); + 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 @@ -8721,30 +6475,42 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -static S16 cmPkRgrSCellActDeactInfo +S16 cmPkRgrRecfg ( -RgrSCellActDeactInfo *param, +RgrRecfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrSCellActDeactInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif { - 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 @@ -8754,41 +6520,41 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSCellActDeactEvnt +S16 cmUnpkRgrRecfg ( -RgrSCellActDeactEvnt *param, +RgrRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { - S8 idx; - for(idx = param->numOfSCells - 1; idx >= 0; idx--) - { - CMCHKPK(cmPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[(uint8_t)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 @@ -8798,58 +6564,23 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrCfgReqInfo +S16 cmPkRgrUeDlSecCellRelInfo ( -RgrCfgReqInfo *param, +RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif { - - - switch(param->action) { - case RGR_SON_CFG: - CMCHKPK(cmPkRgrSonCfg, ¶m->u.sonCfg, mBuf); - break; - case RGR_RESET: - CMCHKPK(cmPkRgrRst, ¶m->u.rstInfo, mBuf); - break; - case RGR_DELETE: - CMCHKPK(cmPkRgrDel, ¶m->u.delInfo, mBuf); - break; - case RGR_RECONFIG: - CMCHKPK(cmPkRgrRecfg, ¶m->u.recfgInfo, mBuf); - break; - case SCH_CONFIG: - CMCHKPK(cmPkRgrCfg, ¶m->u.cfgInfo, mBuf); - break; -#ifdef LTE_ADV - case RGR_SCELL_ACT: - case RGR_SCELL_DEACT: - case RGR_SCELL_READY: - CMCHKPK(cmPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); - break; -#endif - default : - return RFAILED; - } - CMCHKPK(oduUnpackUInt8, param->action, mBuf); + 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 @@ -8859,58 +6590,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrCfgReqInfo +S16 cmPkRgrUeSecCellRelInfo ( -RgrCfgReqInfo *param, +RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -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); - - 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 @@ -8920,32 +6623,57 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrUeBsrTmrCfg +S16 cmPkRgrDel ( -RgrUeBsrTmrCfg *param, +RgrDel *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); - CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf); + 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 @@ -8955,35 +6683,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrUeBsrTmrCfg +S16 cmUnpkRgrUeDlSecCellRelInfo ( -RgrUeBsrTmrCfg *param, +RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { - - - CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prdBsrTmr, mBuf); + 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 @@ -8993,91 +6710,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrSiCfgReq +S16 cmUnpkRgrUeSecCellRelInfo ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrSiCfgReqInfo * cfgReqInfo -) -#else -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; + 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 @@ -9087,389 +6743,203 @@ RgrSiCfgReqInfo * cfgReqInfo; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgReq +S16 cmUnpkRgrDel ( -RgrSiCfgReq func, -Pst *pst, +RgrDel *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgReq(func, pst, mBuf) -RgrSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrSiCfgReqInfo *cfgReqInfo; - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, - sizeof(RgrSiCfgReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - memset(cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(RgrSiCfgReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); + + 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 -S16 cmPkRgrSiCfgReqInfo +S16 cmPkRgrSonPrbCfg ( -RgrSiCfgReqInfo *param, +RgrPrbCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - /* ccpu00111328: S16 is renamed as MsgLen */ - MsgLen msgLen; - - - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkS32, param->cfgType, mBuf); - CMCHKPK(oduUnpackUInt8, param->siId, mBuf); - - if(NULLP != param->pdu) + 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(cmPkLteRnti, param->cellCentreUe[count], mBuf); + } + for(count = param->numCellEdgeUEs - 1; count >= 0; count --) { - CMCHKPK(cmPkMsgLen, 0, mBuf); + CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf); } - + CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf); return ROK; } - + /*********************************************************** * -* Func : cmUnpkRgrSiCfgReqInfo +* Func : cmUnpkRgrSon * * -* Desc : Basic SI configuration/reconfiguration info at RRM +* Desc : SON configuration info for MAC * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrSiCfgReqInfo +S16 cmUnpkRgrSonPrbCfg ( -RgrSiCfgReqInfo *param, -Buffer *mBuf +RgrPrbCfg *param, +Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen, totalMsgLen; - /*Merge from Mohit Changes*/ - S32 cfgType; - - - SFndLenMsg(mBuf, &msgLen); - if(msgLen > 0) + S32 count; + CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); + for (count = 0; count < param->numCellEdgeUEs; 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; - } + 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,(uint32_t *) ¶m->paLevelPerPrb[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); - return ROK; } - - - /*********************************************************** * -* Func : cmPkRgrWarningSiCfgReq +* Func : cmPkRgrSonCfg * * -* Desc : SI Configuration Request from RRM to MAC for -* configuring warning SI +* Desc : SON Configuration info for MAC * * * Ret : S16 * * Notes: * -* File : +* File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgReq +S16 cmPkRgrSonCfg ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo -) -#else -S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; -#endif -{ - Buffer *mBuf = NULLP; - - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR061, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - return RFAILED; - } - - if (cmPkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR062, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR063, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - - if (SPkS16(spId, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR064, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } +RgrSonCfg *param, +Buffer *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) + switch(param->cfgType) { -#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); + case RGR_SON_PRB_CFG : + CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); + break; + default : return RFAILED; } + CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf); + return ROK; +} - pst->event = (Event) EVTRGRWARNINGSICFGREQ; - return (SPstTsk(pst,mBuf)); -}/*cmPkRgrWarningSiCfgReq*/ - - /*********************************************************** * -* Func : cmUnpkRgrWarningSiCfgReq +* 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 -S16 cmUnpkRgrWarningSiCfgReq +S16 cmUnpkRgrSonCfg ( -RgrWarningSiCfgReq func, -Pst *pst, -Buffer *mBuf +RgrSonCfg *param, +Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf) -RgrWarningSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; - - if (SUnpkS16(&spId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR066, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR067, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if ((SGetSBuf(pst->region, pst->pool, (Data **)&warningSiCfgReqInfo, - sizeof(RgrWarningSiCfgReqInfo))) != ROK) - { -#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); - return RFAILED; - } - - - 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 @@ -9479,63 +6949,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgReqInfo +S16 cmPkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen; - uint32_t count; - CmLList *node, *prevNode; - RgrSegmentInfo *pdu; - - CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); + CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->siId, mBuf); - - count = param->siPduLst.count; - node = param->siPduLst.last; - while (node) - { - pdu = (RgrSegmentInfo *)node->node; - prevNode= node->prev; - if(NULLP != pdu) - { - if (SFndLenMsg(pdu->pdu, &msgLen) != ROK) - return RFAILED; - if (SCatMsg(mBuf, pdu->pdu, M1M2) != ROK) - return RFAILED; - /* The PDU is not Released. This has to be done by - * the caller of the packing function */ - CMCHKPK(cmPkMsgLen, msgLen, mBuf); - SPutMsg(pdu->pdu); - } - cmLListDelFrm(¶m->siPduLst, node); - SPutSBuf(pst->region, pst->pool, (Data *)node, sizeof(RgrSegmentInfo)); - node= prevNode; - } - CMCHKPK(oduUnpackUInt32, count, mBuf); return ROK; } + /*********************************************************** * -* Func : cmUnpkRgrWarningSiCfgReqInfo +* Func : cmUnpkRgrRst * * -* Desc : Unpack warning SI configuration info at SCH +* Desc : UE RESET info for MAC * * * Ret : S16 @@ -9545,205 +6979,87 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiCfgReqInfo +S16 cmUnpkRgrRst ( -Pst *pst, -RgrWarningSiCfgReqInfo *param, +RgrRst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { - MsgLen msgLen, totalMsgLen; - uint32_t count, loopCnt; - Buffer *pdu; - CmLList *node; - - - cmLListInit(¶m->siPduLst); - CMCHKUNPK(oduPackUInt32, &count, mBuf); - for (loopCnt=0; loopCnt 0) - { - CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); - if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - { - return RFAILED; - } - if (SSegMsg(mBuf, totalMsgLen-msgLen, &pdu) != ROK) - { - return RFAILED; - } - } - else - { - return RFAILED; - } - if ((SGetSBuf(pst->region, pst->pool, (Data **)&node, - sizeof(CmLList))) != ROK) - return RFAILED; - node->node = (PTR)pdu; - cmLListAdd2Tail(¶m->siPduLst, node); - } - CMCHKUNPK(oduPackUInt8, ¶m->siId, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKPK(oduPackUInt8, ¶m->emtcEnable, mBuf); - + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); return ROK; } - - +#ifdef LTE_ADV /*********************************************************** * -* Func : cmPkRgrWarningSiStopReq +* Func : cmUnPkRgrSCellActDeactInfo +* +* +* Desc : SCell Activation information of the UE * -* Desc : To stop the broadcast for SIB10, SIB11 and SIB12. * * Ret : S16 * * Notes: * * File : +* **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiStopReq +static S16 cmUnPkRgrSCellActDeactInfo ( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -uint8_t siId -) -#else -S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -uint8_t siId; -#endif +RgrSCellActDeactInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + return ROK; +} - 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 */ - - /*********************************************************** * -* Func : cmUnpkRgrWarningSiStopReq +* Func : cmUnPkRgrSCellActDeactEvnt +* +* +* Desc : SCell Activation Configuration structure to SCH * -* Desc : To stop the broadcast for SIB10, SIB11 and SIB12. * * Ret : S16 * * Notes: * * File : +* **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiStopReq +S16 cmUnPkRgrSCellActDeactEvnt ( -RgrWarningSiStopReq func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiStopReq(param, mBuf) -RgrWarningSiStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - uint8_t siId; - RgrCfgTransId transId; + uint8_t idx; - if (SUnpkS16(&spId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR072, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } + CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); + CMCHKUNPK(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 @@ -9753,92 +7069,24 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrWarningSiCfgCfm +static S16 cmPkRgrSCellActDeactInfo ( -Pst* pst, -SuId suId, -RgrCfgTransId transId, -uint8_t siId, -uint8_t status -) -#else -S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -uint8_t siId; -uint8_t status; -#endif +RgrSCellActDeactInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)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 @@ -9848,176 +7096,90 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrWarningSiCfgCfm +S16 cmPkRgrSCellActDeactEvnt ( -RgrWarningSiCfgCfm func, -Pst *pst, +RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf) -RgrWarningSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId; - uint8_t siId; - RgrCfgTransId transId; - uint8_t status; - if (SUnpkS16(&suId, mBuf) != ROK) + S8 idx; + for(idx = param->numOfSCells - 1; idx >= 0; idx--) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR078, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; + CMCHKPK(cmPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[(uint8_t)idx], mBuf); } - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) - { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR079, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } + CMCHKPK(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 -S16 cmPkRgrLoadInfReq +S16 cmPkRgrCfgReqInfo ( -Pst* pst, -SpId spId, -RgrCfgTransId transId, -RgrLoadInfReqInfo * loadInfReq -) -#else -S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrLoadInfReqInfo * loadInfReq; -#endif +RgrCfgReqInfo *param, +Buffer *mBuf +) { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR045, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - return RFAILED; - } - if (cmPkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR046, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR047, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPkS16(spId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR048, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); - return RFAILED; - } - if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR049, (ErrVal)0, "Packing failed"); + switch(param->action) { + case RGR_SON_CFG: + CMCHKPK(cmPkRgrSonCfg, ¶m->u.sonCfg, mBuf); + break; + case RGR_RESET: + CMCHKPK(cmPkRgrRst, ¶m->u.rstInfo, mBuf); + break; + case RGR_DELETE: + CMCHKPK(cmPkRgrDel, ¶m->u.delInfo, mBuf); + break; + case RGR_RECONFIG: + CMCHKPK(cmPkRgrRecfg, ¶m->u.recfgInfo, mBuf); + break; + case SCH_CONFIG: + CMCHKPK(cmPkRgrCfg, ¶m->u.cfgInfo, mBuf); + break; +#ifdef LTE_ADV + case RGR_SCELL_ACT: + case RGR_SCELL_DEACT: + case RGR_SCELL_READY: + CMCHKPK(cmPkRgrSCellActDeactEvnt, ¶m->u.sCellActDeactEvnt, mBuf); + break; #endif - SPutMsg(mBuf); - return RFAILED; - } - - pst->event = (Event) EVTRGRLOADINFREQ; - return (SPstTsk(pst,mBuf)); + default : + return RFAILED; + } + CMCHKPK(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 @@ -10027,81 +7189,52 @@ RgrLoadInfReqInfo * loadInfReq; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLoadInfReq +S16 cmUnpkRgrCfgReqInfo ( -RgrLoadInfReq func, -Pst *pst, +RgrCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReq(func, pst, mBuf) -RgrLoadInfReq func; -Pst *pst; -Buffer *mBuf; -#endif { - SpId spId; - RgrCfgTransId transId; - RgrLoadInfReqInfo *loadInfReq; - - - if (SUnpkS16(&spId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; - } - - if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfReq, - sizeof(RgrLoadInfReqInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - return RFAILED; - } - memset(loadInfReq, 0, sizeof(RgrLoadInfReqInfo)); - if (pst->selector == ODU_SELECTOR_LC) - if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, - sizeof(RgrLoadInfReqInfo)); - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); -#endif - return RFAILED; + CMCHKUNPK(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 @@ -10111,32 +7244,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkRgrLoadInfReqInfo +S16 cmPkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf); - CMCHKPK(oduUnpackUInt8, param->rgrCcPHighEndRb, mBuf); + CMCHKPK(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 @@ -10146,26 +7273,20 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkRgrLoadInfReqInfo +S16 cmUnpkRgrUeBsrTmrCfg ( -RgrLoadInfReqInfo *param, +RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighStartRb, mBuf); - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); + CMCHKUNPK(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 */ @@ -10186,17 +7307,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); @@ -10221,17 +7336,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); @@ -10256,19 +7365,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaInd ( Pst* pst, SuId suId, RgrStaIndInfo* staInd ) -#else -S16 cmPkRgrStaInd(pst, suId, staInd) -Pst* pst; -SuId suId; -RgrStaIndInfo* staInd; -#endif { Buffer *mBuf = NULLP; @@ -10279,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; } @@ -10291,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; } @@ -10303,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) @@ -10340,19 +7442,12 @@ RgrStaIndInfo* staInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaInd ( RgrStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaInd(func, pst, mBuf) -RgrStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrStaIndInfo *staInd; @@ -10369,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) @@ -10383,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) @@ -10413,17 +7508,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10448,17 +7537,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10483,17 +7566,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -10522,17 +7599,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10560,17 +7631,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { @@ -10596,17 +7661,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { S8 idx; uint8_t count; @@ -10638,17 +7697,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { @@ -10674,17 +7727,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10717,19 +7764,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfInd ( Pst* pst, SuId suId, RgrLoadInfIndInfo* loadInfInd ) -#else -S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd) -Pst* pst; -SuId suId; -RgrLoadInfIndInfo* loadInfInd; -#endif { Buffer *mBuf = NULLP; @@ -10740,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; } @@ -10752,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); @@ -10766,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) @@ -10802,19 +7842,12 @@ RgrLoadInfIndInfo* loadInfInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfInd ( RgrLoadInfInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfInd(func, pst, mBuf) -RgrLoadInfInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ @@ -10831,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) @@ -10846,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) @@ -10876,17 +7909,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfIndInfo(param, mBuf) -RgrLoadInfIndInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10923,19 +7950,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfIndInfo(param, pst, mBuf) -RgrLoadInfIndInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { S8 idx; @@ -10965,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, @@ -11010,17 +8030,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { if(param->pAPrsnt) @@ -11049,17 +8063,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -11089,17 +8097,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11124,17 +8126,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11161,17 +8157,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); @@ -11196,17 +8186,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { @@ -11235,17 +8219,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,¶m->ueSCellUlDedPwrCfg, mBuf); CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf); @@ -11279,17 +8257,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) @@ -11320,17 +8292,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); @@ -11364,17 +8330,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -11404,17 +8364,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { S8 idx; @@ -11470,17 +8424,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -11544,19 +8492,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaInd ( Pst* pst, SuId suId, RgrUeStaIndInfo* ueStaInd ) -#else -S16 cmPkRgrUeStaInd(pst, suId, ueStaInd) -Pst* pst; -SuId suId; -RgrUeStaIndInfo* ueStaInd; -#endif { Buffer *mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) @@ -11566,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; } @@ -11578,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; @@ -11591,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) @@ -11628,19 +8569,12 @@ RgrUeStaIndInfo* ueStaInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaInd ( RgrUeStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaInd(func, pst, mBuf) -RgrUeStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrUeStaIndInfo *ueStaInd; @@ -11657,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) @@ -11671,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) @@ -11700,17 +8634,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -11734,17 +8662,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -11771,17 +8693,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { @@ -11805,17 +8721,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { @@ -11839,17 +8749,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { switch(param->cmdType) @@ -11882,17 +8786,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum;