X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_cfg_ul.c;h=d2d08c06e58128a145df4152b3ab0721e9bfc26d;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=9616579cdbedab71b24c1988e0ee4ef907a77336;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c index 9616579cd..d2d08c06e 100755 --- a/src/5gnrrlc/kw_cfg_ul.c +++ b/src/5gnrrlc/kw_cfg_ul.c @@ -63,9 +63,9 @@ static int RLOG_FILE_ID=192; #include "l2_tenb_stats.x" /* Total EnodeB Stats declarations */ #endif #endif -PUBLIC S16 kwValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, +S16 rlcValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcEntCfgInfo *cfgToValidate, CmStatus *status); -#define KW_MODULE KW_DBGMASK_CFG +#define RLC_MODULE RLC_DBGMASK_CFG #ifdef LTE_L2_MEAS /** * @@ -79,15 +79,15 @@ PUBLIC S16 kwValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId * -# RFAILED * */ -PRIVATE S16 kwHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) +static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) { - KwL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + RlcL2MeasCb *measCb = NULLP; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - measCb = &(gCb->u.ulCb->kwL2Cb.kwL2EvtCb[cntr].measCb); + measCb = &(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr].measCb); if( measCb->measType & LKW_L2MEAS_UL_IP) { @@ -117,15 +117,15 @@ PRIVATE S16 kwHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) * -# RFAILED * */ -PRIVATE S16 kwDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) +static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) { - KwL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + RlcL2MeasCb *measCb = NULLP; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - measCb = &(gCb->u.ulCb->kwL2Cb.kwL2EvtCb[cntr].measCb); + measCb = &(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr].measCb); if( measCb->measType & LKW_L2MEAS_UL_IP) @@ -147,14 +147,14 @@ PRIVATE S16 kwDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) { - U32 myIdx =0; + uint32_t myIdx =0; S16 ret; /* Return value */ RlcUlUeCb *ueCb = NULL; for (myIdx = 0; myIdx < measCb->val.ipThMeas.numUes; myIdx++) { ueCb = NULL; - ret = kwDbmFetchUlUeCb(gCb, measCb->val.ipThMeas.ueInfoLst[myIdx].ueId, cellId, &ueCb); + ret = rlcDbmFetchUlUeCb(gCb, measCb->val.ipThMeas.ueInfoLst[myIdx].ueId, cellId, &ueCb); } } @@ -165,23 +165,23 @@ PRIVATE S16 kwDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) } -PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) +static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) { - KwL2MeasCb *measCb = NULLP; - U16 cntr; - U16 cntr1; - U16 ueIdx = 0; - U16 qciIdx = 0; - U16 *numQci; + RlcL2MeasCb *measCb = NULLP; + 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++) { - measCb = &(gCb->u.ulCb->kwL2Cb.kwL2EvtCb[cntr].measCb); + measCb = &(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr].measCb); freeIdx = gCb->genCfg.maxUe; @@ -189,42 +189,42 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) { for(cntr1 =0;cntr1val.nonIpThMeas.numQci;cntr1++) { - if(measCb->val.nonIpThMeas.qci[cntr1] != kwRbCb->qci) + if(measCb->val.nonIpThMeas.qci[cntr1] != rlcRbCb->qci) { - measCb->val.nonIpThMeas.qci[cntr1] = kwRbCb->qci; - gCb->u.ulCb->kwL2Cb.measOn[kwRbCb->qci] |=measCb->measType; + measCb->val.nonIpThMeas.qci[cntr1] = rlcRbCb->qci; + gCb->u.ulCb->rlcL2Cb.measOn[rlcRbCb->qci] |=measCb->measType; break; } } } - if(((kwRbCb->rbL2Cb.measOn & measCb->measType) == LKW_L2MEAS_NONE)) + if(((rlcRbCb->rbL2Cb.measOn & measCb->measType) == LKW_L2MEAS_NONE)) { #ifdef LTE_L2_MEAS_RLC if (measCb->measType & LKW_L2MEAS_ACT_UE) { - if((kwRbCb->mode == CM_LTE_MODE_UM) && - (kwRbCb->dir & KW_DIR_DL )) + if((rlcRbCb->mode == CM_LTE_MODE_UM) && + (rlcRbCb->dir & RLC_DIR_DL )) { - if (kwRbCb->m.um.umDl.sduQ.count) + if (rlcRbCb->m.um.umDl.sduQ.count) { - if (kwRbCb->ueCb->numActRb[kwRbCb->qci] == 0) + if (rlcRbCb->ueCb->numActRb[rlcRbCb->qci] == 0) { - kwRbCb->ueCb->numActRb[kwRbCb->qci]++; - gCb->u.ulCb->kwL2Cb.numActUe[kwRbCb->qci]++; + rlcRbCb->ueCb->numActRb[rlcRbCb->qci]++; + gCb->u.ulCb->rlcL2Cb.numActUe[rlcRbCb->qci]++; } } } - else if (kwRbCb->mode == CM_LTE_MODE_AM) + else if (rlcRbCb->mode == CM_LTE_MODE_AM) { - if ((kwRbCb->m.am.amDl.cntrlBo) || - (kwRbCb->m.am.amDl.retxBo) || - (kwRbCb->m.am.amDl.bo)) + if ((rlcRbCb->m.am.amDl.cntrlBo) || + (rlcRbCb->m.am.amDl.retxBo) || + (rlcRbCb->m.am.amDl.bo)) { - if (kwRbCb->ueCb->numActRb[kwRbCb->qci] == 0) + if (rlcRbCb->ueCb->numActRb[rlcRbCb->qci] == 0) { - kwRbCb->ueCb->numActRb[kwRbCb->qci]++; - gCb->u.ulCb->kwL2Cb.numActUe[kwRbCb->qci]++; + rlcRbCb->ueCb->numActRb[rlcRbCb->qci]++; + gCb->u.ulCb->rlcL2Cb.numActUe[rlcRbCb->qci]++; } } } @@ -263,7 +263,7 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) ueIdx = freeIdx; } measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE; - cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(KwL2Cntr) *LKW_MAX_QCI)); + memset(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI)); measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0; } measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId; @@ -272,7 +272,7 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) for (qciIdx =0; qciIdx < *numQci; qciIdx++) { - if (measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] == kwRbCb->qci) + if (measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] == rlcRbCb->qci) { break; } @@ -280,17 +280,17 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) if (qciIdx == *numQci) { - measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] = kwRbCb->qci; + measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] = rlcRbCb->qci; (*numQci)++; } - kwUtlPlcMeasDatInL2Sts(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[kwRbCb->qci], - &kwRbCb->rbL2Cb, measCb->measType); + rlcUtlPlcMeasDatInL2Sts(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[rlcRbCb->qci], + &rlcRbCb->rbL2Cb, measCb->measType); } - kwRbCb->rbL2Cb.measOn |= measCb->measType; + rlcRbCb->rbL2Cb.measOn |= measCb->measType; } - return ROK; -}/*kwAddToDlL2Meas*/ + return (ROK); +}/*rlcAddToDlL2Meas*/ #endif /*LTE_L2_MEAS*/ /** @@ -307,7 +307,7 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgFillUlRbCb +static S16 rlcCfgFillUlRbCb ( RlcCb *gCb, RlcUlRbCb *rbCb, @@ -315,14 +315,13 @@ RlcUlUeCb *ueCb, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg) +static S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg) RlcCb *gCb; RlcUlRbCb *rbCb; RlcUlUeCb *ueCb; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgFillUlRbCb) RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId, "rlcCfgFillRbCb(cellId(%d), rbId(%d), rbType(%d))", @@ -364,26 +363,26 @@ RlcEntCfgInfo *entCfg; * indx = 1 as Up Link */ rbCb->lch.lChId = entCfg->lCh[1].lChId; rbCb->lch.lChType = entCfg->lCh[1].type; - rbCb->dir = KW_DIR_BOTH; + rbCb->dir = RLC_DIR_BOTH; rbCb->m.amUl.staProhTmrInt = entCfg->m.amInfo.ul.staProhTmr; rbCb->m.amUl.reOrdTmrInt = entCfg->m.amInfo.ul.reOrdTmr; rbCb->m.amUl.snLen = entCfg->m.amInfo.ul.snLen; /* 5GNR */ - if(KW_AM_CFG_12BIT_SN_LEN == rbCb->m.amUl.snLen) + if(RLC_AM_CFG_12BIT_SN_LEN == rbCb->m.amUl.snLen) { - rbCb->m.amUl.snModMask = (1 << KW_SN_LEN_12BITS) - 1; /* 5GNR */ + rbCb->m.amUl.snModMask = (1 << RLC_SN_LEN_12BITS) - 1; /* 5GNR */ } else { - rbCb->m.amUl.snModMask = (1 << KW_SN_LEN_18BITS) - 1; /* 5GNR */ + rbCb->m.amUl.snModMask = (1 << RLC_SN_LEN_18BITS) - 1; /* 5GNR */ } cmInitTimers(&(rbCb->m.amUl.reOrdTmr), 1); cmInitTimers(&(rbCb->m.amUl.staProhTmr), 1); - rbCb->m.amUl.vrMr = rbCb->m.amUl.rxNext + (KW_AM_GET_WIN_SZ(rbCb->m.amUl.snLen)); + rbCb->m.amUl.vrMr = rbCb->m.amUl.rxNext + (RLC_AM_GET_WIN_SZ(rbCb->m.amUl.snLen)); ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb; @@ -417,7 +416,7 @@ RlcEntCfgInfo *entCfg; * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgUpdateUlRb +static S16 rlcCfgUpdateUlRb ( RlcCb *gCb, RlcUlRbCb *rbCb, @@ -425,14 +424,13 @@ void *ptr, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg) +static S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg) RlcCb *gCb; RlcUlRbCb *rbCb; void *ptr; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgUpdateUlRb) switch (rbCb->mode) { @@ -487,7 +485,7 @@ RlcEntCfgInfo *entCfg; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 kwValidateRbCfgParams +S16 rlcValidateRbCfgParams ( RlcCb *gCb, CmLteRnti ueId, @@ -496,7 +494,7 @@ RlcEntCfgInfo *cfgToValidate, CmStatus *status ) #else -PUBLIC S16 kwValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status) +S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status) RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; @@ -511,7 +509,7 @@ CmStatus *status; } if ((cfgToValidate->rguSapId >= gCb->genCfg.maxRguSaps) || (cfgToValidate->rguSapId < 0)) { - KWDBGP_ERROR(gCb, "kwValidateRbCfgParams ueId (%u) cellId (%u) Invalid rguSapId (%d))\n", + RLCDBGP_ERROR(gCb, "rlcValidateRbCfgParams ueId (%u) cellId (%u) Invalid rguSapId (%d))\n", ueId, cellId, cfgToValidate->rguSapId); status->reason = CKW_CFG_REAS_INVALID_RGUSAP; return RFAILED; @@ -529,8 +527,8 @@ CmStatus *status; return RFAILED; } if((cfgToValidate->entMode == CM_LTE_MODE_UM) && - (cfgToValidate->m.umInfo.ul.snLen != KW_UM_CFG_5BIT_SN_LEN) && - (cfgToValidate->m.umInfo.ul.snLen != KW_UM_CFG_10BIT_SN_LEN)) + (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_5BIT_SN_LEN) && + (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_10BIT_SN_LEN)) { RLOG_ARG2(L_ERROR,DBG_UEID,ueId, "CellId[%u]:UM Mode RB[%d],Invalid SN Len[%d]", @@ -542,7 +540,7 @@ CmStatus *status; /* Process Adding new RB */ if (ueId == 0) { - if(cfgToValidate->rbId >= KW_MAX_RB_PER_CELL) + if(cfgToValidate->rbId >= RLC_MAX_RB_PER_CELL) { status->reason = CKW_CFG_REAS_RB_UNKWN; return RFAILED; @@ -558,7 +556,7 @@ CmStatus *status; } else { - if (!(KW_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) + if (!(RLC_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) { status->reason = CKW_CFG_REAS_RB_UNKWN; return RFAILED; @@ -582,7 +580,7 @@ CmStatus *status; { if (ueId == 0) { - if(cfgToValidate->rbId >= KW_MAX_RB_PER_CELL) + if(cfgToValidate->rbId >= RLC_MAX_RB_PER_CELL) { status->reason = CKW_CFG_REAS_RB_UNKWN; return RFAILED; @@ -591,7 +589,7 @@ CmStatus *status; } else { - if (!(KW_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) + if (!(RLC_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) { status->reason = CKW_CFG_REAS_RB_UNKWN; return RFAILED; @@ -617,7 +615,7 @@ CmStatus *status; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgValidateUlRb +S16 rlcCfgValidateUlRb ( RlcCb *gCb, RlcEntCfgInfo *cfgToValidate, @@ -625,21 +623,20 @@ RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData) +S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData) RlcCb *gCb; RlcEntCfgInfo *cfgToValidate; RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateUlRb) RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, "cellId(%d), cfgType(%d)", cfgTmpData->cellId, cfgToValidate->cfgType); - if(ROK != kwValidateRbCfgParams(gCb, + if(ROK != rlcValidateRbCfgParams(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgToValidate, @@ -657,7 +654,7 @@ RlcUlCfgTmpData *cfgTmpData; { /* Cell Cb is added if it not present , it is not roll backed if the * configuration fails */ - kwDbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb); + rlcDbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb); if(!cfgTmpData->cellCb) { /* cell cb does not exist we need to create a new one */ @@ -670,13 +667,13 @@ RlcUlCfgTmpData *cfgTmpData; cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_CREAT_FAIL; return RFAILED; } - kwDbmAddUlCellCb(gCb, cfgTmpData->cellId, cfgTmpData->cellCb); + rlcDbmAddUlCellCb(gCb, cfgTmpData->cellId, cfgTmpData->cellCb); } else { 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; } } @@ -692,7 +689,7 @@ RlcUlCfgTmpData *cfgTmpData; { /* Ue Cb is added if it not present , it is not roll backed if the * configuration fails */ - kwDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb); + rlcDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb); if(!cfgTmpData->ueCb) { RLC_ALLOC(gCb,cfgTmpData->ueCb, sizeof(RlcUlUeCb)); @@ -704,17 +701,17 @@ RlcUlCfgTmpData *cfgTmpData; cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_CREAT_FAIL; return RFAILED; } - kwDbmAddUlUeCb(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgTmpData->ueCb); + rlcDbmAddUlUeCb(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgTmpData->ueCb); } else { - KW_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId, + RLC_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId, cfgToValidate->rbType, cfgTmpData->ueCb, 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; } } @@ -728,24 +725,24 @@ RlcUlCfgTmpData *cfgTmpData; /*Allocating the memory for receive buffer */ if(CM_LTE_MODE_UM == cfgToValidate->entMode) { - U16 winLen; + uint16_t winLen; - cfgEntData->rbCb->m.umUl.umWinSz = KW_POWER(2, + 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(KwUmRecBuf*))); + (winLen * sizeof(RlcUmRecBuf*))); } else if(CM_LTE_MODE_AM == cfgToValidate->entMode) { #ifndef LTE_TDD - U32 hashIndex; + uint32_t hashIndex; RLC_ALLOC(gCb, cfgEntData->rbCb->m.amUl.recBufLst, - (KW_RCV_BUF_BIN_SIZE * sizeof(CmLListCp ))); - for(hashIndex = 0; hashIndex < KW_RCV_BUF_BIN_SIZE; hashIndex++) + (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp ))); + for(hashIndex = 0; hashIndex < RLC_RCV_BUF_BIN_SIZE; hashIndex++) { cmLListInit(&(cfgEntData->rbCb->m.amUl.recBufLst[hashIndex])); } @@ -759,7 +756,7 @@ RlcUlCfgTmpData *cfgTmpData; if (cfgTmpData->ueId == 0) { /* Try to get the CellCb if it already exists */ - kwDbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb); + rlcDbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb); if(!cfgTmpData->cellCb) { RLOG_ARG1(L_ERROR, DBG_CELLID,cfgTmpData->cellId, @@ -781,7 +778,7 @@ RlcUlCfgTmpData *cfgTmpData; } else { - kwDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb); + rlcDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb); if(!cfgTmpData->ueCb) { RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId, @@ -792,7 +789,7 @@ RlcUlCfgTmpData *cfgTmpData; } /* Get rbCb */ - KW_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId, + RLC_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId, cfgToValidate->rbType, cfgTmpData->ueCb, cfgEntData->rbCb); @@ -839,7 +836,7 @@ RlcUlCfgTmpData *cfgTmpData; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgRollBackUlRb +S16 rlcCfgRollBackUlRb ( RlcCb *gCb, CmLteRnti ueId, @@ -847,7 +844,7 @@ RlcEntCfgInfo *cfg, RlcUlEntTmpData *cfgEntData ) #else -PUBLIC S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData) +S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData) ( RlcCb *gCb; CmLteRnti ueId; @@ -856,7 +853,6 @@ RlcUlEntTmpData *cfgEntData; ) #endif { - TRC3(rlcCfgRollBackUlRb) if(CKW_CFG_ADD == cfg->cfgType) { @@ -864,12 +860,12 @@ RlcUlEntTmpData *cfgEntData; { RLC_FREE(gCb, cfgEntData->rbCb->m.umUl.recBuf, - (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(KwUmRecBuf*)); + (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(RlcUmRecBuf*)); } else if(CM_LTE_MODE_AM == cfg->entMode) { #ifndef LTE_TDD - RLC_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (KW_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); + RLC_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); #endif } RLC_FREE(gCb,cfgEntData->rbCb, sizeof(RlcUlRbCb)); @@ -893,7 +889,7 @@ RlcUlEntTmpData *cfgEntData; * -# RFAILED */ #ifdef ANSI -PUBLIC Void rlcCfgApplyUlRb +Void rlcCfgApplyUlRb ( RlcCb *gCb, RlcEntCfgInfo *cfgToAply, @@ -901,7 +897,7 @@ RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData) +Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData) ( RlcCb *gCb; RlcEntCfgInfo *cfgToAply; @@ -910,7 +906,6 @@ RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyUlRb) switch(cfgToAply->cfgType) { @@ -935,7 +930,7 @@ RlcUlCfgTmpData *cfgTmpData; } } - KW_LMM_RB_STS_INC(gCb); + RLC_LMM_RB_STS_INC(gCb); cfgEntData->rbCb->rlcId.cellId = cfgTmpData->cellId; cfgEntData->rbCb->rlcId.ueId = cfgTmpData->ueId; @@ -954,7 +949,7 @@ RlcUlCfgTmpData *cfgTmpData; if (cfgToAply->lCh[1].type == CM_LTE_LCH_DTCH) { /* ccpu00129778 */ - kwAddToUlL2Meas(gCb, cfgEntData->rbCb, + rlcAddToUlL2Meas(gCb, cfgEntData->rbCb, cfgTmpData->cellId,cfgTmpData->ueId); } #endif /* LTE_L2_MEAS */ @@ -994,11 +989,11 @@ RlcUlCfgTmpData *cfgTmpData; /* Free the Buffers of RbCb */ if( CM_LTE_MODE_UM == cfgEntData->rbCb->mode ) { - kwUmmFreeUlRbCb(gCb, cfgEntData->rbCb); + rlcUmmFreeUlRbCb(gCb, cfgEntData->rbCb); } else if(CM_LTE_MODE_AM == cfgEntData->rbCb->mode) { - kwAmmFreeUlRbCb(gCb,cfgEntData->rbCb); + rlcAmmFreeUlRbCb(gCb,cfgEntData->rbCb); } /* Assign NULLP to rbCb in rbCbLst */ @@ -1014,11 +1009,11 @@ RlcUlCfgTmpData *cfgTmpData; /* Delete RbCb */ RLC_FREE(gCb,cfgEntData->rbCb, sizeof(RlcUlRbCb)); - KW_LMM_RB_STS_DEC(gCb); + RLC_LMM_RB_STS_DEC(gCb); break; } } - RETVOID; + return; } @@ -1037,7 +1032,7 @@ RlcUlCfgTmpData *cfgTmpData; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgValidateDelUlUe +S16 rlcCfgValidateDelUlUe ( RlcCb *gCb, RlcEntCfgInfo *cfgToValidate, @@ -1045,14 +1040,13 @@ RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData) +S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData) RlcCb *gCb; RlcEntCfgInfo *cfgToValidate; RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateDelUlUe) RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, "cellId(%d), cfgType(%d)", @@ -1061,7 +1055,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); @@ -1069,12 +1063,12 @@ RlcUlCfgTmpData *cfgTmpData; } /* Fetch Ue Cb */ - if(ROK != kwDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb)) + if(ROK != rlcDbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb)) { 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; @@ -1092,26 +1086,25 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK */ #ifdef ANSI -PUBLIC Void rlcCfgApplyDelUlUe +Void rlcCfgApplyDelUlUe ( RlcCb *gCb, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC Void rlcCfgApplyDelUlUe(gCb, cfgTmpData) +Void rlcCfgApplyDelUlUe(gCb, cfgTmpData) ( RlcCb *gCb; RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyDelUlUe) #ifdef LTE_L2_MEAS - kwDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId); + rlcDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId); #endif - kwDbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE); - RETVOID; + rlcDbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE); + return; } @@ -1131,7 +1124,7 @@ RlcUlCfgTmpData *cfgTmpData; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgValidateDelUlCell +S16 rlcCfgValidateDelUlCell ( RlcCb *gCb, CmLteCellId cellId, @@ -1140,7 +1133,7 @@ RlcUlEntTmpData *cfgEntData, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData) +S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData) RlcCb *gCb; CmLteCellId cellId; RlcEntCfgInfo *cfgToValidate; @@ -1148,7 +1141,6 @@ RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateDelUlCell) RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)", cfgToValidate->cfgType); @@ -1158,16 +1150,16 @@ 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; } /* Fetch Cell Cb */ - kwDbmFetchUlCellCb(gCb,cellId, &cfgTmpData->cellCb); + 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; } @@ -1186,23 +1178,22 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK */ #ifdef ANSI -PUBLIC Void rlcCfgApplyDelUlCell +Void rlcCfgApplyDelUlCell ( RlcCb *gCb, RlcUlCfgTmpData *cfgInfo ) #else -PUBLIC Void rlcCfgApplyDelUlCell(gCb, cfgEntData) +Void rlcCfgApplyDelUlCell(gCb, cfgEntData) ( RlcCb *gCb; RlcUlCfgTmpData *cfgInfo; ) #endif { - TRC3(rlcCfgApplyDelUlCell) - kwDbmDelUlCellCb(gCb,cfgInfo->cellCb); - RETVOID; + rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb); + return; } /** @@ -1220,7 +1211,7 @@ RlcUlCfgTmpData *cfgInfo; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgValidateReEstRb +S16 rlcCfgValidateReEstRb ( RlcCb *gCb, CmLteRnti ueId, @@ -1229,7 +1220,7 @@ RlcEntCfgInfo *cfgToValidate, RlcUlEntTmpData *cfgEntData ) #else -PUBLIC S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData) +S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData) RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; @@ -1238,7 +1229,6 @@ RlcUlEntTmpData *cfgEntData; #endif { CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgValidateReEstRb) RLOG_ARG2(L_DEBUG, DBG_UEID,ueId, "cellId(%d) RBID:%d", @@ -1251,7 +1241,7 @@ RlcUlEntTmpData *cfgEntData; rlcId.rbId = cfgToValidate->rbId; rlcId.rbType = cfgToValidate->rbType; - kwDbmFetchUlRbCbByRbId(gCb,&rlcId, &cfgEntData->rbCb); + rlcDbmFetchUlRbCbByRbId(gCb,&rlcId, &cfgEntData->rbCb); if (cfgEntData->rbCb == NULLP) { RLOG_ARG2(L_WARNING, DBG_UEID,ueId, @@ -1281,7 +1271,7 @@ RlcUlEntTmpData *cfgEntData; * -# ROK */ #ifdef ANSI -PUBLIC Void rlcCfgApplyReEstUlRb +Void rlcCfgApplyReEstUlRb ( RlcCb *gCb, CmLteRnti ueId, @@ -1290,7 +1280,7 @@ Bool sndReEstInd, RlcUlEntTmpData *cfgEntData ) #else -PUBLIC Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData) +Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData) ( RlcCb *gCb; CmLteRnti ueId; @@ -1301,7 +1291,6 @@ RlcUlEntTmpData *cfgEntData; #endif { CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgApplyReEstUlRb) rlcId.ueId = ueId; rlcId.cellId = cellId; @@ -1312,23 +1301,23 @@ RlcUlEntTmpData *cfgEntData; { case CM_LTE_MODE_TM: { - kwTmmUlReEstablish(gCb,cfgEntData->rbCb); + rlcTmmUlReEstablish(gCb,cfgEntData->rbCb); break; } case CM_LTE_MODE_UM: { - kwUmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb); + rlcUmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb); break; } case CM_LTE_MODE_AM: { - kwAmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb); + rlcAmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb); break; } } - RETVOID; + return; } /** @@ -1345,7 +1334,7 @@ RlcUlEntTmpData *cfgEntData; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rlcCfgValidateUeIdChng +S16 rlcCfgValidateUeIdChng ( RlcCb *gCb, CkwUeInfo *ueInfo, @@ -1353,7 +1342,7 @@ CkwUeInfo *newUeInfo, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData) +S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData) RlcCb *gCb; CkwUeInfo *ueInfo; CkwUeInfo *newUeInfo; @@ -1361,7 +1350,6 @@ RlcUlCfgTmpData *cfgTmpData; #endif { RlcUlUeCb *ueCb; - TRC3(rlcCfgValidateUeIdChng) #define CFM_STATUS cfgTmpData->cfgEntData[0].entUlCfgCfm.status if ( (ueInfo->ueId == newUeInfo->ueId) && @@ -1372,7 +1360,7 @@ RlcUlCfgTmpData *cfgTmpData; return RFAILED; } - if(ROK == kwDbmFetchUlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) + if(ROK == rlcDbmFetchUlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) { RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId, "NewUeId[%d]:ueCb already exists", @@ -1382,7 +1370,7 @@ RlcUlCfgTmpData *cfgTmpData; return RFAILED; } - if(ROK != kwDbmFetchUlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, + if(ROK != rlcDbmFetchUlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &cfgTmpData->ueCb)) { RLOG_ARG1(L_ERROR,DBG_CELLID, ueInfo->cellId, @@ -1411,7 +1399,7 @@ RlcUlCfgTmpData *cfgTmpData; * -# ROK */ #ifdef ANSI -PUBLIC Void rlcCfgApplyUlUeIdChng +Void rlcCfgApplyUlUeIdChng ( RlcCb *gCb, CkwUeInfo *ueInfo, @@ -1419,7 +1407,7 @@ CkwUeInfo *newUeInfo, RlcUlCfgTmpData *cfgTmpData ) #else -PUBLIC Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData) +Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData) ( RlcCb *gCb; CkwUeInfo *ueInfo, @@ -1428,10 +1416,9 @@ RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyUlUeIdChng) #ifdef LTE_L2_MEAS - kwHdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId); + rlcHdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId); #endif cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) cfgTmpData->ueCb); /* update the hash key with new values */ @@ -1439,8 +1426,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, @@ -1448,7 +1435,7 @@ RlcUlCfgTmpData *cfgTmpData; newUeInfo->ueId); } - RETVOID; + return; } /********************************************************************30**