X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_utl_dl.c;h=2d1938cb8071693e238f2a729ba07e5608ba5f2f;hb=37badc1a711fc7802d2f0b67924f3c15e569a7d5;hp=46bfc35bbf3c96bb3344eee36087752eb6b8f713;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index 46bfc35bb..2d1938cb8 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -73,27 +73,29 @@ static int RLOG_FILE_ID=209; #include "rlc_utils.h" #include "rlc_mac_inf.h" +#include "du_app_rlc_inf.h" #include "rlc_lwr_inf_api.h" +#include "rlc_upr_inf_api.h" #include "ss_rbuf.h" #include "ss_rbuf.x" -EXTERN SsRngBufCnt rngCb; +SsRngBufCnt rngCb; #if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)) -extern U32 isDatReqProcessed; +uint32_t isDatReqProcessed; #endif #define RLC_MODULE (RLC_DBGMASK_DUT | RLC_DBGMASK_DL) /* for debugging purpose */ #if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)) || defined (SS_RBUF) -EXTERN void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); +void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); #endif Void ResetRLCStats(Void) { RlcCb* dlInst = rlcCb[1]; RlcCb* ulInst = rlcCb[0]; - cmMemset((U8*)&gRlcStats, 0, sizeof(RLCStats)); - cmMemset((U8*)&dlInst->genSts,0,sizeof(RlcGenSts)); - cmMemset((U8*)&ulInst->genSts,0,sizeof(RlcGenSts)); + memset(&gRlcStats, 0, sizeof(RLCStats)); + memset(&dlInst->genSts,0,sizeof(RlcGenSts)); + memset(&ulInst->genSts,0,sizeof(RlcGenSts)); } #ifndef ALIGN_64BIT @@ -230,14 +232,15 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) RguDatReqTb datPerTb; /* DL data info per TB */ RguLchDatReq datPerLch; /* DL data info per Lch */ RlcData *dlData; /* DL data to be sent to MAC */ + RlcDlRrcMsgRsp *dlRrcMsgRsp;/* DL Data Msg Rsp sent to DU */ Pst pst; /* Post structure */ uint16_t pduLen; /* PDU length */ uint16_t copyLen; /* Number of bytes copied */ dlData = NULLP; + dlRrcMsgRsp = NULLP; RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL, dlData, sizeof(RlcData)); -#if (ERRCLASS & ERRCLS_ADD_RES) if ( dlData == NULLP ) { DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dl data"); @@ -245,13 +248,12 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) datReqInfo, sizeof(RguDDatReqInfo)); return RFAILED; } -#endif /* ERRCLASS & ERRCLS_ADD_RES */ for(ueIdx = 0; ueIdx < datReqInfo->nmbOfUeGrantPerTti; ueIdx++) { datPerUe = datReqInfo->datReq[ueIdx]; - memset((uint8_t *)dlData, 0, sizeof(RlcData)); + memset(dlData, 0, sizeof(RlcData)); dlData->cellId = datReqInfo->cellId; dlData->rnti = datPerUe.rnti; @@ -304,6 +306,25 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) }/* For Data per Lch */ }/* For Data per Tb */ + RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL, + dlRrcMsgRsp, sizeof(RlcDlRrcMsgRsp)); + if( dlRrcMsgRsp == NULLP ) + { + DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dlRrcMsgRsp"); + for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) + { + RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData->pduInfo[pduIdx].pduBuf,\ + dlData->pduInfo[pduIdx].pduLen); + } + RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData, sizeof(RlcData)); + RLC_FREE_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL, + datReqInfo, sizeof(RguDDatReqInfo)); + return RFAILED; + } + + dlRrcMsgRsp->cellId = dlData->cellId; + dlRrcMsgRsp->crnti = dlData->rnti; + /* Sending DL Data per UE to MAC */ memset(&pst, 0, sizeof(Pst)); FILL_PST_RLC_TO_MAC(pst, RLC_DL_INST, EVENT_DL_DATA_TO_MAC); @@ -315,6 +336,17 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) dlData->pduInfo[pduIdx].pduLen); } RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData, sizeof(RlcData)); + /* Update DL RRC MSG Rsp State */ + dlRrcMsgRsp->state = TRANSMISSION_FAILED; + } + else + dlRrcMsgRsp->state = TRANSMISSION_COMPLETE; + + /* Send Dl RRC Msg Rsp to DU APP */ + FILL_PST_RLC_TO_DUAPP(pst, RLC_DL_INST, EVENT_DL_RRC_MSG_RSP_TO_DU); + if(rlcSendDlRrcMsgRspToDu(&pst, dlRrcMsgRsp) != ROK) + { + RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlRrcMsgRsp, sizeof(RlcDlRrcMsgRsp)); } } /* For Data per UE */ @@ -397,7 +429,7 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) } /* kw002.201 Removed the allocation of RlcDatReq */ /* kw004.201 Used SSI function to initialize the variable */ - cmMemset( (U8 *)&datReq, 0, sizeof(RlcDatReq) ); + memset(&datReq, 0, sizeof(RlcDatReq) ); totNumPdu = 0; for (numTb = 0; numTb < staInd->nmbOfTbs; numTb++) { @@ -546,7 +578,7 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) else { cmHashListInsert(&(rlcCb.rlcL2Cb.tbHlCp),(PTR)tbSnMap, - (U8 *) &(tbSnMap->tbId), (U16)sizeof(tbSnMap->tbId)); + (uint8_t *) &(tbSnMap->tbId), (uint16_t)sizeof(tbSnMap->tbId)); rlcCb.rlcL2Cb.curTbSnMap = NULLP; } #endif /* LTE_L2_MEAS */ @@ -637,7 +669,6 @@ uint8_t rlcUtlSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, int32_t bo, \ */ /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC -#ifdef ANSI Void rlcUtlEmptySduQ ( RlcCb *gCb, @@ -645,23 +676,11 @@ RlcDlRbCb *rbCb, CmLListCp *sduQ ) #else -Void rlcUtlEmptySduQ(gCb,rbCb, sduQ) -RlcCb *gCb; -RlcDlRbCb *rbCb; -CmLListCp *sduQ; -#endif -#else -#ifdef ANSI Void rlcUtlEmptySduQ ( RlcCb *gCb, CmLListCp *sduQ ) -#else -Void rlcUtlEmptySduQ(gCb,sduQ) -RlcCb *gCb; -CmLListCp *sduQ; -#endif #endif { #ifdef LTE_L2_MEAS_RLC @@ -669,7 +688,6 @@ CmLListCp *sduQ; CmLList *firstSduSnMap; /* First Node in SDU SnMap Queue */ RlcSduSnMap *sduSnMap; /* SDU Sn Map */ - TRC2(rlcUtlEmptySduQ) sduSnMapQ = NULLP; firstSduSnMap = NULLP; sduSnMap = NULLP; @@ -693,7 +711,7 @@ CmLListCp *sduQ; } } #endif - RETVOID; + return; } /** @@ -748,19 +766,8 @@ void rlcUtlCalcLiForSdu(RlcCb *gCb, uint16_t numLi, MsgLen msgLen, int16_t *pduS * * @return void */ -#ifdef ANSI -Void rlcDlUtlSetReestInProgressForRB -( -RlcCb *gCb, -RlcDlRbCb *rbCb -) -#else -Void rlcDlUtlSetReestInProgressForRB(gCb,rbCb) -RlcCb *gCb; -RlcDlRbCb *rbCb; -#endif +Void rlcDlUtlSetReestInProgressForRB(RlcCb *gCb,RlcDlRbCb *rbCb) { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = TRUE; @@ -780,7 +787,7 @@ RlcDlRbCb *rbCb; rlcUtlSendDedLcBoStatus(gCb, rbCb, 0, 0, FALSE,0); - RETVOID; + return; } /** @@ -808,17 +815,8 @@ bool rlcDlUtlIsReestInProgress(RlcDlRbCb *rbCb) * * @return Void */ -#ifdef ANSI -Void rlcDlUtlResetReestInProgress -( -RlcDlRbCb *rbCb -) -#else -Void rlcDlUtlResetReestInProgress(rbCb) -RlcDlRbCb *rbCb; -#endif +Void rlcDlUtlResetReestInProgress(RlcDlRbCb *rbCb) { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = FALSE; } @@ -836,22 +834,10 @@ RlcDlRbCb *rbCb; * * @return void */ -#ifdef ANSI -Void rlcDlUtlSetReestInProgressForAllRBs -( -RlcCb *gCb, -RlcDlUeCb *ueCb -) -#else -Void rlcDlUtlSetReestInProgressForAllRBs(gCb,ueCb) -RlcCb *gCb; -RlcDlUeCb *ueCb; -#endif +Void rlcDlUtlSetReestInProgressForAllRBs(RlcCb *gCb,RlcDlUeCb *ueCb) { - U32 rbIdx; + uint32_t rbIdx; - TRC2(rlcDlUtlSetReestInProgressForAllRBs) - for(rbIdx = 0;rbIdx < RLC_MAX_SRB_PER_UE;rbIdx++) { if(ueCb->srbCb[rbIdx] != NULLP) @@ -879,7 +865,7 @@ RlcDlUeCb *ueCb; } } - RETVOID; + return; } /** @@ -926,24 +912,14 @@ void rlcUtlIncrementGenStsBytesAndPdusSent(RlcGenSts *genSts, Buffer *pdu) * * @return Void */ -#ifdef ANSI -Void rlcUtlInitToBeFreed -( -RlcCb *gCb, -RlcDlDataToBeFreed *toBeFreed -) -#else -Void rlcUtlInitToBeFreed(gCb, toBeFreed) -RlcCb *gCb; -RlcDlDataToBeFreed *toBeFreed; -#endif +Void rlcUtlInitToBeFreed(RlcCb *gCb,RlcDlDataToBeFreed *toBeFreed) { cmLListInit(&(toBeFreed->sduLst)); cmLListInit(&(toBeFreed->rbLst)); cmLListInit(&(toBeFreed->reTxLst)); cmLListInit(&(toBeFreed->txLst)); - RETVOID; + return; } /** @@ -954,15 +930,7 @@ RlcDlDataToBeFreed *toBeFreed; * * @return Void */ -#ifdef ANSI -Void rlcUtlInitializeSelfPst -( -RlcCb *gCb -) -#else -Void rlcUtlInitializeSelfPst(gCb) -RlcCb *gCb; -#endif +Void rlcUtlInitializeSelfPst(RlcCb *gCb) { Pst *selfPst = &gCb->u.dlCb->selfPst; @@ -1021,20 +989,10 @@ void rlcUtlAddSduToBeFreedQueue(RlcCb *gCb, RlcSdu *sdu) * * @return Void */ -#ifdef ANSI -Void rlcUtlAddReTxPduToBeFreedQueue -( -RlcCb *gCb, -RlcRetx *retx -) -#else -Void rlcUtlAddReTxPduToBeFreedQueue(gCb, retx) -RlcCb *gCb; -RlcRetx *retx; -#endif +Void rlcUtlAddReTxPduToBeFreedQueue(RlcCb *gCb,RlcRetx *retx) { cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.reTxLst), &(retx->lstEnt)); - RETVOID; + return; } /** @@ -1046,21 +1004,11 @@ RlcRetx *retx; * * @return Void */ -#ifdef ANSI -Void rlcUtlAddTxPduToBeFreedQueue -( -RlcCb *gCb, -RlcTx *pdu -) -#else -Void rlcUtlAddTxPduToBeFreedQueue(gCb, pdu) -RlcCb *gCb; -RlcTx *pdu; -#endif +Void rlcUtlAddTxPduToBeFreedQueue(RlcCb *gCb,RlcTx *pdu) { pdu->rlsLnk.node = (PTR)pdu; cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.txLst), &(pdu->rlsLnk)); - RETVOID; + return; } /* @@ -1079,27 +1027,12 @@ RlcTx *pdu; * - TRUE if more data to be freed * - FALSE if all the data has been freed */ -#ifdef ANSI -PRIVATE Bool rlcUtlFreeDlAmRbMemory -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -U32 *toBeFreed -) -#else -PRIVATE Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed) -RlcCb *gCb; -RlcDlRbCb *rbCb; -U32 *toBeFreed -#endif +static Bool rlcUtlFreeDlAmRbMemory(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t *toBeFreed) { RlcRetx *retx; /* retransmission buffer */ RlcSn mTxNext; /* send state variable */ RlcTx *txBuf; - TRC2(rlcUtlFreeDlAmRbMemory) - - MODAMT(AMDL.txNext, mTxNext, AMDL.txNextAck,AMDL.snModMask); /* TODO : to be checked changed from <= to < */ @@ -1174,7 +1107,7 @@ U32 *toBeFreed (*toBeFreed)--; } - return (FALSE);; + return (FALSE); } /** @@ -1185,23 +1118,15 @@ U32 *toBeFreed * * @return Void */ -#ifdef ANSI -Void rlcUtlFreeDlMemory -( -RlcCb *gCb -) -#else -Void rlcUtlFreeDlMemory(gCb) -RlcCb *gCb; -#endif +Void rlcUtlFreeDlMemory(RlcCb *gCb) { - U32 toBeFreed; + uint32_t toBeFreed; /* safety check, in case some event was still lying in the queue after the dlCb was deleted*/ if(!gCb->u.dlCb) { - RETVOID; + return; } RlcDlDataToBeFreed* pToBeFreed = &gCb->u.dlCb->toBeFreed; @@ -1307,7 +1232,7 @@ RlcCb *gCb; rlcUtlRaiseDlCleanupEvent(gCb); } - RETVOID; + return; } @@ -1325,12 +1250,12 @@ RlcCb *gCb; */ S16 rlcUtlL2MeasDlInit(RlcCb *gCb) { - U16 cntr; + uint16_t cntr; gCb->u.dlCb->rlcL2Cb.rlcNumMeas=0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - cmMemset((U8 *)&(gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); + memset(&(gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); } gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_DL_DISC].measCb.measType = LKW_L2MEAS_DL_DISC; gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_DL_IP].measCb.measType = LKW_L2MEAS_DL_IP; @@ -1354,32 +1279,22 @@ S16 rlcUtlL2MeasDlInit(RlcCb *gCb) * @return Void * */ -#ifdef ANSI Void rlcUtlUpdateBurstSdus ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcContSduLst *contSduLst, -S32 dataVol, -U32 schPduSz +S32 dataVol, +uint32_t schPduSz ) -#else -Void rlcUtlUpdateBurstSdus (gCb, rbCb, contSduLst, dataVol, schPduSz) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcContSduLst *contSduLst; -S32 dataVol; -U32 schPduSz; -#endif { - RlcL2MeasDlIpTh *l2MeasDlIpThruput = NULLP; - RlcL2MeasTb *l2MeasTb = NULLP; - U8 idx; - U8 currTbIdx; - VOLATILE U32 startTime = 0; + RlcL2MeasDlIpTh *l2MeasDlIpThruput = NULLP; + RlcL2MeasTb *l2MeasTb = NULLP; + uint8_t idx; + uint8_t currTbIdx; + volatile uint32_t startTime = 0; RlcContSduLst *dstContSduLst; - TRC2(rlcUtlUpdateBurstSdus) /*starting Task*/ @@ -1418,7 +1333,7 @@ U32 schPduSz; if(l2MeasTb->numLcId >= RLC_MAX_ACTV_DRB) { /* ccpu00143043 */ - RETVOID; + return; } l2MeasTb->sduInfo[l2MeasTb->numLcId].lcId = rbCb->lch.lChId; /* Copy all the sduIdx from sduInfo to tb sduInfo */ @@ -1437,7 +1352,7 @@ U32 schPduSz; /*stopping Task*/ SStopTask(startTime, PID_RLC_DLIP_TPT_BURSTCALC); - RETVOID; + return; } /** * @brief @@ -1453,24 +1368,14 @@ U32 schPduSz; * * @return Void */ -#ifdef ANSI -Void rlcUtlUpdateContainedSduLst -( -U8 sduIdx, -RlcContSduLst *contSduLst -) -#else -Void rlcUtlUpdateContainedSduLst(sduIdx, contSduLst) -U8 sduIdx; -RlcContSduLst *contSduLst; -#endif +Void rlcUtlUpdateContainedSduLst(uint8_t sduIdx,RlcContSduLst *contSduLst) { if (contSduLst->numSdus < RLC_L2MEAS_MAX_OUTSTNGSDU) { contSduLst->sduIdx[contSduLst->numSdus] = sduIdx; contSduLst->numSdus++; } - RETVOID; + return; } /** @@ -1491,23 +1396,14 @@ RlcContSduLst *contSduLst; * * @return Void */ -#ifdef ANSI Void rlcUtlUpdateOutStandingSduLst ( RlcL2MeasDlIpTh *dlIpThPut, -U8 sduIdx, -MsgLen sduLen, -U32 sduId, -Bool newIdx +uint8_t sduIdx, +MsgLen sduLen, +uint32_t sduId, +Bool newIdx ) -#else -Void rlcUtlUpdateOutStandingSduLst(dlIpThPut, sduIdx, sduLen, sduId, newIdx) -RlcL2MeasDlIpTh *dlIpThPut; -U8 sduIdx; -MsgLen sduLen; -U32 sduId; -Bool newIdx; -#endif { if (sduIdx < RLC_L2MEAS_MAX_OUTSTNGSDU) { @@ -1519,25 +1415,13 @@ Bool newIdx; dlIpThPut->outStngSduArr[sduIdx].sduId = sduId; dlIpThPut->outStngSduArr[sduIdx].sduLen = sduLen; } - RETVOID; + return; } -#ifdef ANSI -RlcL2MeasTb * rlcUtlGetCurMeasTb -( -RlcCb *gCb, -RlcDlRbCb *rbCb -) -#else -RlcL2MeasTb * rlcUtlGetCurMeasTb(gCb, rbCb) -RlcCb *gCb; -RlcDlRbCb *rbCb; -#endif +RlcL2MeasTb * rlcUtlGetCurMeasTb(RlcCb *gCb,RlcDlRbCb *rbCb) { RlcL2MeasTb *curL2MeasTb; - U16 idx; + uint16_t idx; - TRC3(rlcUtlGetCurMeasTb) - if((curL2MeasTb = rbCb->ueCb->l2MeasTbCb[rbCb->ueCb->tbIdx]) == NULLP) { /* Intentionally avoiding the RLC_ALLOC macro to avoid memset */ @@ -1585,40 +1469,30 @@ RlcDlRbCb *rbCb; * -# ROK */ -#ifdef ANSI S16 rlcUtlProcHarqInd ( -RlcCb *gCb, +RlcCb *gCb, RguHarqStatusInd *hqStaInd, -RlcDlUeCb *ueCb, -U8 tbIdx +RlcDlUeCb *ueCb, +uint8_t tbIdx ) -#else -S16 rlcUtlProcHarqInd(gCb, hqStaInd, ueCb, tbIdx) -RlcCb *gCb; -RguHarqStatusInd *hqStaInd; -RlcDlUeCb *ueCb; -U8 tbIdx; -#endif { #ifdef LTE_L2_MEAS - RlcDlRbCb *rlcRbCb; /* KW Control Block */ - RlcL2MeasTb *l2MeasTb = NULLP; /* Measurement TbCb */ - U8 lcIdx; /* Logical channel id index */ - U8 sduIndx; /* sdu index to out standing sdu list in rbCb */ - U32 numSdus; /* number of sdus in the outstanding sdu list */ + RlcDlRbCb *rlcRbCb; /* KW Control Block */ + RlcL2MeasTb *l2MeasTb = NULLP; /* Measurement TbCb */ + uint8_t lcIdx; /* Logical channel id index */ + uint8_t sduIndx; /* sdu index to out standing sdu list in rbCb */ + uint32_t numSdus; /* number of sdus in the outstanding sdu list */ RlcOutStngSduInfo *outStngSduArr; /* Outstanding sdu list */ - Ticks ackTime; - Ticks delay; - U32 totlSduCnt = 0; + Ticks ackTime; + Ticks delay; + uint32_t totlSduCnt = 0; #endif - U8 timeAddedFlag; - S16 ret; - VOLATILE U32 startTime = 0; + uint8_t timeAddedFlag; + S16 ret; + volatile uint32_t startTime = 0; /*kw005.201 Code added for DL IP thruput measurement*/ - TRC3(rlcUtlProcHarqInd) - /*starting Task*/ SStartTask(&startTime, PID_RLC_DLIP_TPT_PRCHARQIND); @@ -1795,34 +1669,21 @@ U8 tbIdx; * -# ROK */ -#ifdef ANSI -S16 rlcUtlSndDlL2MeasCfm -( -RlcCb *gCb, -RlcL2MeasEvtCb *measEvtCb -) -#else -S16 rlcUtlSndDlL2MeasCfm(gCb, measEvtCb) -RlcCb *gCb; -RlcL2MeasEvtCb *measEvtCb; -#endif +S16 rlcUtlSndDlL2MeasCfm(RlcCb *gCb,RlcL2MeasEvtCb *measEvtCb) { - U32 qciIdx; - RlcL2MeasCb *measCb = NULLP; - RlcL2MeasCfmEvt measCfmEvt; - U32 posPkts; - U32 dLoss; - - U64 dlDataVol; - U64 dlTime; - U16 cntr; + uint32_t qciIdx; + RlcL2MeasCb *measCb = NULLP; + RlcL2MeasCfmEvt measCfmEvt; + uint32_t posPkts; + uint32_t dLoss; + uint64_t dlDataVol; + uint64_t dlTime; + uint16_t cntr; /* Discard new changes starts */ - U8 qci = 0; - U32 cfmIdx =0; + uint8_t qci = 0; + uint32_t cfmIdx =0; /* Discard new changes ends */ - TRC3(rlcUtlSndL2MeasCfm) - /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT RLOG1(L_DEBUG,"rlcUtlSndL2MeasCfm(transId(%ld))", measEvtCb->transId); @@ -1833,7 +1694,7 @@ RlcL2MeasEvtCb *measEvtCb; /* Clean up the RB data structures */ measCb = &measEvtCb->measCb; - cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); + memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); measCfmEvt.transId = measEvtCb->transId; measCfmEvt.measType = measCb->measType; @@ -1955,21 +1816,8 @@ RlcL2MeasEvtCb *measEvtCb; * -# ROK */ -#ifdef ANSI -S16 rlcUtlSndDlL2MeasNCfm -( -RlcCb *gCb, -RlcL2MeasReqEvt *measReqEvt, -RlcL2MeasCfmEvt *measCfmEvt -) -#else -S16 rlcUtlSndDlL2MeasNCfm(gCb,measReqEvt, measCfmEvt) -RlcCb *gCb; -RlcL2MeasReqEvt *measReqEvt; -RlcL2MeasCfmEvt *measCfmEvt; -#endif +S16 rlcUtlSndDlL2MeasNCfm(RlcCb *gCb,RlcL2MeasReqEvt *measReqEvt,RlcL2MeasCfmEvt *measCfmEvt) { - TRC3(rlcUtlSndDlL2MeasNCfm) RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); return ROK; @@ -1988,23 +1836,11 @@ RlcL2MeasCfmEvt *measCfmEvt; * * @return Void */ -#ifdef ANSI -Void rlcUtlResetDlL2MeasInRlcRb -( -RlcCb *gCb, -RlcL2MeasCb *measCb, -U8 measType -) -#else -Void rlcUtlResetDlL2MeasInRlcRb(gCb, measCb, measType) -RlcCb *gCb; -RlcL2MeasCb *measCb; -U8 measType; -#endif +Void rlcUtlResetDlL2MeasInRlcRb(RlcCb *gCb,RlcL2MeasCb *measCb,uint8_t measType) { - U32 ueIdx; - U32 qciIdx; + uint32_t ueIdx; + uint32_t qciIdx; RlcDlUeCb *ueCb = NULL; @@ -2039,10 +1875,10 @@ U8 measType; /* for now the only meas should be DL discard in this case */ if (measCb->measType & LKW_L2MEAS_DL_DISC) { - U32 i; + uint32_t i; for(i = 0; i < measCb->val.nonIpThMeas.numQci; i++) { - U8 qciVal = measCb->val.nonIpThMeas.qci[i]; + uint8_t qciVal = measCb->val.nonIpThMeas.qci[i]; measCb->val.nonIpThMeas.measData[qciVal].dlDisc.discSdus = 0; measCb->val.nonIpThMeas.measData[qciVal].dlDisc.totSdus = 0; @@ -2051,10 +1887,10 @@ U8 measType; } if (measCb->measType & LKW_L2MEAS_DL_DELAY) { - U32 i; + uint32_t i; for(i = 0; i < measCb->val.nonIpThMeas.numQci; i++) { - U8 qciVal = measCb->val.nonIpThMeas.qci[i]; + uint8_t qciVal = measCb->val.nonIpThMeas.qci[i]; measCb->val.nonIpThMeas.measData[qciVal].dlPjSduDelay.sduDelay = 0; } @@ -2064,7 +1900,7 @@ U8 measType; } /* rlcUtlResetDlL2MeasInRlcRb */ #endif -PRIVATE Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) +static Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) { if(dlRbCb->mode == CM_LTE_MODE_UM) { @@ -2076,7 +1912,7 @@ PRIVATE Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) } else if(dlRbCb->mode == CM_LTE_MODE_AM) { - U32 j, numTxPdus=0; + uint32_t j, numTxPdus=0; for(j = 0; j <= (RLC_AM_GET_WIN_SZ(dlRbCb->m.amDl.snLen)); j++) { RlcTx *txBuf = rlcUtlGetTxBuf(dlRbCb->m.amDl.txBufLst, j); @@ -2113,7 +1949,7 @@ Void DumpRLCDlDebugInformation(Void) (PTR) ueCb, (PTR *)&ueCb)) { - U32 i; + uint32_t i; for(i = 0; i< RLC_MAX_SRB_PER_UE; i++) { RlcDlRbCb* dlRbCb = ueCb->srbCb[i]; @@ -2151,15 +1987,7 @@ Void DumpRLCDlDebugInformation(Void) * @return Void */ -#ifdef ANSI -void rlcUtlFreeDlMem -( - Void -) -#else -void rlcUtlFreeDlMem() -Void; -#endif +void rlcUtlFreeDlMem( Void) { rlcUtlFreeDlMemory(RLC_GET_RLCCB(RLC_DL_INST)); } @@ -2169,7 +1997,7 @@ Void; * @b Description * This function returns current time * - * @param[in] U32 + * @param[in] uint32_t * * * @return Void @@ -2183,15 +2011,7 @@ void rlcUtlGetCurrTime(uint32_t *currTime) #if defined(MAC_RLC_HARQ_STA_RBUF) || defined (SS_RBUF) #ifdef LTE_L2_MEAS -#ifdef ANSI -void rlcUtlDlBatchProcHqStaInd -( - Void -) -#else -void rlcUtlDlBatchProcHqStaInd() -Void; -#endif +void rlcUtlDlBatchProcHqStaInd( Void) { /* Read from Ring Buffer and process PDCP packets */ //Pst pst = {0}; @@ -2235,19 +2055,7 @@ Void; * @return Void * */ -#ifdef ANSI -Void rlcUtlTrigPdbFlowCntrl -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -U32 pktAdmitCnt -) -#else -Void rlcUtlTrigPdbFlowCntrl(gCb,rbCb,pktAdmitCnt) -RlcCb *gCb; -RlcDlRbCb *rbCb; -U32 pktAdmitCnt; -#endif +Void rlcUtlTrigPdbFlowCntrl(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t pktAdmitCnt) { KwuFlowCntrlIndInfo *flowCntrlInfo; RlcKwuSapCb* rlckwuSap; @@ -2340,32 +2148,18 @@ RlcTx* rlcUtlGetTxBuf(CmLListCp *txBufLst, RlcSn sn) * * @return Void */ -#ifdef ANSI -Void rlcUtlDelTxBuf -( -CmLListCp *txBufLst, -RlcTx *txBuf, -RlcCb *gCb -) -#else -Void rlcUtlDelTxBuf(txBufLst, txBuf, gCb) -CmLListCp *txBufLst; -RlcTx *txBuf; -RlcCb *gCb; -#endif +Void rlcUtlDelTxBuf (CmLListCp *txBufLst,RlcTx *txBuf,RlcCb *gCb) { - U32 hashKey; + uint32_t hashKey; CmLListCp *txBufLstCp; - TRC3(rlcUtlDelTxBuf) - hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; //printf("D-sn(%d)\n", txBuf->hdr.sn); cmLListDelFrm(txBufLstCp, &txBuf->lnk); RLC_FREE_WC(gCb, txBuf, sizeof(RlcTx)); - RETVOID; + return; } /* rlcUtlDelTxBuf */ /** @@ -2382,31 +2176,17 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -Void rlcUtlRemovTxBuf -( -CmLListCp *txBufLst, -RlcTx *txBuf, -RlcCb *gCb -) -#else -Void rlcUtlRemovTxBuf(txBufLst, txBuf, gCb) -CmLListCp *txBufLst; -RlcTx *txBuf; -RlcCb *gCb; -#endif +Void rlcUtlRemovTxBuf(CmLListCp *txBufLst,RlcTx *txBuf,RlcCb *gCb) { - U32 hashKey; + uint32_t hashKey; CmLListCp *txBufLstCp; - TRC3(rlcUtlRemovTxBuf) - hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; //printf("D-sn(%d)\n", txBuf->hdr.sn); cmLListDelFrm(txBufLstCp, &txBuf->lnk); - RETVOID; + return; } /* rlcUtlRemovTxBuf */