X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flrg.c;h=84a4d301c424ab7a0ec3cc418728175416cef651;hb=40d79285fedc8551f3f0e43ba01123d367c09248;hp=38642dbc9c01a19d40ab41f12a9191c1ee867fb7;hpb=073b67b21b11eefdaa84a30029f374435c3e0fd0;p=o-du%2Fl2.git diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 38642dbc9..84a4d301c 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -504,18 +504,18 @@ RgMngmt * cfm /** -* @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 -**/ + * * @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, @@ -524,7 +524,7 @@ Buffer *mBuf ) { RgMngmt cfm; - + if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSTSCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -540,170 +540,6 @@ Buffer *mBuf } -/** -* @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 -**/ -S16 cmPkLrgStaReq -( -Pst * pst, -RgMngmt * sta -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG019, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - - pst->event = (Event) EVTLRGSSTAREQ; - return (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 -**/ -S16 cmUnpkLrgStaReq -( -LrgStaReq func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt sta; - - - memset(&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); - return RFAILED; - } - SPutMsg(mBuf); - return ((*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 -**/ -S16 cmPkLrgStaCfm -( -Pst * pst, -RgMngmt * cfm -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG022, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - - pst->event = (Event) EVTLRGSSTACFM; - return (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 -**/ -S16 cmUnpkLrgStaCfm -( -LrgStaCfm func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt cfm; - - - memset(&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); - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, &cfm)); -} - - /** * @brief This API is used to send a Status Indication from MAC to LM. @@ -870,961 +706,86 @@ Buffer *mBuf } -/** -* @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 -**/ -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 ) { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG031, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - } - - pst->event = (Event) EVTLRGCNTRLREQ; - return (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 -**/ -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 ) { - RgMngmt cntrl; - - 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 - return RFAILED; - } - SPutMsg(mBuf); - return ((*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 -**/ -S16 cmPkLrgSchCntrlReq -( -Pst * pst, -RgMngmt * cntrl -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG034, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - } - - pst->event = (Event) EVTLRGSCHCNTRLREQ; - return (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 -**/ -S16 cmUnpkLrgSchCntrlReq -( -LrgSchCntrlReq func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt cntrl; - - - 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 - return RFAILED; - } - SPutMsg(mBuf); - return ((*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 -**/ -S16 cmPkLrgCntrlCfm -( -Pst * pst, -RgMngmt * cfm -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG037, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - } - - pst->event = (Event) EVTLRGCNTRLCFM; - return (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 -**/ -S16 cmUnpkLrgCntrlCfm -( -LrgCntrlCfm func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt cfm; - - - 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 - return RFAILED; - } - SPutMsg(mBuf); - return ((*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 -**/ -S16 cmPkLrgSchCntrlCfm -( -Pst * pst, -RgMngmt * cntrl -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG040, (ErrVal)0, "Packing failed"); -#endif - return 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); - return RFAILED; - } - } - - pst->event = (Event) EVTLRGSCHCNTRLCFM; - return (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 -**/ -S16 cmUnpkLrgSchCntrlCfm -( -LrgSchCntrlCfm func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt cntrl; - - - 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 - return RFAILED; - } - SPutMsg(mBuf); - return ((*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 -**/ -S16 cmPkLrgTrcInd -( -Pst * pst, -RgMngmt * trc, -Buffer * trcBuf -) -{ - Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ELRG043, (ErrVal)0, "Packing failed"); -#endif - SPutMsg(trcBuf); - return 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); - return 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); - return 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); - return RFAILED; - } - - pst->event = (Event) EVTLRGTRCIND; - return (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 -**/ -S16 cmUnpkLrgTrcInd -( -LrgTrcInd func, -Pst *pst, -Buffer *mBuf -) -{ - RgMngmt trc; - /* lrg_c_001.main_3 - MODIFY - Modified trcBuf to have it initialized to NULLP */ - Buffer *trcBuf = NULLP; - - - 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 - return RFAILED; - } - if (pst->selector == ODU_SELECTOR_LC) { - MsgLen msgLen, totalMsgLen; - CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); - if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - return RFAILED; - if (SSegMsg(mBuf, totalMsgLen-msgLen, &trcBuf) != ROK) - return RFAILED; - } - SPutMsg(mBuf); - return ((*func)(pst, &trc, trcBuf)); -} - - -/*********************************************************** -* -* Func : cmPkRgGenCfg -* -* -* Desc : This structure holds configuration parameters for MAC General Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgGenCfg -( -RgGenCfg *param, -Buffer *mBuf -) -{ - - -#ifdef LTE_ADV - CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf); - CMCHKPK(oduUnpackUInt8, param->forceCntrlSrbBoOnPCel, mBuf); -#endif - 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; -} - - - -/*********************************************************** -* -* Func : cmUnpkRgGenCfg -* -* -* Desc : This structure holds configuration parameters for MAC General Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgGenCfg -( -RgGenCfg *param, -Buffer *mBuf -) -{ - - - 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 - return ROK; -} - - - -/*********************************************************** -* -* Func : cmPkRgUpSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgUpSapCfg -( -RgUpSapCfg *param, -Buffer *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 : cmUnpkRgUpSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgUpSapCfg -( -RgUpSapCfg *param, -Buffer *mBuf -) -{ - - - 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 : cmPkRgLowSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgLowSapCfg -( -RgLowSapCfg *param, -Buffer *mBuf -) -{ - - - 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 : cmUnpkRgLowSapCfg -* -* -* Desc : This structure holds configuration parameters for MAC Lower SAP Configuration. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgLowSapCfg -( -RgLowSapCfg *param, -Buffer *mBuf -) -{ - - - 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 : cmPkRgAckNack -* -* -* Desc : Ack and Nack statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgAckNack -( -RgAckNack *param, -Buffer *mBuf -) -{ - - - CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf); - CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf); - CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); - - return ROK; -} /* cmPkRgAckNack */ - - -/*********************************************************** -* -* Func : cmPkRgSchNackAckStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgSchNackAckStats -( -RgSchNackAckStats *param, -Buffer *mBuf -) -{ - - S32 i; - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgAckNack, ¶m->ulCqiStat[i], mBuf); - } - - for (i=14; i >= 0; i--) { - CMCHKPK(cmPkRgAckNack, ¶m->dlCqiStat[i], mBuf); - } - - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgHqNumRetx -* -* -* Desc : Harq Retransmission statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgHqNumRetx -( -RgSchHqNumRetx *param, -Buffer *mBuf -) -{ - - 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 : cmPkRgSchHqRetxStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgSchHqRetxStats -( -RgSchHqRetxStats *param, -Buffer *mBuf -) -{ - - S32 i; - - 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 : cmUnpkRgAckNack -* -* -* Desc : Ack and Nack statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgAckNack -( -RgAckNack *param, -Buffer *mBuf -) -{ - - - CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->numOfNacks, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->numOfAcks, mBuf); - - return ROK; -} /* cmUnkRgAckNack */ - - -/*********************************************************** -* -* Func : cmUnpkRgSchNackAckStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgSchNackAckStats -( -RgSchNackAckStats *param, -Buffer *mBuf -) -{ - S32 i; - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgAckNack, ¶m->dlCqiStat[i], mBuf); - } - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgAckNack, ¶m->ulCqiStat[i], mBuf); - } - - return ROK; -} /* cmUnpkRgSchNackAckStats */ - - -/*********************************************************** -* -* Func : cmUnpkRgHqNumRetx -* -* -* Desc : Harq Retransmission statistics -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgHqNumRetx -( -RgSchHqNumRetx *param, -Buffer *mBuf -) -{ - - 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 : cmUnpkRgSchHqRetxStats -* -* -* Desc : -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmUnpkRgSchHqRetxStats -( -RgSchHqRetxStats *param, -Buffer *mBuf -) -{ - S32 i; - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); - } - - for (i=0; i <= 14; i++) { - CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); - } - - return ROK; -} /* cmUnpkRgSchHqRetxStats */ - -#endif /* MAC_SCH_STATS */ - - -/*********************************************************** -* -* Func : cmPkRgGenSts -* -* -* Desc : This structure holds General Statistical information of MAC. +* Desc : This structure holds configuration parameters for MAC Upper SAP Configuration. * * * Ret : S16 @@ -1834,20 +795,23 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgGenSts +S16 cmPkRgUpSapCfg ( -RgGenSts *param, +RgUpSapCfg *param, Buffer *mBuf ) { -#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); + + 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; } @@ -1855,10 +819,10 @@ Buffer *mBuf /*********************************************************** * -* 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 @@ -1868,20 +832,23 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgGenSts +S16 cmUnpkRgUpSapCfg ( -RgGenSts *param, +RgUpSapCfg *param, Buffer *mBuf ) { - 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 */ + + 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; } @@ -1889,10 +856,10 @@ Buffer *mBuf /*********************************************************** * -* 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 @@ -1902,16 +869,24 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSapSts +S16 cmPkRgLowSapCfg ( -RgSapSts *param, +RgLowSapCfg *param, Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); - CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); - CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf); + + 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; } @@ -1919,10 +894,10 @@ Buffer *mBuf /*********************************************************** * -* 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 @@ -1932,27 +907,36 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSapSts +S16 cmUnpkRgLowSapCfg ( -RgSapSts *param, +RgLowSapCfg *param, Buffer *mBuf ) { - CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->numPduDrop, mBuf); + + 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 @@ -1962,38 +946,28 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSchInstCfg +S16 cmPkRgAckNack ( -RgSchInstCfg *param, +RgAckNack *param, Buffer *mBuf ) { - S32 i; - 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; -} + 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 @@ -2003,85 +977,33 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSchInstCfg +S16 cmPkRgSchNackAckStats ( -RgSchInstCfg *param, +RgSchNackAckStats *param, Buffer *mBuf ) { S32 i; - 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); + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgAckNack, ¶m->ulCqiStat[i], mBuf); } - return ROK; -} - - -/*********************************************************** -* -* Func : cmPkRgCfg -* -* -* Desc : This structure holds Configuration parameters for MAC. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -S16 cmPkRgCfg -( -RgCfg *param, -S16 elmnt, -Buffer *mBuf -) -{ + for (i=14; i >= 0; i--) { + CMCHKPK(cmPkRgAckNack, ¶m->dlCqiStat[i], mBuf); + } - 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 : cmUnpkRgCfg +* Func : cmPkRgHqNumRetx * * -* Desc : This structure holds Configuration parameters for MAC. +* Desc : Harq Retransmission statistics * * * Ret : S16 @@ -2091,44 +1013,30 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgCfg +S16 cmPkRgHqNumRetx ( -RgCfg *param, -S16 elmnt, +RgSchHqNumRetx *param, Buffer *mBuf ) { - 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; -} + 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 : cmPkRgSapSta +* Func : cmPkRgSchHqRetxStats * * -* Desc : This structure holds a SAP's status information. +* Desc : * * * Ret : S16 @@ -2138,25 +1046,34 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSapSta +S16 cmPkRgSchHqRetxStats ( -RgSapSta *param, +RgSchHqRetxStats *param, Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt8, param->sapState, mBuf); - return ROK; -} + S32 i; + + 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 : cmUnpkRgSapSta +* Func : cmUnpkRgAckNack * * -* Desc : This structure holds a SAP's status information. +* Desc : Ack and Nack statistics * * * Ret : S16 @@ -2166,25 +1083,28 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSapSta +S16 cmUnpkRgAckNack ( -RgSapSta *param, +RgAckNack *param, Buffer *mBuf ) { - CMCHKUNPK(oduPackUInt8, ¶m->sapState, mBuf); - return ROK; -} + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfNacks, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfAcks, mBuf); + + return ROK; +} /* cmUnkRgAckNack */ /*********************************************************** * -* Func : cmPkRgSts +* Func : cmUnpkRgSchNackAckStats * * -* Desc : This structure holds MAC's Statistical information. +* Desc : * * * Ret : S16 @@ -2194,47 +1114,32 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSts +S16 cmUnpkRgSchNackAckStats ( -RgSts *param, -S16 elmnt, +RgSchNackAckStats *param, Buffer *mBuf ) { + S32 i; - 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; -} + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgAckNack, ¶m->dlCqiStat[i], mBuf); + } + + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgAckNack, ¶m->ulCqiStat[i], mBuf); + } + return ROK; +} /* cmUnpkRgSchNackAckStats */ /*********************************************************** * -* Func : cmUnpkRgSts +* Func : cmUnpkRgHqNumRetx * * -* Desc : This structure holds MAC's Statistical information. +* Desc : Harq Retransmission statistics * * * Ret : S16 @@ -2244,47 +1149,30 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSts +S16 cmUnpkRgHqNumRetx ( -RgSts *param, -S16 elmnt, +RgSchHqNumRetx *param, Buffer *mBuf ) { - 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; -} + 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 : cmPkRgSsta +* Func : cmUnpkRgSchHqRetxStats * * -* Desc : This structure holds MAC's Solicited Status information. +* Desc : * * * Ret : S16 @@ -2294,68 +1182,34 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSsta +S16 cmUnpkRgSchHqRetxStats ( -Pst *pst, -RgSsta *param, -S16 elmnt, -#ifdef LRG_V1 -uint8_t eventType, -#endif +RgSchHqRetxStats *param, Buffer *mBuf ) { + S32 i; + + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); + } + + for (i=0; i <= 14; i++) { + CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); + } - 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(oduUnpackUInt8, param->sapInst, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); return ROK; -} +} /* cmUnpkRgSchHqRetxStats */ +#endif /* MAC_SCH_STATS */ /*********************************************************** * -* Func : cmUnpkRgSsta +* Func : cmPkRgGenSts * * -* Desc : This structure holds MAC's Solicited Status information. +* Desc : This structure holds General Statistical information of MAC. * * * Ret : S16 @@ -2365,57 +1219,20 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSsta +S16 cmPkRgGenSts ( -Pst *pst, -RgSsta *param, -S16 elmnt, +RgGenSts *param, Buffer *mBuf ) { - - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(oduPackUInt8, ¶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); - return RFAILED; - } - /* KWORK_FIX: Moved the memset under the NULL check */ - if (param->s.sysId.ptNmb != NULLP) - { - memset(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; - } +#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; } @@ -2423,10 +1240,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmPkRgUstaDgn +* Func : cmUnpkRgGenSts * * -* Desc : Alarm diagnostics structure. +* Desc : This structure holds General Statistical information of MAC. * * * Ret : S16 @@ -2436,21 +1253,20 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgUstaDgn +S16 cmUnpkRgGenSts ( -RgUstaDgn *param, +RgGenSts *param, Buffer *mBuf ) { - switch(param->type) { - case LRG_USTA_DGNVAL_MEM: - CMCHKPK(cmPkMemoryId, ¶m->u.mem, mBuf); - break; - default : - break; - } - CMCHKPK(oduUnpackUInt8, param->type, mBuf); + 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; } @@ -2458,10 +1274,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmUnpkRgUstaDgn +* Func : cmPkRgSapSts * * -* Desc : Alarm diagnostics structure. +* Desc : This structure holds Statistical information of a SAP in MAC. * * * Ret : S16 @@ -2471,23 +1287,46 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgUstaDgn +S16 cmPkRgSapSts ( -RgUstaDgn *param, +RgSapSts *param, Buffer *mBuf ) { + CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf); + return ROK; +} + - CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); - switch(param->type) - { - case LRG_USTA_DGNVAL_MEM: - CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); - break; - default : - break; - } + +/*********************************************************** +* +* Func : cmUnpkRgSapSts +* +* +* Desc : This structure holds Statistical information of a SAP in MAC. +* +* +* Ret : S16 +* +* Notes: +* +* File : +* +**********************************************************/ +S16 cmUnpkRgSapSts +( +RgSapSts *param, +Buffer *mBuf +) +{ + + CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduDrop, mBuf); return ROK; } @@ -2495,10 +1334,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmPkRgUsta +* Func : cmPkRgSchInstCfg * * -* Desc : This structure holds MAC's Unsolicited Status information. +* Desc : Scheduler Configuration * * * Ret : S16 @@ -2508,15 +1347,27 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgUsta +S16 cmPkRgSchInstCfg ( -RgUsta *param, +RgSchInstCfg *param, Buffer *mBuf ) { - CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); - CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); + S32 i; + + 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; } @@ -2524,10 +1375,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmUnpkRgUsta +* Func : cmUnpkRgSchInstCfg * * -* Desc : This structure holds MAC's Unsolicited Status information. +* Desc : Scheduler Configuration * * * Ret : S16 @@ -2537,15 +1388,27 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgUsta +S16 cmUnpkRgSchInstCfg ( -RgUsta *param, +RgSchInstCfg *param, Buffer *mBuf ) { - CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); - CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); + S32 i; + + 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; } @@ -2553,10 +1416,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmPkRgTrc +* Func : cmPkRgCfg * * -* Desc : This structure holds MAC's Trace Indication information. +* Desc : This structure holds Configuration parameters for MAC. * * * Ret : S16 @@ -2566,15 +1429,33 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgTrc +S16 cmPkRgCfg ( -RgTrc *param, +RgCfg *param, +S16 elmnt, Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt8, param->evnt, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); + 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; } @@ -2582,10 +1463,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmUnpkRgTrc +* Func : cmUnpkRgCfg * * -* Desc : This structure holds MAC's Trace Indication information. +* Desc : This structure holds Configuration parameters for MAC. * * * Ret : S16 @@ -2595,15 +1476,33 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgTrc +S16 cmUnpkRgCfg ( -RgTrc *param, +RgCfg *param, +S16 elmnt, Buffer *mBuf ) { - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->evnt, mBuf); + 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; } @@ -2611,10 +1510,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmPkRgDbgCntrl +* Func : cmPkRgSapSta * * -* Desc : This structure holds MAC's Debug Control information. +* Desc : This structure holds a SAP's status information. * * * Ret : S16 @@ -2624,24 +1523,25 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgDbgCntrl +S16 cmPkRgSapSta ( -RgDbgCntrl *param, +RgSapSta *param, Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf); + 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 @@ -2651,29 +1551,25 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSchUlAllocCntrl +S16 cmUnpkRgSapSta ( -RgSchUlAllocCntrl *param, +RgSapSta *param, Buffer *mBuf ) { - CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); - CMCHKPK(oduUnpackUInt16, param->numOfRb, mBuf); - CMCHKPK(oduUnpackUInt16, param->rbStart, mBuf); - CMCHKPK(oduUnpackUInt8, param->testStart, mBuf); - CMCHKPK(oduUnpackUInt8, param->enaLog, mBuf); - CMCHKPK(oduUnpackUInt16, param->logTime, mBuf); - + 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 @@ -2683,32 +1579,47 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSchUlAllocCntrl +S16 cmPkRgSts ( -RgSchUlAllocCntrl *param, +RgSts *param, +S16 elmnt, Buffer *mBuf ) { - CMCHKUNPK(oduPackUInt16, ¶m->logTime, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->enaLog, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->testStart, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->rbStart, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->numOfRb, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); - + 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 @@ -2718,25 +1629,46 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgDbgCntrl +S16 cmUnpkRgSts ( -RgDbgCntrl *param, +RgSts *param, +S16 elmnt, Buffer *mBuf ) { - CMCHKUNPK(oduPackUInt32, ¶m->dbgMask, mBuf); + 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 @@ -2746,15 +1678,21 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgSapCntrl +S16 cmPkRgUstaDgn ( -RgSapCntrl *param, +RgUstaDgn *param, Buffer *mBuf ) { - CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkS16, param->suId, mBuf); + switch(param->type) { + case LRG_USTA_DGNVAL_MEM: + CMCHKPK(cmPkMemoryId, ¶m->u.mem, mBuf); + break; + default : + break; + } + CMCHKPK(oduUnpackUInt8, param->type, mBuf); return ROK; } @@ -2762,10 +1700,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmUnpkRgSapCntrl +* Func : cmUnpkRgUstaDgn * * -* Desc : This structure holds MAC's SAP Control information. +* Desc : Alarm diagnostics structure. * * * Ret : S16 @@ -2775,15 +1713,23 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgSapCntrl +S16 cmUnpkRgUstaDgn ( -RgSapCntrl *param, +RgUstaDgn *param, Buffer *mBuf ) { - CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); - CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); + + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); + switch(param->type) + { + case LRG_USTA_DGNVAL_MEM: + CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); + break; + default : + break; + } return ROK; } @@ -2791,10 +1737,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmPkRgCntrl +* Func : cmPkRgUsta * * -* Desc : This structure holds MAC's Control information. +* Desc : This structure holds MAC's Unsolicited Status information. * * * Ret : S16 @@ -2804,56 +1750,15 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmPkRgCntrl +S16 cmPkRgUsta ( -RgCntrl *param, -S16 elmnt, +RgUsta *param, Buffer *mBuf ) { - - 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(oduUnpackUInt32, 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(oduUnpackUInt8, param->subAction, mBuf); - CMCHKPK(oduUnpackUInt8, param->action, mBuf); - CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); + CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); + CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); return ROK; } @@ -2861,10 +1766,10 @@ Buffer *mBuf /*********************************************************** * -* Func : cmUnpkRgCntrl +* Func : cmUnpkRgUsta * * -* Desc : This structure holds MAC's Control information. +* Desc : This structure holds MAC's Unsolicited Status information. * * * Ret : S16 @@ -2874,60 +1779,18 @@ Buffer *mBuf * File : * **********************************************************/ -S16 cmUnpkRgCntrl +S16 cmUnpkRgUsta ( -RgCntrl *param, -S16 elmnt, +RgUsta *param, Buffer *mBuf ) { - - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); - CMCHKUNPK(oduPackUInt8, ¶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(oduPackUInt32, ¶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; - } + CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); + CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); return ROK; } - /*********************************************************** * @@ -2955,32 +1818,10 @@ Buffer *mBuf switch(eventType) { - case EVTLRGCNTRLREQ: - case EVTLRGCNTRLCFM: - case EVTLRGSCHCNTRLREQ: - case EVTLRGSCHCNTRLCFM: - if(cmPkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - return 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) - return RFAILED; -#else /* LRG_V1 is not defined */ - if(cmPkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - return RFAILED; -#endif /* end of LRG_V1*/ - break; case EVTLRGSTSREQ: case EVTLRGSTSCFM: if(cmPkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf)!= ROK) @@ -3046,25 +1887,10 @@ Buffer *mBuf if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) return RFAILED; break; - case EVTLRGSSTAREQ: - case EVTLRGSSTACFM: - if(cmUnpkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - return 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) - return RFAILED; - break; default : return RFAILED; }