X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_cfg_ul.c;h=c9cc78d892d25490e3a3383a0e7820ba078522e3;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=aaec229f3cd1b85d25d78340bbef1dfba958db68;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c index aaec229f3..c9cc78d89 100755 --- a/src/5gnrrlc/kw_cfg_ul.c +++ b/src/5gnrrlc/kw_cfg_ul.c @@ -79,11 +79,11 @@ S16 rlcValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, * -# RFAILED * */ -PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) +static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) { RlcL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { @@ -117,11 +117,11 @@ PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) * -# RFAILED * */ -PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) +static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) { RlcL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { @@ -147,7 +147,7 @@ PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) { - U32 myIdx =0; + uint32_t myIdx =0; S16 ret; /* Return value */ RlcUlUeCb *ueCb = NULL; @@ -165,18 +165,18 @@ PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) } -PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId) +static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) { RlcL2MeasCb *measCb = NULLP; - U16 cntr; - U16 cntr1; - U16 ueIdx = 0; - U16 qciIdx = 0; - U16 *numQci; + uint16_t cntr; + uint16_t cntr1; + uint16_t ueIdx = 0; + uint16_t qciIdx = 0; + uint16_t *numQci; #ifndef XEON_SPECIFIC_CHANGES - U8 freeIdx = gCb->genCfg.maxUe; + uint8_t freeIdx = gCb->genCfg.maxUe; #else - U16 freeIdx = LKW_MAX_UE; + uint16_t freeIdx = LKW_MAX_UE; #endif for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) @@ -203,7 +203,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId) #ifdef LTE_L2_MEAS_RLC if (measCb->measType & LKW_L2MEAS_ACT_UE) { - if((rlcRbCb->mode == CM_LTE_MODE_UM) && + if((rlcRbCb->mode == RLC_MODE_UM) && (rlcRbCb->dir & RLC_DIR_DL )) { if (rlcRbCb->m.um.umDl.sduQ.count) @@ -215,7 +215,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId) } } } - else if (rlcRbCb->mode == CM_LTE_MODE_AM) + else if (rlcRbCb->mode == RLC_MODE_AM) { if ((rlcRbCb->m.am.amDl.cntrlBo) || (rlcRbCb->m.am.amDl.retxBo) || @@ -306,21 +306,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId) * -#ROK * -#RFAILED */ -#ifdef ANSI -PRIVATE S16 rlcCfgFillUlRbCb -( -RlcCb *gCb, -RlcUlRbCb *rbCb, -RlcUlUeCb *ueCb, -RlcEntCfgInfo *entCfg -) -#else -PRIVATE S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg) -RlcCb *gCb; -RlcUlRbCb *rbCb; -RlcUlUeCb *ueCb; -RlcEntCfgInfo *entCfg; -#endif +static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg) { RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId, @@ -332,14 +318,14 @@ RlcEntCfgInfo *entCfg; /* Initialize according to entMode */ switch (entCfg->entMode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { rbCb->lch.lChId = entCfg->lCh[0].lChId; rbCb->lch.lChType = entCfg->lCh[0].type; rbCb->dir = entCfg->dir; break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { rbCb->lch.lChId = entCfg->lCh[0].lChId; rbCb->lch.lChType = entCfg->lCh[0].type; @@ -351,13 +337,13 @@ RlcEntCfgInfo *entCfg; /* the bitmask for SN = 10 is 0x3ff and for SN = 5 is 0x1f */ rbCb->m.umUl.modBitMask = (rbCb->m.umUl.umWinSz << 1) - 1; - rbCb->m.umUl.reOrdTmrInt = - entCfg->m.umInfo.ul.reOrdTmr; - cmInitTimers(&(rbCb->m.umUl.reOrdTmr), 1); + rbCb->m.umUl.reAsmblTmrInt = + entCfg->m.umInfo.ul.reAsmblTmr; + cmInitTimers(&(rbCb->m.umUl.reAsmblTmr), 1); ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb; break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { /* Down Link Information * indx = 1 as Up Link */ @@ -415,26 +401,12 @@ RlcEntCfgInfo *entCfg; * -#ROK * -#RFAILED */ -#ifdef ANSI -PRIVATE S16 rlcCfgUpdateUlRb -( -RlcCb *gCb, -RlcUlRbCb *rbCb, -void *ptr, -RlcEntCfgInfo *entCfg -) -#else -PRIVATE S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg) -RlcCb *gCb; -RlcUlRbCb *rbCb; -void *ptr; -RlcEntCfgInfo *entCfg; -#endif +static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg) { switch (rbCb->mode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { RlcUlCellCb *cellCb = (RlcUlCellCb *)ptr; rbCb->dir = entCfg->dir; @@ -444,14 +416,14 @@ RlcEntCfgInfo *entCfg; cellCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb; break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { RlcUlUeCb *ueCb = (RlcUlUeCb *)ptr; ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP; rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg); break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { RlcUlUeCb *ueCb = (RlcUlUeCb *)ptr; @@ -484,23 +456,7 @@ RlcEntCfgInfo *entCfg; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rlcValidateRbCfgParams -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -RlcEntCfgInfo *cfgToValidate, -CmStatus *status -) -#else -S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *cfgToValidate; -CmStatus *status; -#endif +S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status) { if (cellId == 0) { @@ -520,15 +476,15 @@ CmStatus *status; { /* Validate LChId for UM and AM modes */ if ((cfgToValidate->lCh[0].lChId <= 0) || - ((cfgToValidate->entMode == CM_LTE_MODE_AM) && + ((cfgToValidate->entMode == RLC_MODE_AM) && (cfgToValidate->lCh[1].lChId <= 0))) { status->reason = CKW_CFG_REAS_INVALID_LCHID; return RFAILED; } - if((cfgToValidate->entMode == CM_LTE_MODE_UM) && - (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_5BIT_SN_LEN) && - (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_10BIT_SN_LEN)) + if((cfgToValidate->entMode == RLC_MODE_UM) && + (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_6BIT_SN_LEN) && + (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_12BIT_SN_LEN)) { RLOG_ARG2(L_ERROR,DBG_UEID,ueId, "CellId[%u]:UM Mode RB[%d],Invalid SN Len[%d]", @@ -547,9 +503,9 @@ CmStatus *status; } if ((cfgToValidate->lCh[0].type != CM_LTE_LCH_CCCH) && - (cfgToValidate->entMode != CM_LTE_MODE_TM)) + (cfgToValidate->entMode != RLC_MODE_TM)) { - status->reason= (cfgToValidate->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS: + status->reason= (cfgToValidate->entMode != RLC_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS: CKW_CFG_REAS_LCHTYPE_MIS; return RFAILED; } @@ -562,13 +518,13 @@ CmStatus *status; return RFAILED; } - if(cfgToValidate->entMode == CM_LTE_MODE_TM) + if(cfgToValidate->entMode == RLC_MODE_TM) { status->reason = CKW_CFG_REAS_LCHTYPE_MIS; return RFAILED; } if (!(((cfgToValidate->lCh[0].type == CM_LTE_LCH_DCCH) && - (cfgToValidate->entMode != CM_LTE_MODE_UM))|| + (cfgToValidate->entMode != RLC_MODE_UM))|| (cfgToValidate->lCh[0].type == CM_LTE_LCH_DTCH)) ) { status->reason = CKW_CFG_REAS_RB_MODE_MIS; @@ -614,7 +570,6 @@ CmStatus *status; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgValidateUlRb ( RlcCb *gCb, @@ -622,13 +577,6 @@ RlcEntCfgInfo *cfgToValidate, RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) -#else -S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData) -RlcCb *gCb; -RlcEntCfgInfo *cfgToValidate; -RlcUlEntTmpData *cfgEntData; -RlcUlCfgTmpData *cfgTmpData; -#endif { RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, @@ -673,7 +621,7 @@ RlcUlCfgTmpData *cfgTmpData; { if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP)) { - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT; return RFAILED; } } @@ -711,7 +659,7 @@ RlcUlCfgTmpData *cfgTmpData; cfgEntData->rbCb); if(cfgEntData->rbCb != NULLP) { - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT; return RFAILED; } } @@ -723,22 +671,27 @@ RlcUlCfgTmpData *cfgTmpData; } } /*Allocating the memory for receive buffer */ - if(CM_LTE_MODE_UM == cfgToValidate->entMode) + if(RLC_MODE_UM == cfgToValidate->entMode) { - U16 winLen; + uint16_t hashIndex; - + /* Spec 38.322 Section 7.2 + * UM_Window_Size = 32 when a 6 bit SN is configured, + * UM_Window_Size = 2048 when a 12 bit SN is configured. + */ cfgEntData->rbCb->m.umUl.umWinSz = RLC_POWER(2, - ((cfgToValidate->m.umInfo.ul.snLen *5)-1)); - winLen = cfgEntData->rbCb->m.umUl.umWinSz << 1; - RLC_ALLOC(gCb, - cfgEntData->rbCb->m.umUl.recBuf, - (winLen * sizeof(RlcUmRecBuf*))); + ((cfgToValidate->m.umInfo.ul.snLen *6)-1)); + RLC_ALLOC(gCb, cfgEntData->rbCb->m.umUl.recBufLst, + (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); + for(hashIndex = 0; hashIndex < RLC_RCV_BUF_BIN_SIZE; hashIndex++ ) + { + cmLListInit(&(cfgEntData->rbCb->m.umUl.recBufLst[hashIndex])); + } } - else if(CM_LTE_MODE_AM == cfgToValidate->entMode) + else if(RLC_MODE_AM == cfgToValidate->entMode) { #ifndef LTE_TDD - U32 hashIndex; + uint32_t hashIndex; RLC_ALLOC(gCb, cfgEntData->rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp ))); @@ -835,7 +788,6 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgRollBackUlRb ( RlcCb *gCb, @@ -843,26 +795,15 @@ CmLteRnti ueId, RlcEntCfgInfo *cfg, RlcUlEntTmpData *cfgEntData ) -#else -S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData) -( -RlcCb *gCb; -CmLteRnti ueId; -RlcEntCfgInfo *cfg; -RlcUlEntTmpData *cfgEntData; -) -#endif { if(CKW_CFG_ADD == cfg->cfgType) { - if(CM_LTE_MODE_UM == cfg->entMode) + if(RLC_MODE_UM == cfg->entMode) { - RLC_FREE(gCb, - cfgEntData->rbCb->m.umUl.recBuf, - (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(RlcUmRecBuf*)); + RLC_FREE(gCb, cfgEntData->rbCb->m.umUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); } - else if(CM_LTE_MODE_AM == cfg->entMode) + else if(RLC_MODE_AM == cfg->entMode) { #ifndef LTE_TDD RLC_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); @@ -888,7 +829,6 @@ RlcUlEntTmpData *cfgEntData; * -# ROK * -# RFAILED */ -#ifdef ANSI Void rlcCfgApplyUlRb ( RlcCb *gCb, @@ -896,15 +836,6 @@ RlcEntCfgInfo *cfgToAply, RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) -#else -Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData) -( -RlcCb *gCb; -RlcEntCfgInfo *cfgToAply; -RlcUlEntTmpData *cfgEntData; -RlcUlCfgTmpData *cfgTmpData; -) -#endif { switch(cfgToAply->cfgType) @@ -987,11 +918,11 @@ RlcUlCfgTmpData *cfgTmpData; NULLP; /* Free the Buffers of RbCb */ - if( CM_LTE_MODE_UM == cfgEntData->rbCb->mode ) + if( RLC_MODE_UM == cfgEntData->rbCb->mode ) { rlcUmmFreeUlRbCb(gCb, cfgEntData->rbCb); } - else if(CM_LTE_MODE_AM == cfgEntData->rbCb->mode) + else if(RLC_MODE_AM == cfgEntData->rbCb->mode) { rlcAmmFreeUlRbCb(gCb,cfgEntData->rbCb); } @@ -1013,7 +944,7 @@ RlcUlCfgTmpData *cfgTmpData; break; } } - RETVOID; + return; } @@ -1031,7 +962,6 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgValidateDelUlUe ( RlcCb *gCb, @@ -1039,13 +969,6 @@ RlcEntCfgInfo *cfgToValidate, RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) -#else -S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData) -RlcCb *gCb; -RlcEntCfgInfo *cfgToValidate; -RlcUlEntTmpData *cfgEntData; -RlcUlCfgTmpData *cfgTmpData; -#endif { RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, @@ -1055,7 +978,7 @@ RlcUlCfgTmpData *cfgTmpData; /* Check for ueId is present or not */ if ( cfgTmpData->ueId == 0 ) { - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN; RLOG_ARG1(L_ERROR,DBG_UEID,cfgTmpData->ueId, "UeId is 0 for CELLID;%d", cfgTmpData->cellId); @@ -1068,7 +991,7 @@ RlcUlCfgTmpData *cfgTmpData; RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId, "UeId [%d]: UeCb not found", cfgTmpData->ueId); - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN; return RFAILED; } return ROK; @@ -1085,26 +1008,18 @@ RlcUlCfgTmpData *cfgTmpData; * @return S16 * -# ROK */ -#ifdef ANSI Void rlcCfgApplyDelUlUe ( RlcCb *gCb, RlcUlCfgTmpData *cfgTmpData ) -#else -Void rlcCfgApplyDelUlUe(gCb, cfgTmpData) -( -RlcCb *gCb; -RlcUlCfgTmpData *cfgTmpData; -) -#endif { #ifdef LTE_L2_MEAS rlcDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId); #endif rlcDbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE); - RETVOID; + return; } @@ -1123,7 +1038,6 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgValidateDelUlCell ( RlcCb *gCb, @@ -1132,14 +1046,6 @@ RlcEntCfgInfo *cfgToValidate, RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) -#else -S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData) -RlcCb *gCb; -CmLteCellId cellId; -RlcEntCfgInfo *cfgToValidate; -RlcUlEntTmpData *cfgEntData; -RlcUlCfgTmpData *cfgTmpData; -#endif { RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)", @@ -1150,7 +1056,7 @@ RlcUlCfgTmpData *cfgTmpData; /* Check for cellId is present or not */ if ( cellId == 0 ) { - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN; RLOG_ARG0(L_ERROR,DBG_CELLID,cellId , "CellId is 0"); return RFAILED; } @@ -1159,7 +1065,7 @@ RlcUlCfgTmpData *cfgTmpData; rlcDbmFetchUlCellCb(gCb,cellId, &cfgTmpData->cellCb); if (!cfgTmpData->cellCb) { - cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;; + cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN; RLOG_ARG0(L_ERROR, DBG_CELLID,cellId, "CellCb not found"); return RFAILED; } @@ -1177,23 +1083,11 @@ RlcUlCfgTmpData *cfgTmpData; * @return S16 * -# ROK */ -#ifdef ANSI -Void rlcCfgApplyDelUlCell -( -RlcCb *gCb, -RlcUlCfgTmpData *cfgInfo -) -#else -Void rlcCfgApplyDelUlCell(gCb, cfgEntData) -( -RlcCb *gCb; -RlcUlCfgTmpData *cfgInfo; -) -#endif +Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo) { rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb); - RETVOID; + return; } /** @@ -1210,7 +1104,6 @@ RlcUlCfgTmpData *cfgInfo; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgValidateReEstRb ( RlcCb *gCb, @@ -1219,14 +1112,6 @@ CmLteCellId cellId, RlcEntCfgInfo *cfgToValidate, RlcUlEntTmpData *cfgEntData ) -#else -S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *cfgToValidate; -RlcUlEntTmpData *cfgEntData; -#endif { CmLteRlcId rlcId; /* RLC Identifier */ @@ -1270,25 +1155,14 @@ RlcUlEntTmpData *cfgEntData; * @return S16 * -# ROK */ -#ifdef ANSI Void rlcCfgApplyReEstUlRb ( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -Bool sndReEstInd, -RlcUlEntTmpData *cfgEntData -) -#else -Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData) -( -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -Bool sndReEstInd; -RlcUlEntTmpData *cfgEntData; +RlcCb *gCb, +CmLteRnti ueId, +CmLteCellId cellId, +Bool sndReEstInd, +RlcUlEntTmpData *cfgEntData ) -#endif { CmLteRlcId rlcId; /* RLC Identifier */ @@ -1299,25 +1173,25 @@ RlcUlEntTmpData *cfgEntData; cfgEntData->rbCb->rlcId.ueId = ueId; switch (cfgEntData->rbCb->mode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { rlcTmmUlReEstablish(gCb,cfgEntData->rbCb); break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { rlcUmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb); break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { rlcAmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb); break; } } - RETVOID; + return; } /** @@ -1333,21 +1207,13 @@ RlcUlEntTmpData *cfgEntData; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgValidateUeIdChng ( -RlcCb *gCb, +RlcCb *gCb, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo, -RlcUlCfgTmpData *cfgTmpData +RlcUlCfgTmpData *cfgTmpData ) -#else -S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData) -RlcCb *gCb; -CkwUeInfo *ueInfo; -CkwUeInfo *newUeInfo; -RlcUlCfgTmpData *cfgTmpData; -#endif { RlcUlUeCb *ueCb; @@ -1398,23 +1264,13 @@ RlcUlCfgTmpData *cfgTmpData; * @return S16 * -# ROK */ -#ifdef ANSI Void rlcCfgApplyUlUeIdChng ( -RlcCb *gCb, -CkwUeInfo *ueInfo, -CkwUeInfo *newUeInfo, -RlcUlCfgTmpData *cfgTmpData -) -#else -Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData) -( -RlcCb *gCb; +RlcCb *gCb, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo, -RlcUlCfgTmpData *cfgTmpData; +RlcUlCfgTmpData *cfgTmpData ) -#endif { #ifdef LTE_L2_MEAS @@ -1426,8 +1282,8 @@ RlcUlCfgTmpData *cfgTmpData; cfgTmpData->ueCb->cellId =newUeInfo->cellId; if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp), (PTR)cfgTmpData->ueCb, - (U8 *)&(cfgTmpData->ueCb->ueId), - (U16) sizeof(CmLteRnti))) + (uint8_t *)&(cfgTmpData->ueCb->ueId), + (uint16_t) sizeof(CmLteRnti))) { RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId, @@ -1435,7 +1291,7 @@ RlcUlCfgTmpData *cfgTmpData; newUeInfo->ueId); } - RETVOID; + return; } /********************************************************************30**