From: Balaji Shankaran Date: Wed, 11 Mar 2020 10:23:09 +0000 (+0530) Subject: Addressed review comments X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F2765%2F1;p=o-du%2Fl2.git Addressed review comments Change-Id: I567d9188943798c0c37db7633119dcafe8f2d623 Signed-off-by: Balaji Shankaran --- diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index 4f96a5f35..39eda9786 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -223,10 +223,10 @@ Buffer *mBuf; /* message buffer */ cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf); break; case EVTRLCDLDAT: - unpackSendDlData(RgUiRguDDatReq, pst, mBuf); + unpackDlData(RgUiRguDDatReq, pst, mBuf); break; case EVTRLCBOSTA: - unpackSendBOStatus(RgUiRguDStaRsp, pst, mBuf); + unpackBOStatus(RgUiRguDStaRsp, pst, mBuf); break; #ifdef LTE_L2_MEAS diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index ef72cf2dc..e291e871b 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -337,7 +337,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU -// cmPkRguCDatInd, /* Call packRcvdUlData instead */ +// cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */ #else PtUiRguCDatInd, #endif @@ -347,7 +347,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = PtUiRguCDatInd, #endif #ifdef LWLCRGUIRGU -// cmPkRguCDatInd, /* Call packRcvdUlData instead */ +// cmPkRguCDatInd, /* TODO:Call packRcvdUlData instead */ #else PtUiRguCDatInd, #endif @@ -358,7 +358,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU -// cmPkRguDDatInd, /* Call packRcvdUlData instead */ +// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ #else PtUiRguDDatInd, #endif @@ -368,7 +368,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = PtUiRguDDatInd, #endif #ifdef LWLCRGUIRGU -// cmPkRguDDatInd, /* Call packRcvdUlData instead */ +// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ #else PtUiRguDDatInd, #endif @@ -381,7 +381,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU - //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */ + //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ #else PtUiRguCStaInd, #endif @@ -391,7 +391,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = PtUiRguCStaInd, #endif #ifdef LWLCRGUIRGU - //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */ + //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ #else PtUiRguCStaInd, #endif @@ -404,7 +404,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU - //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */ + //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ #else PtUiRguDStaInd, #endif @@ -414,7 +414,7 @@ PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = PtUiRguDStaInd, #endif #ifdef LWLCRGUIRGU - //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */ + //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ #else PtUiRguDStaInd, #endif diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c index 298ecefb2..f59095566 100755 --- a/src/5gnrrlc/kw_lim.c +++ b/src/5gnrrlc/kw_lim.c @@ -227,19 +227,7 @@ U8 status; * */ -#ifdef ANSI -PUBLIC S16 RlcMacProcUlData -( -Pst* pst, -SuId suId, -RlcMacData *ulData -) -#else -PUBLIC S16 RlcMacProcUlData(pst, suId, ulData) -Pst* pst; -SuId suId; -RlcMacData *ulData; -#endif +PUBLIC S16 RlcMacProcUlData(Pst *pst, SuId suId, RlcMacData *ulData) { U8 idx; U8 lcId; /* Logical Channel */ @@ -481,19 +469,7 @@ RguDDatIndInfo *datInd; * RFAILED - failure * * ****************************************************************/ -#ifdef ANSI -PUBLIC S16 RlcMacProcSchedRep -( -Pst *pst, -SuId suId, -RlcMacSchedRep *schRep -) -#else -PUBLIC S16 RlcMacProcSchedRep(pst, suId, schRep) -Pst *pst; -SuId suId; -RlcMacSchedRep *schRep; -#endif +PUBLIC S16 RlcMacProcSchedRep(Pst *pst, SuId suId,RlcMacSchedRep *schRep) { U8 idx; /* Iterator */ U8 nmbDLch = 0; /* Number of dedicated logical channles */ diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c index 5e7873d73..92cb98ed5 100755 --- a/src/5gnrrlc/kw_ptli.c +++ b/src/5gnrrlc/kw_ptli.c @@ -150,13 +150,13 @@ PUBLIC RguBndReq kwLiRguUbndReqMt[] = PUBLIC RguDDatReq rlcMacSendDlDataOpts[] = { #ifdef LCKWLIRGU - packSendDlData, /* 0 - loosely coupled */ + packDlData, /* 0 - loosely coupled */ #endif /* LCRGUIRGU */ #ifdef RG RgUiRguDDatReq, /* 1 - tightly coupled, MAC */ #endif /* RG */ #ifdef LCKWLIRGU - packSendDlData, /* 0 - loosely coupled */ + packDlData, /* 0 - loosely coupled */ #endif /* LCRGUIRGU */ }; @@ -166,13 +166,13 @@ PUBLIC RguDDatReq rlcMacSendDlDataOpts[] = PUBLIC RguDStaRsp rlcMacSendBOStatusOpts[] = { #ifdef LCKWLIRGU - packSendBOStatus, /* 0 - loosely coupled */ + packBOStatus, /* 0 - loosely coupled */ #endif /* LCRGUIRGU */ #ifdef RG RgUiRguDStaRsp, /* 1 - tightly coupled, MAC */ #endif /* RG */ #ifdef LCKWLIRGU - packSendBOStatus, /* 0 - LWLC loosely coupled */ + packBOStatus, /* 0 - LWLC loosely coupled */ #endif /* LCRGUIRGU */ }; diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c index 59a46b890..5732c9381 100755 --- a/src/5gnrrlc/kw_uim.c +++ b/src/5gnrrlc/kw_uim.c @@ -289,6 +289,7 @@ Reason reason; PUBLIC S16 RlcDuappProcUeCreateReq(Pst *pst, CkwCfgInfo *ueCfg) { U8 idx; + S16 ret=ROK; ueCfg->transId = 1; @@ -297,7 +298,9 @@ PUBLIC S16 RlcDuappProcUeCreateReq(Pst *pst, CkwCfgInfo *ueCfg) ueCfg->entCfg[idx].cfgType = CKW_CFG_ADD; } - KwUiCkwCfgReq(pst, ueCfg); + ret = KwUiCkwCfgReq(pst, ueCfg); + return ret; + } /* RlcDuappUeCreateReq */ @@ -332,7 +335,6 @@ Pst *pst; CkwCfgInfo *cfg; #endif { - S16 ret = ROK; KwCb *tKwCb; KwUlCfgTmpData *cfgTmpData; @@ -350,19 +352,6 @@ CkwCfgInfo *cfg; #endif tKwCb = KW_GET_KWCB(pst->dstInst); -/* HLAL */ -#if 0 - RLOG1(L_DEBUG, "spId(%d)", spId); - - /* Validate SAP ID under ERRORCLS */ - KW_VALDATE_SAP(tKwCb, spId, (&(tKwCb->u.ulCb->ckwSap)), ret); - if (ret != ROK) - { - KW_PST_FREE(pst->region, pst->pool, cfg, sizeof(CkwCfgInfo)); - RETVALUE(RFAILED); - } -#endif - KW_ALLOC(tKwCb, cfgTmpData, sizeof (KwUlCfgTmpData)); if (cfgTmpData == NULLP) diff --git a/src/cm/ckw.c b/src/cm/ckw.c index a472ef38c..feec780e5 100755 --- a/src/cm/ckw.c +++ b/src/cm/ckw.c @@ -555,33 +555,6 @@ CkwCfgInfo *cfgInfo; CMCHKPK(cmPkPtr,(PTR) cfgInfo, mBuf); break; } -/* HLAL */ -#if 0 -#ifdef LCCKW - case CKW_SEL_LC: - { - ret1 = cmPkCkwCfgInfo( (cfgInfo), pst, mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - if(ret1 != ROK) - { - SPutMsg(mBuf); - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ECKW012, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); - } -#endif /* ERRCLASS & ERRCLS_ADD_RES */ - if (SPutSBuf(pst->region, pst->pool, (Data *)cfgInfo, - sizeof(CkwCfgInfo)) != ROK) - { - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - break; - } -#endif /* LCCKW */ -#endif /* HLAL */ } pst->event = (Event) RLC_EVT_UE_CREATE_REQ; @@ -1462,27 +1435,6 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf); break; } -/* HLAL */ -#if 0 -#ifdef LCCKW - case CKW_SEL_LC: - { - ret1 = cmUnpkCkwCfgInfo( (cfgInfo), pst, mBuf); -#if(ERRCLASS & ERRCLS_DEBUG) - if(ret1 != ROK) - { - SPutMsg(mBuf); - SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, - (ErrVal)ECKW034, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); - } -#endif /* ERRCLASS & ERRCLS_DEBUG */ - break; - } -#endif /* LCCKW */ -#endif /* HLAL */ - } SPutMsg(mBuf); diff --git a/src/cm/rgu.c b/src/cm/rgu.c index 1125b6bc3..25cd9ffb1 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -420,7 +420,7 @@ Buffer *mBuf; * * @details * -* Function : packSendDlData +* Function : packDlData * * @param[in] Pst* pst * @param[in] SpId spId @@ -429,21 +429,21 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 packSendDlData +PUBLIC S16 packDlData ( Pst* pst, SpId spId, RlcMacData *dlData ) #else -PUBLIC S16 packSendDlData(pst, spId, dlData) +PUBLIC S16 packDlData(pst, spId, dlData) Pst* pst; SpId spId; RlcMacData dlData; #endif { Buffer *mBuf = NULLP; - TRC3(packSendDlData) + TRC3(packDlData) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -516,7 +516,7 @@ RlcMacData dlData; * * @details * -* Function : unpackSendDlData +* Function : unpackDlData * * @param[in] Pst* pst * @param[in] SpId spId @@ -525,14 +525,14 @@ RlcMacData dlData; * -# ROK **/ #ifdef ANSI -PUBLIC S16 unpackSendDlData +PUBLIC S16 unpackDlData ( RguDDatReq func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 unpackSendDlData(func, pst, mBuf) +PUBLIC S16 unpackDlData(func, pst, mBuf) RguDDatReq func; Pst *pst; Buffer *mBuf; @@ -542,7 +542,7 @@ Buffer *mBuf; // RguDDatReqInfo *datReq; RlcMacData *dlData; - TRC3(unpackSendDlData) + TRC3(unpackDlData) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1021,7 +1021,7 @@ Buffer *mBuf; * * @details * -* Function : packSendBOStatus, +* Function : packBOStatus, * * @param[in] Pst* pst * @param[in] SpId spId @@ -1030,14 +1030,14 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PUBLIC S16 packSendBOStatus +PUBLIC S16 packBOStatus ( Pst* pst, SpId spId, RlcMacBOStatus *boStatus ) #else -PUBLIC S16 packSendBOStatus(pst, spId, staRsp) +PUBLIC S16 packBOStatus(pst, spId, staRsp) Pst* pst; SpId spId; RlcMacBOStatus *boStatus; @@ -1115,7 +1115,7 @@ RlcMacBOStatus *boStatus; * * @details * -* Function : unpackSendBOStatus +* Function : unpackBOStatus * * @param[in] Pst* pst * @param[in] SpId spId @@ -1124,14 +1124,14 @@ RlcMacBOStatus *boStatus; * -# ROK **/ #ifdef ANSI -PUBLIC S16 unpackSendBOStatus +PUBLIC S16 unpackBOStatus ( RguDStaRsp func, Pst *pst, Buffer *mBuf ) #else -PUBLIC S16 unpackSendBOStatus(func, pst, mBuf) +PUBLIC S16 unpackBOStatus(func, pst, mBuf) RguDStaRsp func; Pst *pst; Buffer *mBuf; @@ -1140,7 +1140,7 @@ Buffer *mBuf; SpId spId; RlcMacBOStatus *boSta; - TRC3(unpackSendBOStatus) + TRC3(unpackBOStatus) if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) diff --git a/src/cm/rgu.x b/src/cm/rgu.x index d7eb2f067..9c4c13b6a 100755 --- a/src/cm/rgu.x +++ b/src/cm/rgu.x @@ -825,14 +825,14 @@ EXTERN S16 cmUnpkRguCDatReq ARGS(( )); /** @brief Request from RLC to MAC for forwarding SDUs on * dedicated channel for transmission */ -EXTERN S16 packSendDlData ARGS(( +EXTERN S16 packDlData ARGS(( Pst* pst, SpId spId, RlcMacData * datReq )); /** @brief Request from RLC to MAC for forwarding SDUs on * dedicated channel for transmission */ -EXTERN S16 unpackSendDlData ARGS(( +EXTERN S16 unpackDlData ARGS(( RguDDatReq func, Pst* pst, Buffer *mBuf @@ -881,14 +881,14 @@ EXTERN S16 cmUnpkRguCStaRsp ARGS(( )); /** @brief Primitive invoked from RLC to MAC to * inform the BO report for dedicated channels*/ -EXTERN S16 packSendBOStatus ARGS(( +EXTERN S16 packBOStatus ARGS(( Pst* pst, SpId spId, RlcMacBOStatus* boStatus )); /** @brief Primitive invoked from RLC to MAC to * inform the BO report for dedicated channels*/ -EXTERN S16 unpackSendBOStatus ARGS(( +EXTERN S16 unpackBOStatus ARGS(( RguDStaRsp func, Pst* pst, Buffer *mBuf