X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flrg.c;h=84a4d301c424ab7a0ec3cc418728175416cef651;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=154b0e9d1f386f4caad325520544928405ca9555;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 154b0e9d1..84a4d301c 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -56,20 +56,13 @@ Configuration Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgCfgReq +S16 cmPkLrgCfgReq ( Pst * pst, RgMngmt * cfg ) -#else -PUBLIC S16 cmPkLrgCfgReq(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -77,7 +70,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTLRGCFGREQ, mBuf) != ROK) { @@ -87,11 +80,11 @@ RgMngmt * cfg; (ErrVal)ELRG002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -108,24 +101,16 @@ Configuration Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgCfgReq +S16 cmUnpkLrgCfgReq ( LrgCfgReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgCfgReq(func, pst, mBuf) -LrgCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; - TRC3(cmUnpkLrgCfgReq) if (cmUnpkRgMngmt(pst, &cfg, EVTLRGCFGREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -134,10 +119,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG003, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -154,20 +139,13 @@ Configuration Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchCfgReq +S16 cmPkLrgSchCfgReq ( Pst * pst, RgMngmt * cfg ) -#else -PUBLIC S16 cmPkLrgSchCfgReq(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -175,7 +153,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) { @@ -185,11 +163,11 @@ RgMngmt * cfg; (ErrVal)ELRG005, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -206,24 +184,16 @@ Configuration Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchCfgReq +S16 cmUnpkLrgSchCfgReq ( LrgSchCfgReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchCfgReq(func, pst, mBuf) -LrgSchCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; - TRC3(cmUnpkLrgSchCfgReq) if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -232,10 +202,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -252,20 +222,13 @@ Configuration Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgCfgCfm +uint8_t cmPkLrgCfgCfm ( Pst * pst, RgMngmt * cfm ) -#else -PUBLIC S16 cmPkLrgCfgCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -273,7 +236,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG007, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfm, EVTLRGCFGCFM, mBuf) != ROK) { @@ -283,12 +246,12 @@ RgMngmt * cfm; (ErrVal)ELRG008, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -305,23 +268,15 @@ Configuration Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgCfgCfm +S16 cmUnpkLrgCfgCfm ( LrgCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgCfgCfm(func, pst, mBuf) -LrgCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; - TRC3(cmUnpkLrgCfgCfm) if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCFGCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -330,10 +285,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -350,20 +305,13 @@ Configuration Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchCfgCfm +uint8_t cmPkLrgSchCfgCfm ( Pst * pst, RgMngmt * cfg ) -#else -PUBLIC S16 cmPkLrgSchCfgCfm(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -371,7 +319,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) { @@ -381,12 +329,12 @@ RgMngmt * cfg; (ErrVal)ELRG011, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTMACSCHGENCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -403,24 +351,15 @@ Configuration Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchCfgCfm +S16 cmUnpkLrgSchCfgCfm ( LrgSchCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchCfgCfm(func, pst, mBuf) -LrgSchCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfg; - TRC3(cmUnpkLrgSchCfgCfm) - if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -428,10 +367,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG012, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -448,20 +387,13 @@ Statistics Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgStsReq +S16 cmPkLrgStsReq ( Pst * pst, RgMngmt * sts ) -#else -PUBLIC S16 cmPkLrgStsReq(pst, sts) -Pst * pst; -RgMngmt * sts; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStsReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -469,7 +401,7 @@ RgMngmt * sts; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG013, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, sts, EVTLRGSTSREQ, mBuf) != ROK) { @@ -479,12 +411,12 @@ RgMngmt * sts; (ErrVal)ELRG014, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSTSREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -501,23 +433,15 @@ Statistics Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgStsReq +S16 cmUnpkLrgStsReq ( LrgStsReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgStsReq(func, pst, mBuf) -LrgStsReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt sts; - TRC3(cmUnpkLrgStsReq) if (cmUnpkRgMngmt(pst, &sts, EVTLRGSTSREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -526,10 +450,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sts)); + return ((*func)(pst, &sts)); } @@ -546,20 +470,13 @@ Statistics Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgStsCfm +S16 cmPkLrgStsCfm ( Pst * pst, RgMngmt * cfm ) -#else -PUBLIC S16 cmPkLrgStsCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStsCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -567,7 +484,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG016, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfm, EVTLRGSTSCFM, mBuf) != ROK) { @@ -577,45 +494,37 @@ RgMngmt * cfm; (ErrVal)ELRG017, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSTSCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** -* @brief This API is used to send a -Statistics Confirm from MAC to LM. -* -* @details -* -* Function: cmUnpkLrgStsCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cfm -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgStsCfm + * * @brief This API is used to send a + * Statistics Confirm from MAC to LM. + * * + * * @details + * * + * * Function: cmUnpkLrgStsCfm + * * + * * @param[in] Pst * pst + * * @param[in] RgMngmt * cfm + * * @return S16 + * * -# ROK + * **/ +S16 cmUnpkLrgStsCfm ( LrgStsCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgStsCfm(func, pst, mBuf) -LrgStsCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; - - TRC3(cmUnpkLrgStsCfm) + if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSTSCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -624,204 +533,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG018, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); -} - - -/** -* @brief This API is used to send a -Status Request from LM to MAC. -* -* @details -* -* Function: cmPkLrgStaReq -* -* @param[in] Pst * pst -* @param[in] RgMngmt * sta -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgStaReq -( -Pst * pst, -RgMngmt * sta -) -#else -PUBLIC S16 cmPkLrgStaReq(pst, sta) -Pst * pst; -RgMngmt * sta; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaReq) - - 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)ELRG019, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (cmPkRgMngmt(pst, sta, EVTLRGSSTAREQ, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG020, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTLRGSSTAREQ; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Status Request from LM to MAC. -* -* @details -* -* Function: cmUnpkLrgStaReq -* -* @param[in] Pst * pst -* @param[in] RgMngmt * sta -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgStaReq -( -LrgStaReq func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgStaReq(func, pst, mBuf) -LrgStaReq func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt sta; - - TRC3(cmUnpkLrgStaReq) - - cmMemset((U8 *)&sta, 0, sizeof(RgMngmt)); - if (cmUnpkRgMngmt(pst, &sta, EVTLRGSSTAREQ, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG021, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &sta)); -} - - -/** -* @brief This API is used to send a -Status Confirm from MAC to LM. -* -* @details -* -* Function: cmPkLrgStaCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cfm -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgStaCfm -( -Pst * pst, -RgMngmt * cfm -) -#else -PUBLIC S16 cmPkLrgStaCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaCfm) - - 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)ELRG022, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (cmPkRgMngmt(pst, cfm, EVTLRGSSTACFM, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG023, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTLRGSSTACFM; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Status Confirm from MAC to LM. -* -* @details -* -* Function: cmUnpkLrgStaCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cfm -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgStaCfm -( -LrgStaCfm func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgStaCfm(func, pst, mBuf) -LrgStaCfm func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt cfm; - - TRC3(cmUnpkLrgStaCfm) - - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); - if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSSTACFM, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG024, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -838,20 +553,13 @@ Status Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgStaInd +S16 cmPkLrgStaInd ( Pst * pst, RgMngmt * usta ) -#else -PUBLIC S16 cmPkLrgStaInd(pst, usta) -Pst * pst; -RgMngmt * usta; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -859,7 +567,7 @@ RgMngmt * usta; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, usta, EVTLRGUSTAIND, mBuf) != ROK) { @@ -869,12 +577,12 @@ RgMngmt * usta; (ErrVal)ELRG026, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGUSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -891,23 +599,15 @@ Status Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgStaInd +S16 cmUnpkLrgStaInd ( LrgStaInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgStaInd(func, pst, mBuf) -LrgStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt usta; - TRC3(cmUnpkLrgStaInd) if (cmUnpkRgMngmt(pst, &usta, EVTLRGUSTAIND, mBuf) != ROK) { SPutMsg(mBuf); @@ -916,10 +616,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG027, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &usta)); + return ((*func)(pst, &usta)); } @@ -936,20 +636,13 @@ Status Indication from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchStaInd +S16 cmPkLrgSchStaInd ( Pst * pst, RgMngmt * sta ) -#else -PUBLIC S16 cmPkLrgSchStaInd(pst, sta) -Pst * pst; -RgMngmt * sta; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -957,7 +650,7 @@ RgMngmt * sta; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG028, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, sta, EVTLRGSCHSTAIND, mBuf) != ROK) { @@ -967,12 +660,12 @@ RgMngmt * sta; (ErrVal)ELRG029, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSCHSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -989,23 +682,15 @@ Status Indication from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchStaInd +S16 cmUnpkLrgSchStaInd ( LrgSchStaInd func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchStaInd(func, pst, mBuf) -LrgSchStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt sta; - TRC3(cmUnpkLrgSchStaInd) if (cmUnpkRgMngmt(pst, &sta, EVTLRGSCHSTAIND, mBuf) != ROK) { SPutMsg(mBuf); @@ -1014,1184 +699,130 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sta)); + return ((*func)(pst, &sta)); } -/** -* @brief This API is used to send a -Control Request from LM to MAC. +/*********************************************************** * -* @details +* Func : cmPkRgGenCfg * -* Function: cmPkLrgCntrlReq * -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgCntrlReq +* Desc : This structure holds configuration parameters for MAC General Configuration. +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgGenCfg ( -Pst * pst, -RgMngmt * cntrl +RgGenCfg *param, +Buffer *mBuf ) -#else -PUBLIC S16 cmPkLrgCntrlReq(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif { - Buffer *mBuf = NULLP; - TRC3(cmPkLrgCntrlReq) - 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)ELRG031, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - if (cmPkRgMngmt(pst, cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG032, (ErrVal)0, "Packing failed"); + +#ifdef LTE_ADV + CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf); + CMCHKPK(oduUnpackUInt8, param->forceCntrlSrbBoOnPCel, mBuf); #endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - } - - pst->event = (Event) EVTLRGCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); + CMCHKPK(oduUnpackUInt8, param->startCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRguSaps, mBuf); + CMCHKPK(oduUnpackUInt8, param->tmrRes, mBuf); + CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); + CMCHKPK(cmPkPst, ¶m->lmPst, mBuf); + return ROK; } + -/** -* @brief This API is used to send a -Control Request from LM to MAC. +/*********************************************************** * -* @details +* Func : cmUnpkRgGenCfg * -* Function: cmUnpkLrgCntrlReq * -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgCntrlReq +* Desc : This structure holds configuration parameters for MAC General Configuration. +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmUnpkRgGenCfg ( -LrgCntrlReq func, -Pst *pst, +RgGenCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgCntrlReq(func, pst, mBuf) -LrgCntrlReq func; -Pst *pst; -Buffer *mBuf; -#endif { - RgMngmt cntrl; - - TRC3(cmUnpkLrgCntrlReq) - if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG033, (ErrVal)0, "Packing failed"); + + CMCHKUNPK(cmUnpkPst, ¶m->lmPst, mBuf); + CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tmrRes, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRguSaps, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->startCellId, mBuf); +#ifdef LTE_ADV + CMCHKUNPK(oduPackUInt8, ¶m->forceCntrlSrbBoOnPCel, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSCellActDeactAlgoEnable, mBuf); #endif - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); + return ROK; } + -/** -* @brief This API is used to send a -Control Request from LM to SCH. +/*********************************************************** * -* @details +* Func : cmPkRgUpSapCfg * -* Function: cmPkLrgSchCntrlReq * -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchCntrlReq +* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmPkRgUpSapCfg ( -Pst * pst, -RgMngmt * cntrl -) -#else -PUBLIC S16 cmPkLrgSchCntrlReq(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCntrlReq) - - 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)ELRG034, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG035, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - } - - pst->event = (Event) EVTLRGSCHCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Control Request from LM to SCH. -* -* @details -* -* Function: cmUnpkLrgSchCntrlReq -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchCntrlReq -( -LrgSchCntrlReq func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgSchCntrlReq(func, pst, mBuf) -LrgSchCntrlReq func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt cntrl; - - TRC3(cmUnpkLrgSchCntrlReq) - - if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG036, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); -} - - -/** -* @brief This API is used to send a -Control Confirm from MAC to LM. -* -* @details -* -* Function: cmPkLrgCntrlCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cfm -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgCntrlCfm -( -Pst * pst, -RgMngmt * cfm -) -#else -PUBLIC S16 cmPkLrgCntrlCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgCntrlCfm) - - 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)ELRG037, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - if (cmPkRgMngmt(pst, cfm, EVTLRGCNTRLCFM, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG038, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - } - - pst->event = (Event) EVTLRGCNTRLCFM; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Control Confirm from MAC to LM. -* -* @details -* -* Function: cmUnpkLrgCntrlCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cfm -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgCntrlCfm -( -LrgCntrlCfm func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgCntrlCfm(func, pst, mBuf) -LrgCntrlCfm func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt cfm; - - TRC3(cmUnpkLrgCntrlCfm) - - if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCNTRLCFM, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG039, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); -} - - -/** -* @brief This API is used to send a -Control Confirm from SCH to LM. -* -* @details -* -* Function: cmPkLrgSchCntrlCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchCntrlCfm -( -Pst * pst, -RgMngmt * cntrl -) -#else -PUBLIC S16 cmPkLrgSchCntrlCfm(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCntrlCfm) - - 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)ELRG040, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG041, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - } - - pst->event = (Event) EVTLRGSCHCNTRLCFM; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Control Confirm from SCH to LM. -* -* @details -* -* Function: cmUnpkLrgSchCntrlCfm -* -* @param[in] Pst * pst -* @param[in] RgMngmt * cntrl -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchCntrlCfm -( -LrgSchCntrlCfm func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgSchCntrlCfm(func, pst, mBuf) -LrgSchCntrlCfm func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt cntrl; - - TRC3(cmUnpkLrgSchCntrlCfm) - - if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG042, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); -} - - -/** -* @brief This API is used to send a -Trace Indication from MAC to LM. -* -* @details -* -* Function: cmPkLrgTrcInd -* -* @param[in] Pst * pst -* @param[in] RgMngmt * trc -* @param[in] Buffer * trcBuf -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmPkLrgTrcInd -( -Pst * pst, -RgMngmt * trc, -Buffer * trcBuf -) -#else -PUBLIC S16 cmPkLrgTrcInd(pst, trc, trcBuf) -Pst * pst; -RgMngmt * trc; -Buffer * trcBuf; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkLrgTrcInd) - - 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)ELRG043, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(trcBuf); - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - MsgLen msgLen; - if (SFndLenMsg(trcBuf, &msgLen) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG044, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(trcBuf); - RETVALUE(RFAILED); - } - if (SCatMsg(mBuf, trcBuf, M1M2) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG045, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(trcBuf); - RETVALUE(RFAILED); - } - SPutMsg(trcBuf); - CMCHKPK(cmPkMsgLen, msgLen, mBuf); - } - if (cmPkRgMngmt(pst, trc, EVTLRGTRCIND, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG046, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(trcBuf); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - pst->event = (Event) EVTLRGTRCIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/** -* @brief This API is used to send a -Trace Indication from MAC to LM. -* -* @details -* -* Function: cmUnpkLrgTrcInd -* -* @param[in] Pst * pst -* @param[in] RgMngmt * trc -* @param[in] Buffer * trcBuf -* @return S16 -* -# ROK -**/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgTrcInd -( -LrgTrcInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkLrgTrcInd(func, pst, mBuf) -LrgTrcInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - RgMngmt trc; - /* lrg_c_001.main_3 - MODIFY - Modified trcBuf to have it initialized to NULLP */ - Buffer *trcBuf = NULLP; - - TRC3(cmUnpkLrgTrcInd) - - if (cmUnpkRgMngmt(pst, &trc, EVTLRGTRCIND, mBuf) != ROK) { - SPutMsg(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG047, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector == ODU_SELECTOR_LC) { - MsgLen msgLen, totalMsgLen; - CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); - if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); - if (SSegMsg(mBuf, totalMsgLen-msgLen, &trcBuf) != ROK) - RETVALUE(RFAILED); - } - SPutMsg(mBuf); - RETVALUE((*func)(pst, &trc, trcBuf)); -} - - -/*********************************************************** -* -* Func : cmPkRgGenCfg -* -* -* Desc : This structure holds configuration parameters for MAC General Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgGenCfg -( -RgGenCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgGenCfg(param, mBuf) -RgGenCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgGenCfg) - -#ifdef LTE_ADV - CMCHKPK(SPkU8, param->isSCellActDeactAlgoEnable, mBuf); - CMCHKPK(SPkU8, param->forceCntrlSrbBoOnPCel, mBuf); -#endif - CMCHKPK(SPkU8, param->startCellId, mBuf); - CMCHKPK(SPkU8, param->numRguSaps, mBuf); - CMCHKPK(SPkU8, param->tmrRes, mBuf); - CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); - CMCHKPK(cmPkPst, ¶m->lmPst, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRgGenCfg -* -* -* Desc : This structure holds configuration parameters for MAC General Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgGenCfg -( -RgGenCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgGenCfg(param, mBuf) -RgGenCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgGenCfg) - - CMCHKUNPK(cmUnpkPst, ¶m->lmPst, mBuf); - CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tmrRes, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRguSaps, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->startCellId, mBuf); -#ifdef LTE_ADV - CMCHKUNPK(SUnpkU8, ¶m->forceCntrlSrbBoOnPCel, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isSCellActDeactAlgoEnable, mBuf); -#endif - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmPkRgUpSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgUpSapCfg -( -RgUpSapCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgUpSapCfg(param, mBuf) -RgUpSapCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgUpSapCfg) - - CMCHKPK(SPkS16, param->suId, mBuf); - CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkU8, param->route, mBuf); - CMCHKPK(SPkU8, param->inst, mBuf); - CMCHKPK(SPkU8, param->ent, mBuf); - CMCHKPK(SPkU16, param->procId, mBuf); - CMCHKPK(SPkU8, param->prior, mBuf); - CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); - CMCHKPK(SPkU8, param->selector, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRgUpSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgUpSapCfg -( -RgUpSapCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgUpSapCfg(param, mBuf) -RgUpSapCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgUpSapCfg) - - CMCHKUNPK(SUnpkU8, ¶m->selector, mBuf); - CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prior, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->procId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ent, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->inst, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->route, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmPkRgLowSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgLowSapCfg -( -RgLowSapCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgLowSapCfg(param, mBuf) -RgLowSapCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgLowSapCfg) - - CMCHKPK(cmPkTmrCfg, ¶m->bndTmr, mBuf); - CMCHKPK(SPkS16, param->suId, mBuf); - CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkU8, param->route, mBuf); - CMCHKPK(SPkU8, param->inst, mBuf); - CMCHKPK(SPkU8, param->ent, mBuf); - CMCHKPK(SPkU16, param->procId, mBuf); - CMCHKPK(SPkU8, param->prior, mBuf); - CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); - CMCHKPK(SPkU8, param->selector, mBuf); - RETVALUE(ROK); -} - - - -/*********************************************************** -* -* Func : cmUnpkRgLowSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgLowSapCfg -( -RgLowSapCfg *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgLowSapCfg(param, mBuf) -RgLowSapCfg *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgLowSapCfg) - - CMCHKUNPK(SUnpkU8, ¶m->selector, mBuf); - CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prior, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->procId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ent, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->inst, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->route, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); - CMCHKUNPK(cmUnpkTmrCfg, ¶m->bndTmr, mBuf); - RETVALUE(ROK); -} - -#ifdef MAC_SCH_STATS - - -/*********************************************************** -* -* Func : cmPkRgAckNack -* -* -* Desc : Ack and Nack statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgAckNack -( -RgAckNack *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgAckNack (param, mBuf) -RgAckNack *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmPkRgAckNack) - - CMCHKPK(SPkU16, param->numOfAcks, mBuf); - CMCHKPK(SPkU16, param->numOfNacks, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - - RETVALUE(ROK); -} /* cmPkRgAckNack */ - - -/*********************************************************** -* -* Func : cmPkRgSchNackAckStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSchNackAckStats -( -RgSchNackAckStats *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgSchNackAckStats (param, mBuf) -RgSchNackAckStats *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmPkRgSchNackAckStats) - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgAckNack, ¶m->ulCqiStat[i], mBuf); - } - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgAckNack, ¶m->dlCqiStat[i], mBuf); - } - - RETVALUE(ROK); -} - - -/*********************************************************** -* -* Func : cmPkRgHqNumRetx -* -* -* Desc : Harq Retransmission statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgHqNumRetx -( -RgSchHqNumRetx *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgHqNumRetx (param, mBuf) -RgSchHqNumRetx *param; -Buffer *mBuf; -#endif -{ - TRC3(cmPkRgHqNumRetx) - - CMCHKPK(SPkU32, param->totalTx, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_4, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_3, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_2, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_1, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - - RETVALUE(ROK); -} /* cmPkRgHqNumRetx */ - - -/*********************************************************** -* -* Func : cmPkRgSchHqRetxStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSchHqRetxStats -( -RgSchHqRetxStats *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmPkRgSchHqRetxStats (param, mBuf) -RgSchHqRetxStats *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmPkRgSchHqRetxStats) - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); - } - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); - } - - RETVALUE(ROK); -} /* cmPkRgSchHqRetxStats */ - -/* unpcaking functions */ - -/*********************************************************** -* -* Func : cmUnpkRgAckNack -* -* -* Desc : Ack and Nack statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgAckNack -( -RgAckNack *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgAckNack (param, mBuf) -RgAckNack *param; -Buffer *mBuf; -#endif -{ - - TRC3(cmUnpkRgAckNack) - - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfNacks, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfAcks, mBuf); - - RETVALUE(ROK); -} /* cmUnkRgAckNack */ - - -/*********************************************************** -* -* Func : cmUnpkRgSchNackAckStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSchNackAckStats -( -RgSchNackAckStats *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgSchNackAckStats (param, mBuf) -RgSchNackAckStats *param; -Buffer *mBuf; -#endif -{ - S32 i; - TRC3(cmUnpkRgSchNackAckStats) - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgAckNack, ¶m->dlCqiStat[i], mBuf); - } - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgAckNack, ¶m->ulCqiStat[i], mBuf); - } - - RETVALUE(ROK); -} /* cmUnpkRgSchNackAckStats */ - - -/*********************************************************** -* -* Func : cmUnpkRgHqNumRetx -* -* -* Desc : Harq Retransmission statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgHqNumRetx -( -RgSchHqNumRetx *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgHqNumRetx (param, mBuf) -RgSchHqNumRetx *param; -Buffer *mBuf; -#endif -{ - TRC3(cmUnpkRgHqNumRetx) - - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_1, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_2, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_3, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_4, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->totalTx, mBuf); - - RETVALUE(ROK); -} /* cmUnpkRgHqNumRetx */ - - -/*********************************************************** -* -* Func : cmUnpkRgSchHqRetxStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSchHqRetxStats -( -RgSchHqRetxStats *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkRgSchHqRetxStats (param, mBuf) -RgSchHqRetxStats *param; -Buffer *mBuf; -#endif -{ - S32 i; - TRC3(cmUnpkRgSchHqRetxStats) - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); - } - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); - } - - RETVALUE(ROK); -} /* cmUnpkRgSchHqRetxStats */ - -#endif /* MAC_SCH_STATS */ - - -/*********************************************************** -* -* Func : cmPkRgGenSts -* -* -* Desc : This structure holds General Statistical information of MAC. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgGenSts -( -RgGenSts *param, +RgUpSapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgGenSts(param, mBuf) -RgGenSts *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgGenSts) -#ifdef MAC_SCH_STATS - CMCHKPK(cmPkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); - CMCHKPK(cmPkRgSchNackAckStats, ¶m->nackAckStats, mBuf); -#endif /* MAC_SCH_STATS */ - CMCHKPK(SPkU16, param->numCellCfg, mBuf); - CMCHKPK(SPkU32, param->numUeCfg, mBuf); - CMCHKPK(SPkU32, param->numHarqFail, mBuf); - RETVALUE(ROK); + CMCHKPK(SPkS16, param->suId, mBuf); + CMCHKPK(SPkS16, param->spId, mBuf); + CMCHKPK(oduUnpackUInt8, param->route, mBuf); + CMCHKPK(oduUnpackUInt8, param->inst, mBuf); + CMCHKPK(oduUnpackUInt8, param->ent, mBuf); + CMCHKPK(oduUnpackUInt16, param->procId, mBuf); + CMCHKPK(oduUnpackUInt8, param->prior, mBuf); + CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); + CMCHKPK(oduUnpackUInt8, param->selector, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgGenSts +* Func : cmUnpkRgUpSapCfg * * -* Desc : This structure holds General Statistical information of MAC. +* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. * * * Ret : S16 @@ -2201,39 +832,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgGenSts +S16 cmUnpkRgUpSapCfg ( -RgGenSts *param, +RgUpSapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgGenSts(param, mBuf) -RgGenSts *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgGenSts) - CMCHKUNPK(SUnpkU32, ¶m->numHarqFail, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numUeCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numCellCfg, mBuf); -#ifdef MAC_SCH_STATS - CMCHKUNPK(cmUnpkRgSchNackAckStats, ¶m->nackAckStats, mBuf); - CMCHKUNPK(cmUnpkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); -#endif /* MAC_SCH_STATS */ - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); + CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prior, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->procId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ent, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->inst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->route, mBuf); + CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); + CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); + return ROK; } /*********************************************************** * -* Func : cmPkRgSapSts +* Func : cmPkRgLowSapCfg * * -* Desc : This structure holds Statistical information of a SAP in MAC. +* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. * * * Ret : S16 @@ -2243,35 +869,35 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSapSts +S16 cmPkRgLowSapCfg ( -RgSapSts *param, +RgLowSapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSapSts(param, mBuf) -RgSapSts *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgSapSts) - CMCHKPK(SPkU32, param->numPduDrop, mBuf); - CMCHKPK(SPkU32, param->numPduTxmit, mBuf); - CMCHKPK(SPkU32, param->numPduRcvd, mBuf); - RETVALUE(ROK); + CMCHKPK(cmPkTmrCfg, ¶m->bndTmr, mBuf); + CMCHKPK(SPkS16, param->suId, mBuf); + CMCHKPK(SPkS16, param->spId, mBuf); + CMCHKPK(oduUnpackUInt8, param->route, mBuf); + CMCHKPK(oduUnpackUInt8, param->inst, mBuf); + CMCHKPK(oduUnpackUInt8, param->ent, mBuf); + CMCHKPK(oduUnpackUInt16, param->procId, mBuf); + CMCHKPK(oduUnpackUInt8, param->prior, mBuf); + CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); + CMCHKPK(oduUnpackUInt8, param->selector, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgSapSts +* Func : cmUnpkRgLowSapCfg * * -* Desc : This structure holds Statistical information of a SAP in MAC. +* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. * * * Ret : S16 @@ -2281,35 +907,36 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSapSts +S16 cmUnpkRgLowSapCfg ( -RgSapSts *param, +RgLowSapCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSapSts(param, mBuf) -RgSapSts *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgSapSts) - CMCHKUNPK(SUnpkU32, ¶m->numPduRcvd, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numPduTxmit, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numPduDrop, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); + CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prior, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->procId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ent, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->inst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->route, mBuf); + CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); + CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); + CMCHKUNPK(cmUnpkTmrCfg, ¶m->bndTmr, mBuf); + return ROK; } +#ifdef MAC_SCH_STATS /*********************************************************** * -* Func : cmPkRgSchInstCfg +* Func : cmPkRgAckNack * * -* Desc : Scheduler Configuration +* Desc : Ack and Nack statistics * * * Ret : S16 @@ -2319,45 +946,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSchInstCfg +S16 cmPkRgAckNack ( -RgSchInstCfg *param, +RgAckNack *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSchInstCfg(param, mBuf) -RgSchInstCfg *param; -Buffer *mBuf; -#endif { - S32 i; - TRC3(cmPkRgSchInstCfg) - for (i=param->numSaps-1; i >= 0; i--) { - CMCHKPK(cmPkRgLowSapCfg, ¶m->tfuSap[i], mBuf); - } - for (i=param->numSaps-1; i >= 0; i--) { - CMCHKPK(cmPkRgUpSapCfg, ¶m->rgrSap[i], mBuf); - } - for (i=param->numSaps-1; i >= 0; i--) { - CMCHKPK(cmPkRgUpSapCfg, ¶m->rgmSap[i], mBuf); - } - CMCHKPK(SPkU8, param->numSaps, mBuf); - CMCHKPK(cmPkRgGenCfg, ¶m->genCfg, mBuf); - CMCHKPK(SPkU8, param->instId, mBuf); - RETVALUE(ROK); -} + CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + return ROK; +} /* cmPkRgAckNack */ /*********************************************************** * -* Func : cmUnpkRgSchInstCfg +* Func : cmPkRgSchNackAckStats * * -* Desc : Scheduler Configuration +* Desc : * * * Ret : S16 @@ -2367,45 +977,33 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSchInstCfg +S16 cmPkRgSchNackAckStats ( -RgSchInstCfg *param, +RgSchNackAckStats *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSchInstCfg(param, mBuf) -RgSchInstCfg *param; -Buffer *mBuf; -#endif { S32 i; - TRC3(cmUnpkRgSchInstCfg) - CMCHKUNPK(SUnpkU8, ¶m->instId, mBuf); - CMCHKUNPK(cmUnpkRgGenCfg, ¶m->genCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSaps, mBuf); - for (i=0; inumSaps; i++) { - CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->rgmSap[i], mBuf); - } - for (i=0; inumSaps; i++) { - CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->rgrSap[i], mBuf); + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgAckNack, ¶m->ulCqiStat[i], mBuf); } - for (i=0; inumSaps; i++) { - CMCHKUNPK(cmUnpkRgLowSapCfg, ¶m->tfuSap[i], mBuf); + + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgAckNack, ¶m->dlCqiStat[i], mBuf); } - RETVALUE(ROK); -} + return ROK; +} /*********************************************************** * -* Func : cmPkRgCfg +* Func : cmPkRgHqNumRetx * * -* Desc : This structure holds Configuration parameters for MAC. +* Desc : Harq Retransmission statistics * * * Ret : S16 @@ -2415,53 +1013,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgCfg +S16 cmPkRgHqNumRetx ( -RgCfg *param, -S16 elmnt, +RgSchHqNumRetx *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgCfg(param, elmnt, mBuf) -RgCfg *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmPkRgCfg) - - switch(elmnt) { - case STSCHINST: - CMCHKPK(cmPkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); - break; - case STTFUSAP: - CMCHKPK(cmPkRgLowSapCfg, ¶m->s.tfuSap, mBuf); - break; - case STCRGSAP: - CMCHKPK(cmPkRgUpSapCfg, ¶m->s.crgSap, mBuf); - break; - case STRGUSAP: - CMCHKPK(cmPkRgUpSapCfg, ¶m->s.rguSap, mBuf); - break; - case STGEN: - CMCHKPK(cmPkRgGenCfg, ¶m->s.genCfg, mBuf); - break; - default : - RETVALUE(RFAILED); - } - RETVALUE(ROK); -} + CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_4, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_3, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_2, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_1, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + return ROK; +} /* cmPkRgHqNumRetx */ /*********************************************************** * -* Func : cmUnpkRgCfg +* Func : cmPkRgSchHqRetxStats * * -* Desc : This structure holds Configuration parameters for MAC. +* Desc : * * * Ret : S16 @@ -2471,53 +1046,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgCfg +S16 cmPkRgSchHqRetxStats ( -RgCfg *param, -S16 elmnt, +RgSchHqRetxStats *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgCfg(param, elmnt, mBuf) -RgCfg *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgCfg) + S32 i; - switch(elmnt) { - case STGEN: - CMCHKUNPK(cmUnpkRgGenCfg, ¶m->s.genCfg, mBuf); - break; - case STRGUSAP: - CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->s.rguSap, mBuf); - break; - case STCRGSAP: - CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->s.crgSap, mBuf); - break; - case STTFUSAP: - CMCHKUNPK(cmUnpkRgLowSapCfg, ¶m->s.tfuSap, mBuf); - break; - case STSCHINST: - CMCHKUNPK(cmUnpkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); - break; - default : - RETVALUE(RFAILED); - } - RETVALUE(ROK); -} + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); + } + + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); + } + return ROK; +} /* cmPkRgSchHqRetxStats */ +/* unpcaking functions */ /*********************************************************** * -* Func : cmPkRgSapSta +* Func : cmUnpkRgAckNack * * -* Desc : This structure holds a SAP's status information. +* Desc : Ack and Nack statistics * * * Ret : S16 @@ -2527,33 +1083,28 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSapSta +S16 cmUnpkRgAckNack ( -RgSapSta *param, +RgAckNack *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSapSta(param, mBuf) -RgSapSta *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgSapSta) - CMCHKPK(SPkU8, param->sapState, mBuf); - RETVALUE(ROK); -} + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfNacks, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfAcks, mBuf); + return ROK; +} /* cmUnkRgAckNack */ /*********************************************************** * -* Func : cmUnpkRgSapSta +* Func : cmUnpkRgSchNackAckStats * * -* Desc : This structure holds a SAP's status information. +* Desc : * * * Ret : S16 @@ -2563,33 +1114,32 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSapSta +S16 cmUnpkRgSchNackAckStats ( -RgSapSta *param, +RgSchNackAckStats *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSapSta(param, mBuf) -RgSapSta *param; -Buffer *mBuf; -#endif { + S32 i; - TRC3(cmUnpkRgSapSta) + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgAckNack, ¶m->dlCqiStat[i], mBuf); + } - CMCHKUNPK(SUnpkU8, ¶m->sapState, mBuf); - RETVALUE(ROK); -} + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgAckNack, ¶m->ulCqiStat[i], mBuf); + } + return ROK; +} /* cmUnpkRgSchNackAckStats */ /*********************************************************** * -* Func : cmPkRgSts +* Func : cmUnpkRgHqNumRetx * * -* Desc : This structure holds MAC's Statistical information. +* Desc : Harq Retransmission statistics * * * Ret : S16 @@ -2599,56 +1149,30 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSts +S16 cmUnpkRgHqNumRetx ( -RgSts *param, -S16 elmnt, +RgSchHqNumRetx *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSts(param, elmnt, mBuf) -RgSts *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmPkRgSts) - - switch(elmnt) { - case STTFUSAP: - CMCHKPK(cmPkRgSapSts, ¶m->s.tfuSts, mBuf); - break; - case STRGRSAP: - CMCHKPK(cmPkRgSapSts, ¶m->s.rgrSts, mBuf); - break; - case STCRGSAP: - CMCHKPK(cmPkRgSapSts, ¶m->s.crgSts, mBuf); - break; - case STRGUSAP: - CMCHKPK(cmPkRgSapSts, ¶m->s.rguSts, mBuf); - break; - case STGEN: - CMCHKPK(cmPkRgGenSts, ¶m->s.genSts, mBuf); - break; - default : - break; - } - CMCHKPK(cmPkAction, param->action, mBuf); - CMCHKPK(SPkU8, param->sapInst, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); -} + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_1, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_2, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_3, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_4, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->totalTx, mBuf); + return ROK; +} /* cmUnpkRgHqNumRetx */ /*********************************************************** * -* Func : cmUnpkRgSts +* Func : cmUnpkRgSchHqRetxStats * * -* Desc : This structure holds MAC's Statistical information. +* Desc : * * * Ret : S16 @@ -2658,56 +1182,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSts +S16 cmUnpkRgSchHqRetxStats ( -RgSts *param, -S16 elmnt, +RgSchHqRetxStats *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSts(param, elmnt, mBuf) -RgSts *param; -S16 elmnt; -Buffer *mBuf; -#endif { + S32 i; - TRC3(cmUnpkRgSts) + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); + } - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sapInst, mBuf); - CMCHKUNPK(cmUnpkAction, ¶m->action, mBuf); - switch(elmnt) { - case STGEN: - CMCHKUNPK(cmUnpkRgGenSts, ¶m->s.genSts, mBuf); - break; - case STRGUSAP: - CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.rguSts, mBuf); - break; - case STCRGSAP: - CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.crgSts, mBuf); - break; - case STRGRSAP: - CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.rgrSts, mBuf); - break; - case STTFUSAP: - CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.tfuSts, mBuf); - break; - default : - break; - } - RETVALUE(ROK); -} + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); + } + return ROK; +} /* cmUnpkRgSchHqRetxStats */ + +#endif /* MAC_SCH_STATS */ /*********************************************************** * -* Func : cmPkRgSsta +* Func : cmPkRgGenSts * * -* Desc : This structure holds MAC's Solicited Status information. +* Desc : This structure holds General Statistical information of MAC. * * * Ret : S16 @@ -2717,82 +1219,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSsta +S16 cmPkRgGenSts ( -Pst *pst, -RgSsta *param, -S16 elmnt, -#ifdef LRG_V1 -U8 eventType, -#endif +RgGenSts *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSsta(pst, param, elmnt, eventType, mBuf) -Pst *pst; -RgSsta *param; -S16 elmnt; -/* lrg_c_001.main_3 - ADD - Added the extra parameter eventType to the function */ -#ifdef LRG_V1 -U8 eventType; -#endif -Buffer *mBuf; -#endif { - TRC3(cmPkRgSsta) - - switch(elmnt) { - case STTFUSAP: - CMCHKPK(cmPkRgSapSta, ¶m->s.tfuSapSta, mBuf); - break; - case STRGRSAP: - CMCHKPK(cmPkRgSapSta, ¶m->s.rgrSapSta, mBuf); - break; - case STCRGSAP: - CMCHKPK(cmPkRgSapSta, ¶m->s.crgSapSta, mBuf); - break; - case STRGUSAP: - CMCHKPK(cmPkRgSapSta, ¶m->s.rguSapSta, mBuf); - break; - /*ccpu00118255 - ADD - Check for eventType before Pack */ - case STGEN: -#ifdef LRG_V1 - if (eventType == EVTLRGSSTACFM) - { - CMCHKPK(cmPkSystemId, ¶m->s.sysId, mBuf); - if (param->s.sysId.ptNmb != NULLP) - { - SPutSBuf(pst->region, pst->pool, - (Data *)param->s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); - } - } -#else /*LRG_V1 not defined */ - if (param->s.sysId.ptNmb != NULLP) - { - CMCHKPK(cmPkSystemId, ¶m->s.sysId, mBuf); - SPutSBuf(pst->region, pst->pool, (Data *)param->s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); - } - -#endif /*end of LRG_V1 */ - break; - default : - break; - } - CMCHKPK(SPkU8, param->sapInst, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); +#ifdef MAC_SCH_STATS + CMCHKPK(cmPkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); + CMCHKPK(cmPkRgSchNackAckStats, ¶m->nackAckStats, mBuf); +#endif /* MAC_SCH_STATS */ + CMCHKPK(oduUnpackUInt16, param->numCellCfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->numUeCfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->numHarqFail, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgSsta +* Func : cmUnpkRgGenSts * * -* Desc : This structure holds MAC's Solicited Status information. +* Desc : This structure holds General Statistical information of MAC. * * * Ret : S16 @@ -2802,77 +1253,31 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSsta +S16 cmUnpkRgGenSts ( -Pst *pst, -RgSsta *param, -S16 elmnt, +RgGenSts *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSsta(pst, param, elmnt, mBuf) -Pst *pst; -RgSsta *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgSsta) - - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sapInst, mBuf); - switch(elmnt) { - case STGEN: - /*ccpu00118255 - ADD - Check for eventType before Unpack */ - if (pst->event == EVTLRGSSTACFM) - { - /* After Merging */ - if((SGetSBuf(pst->region, pst->pool, (Data **)¶m->s.sysId.ptNmb, - LRG_MAX_PT_NUM_SIZE)) != ROK){ -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG048, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - /* KWORK_FIX: Moved the memset under the NULL check */ - if (param->s.sysId.ptNmb != NULLP) - { - cmMemset((U8 *)param->s.sysId.ptNmb, 0, LRG_MAX_PT_NUM_SIZE); - CMCHKUNPK(cmUnpkSystemId, ¶m->s.sysId, mBuf); - } - } - break; - case STRGUSAP: - CMCHKUNPK(cmUnpkRgSapSta, ¶m->s.rguSapSta, mBuf); - break; - case STCRGSAP: - CMCHKUNPK(cmUnpkRgSapSta, ¶m->s.crgSapSta, mBuf); - break; - case STRGRSAP: - CMCHKUNPK(cmUnpkRgSapSta, ¶m->s.rgrSapSta, mBuf); - break; - case STTFUSAP: - CMCHKUNPK(cmUnpkRgSapSta, ¶m->s.tfuSapSta, mBuf); - break; - default : - break; - } - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->numHarqFail, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numUeCfg, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numCellCfg, mBuf); +#ifdef MAC_SCH_STATS + CMCHKUNPK(cmUnpkRgSchNackAckStats, ¶m->nackAckStats, mBuf); + CMCHKUNPK(cmUnpkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); +#endif /* MAC_SCH_STATS */ + return ROK; } /*********************************************************** * -* Func : cmPkRgUstaDgn +* Func : cmPkRgSapSts * * -* Desc : Alarm diagnostics structure. +* Desc : This structure holds Statistical information of a SAP in MAC. * * * Ret : S16 @@ -2882,40 +1287,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgUstaDgn +S16 cmPkRgSapSts ( -RgUstaDgn *param, +RgSapSts *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgUstaDgn(param, mBuf) -RgUstaDgn *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgUstaDgn) - - switch(param->type) { - case LRG_USTA_DGNVAL_MEM: - CMCHKPK(cmPkMemoryId, ¶m->u.mem, mBuf); - break; - default : - break; - } - CMCHKPK(SPkU8, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgUstaDgn +* Func : cmUnpkRgSapSts * * -* Desc : Alarm diagnostics structure. +* Desc : This structure holds Statistical information of a SAP in MAC. * * * Ret : S16 @@ -2925,40 +1317,27 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgUstaDgn +S16 cmUnpkRgSapSts ( -RgUstaDgn *param, +RgSapSts *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgUstaDgn(param, mBuf) -RgUstaDgn *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgUstaDgn) - - CMCHKUNPK(SUnpkU8, ¶m->type, mBuf); - switch(param->type) { - case LRG_USTA_DGNVAL_MEM: - CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); - break; - default : - break; - } - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduDrop, mBuf); + return ROK; } /*********************************************************** * -* Func : cmPkRgUsta +* Func : cmPkRgSchInstCfg * * -* Desc : This structure holds MAC's Unsolicited Status information. +* Desc : Scheduler Configuration * * * Ret : S16 @@ -2968,34 +1347,38 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgUsta +S16 cmPkRgSchInstCfg ( -RgUsta *param, +RgSchInstCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgUsta(param, mBuf) -RgUsta *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgUsta) + S32 i; - CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); - CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); - RETVALUE(ROK); + for (i=param->numSaps-1; i >= 0; i--) { + CMCHKPK(cmPkRgLowSapCfg, ¶m->tfuSap[i], mBuf); + } + for (i=param->numSaps-1; i >= 0; i--) { + CMCHKPK(cmPkRgUpSapCfg, ¶m->rgrSap[i], mBuf); + } + for (i=param->numSaps-1; i >= 0; i--) { + CMCHKPK(cmPkRgUpSapCfg, ¶m->rgmSap[i], mBuf); + } + CMCHKPK(oduUnpackUInt8, param->numSaps, mBuf); + CMCHKPK(cmPkRgGenCfg, ¶m->genCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->instId, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgUsta +* Func : cmUnpkRgSchInstCfg * * -* Desc : This structure holds MAC's Unsolicited Status information. +* Desc : Scheduler Configuration * * * Ret : S16 @@ -3005,34 +1388,38 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgUsta +S16 cmUnpkRgSchInstCfg ( -RgUsta *param, +RgSchInstCfg *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgUsta(param, mBuf) -RgUsta *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgUsta) + S32 i; - CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); - CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->instId, mBuf); + CMCHKUNPK(cmUnpkRgGenCfg, ¶m->genCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSaps, mBuf); + for (i=0; inumSaps; i++) { + CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->rgmSap[i], mBuf); + } + for (i=0; inumSaps; i++) { + CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->rgrSap[i], mBuf); + } + for (i=0; inumSaps; i++) { + CMCHKUNPK(cmUnpkRgLowSapCfg, ¶m->tfuSap[i], mBuf); + } + return ROK; } /*********************************************************** * -* Func : cmPkRgTrc +* Func : cmPkRgCfg * * -* Desc : This structure holds MAC's Trace Indication information. +* Desc : This structure holds Configuration parameters for MAC. * * * Ret : S16 @@ -3042,34 +1429,44 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgTrc +S16 cmPkRgCfg ( -RgTrc *param, +RgCfg *param, +S16 elmnt, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgTrc(param, mBuf) -RgTrc *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgTrc) - - CMCHKPK(SPkU8, param->evnt, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + switch(elmnt) { + case STSCHINST: + CMCHKPK(cmPkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); + break; + case STTFUSAP: + CMCHKPK(cmPkRgLowSapCfg, ¶m->s.tfuSap, mBuf); + break; + case STCRGSAP: + CMCHKPK(cmPkRgUpSapCfg, ¶m->s.crgSap, mBuf); + break; + case STRGUSAP: + CMCHKPK(cmPkRgUpSapCfg, ¶m->s.rguSap, mBuf); + break; + case STGEN: + CMCHKPK(cmPkRgGenCfg, ¶m->s.genCfg, mBuf); + break; + default : + return RFAILED; + } + return ROK; } /*********************************************************** * -* Func : cmUnpkRgTrc +* Func : cmUnpkRgCfg * * -* Desc : This structure holds MAC's Trace Indication information. +* Desc : This structure holds Configuration parameters for MAC. * * * Ret : S16 @@ -3079,34 +1476,44 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgTrc +S16 cmUnpkRgCfg ( -RgTrc *param, +RgCfg *param, +S16 elmnt, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgTrc(param, mBuf) -RgTrc *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgTrc) - - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->evnt, mBuf); - RETVALUE(ROK); + switch(elmnt) { + case STGEN: + CMCHKUNPK(cmUnpkRgGenCfg, ¶m->s.genCfg, mBuf); + break; + case STRGUSAP: + CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->s.rguSap, mBuf); + break; + case STCRGSAP: + CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->s.crgSap, mBuf); + break; + case STTFUSAP: + CMCHKUNPK(cmUnpkRgLowSapCfg, ¶m->s.tfuSap, mBuf); + break; + case STSCHINST: + CMCHKUNPK(cmUnpkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); + break; + default : + return RFAILED; + } + return ROK; } /*********************************************************** * -* Func : cmPkRgDbgCntrl +* Func : cmPkRgSapSta * * -* Desc : This structure holds MAC's Debug Control information. +* Desc : This structure holds a SAP's status information. * * * Ret : S16 @@ -3116,32 +1523,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgDbgCntrl +S16 cmPkRgSapSta ( -RgDbgCntrl *param, +RgSapSta *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgDbgCntrl(param, mBuf) -RgDbgCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgDbgCntrl) - - CMCHKPK(SPkU32, param->dbgMask, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->sapState, mBuf); + return ROK; } -#ifdef PHY_ERROR_LOGING + + /*********************************************************** * -* Func : cmPkRgSchUlAllocCntrl +* Func : cmUnpkRgSapSta * * -* Desc : This structure holds MAC's Debug Control information. +* Desc : This structure holds a SAP's status information. * * * Ret : S16 @@ -3151,36 +1551,25 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSchUlAllocCntrl +S16 cmUnpkRgSapSta ( -RgSchUlAllocCntrl *param, +RgSapSta *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSchUlAllocCntrl(param, mBuf) -RgSchUlAllocCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgSchUlAllocCntrl) - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU16, param->numOfRb, mBuf); - CMCHKPK(SPkU16, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->testStart, mBuf); - CMCHKPK(SPkU8, param->enaLog, mBuf); - CMCHKPK(SPkU16, param->logTime, mBuf); - - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->sapState, mBuf); + return ROK; } + + /*********************************************************** * -* Func : cmUnpkRgSchUlAllocCntrl +* Func : cmPkRgSts * * -* Desc : This structure holds MAC's Scheduler Configuration for Ul Allocation. +* Desc : This structure holds MAC's Statistical information. * * * Ret : S16 @@ -3190,39 +1579,47 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSchUlAllocCntrl +S16 cmPkRgSts ( -RgSchUlAllocCntrl *param, +RgSts *param, +S16 elmnt, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSchUlAllocCntrl(param, mBuf) -RgSchUlAllocCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgSchUlAllocCntrl) - CMCHKUNPK(SUnpkU16, ¶m->logTime, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->enaLog, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->testStart, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - - RETVALUE(ROK); + switch(elmnt) { + case STTFUSAP: + CMCHKPK(cmPkRgSapSts, ¶m->s.tfuSts, mBuf); + break; + case STRGRSAP: + CMCHKPK(cmPkRgSapSts, ¶m->s.rgrSts, mBuf); + break; + case STCRGSAP: + CMCHKPK(cmPkRgSapSts, ¶m->s.crgSts, mBuf); + break; + case STRGUSAP: + CMCHKPK(cmPkRgSapSts, ¶m->s.rguSts, mBuf); + break; + case STGEN: + CMCHKPK(cmPkRgGenSts, ¶m->s.genSts, mBuf); + break; + default : + break; + } + CMCHKPK(cmPkAction, param->action, mBuf); + CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf); + CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); + return ROK; } -#endif /*********************************************************** * -* Func : cmUnpkRgDbgCntrl +* Func : cmUnpkRgSts * * -* Desc : This structure holds MAC's Debug Control information. +* Desc : This structure holds MAC's Statistical information. * * * Ret : S16 @@ -3232,33 +1629,46 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgDbgCntrl +S16 cmUnpkRgSts ( -RgDbgCntrl *param, +RgSts *param, +S16 elmnt, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgDbgCntrl(param, mBuf) -RgDbgCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgDbgCntrl) - - CMCHKUNPK(SUnpkU32, ¶m->dbgMask, mBuf); - RETVALUE(ROK); + CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); + CMCHKUNPK(cmUnpkAction, ¶m->action, mBuf); + switch(elmnt) { + case STGEN: + CMCHKUNPK(cmUnpkRgGenSts, ¶m->s.genSts, mBuf); + break; + case STRGUSAP: + CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.rguSts, mBuf); + break; + case STCRGSAP: + CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.crgSts, mBuf); + break; + case STRGRSAP: + CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.rgrSts, mBuf); + break; + case STTFUSAP: + CMCHKUNPK(cmUnpkRgSapSts, ¶m->s.tfuSts, mBuf); + break; + default : + break; + } + return ROK; } - /*********************************************************** * -* Func : cmPkRgSapCntrl +* Func : cmPkRgUstaDgn * * -* Desc : This structure holds MAC's SAP Control information. +* Desc : Alarm diagnostics structure. * * * Ret : S16 @@ -3268,34 +1678,32 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgSapCntrl +S16 cmPkRgUstaDgn ( -RgSapCntrl *param, +RgUstaDgn *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgSapCntrl(param, mBuf) -RgSapCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRgSapCntrl) - - CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkS16, param->suId, mBuf); - RETVALUE(ROK); + switch(param->type) { + case LRG_USTA_DGNVAL_MEM: + CMCHKPK(cmPkMemoryId, ¶m->u.mem, mBuf); + break; + default : + break; + } + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgSapCntrl +* Func : cmUnpkRgUstaDgn * * -* Desc : This structure holds MAC's SAP Control information. +* Desc : Alarm diagnostics structure. * * * Ret : S16 @@ -3305,34 +1713,34 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgSapCntrl +S16 cmUnpkRgUstaDgn ( -RgSapCntrl *param, +RgUstaDgn *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgSapCntrl(param, mBuf) -RgSapCntrl *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgSapCntrl) - CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); + switch(param->type) + { + case LRG_USTA_DGNVAL_MEM: + CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); + break; + default : + break; + } + return ROK; } /*********************************************************** * -* Func : cmPkRgCntrl +* Func : cmPkRgUsta * * -* Desc : This structure holds MAC's Control information. +* Desc : This structure holds MAC's Unsolicited Status information. * * * Ret : S16 @@ -3342,75 +1750,26 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgCntrl +S16 cmPkRgUsta ( -RgCntrl *param, -S16 elmnt, +RgUsta *param, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgCntrl(param, elmnt, mBuf) -RgCntrl *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmPkRgCntrl) - - switch(elmnt) { - case STTFUSAP: - case STRGUSAP: - case STRGRSAP: - case STCRGSAP: - switch(param->subAction) { - default : - CMCHKPK(cmPkRgSapCntrl, ¶m->s.rgSapCntrl, mBuf); - break; - } - break; - case STGEN: - switch(param->subAction) { - case SATRC: - CMCHKPK(SPkS16, param->s.trcLen, mBuf); - break; - case SADBG: - CMCHKPK(cmPkRgDbgCntrl, ¶m->s.rgDbgCntrl, mBuf); - break; - case SAUSTA: - break; -#ifdef SS_DIAG - case SALOG: - CMCHKPK(SPkU32, param->s.logMask, mBuf); - break; -#endif -#ifdef PHY_ERROR_LOGING - case SAELMNT: - CMCHKPK(cmPkRgSchUlAllocCntrl, ¶m->s.rgSchUlAllocCntrl, mBuf); - break; -#endif - default : - break; - } - break; - default : - break; - } - CMCHKPK(SPkU8, param->subAction, mBuf); - CMCHKPK(SPkU8, param->action, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); + CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); + return ROK; } /*********************************************************** * -* Func : cmUnpkRgCntrl +* Func : cmUnpkRgUsta * * -* Desc : This structure holds MAC's Control information. +* Desc : This structure holds MAC's Unsolicited Status information. * * * Ret : S16 @@ -3420,68 +1779,18 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgCntrl +S16 cmUnpkRgUsta ( -RgCntrl *param, -S16 elmnt, +RgUsta *param, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgCntrl(param, elmnt, mBuf) -RgCntrl *param; -S16 elmnt; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgCntrl) - - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->action, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->subAction, mBuf); - switch(elmnt) { - case STGEN: - switch(param->subAction) { - case SADBG: - CMCHKUNPK(cmUnpkRgDbgCntrl, ¶m->s.rgDbgCntrl, mBuf); - break; - case SATRC: - CMCHKUNPK(SUnpkS16, ¶m->s.trcLen, mBuf); - break; - case SAUSTA: - break; -#ifdef SS_DIAG - case SALOG: - CMCHKUNPK(SUnpkU32, ¶m->s.logMask, mBuf); - break; -#endif -#ifdef PHY_ERROR_LOGING - case SAELMNT: - CMCHKUNPK(cmUnpkRgSchUlAllocCntrl, ¶m->s.rgSchUlAllocCntrl, mBuf); - break; -#endif - default : - break; - } - break; - case STTFUSAP: - case STRGUSAP: - case STRGRSAP: - case STCRGSAP: - switch(param->subAction) { - default : - CMCHKUNPK(cmUnpkRgSapCntrl, ¶m->s.rgSapCntrl, mBuf); - break; - } - break; - default : - break; - } - RETVALUE(ROK); + CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); + CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); + return ROK; } - /*********************************************************** * @@ -3498,73 +1807,42 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkRgMngmt +S16 cmPkRgMngmt ( Pst *pst, RgMngmt *param, -U8 eventType, +uint8_t eventType, Buffer *mBuf ) -#else -PUBLIC S16 cmPkRgMngmt(pst, param, eventType, mBuf) -Pst *pst; -RgMngmt *param; -U8 eventType; -Buffer *mBuf; -#endif { - TRC3(cmPkRgMngmt) switch(eventType) { - case EVTLRGCNTRLREQ: - case EVTLRGCNTRLCFM: - case EVTLRGSCHCNTRLREQ: - case EVTLRGSCHCNTRLCFM: - if(cmPkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); - break; - case EVTLRGTRCIND: - CMCHKPK(cmPkRgTrc, ¶m->t.trc, mBuf); - break; case EVTLRGUSTAIND: case EVTLRGSCHSTAIND: CMCHKPK(cmPkRgUsta, ¶m->t.usta, mBuf); break; - case EVTLRGSSTAREQ: - case EVTLRGSSTACFM: - /*ccpu00118255 - ADD - eventType param */ -#ifdef LRG_V1 - if(cmPkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, - eventType, mBuf) != ROK) - RETVALUE(RFAILED); -#else /* LRG_V1 is not defined */ - if(cmPkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); -#endif /* end of LRG_V1*/ - break; case EVTLRGSTSREQ: case EVTLRGSTSCFM: if(cmPkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf)!= ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGCFGREQ: case EVTLRGCFGCFM: if(cmPkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTMACSCHGENCFGREQ: case EVTMACSCHGENCFGCFM: if(cmPkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkCmStatus, ¶m->cfm, mBuf); CMCHKPK(cmPkHeader, ¶m->hdr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3584,63 +1862,39 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkRgMngmt +S16 cmUnpkRgMngmt ( Pst *pst, RgMngmt *param, -U8 eventType, +uint8_t eventType, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkRgMngmt(pst, param, eventType, mBuf) -Pst *pst; -RgMngmt *param; -U8 eventType; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRgMngmt) CMCHKUNPK(cmUnpkHeader, ¶m->hdr, mBuf); CMCHKUNPK(cmUnpkCmStatus, ¶m->cfm, mBuf); - switch(eventType) { - case EVTLRGCFGREQ: - case EVTLRGCFGCFM: - case EVTMACSCHGENCFGREQ: - case EVTMACSCHGENCFGCFM: - if(cmUnpkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); - break; - case EVTLRGSTSREQ: - case EVTLRGSTSCFM: - if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); - break; - case EVTLRGSSTAREQ: - case EVTLRGSSTACFM: - if(cmUnpkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); - break; - case EVTLRGUSTAIND: - case EVTLRGSCHSTAIND: - CMCHKUNPK(cmUnpkRgUsta, ¶m->t.usta, mBuf); - break; - case EVTLRGTRCIND: - CMCHKUNPK(cmUnpkRgTrc, ¶m->t.trc, mBuf); - break; - case EVTLRGCNTRLREQ: - case EVTLRGCNTRLCFM: - case EVTLRGSCHCNTRLREQ: - case EVTLRGSCHCNTRLCFM: - if(cmUnpkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); - break; - default : - RETVALUE(RFAILED); + switch(eventType) { + case EVTLRGCFGREQ: + case EVTLRGCFGCFM: + case EVTMACSCHGENCFGREQ: + case EVTMACSCHGENCFGCFM: + if(cmUnpkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + case EVTLRGSTSREQ: + case EVTLRGSTSCFM: + if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + case EVTLRGUSTAIND: + case EVTLRGSCHSTAIND: + CMCHKUNPK(cmUnpkRgUsta, ¶m->t.usta, mBuf); + break; + default : + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* lrg_c_001.main_3 - ADD - Added the functions pertaining to LTE_L2_MEAS */ @@ -3659,29 +1913,22 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkNmbActvUeQciReq +static S16 cmPkNmbActvUeQciReq ( LrgNmbActvUeQCI *nmbActvUeQci, Buffer *mBuf ) -#else -PRIVATE S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf) -LrgNmbActvUeQCI *nmbActvUeQci; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmPkNmbActvUeQciReq) for(idx = 0; idx < nmbActvUeQci->numQci; idx++) { - CMCHKPK(SPkU8, nmbActvUeQci->qci[idx], mBuf); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->qci[idx], mBuf); } - CMCHKPK(SPkU8, nmbActvUeQci->numQci, mBuf); - CMCHKPK(SPkU8, nmbActvUeQci->sampPrd, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->numQci, mBuf); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->sampPrd, mBuf); + return ROK; } /** @@ -3697,28 +1944,20 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkAvgPrbQciReq +static S16 cmPkAvgPrbQciReq ( LrgAvgPrbQCI *avgPrbQciReq, Buffer *mBuf ) -#else -PRIVATE S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf) -LrgAvgPrbQCI *avgPrbQciReq; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmPkAvgPrbQciReq) - for(idx = 0; idx < avgPrbQciReq->numQci; idx++) { - CMCHKPK(SPkU8, avgPrbQciReq->qci[idx], mBuf); + CMCHKPK(oduUnpackUInt8, avgPrbQciReq->qci[idx], mBuf); } - CMCHKPK(SPkU8, avgPrbQciReq->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, avgPrbQciReq->numQci, mBuf); + return ROK; } @@ -3735,20 +1974,13 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchL2MeasReq +S16 cmPkLrgSchL2MeasReq ( Pst * pst, LrgSchMeasReqInfo *measInfo ) -#else -PUBLIC S16 cmPkLrgSchL2MeasReq(pst, measInfo) -Pst * pst; -LrgSchMeasReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3756,7 +1988,7 @@ LrgSchMeasReqInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) { @@ -3776,11 +2008,11 @@ LrgSchMeasReqInfo *measInfo; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - CMCHKPK(SPkU32, measInfo->timePrd, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** * @brief This API is used to stop a @@ -3795,20 +2027,13 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchL2MeasStopReq +S16 cmPkLrgSchL2MeasStopReq ( Pst * pst, LrgSchMeasStopReqInfo *measInfo ) -#else -PUBLIC S16 cmPkLrgSchL2MeasStopReq(pst, measInfo) -Pst * pst; -LrgSchMeasStopReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasStopReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3816,14 +2041,14 @@ LrgSchMeasStopReqInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - /*CMCHKPK(SPkU16, measInfo->timePrd, mBuf);*/ - CMCHKPK(SPkU16, measInfo->measType, mBuf); + /*CMCHKPK(oduUnpackUInt16, measInfo->timePrd, mBuf);*/ + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSTOPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasStopReq*/ /** @@ -3839,34 +2064,27 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchL2MeasSendReq +S16 cmPkLrgSchL2MeasSendReq ( Pst * pst, LrgSchMeasSndReqInfo *measInfo ) -#else -PUBLIC S16 cmPkLrgSchL2MeasSendReq(pst, measInfo) -Pst * pst; -LrgSchMeasSndReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasSendReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != 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)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - CMCHKPK(SPkU32, measInfo->timePrd, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSENDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasSendReq*/ /** @@ -3881,30 +2099,22 @@ LrgSchMeasSndReqInfo *measInfo; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkNmbActvUeQciReq +static S16 cmUnpkNmbActvUeQciReq ( LrgNmbActvUeQCI *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkNmbActvUeQciReq(param, mBuf) -LrgNmbActvUeQCI *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkNmbActvUeQciReq) - - CMCHKUNPK(SUnpkU8, ¶m->sampPrd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sampPrd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->qci[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci[idx - 1], mBuf); } - RETVALUE(ROK); + return ROK; } /** @@ -3919,28 +2129,21 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbQciReq +static S16 cmUnpkAvgPrbQciReq ( LrgAvgPrbQCI *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkAvgPrbQciReq (param, mBuf) -LrgAvgPrbQCI *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkAvgPrbQciReq) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->qci[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci[idx - 1], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3958,27 +2161,19 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchL2MeasReq +S16 cmUnpkLrgSchL2MeasReq ( LrgSchL2MeasReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchL2MeasReq(func, pst, mBuf) -LrgSchL2MeasReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasReqInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasReq) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); if(measInfo.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) { @@ -3997,7 +2192,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkNmbActvUeQciReq, &measInfo.nmbActvUeQciDl, mBuf); } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } /** @@ -4014,30 +2209,21 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchL2MeasStopReq +S16 cmUnpkLrgSchL2MeasStopReq ( LrgSchL2MeasStopReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchL2MeasStopReq(func, pst, mBuf) -LrgSchL2MeasStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasStopReqInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasStopReq) - CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - /*CMCHKUNPK(SUnpkU16, &measInfo.timePrd, mBuf);*/ + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + /*CMCHKUNPK(oduPackUInt16, &measInfo.timePrd, mBuf);*/ CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasStopReq*/ /** @@ -4054,27 +2240,20 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchL2MeasSendReq +S16 cmUnpkLrgSchL2MeasSendReq ( LrgSchL2MeasSendReq func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchL2MeasSendReq(func, pst, mBuf) -LrgSchL2MeasSendReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasSndReqInfo measInfo; CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasSendReq*/ /** @@ -4090,35 +2269,28 @@ L2 Measurement confirm from MAC to LM * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchL2MeasStopCfm +S16 cmPkLrgSchL2MeasStopCfm ( Pst * pst, LrgSchMeasCfmInfo *measInfo ) -#else -PUBLIC S16 cmPkLrgSchL2MeasStopCfm(pst, measInfo) -Pst * pst; -LrgSchMeasCfmInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasStopCfm) - if (SGetMsg(pst->region, pst->pool, &mBuf) != 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)ELRG050, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSTOPCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasStopCfm*/ /** * @brief This API is used to Send a @@ -4133,31 +2305,23 @@ Measurement Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchL2MeasStopCfm +S16 cmUnpkLrgSchL2MeasStopCfm ( LrgSchL2MeasStopCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchL2MeasStopCfm(func, pst, mBuf) -LrgSchL2MeasStopCfm func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasCfmInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasStopCfm*/ /** @@ -4172,31 +2336,24 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkNumUeQciCfm +static S16 cmPkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkNumUeQciCfm(param, mBuf) -LrgNumActvUeQCICfm *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmPkNumUeQciCfm) for(idx = 0; idx < param->numQci; idx++) { /*LRG : Review Tag*/ - CMCHKPK(SPkU8, param->numActvUeQci[idx].qciValue, mBuf); - CMCHKPK(SPkU8, param->numActvUeQci[idx].numActvUeQci, mBuf); + CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].qciValue, mBuf); + CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].numActvUeQci, mBuf); /*LRG : Review Tag*/ } - CMCHKPK(SPkU8, param->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numQci, mBuf); + return ROK; } /** @@ -4211,30 +2368,23 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkAvgPrbQciCfm +static S16 cmPkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkAvgPrbQciCfm(param, mBuf) -LrgAvgPrbQCICfm *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmPkAvgPrbQciCfm) for(idx = 0; idx < param->numQci; idx++) { /*LRG : Review Tag*/ - CMCHKPK(SPkU8, param->prbPercQci[idx].qciValue, mBuf); - CMCHKPK(SPkU8, param->prbPercQci[idx].prbPercQci, mBuf); + CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].qciValue, mBuf); + CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].prbPercQci, mBuf); /*LRG : Review Tag*/ } - CMCHKPK(SPkU8, param->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numQci, mBuf); + return ROK; } /** @@ -4249,24 +2399,17 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkRaPrmbsCfm +static S16 cmPkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkRaPrmbsCfm(param, mBuf) -LrgRaPreamblesCfm *param; -Buffer *mBuf; -#endif { - TRC3(cmPkRaPrmbsCfm) - CMCHKPK(SPkU16, param->randSelPreHighRange, mBuf); - CMCHKPK(SPkU16, param->randSelPreLowRange, mBuf); - CMCHKPK(SPkU16, param->dedPreambles, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf); + CMCHKPK(oduUnpackUInt16, param->randSelPreLowRange, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedPreambles, mBuf); + return ROK; } /** @@ -4281,22 +2424,15 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmPkAvgPrbCfm +static S16 cmPkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkAvgPrbCfm(param, mBuf) -LrgAvgPrbCfm *param; -Buffer *mBuf; -#endif { - TRC3(cmPkAvgPrbCfm) - CMCHKPK(SPkU8, param->prbPerc, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf); + return ROK; } /** @@ -4312,21 +2448,14 @@ L2 Measurement confirm from MAC to LM * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmPkLrgSchL2MeasCfm +S16 cmPkLrgSchL2MeasCfm ( Pst * pst, LrgSchMeasCfmInfo *measInfo ) -#else -PUBLIC S16 cmPkLrgSchL2MeasCfm(pst, measInfo) -Pst * pst; -LrgSchMeasCfmInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -4334,7 +2463,7 @@ LrgSchMeasCfmInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG050, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) { @@ -4366,26 +2495,26 @@ LrgSchMeasCfmInfo *measInfo; } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransDlTotalCnt, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlTotalCnt, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransDlFaulty, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlFaulty, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransUlTotalCnt, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlTotalCnt, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransUlFaulty, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlFaulty, mBuf); } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -4400,30 +2529,23 @@ LrgSchMeasCfmInfo *measInfo; * @return Void * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkNumUeQciCfm +static S16 cmUnpkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkNumUeQciCfm(param, mBuf) -LrgNumActvUeQCICfm *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkNumUeQciCfm) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { /*LRG : Review Tag*/ - CMCHKUNPK(SUnpkU8, ¶m->numActvUeQci[idx - 1].numActvUeQci, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numActvUeQci[idx - 1].qciValue, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numActvUeQci[idx - 1].numActvUeQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numActvUeQci[idx - 1].qciValue, mBuf); /*LRG : Review Tag*/ } - RETVALUE(ROK); + return ROK; } /** @@ -4438,31 +2560,24 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbQciCfm +static S16 cmUnpkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkAvgPrbQciCfm(param, mBuf) -LrgAvgPrbQCICfm *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - TRC3(cmUnpkAvgPrbQciCfm) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { /*LRG : Review Tag*/ - CMCHKUNPK(SUnpkU8, ¶m->prbPercQci[idx - 1].prbPercQci, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prbPercQci[idx - 1].qciValue, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prbPercQci[idx - 1].prbPercQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prbPercQci[idx - 1].qciValue, mBuf); /*LRG : Review Tag*/ } - RETVALUE(ROK); + return ROK; } /** @@ -4477,25 +2592,18 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkRaPrmbsCfm +static S16 cmUnpkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkRaPrmbsCfm(param, mBuf) -LrgRaPreamblesCfm *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkRaPrmbsCfm) - CMCHKUNPK(SUnpkU16, ¶m->dedPreambles, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->randSelPreLowRange, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->randSelPreHighRange, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->dedPreambles, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->randSelPreLowRange, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->randSelPreHighRange, mBuf); + return ROK; } /** @@ -4510,23 +2618,16 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbCfm +static S16 cmUnpkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkAvgPrbCfm(param, mBuf) -LrgAvgPrbCfm *param; -Buffer *mBuf; -#endif { - TRC3(cmUnpkAvgPrbCfm) - CMCHKUNPK(SUnpkU8, ¶m->prbPerc, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->prbPerc, mBuf); + return ROK; } /** @@ -4542,43 +2643,35 @@ Measurement Confirm from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 cmUnpkLrgSchL2MeasCfm +S16 cmUnpkLrgSchL2MeasCfm ( LrgSchL2MeasCfm func, Pst *pst, Buffer *mBuf ) -#else -PUBLIC S16 cmUnpkLrgSchL2MeasCfm(func, pst, mBuf) -LrgSchL2MeasCfm func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasCfmInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransUlFaulty, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransUlFaulty, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransUlTotalCnt, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransUlTotalCnt, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransDlFaulty, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransDlFaulty, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransDlTotalCnt, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransDlTotalCnt, mBuf); } if(measInfo.measType & LRG_L2MEAS_AVG_PRB_UL) { @@ -4609,7 +2702,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkNumUeQciCfm, &measInfo.numUeQciDlCfm, mBuf); } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } #endif #endif