X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_cfg_dl.c;h=e8f6ccca80b945f6a645ed973209bd66af259280;hb=069f38324ca51afc183962404383802ae8a5553c;hp=1d636d43169a563b8865d5fa88e5233a16cfc31e;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c index 1d636d431..e8f6ccca8 100755 --- a/src/5gnrrlc/kw_cfg_dl.c +++ b/src/5gnrrlc/kw_cfg_dl.c @@ -18,7 +18,7 @@ /********************************************************************20** - Name: LTE RLC - Configuration Manager file + Name: NR RLC - Configuration Manager file Type: C source file @@ -36,9 +36,6 @@ File: kw_cfg_dl.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="CFG"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=191; /** @file kw_cfg_dl.c @brief RLC Downlink Configuration Module @@ -47,6 +44,7 @@ static int RLOG_FILE_ID=191; /* header (.h) include files */ #include "common_def.h" +#include "math.h" #include "lkw.h" /* LKW defines */ #include "ckw.h" /* CKW defines */ #include "kwu.h" /* KWU defines */ @@ -66,6 +64,7 @@ static int RLOG_FILE_ID=191; #include "kw.x" #include "kw_udx.x" #include "kw_dl.x" +#include "du_app_rlc_inf.h" #define RLC_MODULE RLC_DBGMASK_CFG /*Added for adding new Ue in onging L2 Meas*/ @@ -82,12 +81,12 @@ static int RLOG_FILE_ID=191; * -# RFAILED * */ -PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) +static S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) { RlcL2MeasEvtCb *measEvtCb = NULLP; RlcL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { @@ -123,12 +122,12 @@ PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) * -# RFAILED * */ -PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) +static S16 rlcDelFrmDlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) { RlcL2MeasEvtCb *measEvtCb = NULLP; RlcL2MeasCb *measCb = NULLP; - U16 cntr; - U16 ueIdx = 0; + uint16_t cntr; + uint16_t ueIdx = 0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) @@ -160,19 +159,19 @@ PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) } -PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) +static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) { RlcL2MeasEvtCb *measEvtCb = NULLP; 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 @@ -202,7 +201,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) { 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.umDl.sduQ.count) @@ -214,7 +213,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) } } } - else if (rlcRbCb->mode == CM_LTE_MODE_AM) + else if (rlcRbCb->mode == RLC_MODE_AM) { if ((rlcRbCb->m.amDl.cntrlBo) || (rlcRbCb->m.amDl.retxBo) || @@ -262,7 +261,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) ueIdx = freeIdx; } measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE; - cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *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; @@ -301,6 +300,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) return ROK; }/*rlcAddToDlL2Meas*/ #endif /*LTE_L2_MEAS*/ + /** * @brief @@ -315,26 +315,10 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) * -#ROK * -#RFAILED */ -#ifdef ANSI -PRIVATE S16 rlcCfgFillDlRbCb -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcDlUeCb *ueCb, -RlcEntCfgInfo *entCfg -) -#else -PRIVATE S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcDlUeCb *ueCb; -RlcEntCfgInfo *entCfg; -#endif +static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfgInfo *entCfg) { - TRC3(rlcCfgFillDlRbCb) - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))", rbCb->rlcId.ueId, rbCb->rlcId.cellId, entCfg->rbType); @@ -342,7 +326,7 @@ 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; @@ -350,30 +334,39 @@ RlcEntCfgInfo *entCfg; break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { rbCb->lch.lChId = entCfg->lCh[0].lChId; rbCb->lch.lChType = entCfg->lCh[0].type; rbCb->dir = entCfg->dir; + + /* Spec 38.322 Section 7.1 + * All UM state variables can take values from 0 to 63 for 6 bit SN or + * from 0 to 4095 for 12 bit SN. All arithmetic operations on UM state + * variables are affected by the UM modulus + * (i.e. final value = [value from arithmetic operation] modulo 64 + * for 6 bit SN and 4096 for 12 bit SN) + */ rbCb->m.umDl.snLen = entCfg->m.umInfo.dl.snLen; - if (entCfg->m.umInfo.dl.snLen == RLC_UM_CFG_5BIT_SN_LEN) - rbCb->m.umDl.modBitMask = 0x1f; + if (entCfg->m.umInfo.dl.snLen == RLC_UM_CFG_6BIT_SN_LEN) + rbCb->m.umDl.modBitMask = 0x3f; else - rbCb->m.umDl.modBitMask = 0x3ff; + rbCb->m.umDl.modBitMask = 0xfff; ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = rbCb; break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { /* Down Link Information * indx = 0 as Down Link */ rbCb->lch.lChId = entCfg->lCh[0].lChId; rbCb->lch.lChType = entCfg->lCh[0].type; rbCb->dir = RLC_DIR_BOTH; + rbCb->m.amDl.pollPdu = entCfg->m.amInfo.dl.pollPdu; - rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte; + rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte; rbCb->m.amDl.maxRetx = entCfg->m.amInfo.dl.maxRetx; rbCb->m.amDl.pollRetxTmrInt = entCfg->m.amInfo.dl.pollRetxTmr; rbCb->m.amDl.snLen = entCfg->m.amInfo.dl.snLen; @@ -388,12 +381,10 @@ RlcEntCfgInfo *entCfg; } cmInitTimers(&(rbCb->m.amDl.pollRetxTmr), 1); - - ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = rbCb; #ifndef LTE_TDD - U32 hashIndex; + uint32_t hashIndex; RLC_ALLOC(gCb, rbCb->m.amDl.txBufLst, (RLC_TX_BUF_BIN_SIZE * sizeof(CmLListCp))); @@ -406,8 +397,7 @@ RlcEntCfgInfo *entCfg; } default: { - RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId, - "Invalid RB Mode ueId(%d),cellId(%d)", + DU_LOG("\nERROR --> RLC_DL : Invalid RB Mode ueId(%d),cellId(%d)", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return RFAILED; @@ -432,28 +422,18 @@ RlcEntCfgInfo *entCfg; * -#ROK * -#RFAILED */ -#ifdef ANSI -PRIVATE S16 rlcCfgUpdateDlRb +static S16 rlcCfgUpdateDlRb ( -RlcCb *gCb, -RlcDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, void *ptr, RlcEntCfgInfo *entCfg ) -#else -PRIVATE S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg) -RlcCb *gCb; -RlcDlRbCb *rbCb; -void *ptr; -RlcEntCfgInfo *entCfg; -#endif { - TRC3(rlcCfgUpdateDlRb) if (rbCb->mode != entCfg->entMode) { - RLOG_ARG4(L_ERROR,DBG_RBID,rbCb->rlcId.rbId, - "RB Mode Mismatch : exp [%d] rcv [%d] UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : RB Mode Mismatch : exp [%d] rcv [%d] UEID:%d CELLID:%d", rbCb->mode, entCfg->entMode, rbCb->rlcId.ueId, @@ -463,7 +443,7 @@ RlcEntCfgInfo *entCfg; switch (rbCb->mode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { RlcDlCellCb *cellCb = (RlcDlCellCb *)ptr; @@ -475,7 +455,7 @@ RlcEntCfgInfo *entCfg; break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { RlcDlUeCb *ueCb = (RlcDlUeCb *)ptr; @@ -492,7 +472,7 @@ RlcEntCfgInfo *entCfg; break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { RlcDlUeCb *ueCb = (RlcDlUeCb *)ptr; @@ -548,7 +528,6 @@ RlcEntCfgInfo *entCfg; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgAddDlRb ( RlcCb *gCb, @@ -557,24 +536,13 @@ CmLteCellId cellId, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { RlcDlUeCb *ueCb = NULLP; /* UE Control Block */ RlcDlCellCb *cellCb; /* Cell Control Block */ RlcDlRbCb *rlcRbCb; /* KW RB Control Block */ - U8 reason; /* Rb Identifier */ + uint8_t reason; /* Rb Identifier */ - TRC3(rlcCfgAddDlRb) - - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))", cellId, ueId, entCfg->cfgType); @@ -584,8 +552,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_CELL_UNKWN); - RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId, - "Add DLRb,CellId is 0 for UEID:%d", + DU_LOG("\nERROR --> RLC_DL : Add DLRb,CellId is 0 for UEID:%d", ueId); return RFAILED; } @@ -606,8 +573,7 @@ RlcEntCfgCfmInfo *entCfm; RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId, - "Invalid RbId ,Max is [%d] CELLID:%d UEID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid RbId ,Max is [%d] CELLID:%d UEID:%d", RLC_MAX_RB_PER_CELL, cellId, ueId); @@ -617,7 +583,7 @@ RlcEntCfgCfmInfo *entCfm; if (((entCfg->lCh[0].type == CM_LTE_LCH_BCCH) || (entCfg->lCh[0].type == CM_LTE_LCH_PCCH) || (entCfg->lCh[0].type == CM_LTE_LCH_CCCH)) && - (entCfg->entMode == CM_LTE_MODE_TM)) + (entCfg->entMode == RLC_MODE_TM)) { /* Cell CB present */ rlcDbmFetchDlCellCb(gCb, cellId, &cellCb); @@ -630,8 +596,7 @@ RlcEntCfgCfmInfo *entCfm; RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_PRSNT); - RLOG_ARG2(L_WARNING, DBG_CELLID,cellId, - "RbId [%d] already exists UEID:%d", + DU_LOG("\nERROR --> RLC_DL : RbId [%d] already exists UEID:%d", entCfg->rbId, ueId); return RFAILED; @@ -646,8 +611,7 @@ RlcEntCfgCfmInfo *entCfm; RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_CELL_CREAT_FAIL); - RLOG_ARG2(L_ERROR,DBG_CELLID,cellId, - "cellCb Creation failed RBID:%d UEID:%d", + DU_LOG("\nERROR --> RLC_DL : cellCb Creation failed RBID:%d UEID:%d", entCfg->rbId, ueId); return RFAILED; @@ -657,8 +621,7 @@ RlcEntCfgCfmInfo *entCfm; /* Validate LChId */ if(entCfg->lCh[0].lChId <= 0) { - RLOG_ARG3(L_ERROR,DBG_LCID,entCfg->lCh[0].lChId , - "Invalid LcId CELLID:%d UEID:%d RBID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid LcId CELLID:%d UEID:%d RBID:%d", cellId, ueId, entCfg->rbId); @@ -672,8 +635,7 @@ RlcEntCfgCfmInfo *entCfm; RLC_ALLOC(gCb,rlcRbCb, sizeof (RlcDlRbCb)); if (!rlcRbCb) { - RLOG_ARG2(L_FATAL,DBG_UEID,ueId, - "Memory allocation failed for rbId:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed for rbId:%d CELLID:%d", entCfg->rbId, ueId); /* Fill entCfm structure */ @@ -688,7 +650,7 @@ RlcEntCfgCfmInfo *entCfm; } else { - reason= (entCfg->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS: + reason= (entCfg->entMode != RLC_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS: CKW_CFG_REAS_LCHTYPE_MIS; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, @@ -703,18 +665,17 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId, - "Invalid RbId for RbType[%d] UEID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid RbId for RbType[%d] UEID:%d", entCfg->rbType, ueId); return RFAILED; } if ((((entCfg->lCh[0].type == CM_LTE_LCH_DCCH) && - (entCfg->entMode != CM_LTE_MODE_UM) && + (entCfg->entMode != RLC_MODE_UM) && (CM_LTE_SRB == entCfg->rbType)) || ((entCfg->lCh[0].type == CM_LTE_LCH_DTCH) && (CM_LTE_DRB == entCfg->rbType))) && - (entCfg->entMode != CM_LTE_MODE_TM)) + (entCfg->entMode != RLC_MODE_TM)) { /* UE CB present */ if ( rlcDbmFetchDlUeCb(gCb,ueId, cellId, &ueCb) == ROK) @@ -727,8 +688,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_PRSNT); - RLOG_ARG2(L_WARNING, DBG_UEID, ueId, - "CellId[%u]:rbId [%d] already exists", + DU_LOG("\nERROR --> RLC_DL : CellId[%u]:rbId [%d] already exists", cellId, entCfg->rbId); return RFAILED; @@ -742,17 +702,26 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_CREAT_FAIL); - RLOG_ARG2(L_WARNING, DBG_CELLID,cellId, - "UeId [%u]:ueCb Creation Failed RBID:%d", + DU_LOG("\nERROR --> RLC_DL : UeId [%u]:ueCb Creation Failed RBID:%d", ueId, entCfg->rbId); return RFAILED; } + /* Start throughput calculation for this UE */ + gCb->rlcThpt.thptPerUe[gCb->rlcThpt.numActvUe].ueIdx = ueId; + gCb->rlcThpt.thptPerUe[gCb->rlcThpt.numActvUe].dataVol = 0; + gCb->rlcThpt.numActvUe++; + + if((rlcChkTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR)) == FALSE) + { + printf("\nHLAL Starting Throughput timer"); + rlcStartTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR); + } } /* Validate LChId for UM and AM modes */ if ((entCfg->lCh[0].lChId <= 0) || - ((entCfg->entMode == CM_LTE_MODE_AM)&& + ((entCfg->entMode == RLC_MODE_AM)&& (entCfg->lCh[1].lChId <= 0))) { /* Fill entCfm structure */ @@ -768,8 +737,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL); - RLOG_ARG2(L_FATAL,DBG_UEID,ueId, - "Memory allocation failed RBID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed RBID:%d CELLID:%d", entCfg->rbId, cellId); return RFAILED; @@ -787,7 +755,7 @@ RlcEntCfgCfmInfo *entCfm; } else { - if (entCfg->entMode == CM_LTE_MODE_TM) + if (entCfg->entMode == RLC_MODE_TM) { reason = CKW_CFG_REAS_RB_MODE_MIS; } @@ -821,8 +789,7 @@ RlcEntCfgCfmInfo *entCfm; /* Delete RB CB created */ RLC_FREE(gCb,rlcRbCb, sizeof(RlcDlRbCb)); - RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId, - "Filling of RbCb failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Filling of RbCb failed UEID:%d CELLID:%d", ueId, cellId); return RFAILED; @@ -875,7 +842,6 @@ RlcEntCfgCfmInfo *entCfm; * -#ROK * -#RFAILED */ -#ifdef ANSI S16 rlcCfgReCfgDlRb ( RlcCb *gCb, @@ -884,25 +850,14 @@ CmLteCellId cellId, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { RlcDlRbCb *rbCb; /* RB Control Block */ RlcDlRbCb tRbCb; /* KW RB Control Block */ RlcDlCellCb *cellCb; /* Cell Control Block */ RlcDlUeCb *ueCb; /* Ue Control Block */ - U8 ret; - - TRC3(rlcCfgReCfgDlRb) + uint8_t ret; - RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, - "rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d", cellId, entCfg->cfgType,entCfg->rbId); @@ -914,8 +869,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId, - "Invalid RbId , Max is [%d] UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid RbId , Max is [%d] UEID:%d CELLID:%d", RLC_MAX_RB_PER_CELL, ueId, cellId); @@ -928,8 +882,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_CELL_UNKWN); - RLOG_ARG3(L_ERROR,DBG_CELLID,cellId, - "CellCb not found ueId:%d RBID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : CellCb not found ueId:%d RBID:%d CELLID:%d", ueId, entCfg->rbId, cellId); @@ -944,8 +897,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR,DBG_UEID,ueId, - "CELLID:%d RBID:%d not found", + DU_LOG("\nERROR --> RLC_DL : CELLID:%d RBID:%d not found", cellId, entCfg->rbId); return RFAILED; @@ -954,7 +906,7 @@ RlcEntCfgCfmInfo *entCfm; /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); + memcpy(&tRbCb, rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg); @@ -967,11 +919,10 @@ RlcEntCfgCfmInfo *entCfm; CKW_CFG_CFM_NOK, ret); - RLOG_ARG2(L_ERROR,DBG_UEID,ueId, - "CELLID:%u RBID:%d updation failed", + DU_LOG("\nERROR --> RLC_DL : CELLID:%u RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); + memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb)); return (ret); } @@ -983,8 +934,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG3(L_ERROR,DBG_UEID,ueId, - "CELLID:%d Invalid RBID:%d for RbType[%d]", + DU_LOG("\nERROR --> RLC_DL : CELLID:%d Invalid RBID:%d for RbType[%d]", cellId, entCfg->rbId, entCfg->rbType); @@ -997,8 +947,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN); - RLOG_ARG2(L_ERROR,DBG_CELLID, cellId, - "UEID:%d UeCb not found RBID:%d", + DU_LOG("\nERROR --> RLC_DL : UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); return (ret); @@ -1012,8 +961,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR, DBG_UEID,ueId, - "CELLID:%d RBID:%d not found", + DU_LOG("\nERROR --> RLC_DL : CELLID:%d RBID:%d not found", cellId, entCfg->rbId); return (ret); @@ -1022,7 +970,7 @@ RlcEntCfgCfmInfo *entCfm; /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); + memcpy(&tRbCb, rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg); @@ -1031,11 +979,10 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, ret); - RLOG_ARG2(L_ERROR,DBG_UEID,ueId, - "CELLID:%d RBID:%d updation failed", + DU_LOG("\nERROR --> RLC_DL : CELLID:%d RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); + memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb)); return (ret); } @@ -1078,7 +1025,6 @@ RlcEntCfgCfmInfo *entCfm; * -#ROK * -#RFAILED */ -#ifdef ANSI S16 rlcCfgDelDlRb ( RlcCb *gCb, @@ -1087,24 +1033,13 @@ CmLteCellId cellId, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { S16 ret; /* Return Value */ RlcDlUeCb *ueCb; /* UE Control Block */ RlcDlCellCb *cellCb; /* UE Control Block */ RlcDlRbCb *rlcRbCb; /* KW RB Control Block */ - TRC3(rlcCfgDelDlRb) - - RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, - "rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))", entCfg->rbId, cellId, entCfg->cfgType); @@ -1119,8 +1054,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId , - "Invalid RbId, Max is [%d] UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid RbId, Max is [%d] UEID:%d CELLID:%d", RLC_MAX_RB_PER_CELL, ueId, cellId); @@ -1133,8 +1067,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR,DBG_CELLID,cellId, - "CellCb not found UEID:%d RBID:%d", + DU_LOG("\nERROR --> RLC_DL : CellCb not found UEID:%d RBID:%d", ueId, entCfg->rbId); return (ret); @@ -1148,8 +1081,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR, DBG_UEID,ueId, - "CellId[%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); return (ret); @@ -1171,8 +1103,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG3(L_ERROR,DBG_RBID, entCfg->rbId, - "Invalid RbId for RbType[%d] UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Invalid RbId for RbType[%d] UEID:%d CELLID:%d", entCfg->rbType, ueId, cellId); @@ -1186,8 +1117,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN); - RLOG_ARG2(L_ERROR,DBG_CELLID, cellId, - "UeId [%d]: UeCb not found RBID:%d", + DU_LOG("\nERROR --> RLC_DL : UeId [%d]: UeCb not found RBID:%d", ueId, entCfg->rbId); return (ret); @@ -1201,8 +1131,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR, DBG_UEID,ueId, - "CellId[%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); return (ret); @@ -1214,13 +1143,13 @@ RlcEntCfgCfmInfo *entCfm; RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, rlcRbCb); #endif /* Free the Buffers of RbCb */ - if( CM_LTE_MODE_UM == rlcRbCb->mode) + if( RLC_MODE_UM == rlcRbCb->mode) { rlcUmmFreeDlRbCb(gCb,rlcRbCb); /* Delete RbCb */ RLC_FREE(gCb,rlcRbCb, sizeof(RlcDlRbCb)); } - else if( CM_LTE_MODE_AM == rlcRbCb->mode) + else if( RLC_MODE_AM == rlcRbCb->mode) { rlcAmmFreeDlRbCb(gCb,rlcRbCb); } @@ -1274,33 +1203,20 @@ RlcEntCfgCfmInfo *entCfm; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgReEstDlRb ( -RlcCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, Bool sndReEstInd, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -Bool sndReEstInd; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { RlcDlRbCb *rbCb; /* RB Control Block */ CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgReEstDlRb) - - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))", ueId, cellId, entCfg->cfgType); @@ -1317,8 +1233,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, rlcId.rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN); - RLOG_ARG2(L_ERROR, DBG_UEID,ueId, - "CellId[%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); return RFAILED; @@ -1328,19 +1243,19 @@ RlcEntCfgCfmInfo *entCfm; switch (rbCb->mode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { rlcDlTmmReEstablish(gCb,rbCb); break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { rlcDlUmmReEstablish(gCb,rlcId,sndReEstInd,rbCb); break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { rlcAmmDlReEstablish(gCb, rlcId, rbCb); break; @@ -1377,31 +1292,19 @@ RlcEntCfgCfmInfo *entCfm; * -#ROK * -#RFAILED */ -#ifdef ANSI S16 rlcCfgDelDlUe ( -RlcCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { S16 ret; /* Return Value */ RlcDlUeCb *ueCb; /* UE Control Block */ - TRC3(rlcCfgDelUe) - - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, - "rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))", ueId, cellId, entCfg->cfgType); @@ -1414,8 +1317,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN); - RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId, - "ueId(%d), cellId(%d)", + DU_LOG("\nERROR --> RLC_DL : ueId(%d), cellId(%d)", ueId, cellId); return RFAILED; @@ -1428,8 +1330,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN); - RLOG_ARG2(L_ERROR,DBG_CELLID, cellId, - "UEID:%d UeCb not found RBID:%d", + DU_LOG("\nERROR --> RLC_DL : UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); return RFAILED; @@ -1470,7 +1371,6 @@ RlcEntCfgCfmInfo *entCfm; * -#ROK * -#RFAILED */ -#ifdef ANSI S16 rlcCfgDelDlCell ( RlcCb *gCb, @@ -1478,21 +1378,11 @@ CmLteCellId cellId, RlcEntCfgInfo *entCfg, RlcEntCfgCfmInfo *entCfm ) -#else -S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm) -RlcCb *gCb; -CmLteCellId cellId; -RlcEntCfgInfo *entCfg; -RlcEntCfgCfmInfo *entCfm; -#endif { RlcDlCellCb *cellCb; /* UE Control Block */ - U8 rbId; /* RB Identifier */ - - TRC3(rlcCfgDelCell) + uint8_t rbId; /* RB Identifier */ - RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId, - "rlcCfgDelCell( cellId(%d), cfgType(%d)", + DU_LOG("\nDEBUG --> RLC_DL : rlcCfgDelCell( cellId(%d), cfgType(%d)", cellId, entCfg->cfgType); @@ -1505,8 +1395,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_CELL_UNKWN); - RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId, - "cellId is 0 (%d) ", + DU_LOG("\nERROR --> RLC_DL : cellId is 0 (%d) ", cellId); return RFAILED; } @@ -1518,8 +1407,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ RLC_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_CELL_UNKWN); - RLOG_ARG1(L_ERROR, DBG_CELLID,cellId, - "CellCb not found for RBID:%d", + DU_LOG("\nERROR --> RLC_DL : CellCb not found for RBID:%d", entCfg->rbId); return RFAILED; } @@ -1556,7 +1444,6 @@ RlcEntCfgCfmInfo *entCfm; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcCfgDlUeIdChng ( RlcCb *gCb, @@ -1564,25 +1451,16 @@ CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo, CmStatus *status ) -#else -S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status) -RlcCb *gCb; -CkwUeInfo *ueInfo; -CkwUeInfo *newUeInfo; -CmStatus *status; -#endif { RlcDlUeCb *ueCb; -/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/ - TRC3(rlcCfgUeIdChng) +/*kw004.201 Adding of Missing Trace in RLC PDCP*/ if ( (ueInfo->ueId == newUeInfo->ueId) && (ueInfo->cellId == newUeInfo->cellId)) { status->reason = CKW_CFG_REAS_SAME_UEID; status->status = CKW_CFG_CFM_NOK; - RLOG_ARG2(L_ERROR,DBG_CELLID,ueInfo->cellId, - "Old UeId[%d] same as new UeId[%d]", + DU_LOG("\nERROR --> RLC_DL : Old UeId[%d] same as new UeId[%d]", ueInfo->ueId, newUeInfo->ueId); return RFAILED; @@ -1590,8 +1468,7 @@ CmStatus *status; if(ROK == rlcDbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) { - RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId, - "NewUeId[%d]:ueCb already exists", + DU_LOG("\nERROR --> RLC_DL : NewUeId[%d]:ueCb already exists", newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_EXISTS; status->status = CKW_CFG_CFM_NOK; @@ -1601,8 +1478,7 @@ CmStatus *status; if(ROK != rlcDbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId, - "UeId [%d]: UeCb not found", + DU_LOG("\nERROR --> RLC_DL : UeId [%d]: UeCb not found", ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_UNKWN; status->status = CKW_CFG_CFM_NOK; @@ -1614,8 +1490,7 @@ CmStatus *status; #endif if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId, - "UeId[%u] HashList Deletion Failed", + DU_LOG("\nERROR --> RLC_DL : UeId[%u] HashList Deletion Failed", ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK; @@ -1627,12 +1502,11 @@ CmStatus *status; ueCb->cellId = newUeInfo->cellId; if(ROK != cmHashListInsert(&(gCb->u.dlCb->ueLstCp), - (PTR)ueCb, (U8 *)&(ueCb->ueId), - (U16) sizeof(CmLteRnti))) + (PTR)ueCb, (uint8_t *)&(ueCb->ueId), + (uint16_t) sizeof(CmLteRnti))) { - RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId, - "UeId[%u] HashList Insertion Failed", + DU_LOG("\nERROR --> RLC_DL : UeId[%u] HashList Insertion Failed", newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK;