X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_cfg_dl.c;h=ab4b6321fb2af80d7459a705c085d146998565c3;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=359b3c7e04ed707b604fe1ee846a4f5da38aadd5;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c index 359b3c7e0..ab4b6321f 100755 --- a/src/5gnrrlc/kw_cfg_dl.c +++ b/src/5gnrrlc/kw_cfg_dl.c @@ -24,14 +24,14 @@ Desc: It contains the following configuraiton primtives for different actions - -- kwCfgValdtEntCfg - -- kwCfgFillRbCb - -- kwCfgRbInit - -- kwCfgAddRb - -- kwCfgReCfgRb - -- kwCfgDelRb - -- kwCfgReEstRb - -- kwCfgDelUe + -- rlcCfgValdtEntCfg + -- rlcCfgFillRbCb + -- rlcCfgRbInit + -- rlcCfgAddRb + -- rlcCfgReCfgRb + -- rlcCfgDelRb + -- rlcCfgReEstRb + -- rlcCfgDelUe File: kw_cfg_dl.c @@ -82,7 +82,7 @@ static int RLOG_FILE_ID=191; * -# RFAILED * */ -PRIVATE S16 kwHdlMeasDlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) +PRIVATE S16 kwHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) { KwL2MeasEvtCb *measEvtCb = NULLP; KwL2MeasCb *measCb = NULLP; @@ -108,7 +108,7 @@ PRIVATE S16 kwHdlMeasDlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) } } } - RETVALUE(ROK); + return ROK; } /** @@ -123,7 +123,7 @@ PRIVATE S16 kwHdlMeasDlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) * -# RFAILED * */ -PRIVATE S16 kwDelFrmDlL2Meas(KwCb *gCb, U8 cellId,U8 ueId) +PRIVATE S16 kwDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) { KwL2MeasEvtCb *measEvtCb = NULLP; KwL2MeasCb *measCb = NULLP; @@ -156,11 +156,11 @@ PRIVATE S16 kwDelFrmDlL2Meas(KwCb *gCb, U8 cellId,U8 ueId) } } - RETVALUE(ROK); + return ROK; } -PRIVATE S16 kwAddToDlL2Meas(KwCb *gCb, KwDlRbCb *kwRbCb,U8 cellId,U8 ueId) +PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId) { KwL2MeasEvtCb *measEvtCb = NULLP; KwL2MeasCb *measCb = NULLP; @@ -251,7 +251,7 @@ PRIVATE S16 kwAddToDlL2Meas(KwCb *gCb, KwDlRbCb *kwRbCb,U8 cellId,U8 ueId) { if (gCb->genCfg.maxUe == measCb->val.ipThMeas.numUes) { - RETVALUE(RFAILED); + return RFAILED; } if (gCb->genCfg.maxUe == freeIdx) { @@ -298,7 +298,7 @@ PRIVATE S16 kwAddToDlL2Meas(KwCb *gCb, KwDlRbCb *kwRbCb,U8 cellId,U8 ueId) } kwRbCb->rbL2Cb.measOn |= measCb->measType; } - RETVALUE(ROK); + return ROK; }/*kwAddToDlL2Meas*/ #endif /*LTE_L2_MEAS*/ @@ -316,25 +316,25 @@ PRIVATE S16 kwAddToDlL2Meas(KwCb *gCb, KwDlRbCb *kwRbCb,U8 cellId,U8 ueId) * -#RFAILED */ #ifdef ANSI -PRIVATE S16 kwCfgFillDlRbCb +PRIVATE S16 rlcCfgFillDlRbCb ( -KwCb *gCb, -KwDlRbCb *rbCb, -KwDlUeCb *ueCb, -CkwEntCfgInfo *entCfg +RlcCb *gCb, +RlcDlRbCb *rbCb, +RlcDlUeCb *ueCb, +RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 kwCfgFillDlRbCb(gCb,rbCb,entCfg) -KwCb *gCb; -KwDlRbCb *rbCb; -KwDlUeCb *ueCb; -CkwEntCfgInfo *entCfg; +PRIVATE S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg) +RlcCb *gCb; +RlcDlRbCb *rbCb; +RlcDlUeCb *ueCb; +RlcEntCfgInfo *entCfg; #endif { - TRC3(kwCfgFillDlRbCb) + TRC3(rlcCfgFillDlRbCb) RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "kwCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))", + "rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))", rbCb->rlcId.ueId, rbCb->rlcId.cellId, entCfg->rbType); @@ -394,7 +394,7 @@ CkwEntCfgInfo *entCfg; #ifndef LTE_TDD U32 hashIndex; - KW_ALLOC(gCb, + RLC_ALLOC(gCb, rbCb->m.amDl.txBufLst, (KW_TX_BUF_BIN_SIZE * sizeof(CmLListCp))); for(hashIndex = 0; hashIndex < KW_TX_BUF_BIN_SIZE; hashIndex++) @@ -410,13 +410,13 @@ CkwEntCfgInfo *entCfg; "Invalid RB Mode ueId(%d),cellId(%d)", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } } rbCb->mode = entCfg->entMode; rbCb->discTmrInt = entCfg->discardTmr; - RETVALUE(ROK); + return ROK; } @@ -433,22 +433,22 @@ CkwEntCfgInfo *entCfg; * -#RFAILED */ #ifdef ANSI -PRIVATE S16 kwCfgUpdateDlRb +PRIVATE S16 rlcCfgUpdateDlRb ( -KwCb *gCb, -KwDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, void *ptr, -CkwEntCfgInfo *entCfg +RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 kwCfgUpdateDlRb(gCb,rbCb, ptr, entCfg) -KwCb *gCb; -KwDlRbCb *rbCb; +PRIVATE S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg) +RlcCb *gCb; +RlcDlRbCb *rbCb; void *ptr; -CkwEntCfgInfo *entCfg; +RlcEntCfgInfo *entCfg; #endif { - TRC3(kwCfgUpdateDlRb) + TRC3(rlcCfgUpdateDlRb) if (rbCb->mode != entCfg->entMode) { @@ -458,14 +458,14 @@ CkwEntCfgInfo *entCfg; entCfg->entMode, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(CKW_CFG_REAS_RB_MODE_MIS); + return (CKW_CFG_REAS_RB_MODE_MIS); } switch (rbCb->mode) { case CM_LTE_MODE_TM: { - KwDlCellCb *cellCb = (KwDlCellCb *)ptr; + RlcDlCellCb *cellCb = (RlcDlCellCb *)ptr; rbCb->dir = entCfg->dir; rbCb->lch.lChId = entCfg->lCh[0].lChId; @@ -477,11 +477,11 @@ CkwEntCfgInfo *entCfg; case CM_LTE_MODE_UM: { - KwDlUeCb *ueCb = (KwDlUeCb *)ptr; + RlcDlUeCb *ueCb = (RlcDlUeCb *)ptr; if (entCfg->lCh[0].type == CM_LTE_LCH_DCCH) { - RETVALUE(CKW_CFG_REAS_LCHTYPE_MIS); + return (CKW_CFG_REAS_LCHTYPE_MIS); } ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = NULLP; ueCb->lCh[entCfg->lCh[0].lChId - 1].dlRbCb = rbCb; @@ -494,7 +494,7 @@ CkwEntCfgInfo *entCfg; case CM_LTE_MODE_AM: { - KwDlUeCb *ueCb = (KwDlUeCb *)ptr; + RlcDlUeCb *ueCb = (RlcDlUeCb *)ptr; ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = NULLP; ueCb->lCh[entCfg->lCh[1].lChId - 1].dlRbCb = rbCb; @@ -514,7 +514,7 @@ CkwEntCfgInfo *entCfg; /* AGHOSH */ rbCb->discTmrInt = entCfg->discardTmr; /* AGHOSH */ - RETVALUE(CKW_CFG_REAS_NONE); + return (CKW_CFG_REAS_NONE); } @@ -549,32 +549,32 @@ CkwEntCfgInfo *entCfg; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgAddDlRb +PUBLIC S16 rlcCfgAddDlRb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm) +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { - KwDlUeCb *ueCb = NULLP; /* UE Control Block */ - KwDlCellCb *cellCb; /* Cell Control Block */ - KwDlRbCb *kwRbCb; /* KW RB Control Block */ + RlcDlUeCb *ueCb = NULLP; /* UE Control Block */ + RlcDlCellCb *cellCb; /* Cell Control Block */ + RlcDlRbCb *kwRbCb; /* KW RB Control Block */ U8 reason; /* Rb Identifier */ - TRC3(kwCfgAddDlRb) + TRC3(rlcCfgAddDlRb) RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "kwCfgAddRb(cellId(%d),UEID:%d cfgType(%d))", + "rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))", cellId, ueId, entCfg->cfgType); @@ -587,13 +587,13 @@ CkwEntCfgCfmInfo *entCfm; RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId, "Add DLRb,CellId is 0 for UEID:%d", ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((entCfg->rguSapId >= gCb->genCfg.maxRguSaps) || (entCfg->rguSapId < 0)) { - KWDBGP_ERROR(gCb, "kwCfgAddDlRb(ueId(%u), cellId(%u), Invalid rguSapId (%d)\n", + KWDBGP_ERROR(gCb, "rlcCfgAddDlRb(ueId(%u), cellId(%u), Invalid rguSapId (%d)\n", ueId, cellId, entCfg->rguSapId); - RETVALUE(RFAILED); + return RFAILED; } @@ -611,7 +611,7 @@ CkwEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, cellId, ueId); - RETVALUE(RFAILED); + return RFAILED; } if (((entCfg->lCh[0].type == CM_LTE_LCH_BCCH) || @@ -634,7 +634,7 @@ CkwEntCfgCfmInfo *entCfm; "RbId [%d] already exists UEID:%d", entCfg->rbId, ueId); - RETVALUE(RFAILED); + return RFAILED; } } else /* Cell CB UNKNOWN */ @@ -650,7 +650,7 @@ CkwEntCfgCfmInfo *entCfm; "cellCb Creation failed RBID:%d UEID:%d", entCfg->rbId, ueId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -665,11 +665,11 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID); - RETVALUE(RFAILED); + return RFAILED; } /* Create RB CB */ - KW_ALLOC(gCb,kwRbCb, sizeof (KwDlRbCb)); + RLC_ALLOC(gCb,kwRbCb, sizeof (RlcDlRbCb)); if (!kwRbCb) { RLOG_ARG2(L_FATAL,DBG_UEID,ueId, @@ -679,7 +679,7 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL); - RETVALUE(RFAILED); + return RFAILED; } kwRbCb->rlcId.rbId = entCfg->rbId; cellCb->rbCb[entCfg->rbId] = kwRbCb; @@ -693,7 +693,7 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -707,7 +707,7 @@ CkwEntCfgCfmInfo *entCfm; "Invalid RbId for RbType[%d] UEID:%d", entCfg->rbType, ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((((entCfg->lCh[0].type == CM_LTE_LCH_DCCH) && (entCfg->entMode != CM_LTE_MODE_UM) && @@ -731,7 +731,7 @@ CkwEntCfgCfmInfo *entCfm; "CellId[%u]:rbId [%d] already exists", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } } else /* UE CB UNKNOWN */ @@ -746,7 +746,7 @@ CkwEntCfgCfmInfo *entCfm; "UeId [%u]:ueCb Creation Failed RBID:%d", ueId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -758,11 +758,11 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID); - RETVALUE(RFAILED); + return RFAILED; } /* Create RB CB */ - KW_ALLOC(gCb,kwRbCb, sizeof (KwDlRbCb)); + RLC_ALLOC(gCb,kwRbCb, sizeof (RlcDlRbCb)); if (kwRbCb == NULL) { /* Fill entCfm structure */ @@ -772,7 +772,7 @@ CkwEntCfgCfmInfo *entCfm; "Memory allocation failed RBID:%d CELLID:%d", entCfg->rbId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* copy the RB Cb into UECb */ @@ -798,7 +798,7 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason); - RETVALUE(RFAILED); + return RFAILED; } } @@ -813,19 +813,19 @@ CkwEntCfgCfmInfo *entCfm; /* Fill RB CB */ - if (kwCfgFillDlRbCb(gCb,kwRbCb, ueCb, entCfg) != ROK) + if (rlcCfgFillDlRbCb(gCb,kwRbCb, ueCb, entCfg) != ROK) { /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL); /* Delete RB CB created */ - KW_FREE(gCb,kwRbCb, sizeof(KwDlRbCb)); + RLC_FREE(gCb,kwRbCb, sizeof(RlcDlRbCb)); RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId, "Filling of RbCb failed UEID:%d CELLID:%d", ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } kwRbCb->qci = entCfg->qci; #ifdef LTE_L2_MEAS @@ -840,7 +840,7 @@ CkwEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -876,33 +876,33 @@ CkwEntCfgCfmInfo *entCfm; * -#RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgReCfgDlRb +PUBLIC S16 rlcCfgReCfgDlRb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm) +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { - KwDlRbCb *rbCb; /* RB Control Block */ - KwDlRbCb tRbCb; /* KW RB Control Block */ - KwDlCellCb *cellCb; /* Cell Control Block */ - KwDlUeCb *ueCb; /* Ue Control Block */ + RlcDlRbCb *rbCb; /* RB Control Block */ + RlcDlRbCb tRbCb; /* KW RB Control Block */ + RlcDlCellCb *cellCb; /* Cell Control Block */ + RlcDlUeCb *ueCb; /* Ue Control Block */ U8 ret; - TRC3(kwCfgReCfgDlRb) + TRC3(rlcCfgReCfgDlRb) RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, - "kwCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d", + "rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d", cellId, entCfg->cfgType,entCfg->rbId); @@ -919,7 +919,7 @@ CkwEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get cellCb */ kwDbmFetchDlCellCb(gCb,cellId, &cellCb); @@ -933,7 +933,7 @@ CkwEntCfgCfmInfo *entCfm; ueId, entCfg->rbId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get rbCb */ @@ -948,16 +948,16 @@ CkwEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d not found", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(KwDlRbCb)); + cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ - ret = kwCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg); + ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg); if (ret != ROK) { /* Fill entCfm structure */ @@ -971,9 +971,9 @@ CkwEntCfgCfmInfo *entCfm; "CELLID:%u RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(KwDlRbCb)); + cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); - RETVALUE(ret); + return (ret); } } else @@ -988,7 +988,7 @@ CkwEntCfgCfmInfo *entCfm; cellId, entCfg->rbId, entCfg->rbType); - RETVALUE(RFAILED); + return RFAILED; } /* Get ueCb */ ret = kwDbmFetchDlUeCb(gCb,ueId, cellId, &ueCb); @@ -1001,7 +1001,7 @@ CkwEntCfgCfmInfo *entCfm; "UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1016,16 +1016,16 @@ CkwEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(KwDlRbCb)); + cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ - ret = kwCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg); + ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg); if (ret != CKW_CFG_REAS_NONE) { /* Fill entCfm structure */ @@ -1035,16 +1035,16 @@ CkwEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(KwDlRbCb)); + cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); - RETVALUE(ret); + return (ret); } } /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1079,32 +1079,32 @@ CkwEntCfgCfmInfo *entCfm; * -#RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgDelDlRb +PUBLIC S16 rlcCfgDelDlRb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgDelRb(gCb,ueId, cellId, entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm) +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { S16 ret; /* Return Value */ - KwDlUeCb *ueCb; /* UE Control Block */ - KwDlCellCb *cellCb; /* UE Control Block */ - KwDlRbCb *kwRbCb; /* KW RB Control Block */ + RlcDlUeCb *ueCb; /* UE Control Block */ + RlcDlCellCb *cellCb; /* UE Control Block */ + RlcDlRbCb *kwRbCb; /* KW RB Control Block */ - TRC3(kwCfgDelDlRb) + TRC3(rlcCfgDelDlRb) RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, - "kwCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))", + "rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))", entCfg->rbId, cellId, entCfg->cfgType); @@ -1124,7 +1124,7 @@ CkwEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get cellCb */ kwDbmFetchDlCellCb(gCb,cellId, &cellCb); @@ -1137,7 +1137,7 @@ CkwEntCfgCfmInfo *entCfm; "CellCb not found UEID:%d RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1152,7 +1152,7 @@ CkwEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Assign NULLP to rbCb in rbCbLst */ @@ -1161,7 +1161,7 @@ CkwEntCfgCfmInfo *entCfm; /* Assign NULLP to dlRbCb/ulRbCb. * Delete Hashlist allocated for it if any */ cellCb->lCh[kwRbCb->lch.lChId - 1].dlRbCb = NULLP; - KW_FREE(gCb,kwRbCb, sizeof(KwDlRbCb)); /*Vartika: Mem leak fix */ + RLC_FREE(gCb,kwRbCb, sizeof(RlcDlRbCb)); /*Vartika: Mem leak fix */ } /* Get ueCb and delete rbCb from it */ else @@ -1176,7 +1176,7 @@ CkwEntCfgCfmInfo *entCfm; entCfg->rbType, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get ueCb */ @@ -1190,7 +1190,7 @@ CkwEntCfgCfmInfo *entCfm; "UeId [%d]: UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1205,7 +1205,7 @@ CkwEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } ueCb->lCh[kwRbCb->lch.lChId - 1].dlRbCb = NULLP; @@ -1218,7 +1218,7 @@ CkwEntCfgCfmInfo *entCfm; { kwUmmFreeDlRbCb(gCb,kwRbCb); /* Delete RbCb */ - KW_FREE(gCb,kwRbCb, sizeof(KwDlRbCb)); + RLC_FREE(gCb,kwRbCb, sizeof(RlcDlRbCb)); } else if( CM_LTE_MODE_AM == kwRbCb->mode) { @@ -1242,7 +1242,7 @@ CkwEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ret); + return (ret); } @@ -1275,32 +1275,32 @@ CkwEntCfgCfmInfo *entCfm; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgReEstDlRb +PUBLIC S16 rlcCfgReEstDlRb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, Bool sndReEstInd, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm) +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; Bool sndReEstInd; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { - KwDlRbCb *rbCb; /* RB Control Block */ + RlcDlRbCb *rbCb; /* RB Control Block */ CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(kwCfgReEstDlRb) + TRC3(rlcCfgReEstDlRb) RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "kwCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))", + "rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))", ueId, cellId, entCfg->cfgType); @@ -1321,7 +1321,7 @@ CkwEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } rbCb->rlcId.ueId = ueId; @@ -1330,13 +1330,13 @@ CkwEntCfgCfmInfo *entCfm; { case CM_LTE_MODE_TM: { - kwDlTmmReEstablish(gCb,rbCb); + rlcDlTmmReEstablish(gCb,rbCb); break; } case CM_LTE_MODE_UM: { - kwDlUmmReEstablish(gCb,rlcId,sndReEstInd,rbCb); + rlcDlUmmReEstablish(gCb,rlcId,sndReEstInd,rbCb); break; } @@ -1351,7 +1351,7 @@ CkwEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1378,30 +1378,30 @@ CkwEntCfgCfmInfo *entCfm; * -#RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgDelDlUe +PUBLIC S16 rlcCfgDelDlUe ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgDelDlUe(ueId, cellId, entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm) +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { S16 ret; /* Return Value */ - KwDlUeCb *ueCb; /* UE Control Block */ + RlcDlUeCb *ueCb; /* UE Control Block */ - TRC3(kwCfgDelUe) + TRC3(rlcCfgDelUe) RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "kwCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))", + "rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))", ueId, cellId, entCfg->cfgType); @@ -1418,7 +1418,7 @@ CkwEntCfgCfmInfo *entCfm; "ueId(%d), cellId(%d)", ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Ue Cb */ @@ -1432,7 +1432,7 @@ CkwEntCfgCfmInfo *entCfm; "UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -1446,7 +1446,7 @@ CkwEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1471,28 +1471,28 @@ CkwEntCfgCfmInfo *entCfm; * -#RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgDelDlCell +PUBLIC S16 rlcCfgDelDlCell ( -KwCb *gCb, +RlcCb *gCb, CmLteCellId cellId, -CkwEntCfgInfo *entCfg, -CkwEntCfgCfmInfo *entCfm +RlcEntCfgInfo *entCfg, +RlcEntCfgCfmInfo *entCfm ) #else -PUBLIC S16 kwCfgDelCell(gCb,cellId, entCfg, entCfm) -KwCb *gCb; +PUBLIC S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm) +RlcCb *gCb; CmLteCellId cellId; -CkwEntCfgInfo *entCfg; -CkwEntCfgCfmInfo *entCfm; +RlcEntCfgInfo *entCfg; +RlcEntCfgCfmInfo *entCfm; #endif { - KwDlCellCb *cellCb; /* UE Control Block */ + RlcDlCellCb *cellCb; /* UE Control Block */ U8 rbId; /* RB Identifier */ - TRC3(kwCfgDelCell) + TRC3(rlcCfgDelCell) RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId, - "kwCfgDelCell( cellId(%d), cfgType(%d)", + "rlcCfgDelCell( cellId(%d), cfgType(%d)", cellId, entCfg->cfgType); @@ -1508,7 +1508,7 @@ CkwEntCfgCfmInfo *entCfm; RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId, "cellId is 0 (%d) ", cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Ue Cb */ @@ -1521,7 +1521,7 @@ CkwEntCfgCfmInfo *entCfm; RLOG_ARG1(L_ERROR, DBG_CELLID,cellId, "CellCb not found for RBID:%d", entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } /* Delete Ue Cb */ @@ -1532,7 +1532,7 @@ CkwEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } /** @@ -1557,24 +1557,24 @@ CkwEntCfgCfmInfo *entCfm; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 kwCfgDlUeIdChng +PUBLIC S16 rlcCfgDlUeIdChng ( -KwCb *gCb, +RlcCb *gCb, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo, CmStatus *status ) #else -PUBLIC S16 kwCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status) -KwCb *gCb; +PUBLIC S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status) +RlcCb *gCb; CkwUeInfo *ueInfo; CkwUeInfo *newUeInfo; CmStatus *status; #endif { - KwDlUeCb *ueCb; + RlcDlUeCb *ueCb; /*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/ - TRC3(kwCfgUeIdChng) + TRC3(rlcCfgUeIdChng) if ( (ueInfo->ueId == newUeInfo->ueId) && (ueInfo->cellId == newUeInfo->cellId)) @@ -1585,7 +1585,7 @@ CmStatus *status; "Old UeId[%d] same as new UeId[%d]", ueInfo->ueId, newUeInfo->ueId); - RETVALUE(RFAILED); + return RFAILED; } if(ROK == kwDbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) @@ -1595,7 +1595,7 @@ CmStatus *status; newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_EXISTS; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } if(ROK != kwDbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb)) @@ -1606,7 +1606,7 @@ CmStatus *status; ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_UNKWN; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -1619,7 +1619,7 @@ CmStatus *status; ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } /* update the hash key with new values */ @@ -1636,10 +1636,10 @@ CmStatus *status; newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /********************************************************************30**