X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_utl_dl.c;h=146eaf9867dd504a6d5f4a773656389c5ccc78c0;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;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..146eaf986 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -78,22 +78,22 @@ static int RLOG_FILE_ID=209; #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 @@ -251,7 +251,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) { datPerUe = datReqInfo->datReq[ueIdx]; - memset((uint8_t *)dlData, 0, sizeof(RlcData)); + memset(dlData, 0, sizeof(RlcData)); dlData->cellId = datReqInfo->cellId; dlData->rnti = datPerUe.rnti; @@ -397,7 +397,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 +546,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 */ @@ -669,7 +669,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 +692,7 @@ CmLListCp *sduQ; } } #endif - RETVOID; + return; } /** @@ -760,7 +759,6 @@ RlcCb *gCb; RlcDlRbCb *rbCb; #endif { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = TRUE; @@ -780,7 +778,7 @@ RlcDlRbCb *rbCb; rlcUtlSendDedLcBoStatus(gCb, rbCb, 0, 0, FALSE,0); - RETVOID; + return; } /** @@ -818,7 +816,6 @@ Void rlcDlUtlResetReestInProgress(rbCb) RlcDlRbCb *rbCb; #endif { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = FALSE; } @@ -848,10 +845,8 @@ RlcCb *gCb; RlcDlUeCb *ueCb; #endif { - U32 rbIdx; + uint32_t rbIdx; - TRC2(rlcDlUtlSetReestInProgressForAllRBs) - for(rbIdx = 0;rbIdx < RLC_MAX_SRB_PER_UE;rbIdx++) { if(ueCb->srbCb[rbIdx] != NULLP) @@ -879,7 +874,7 @@ RlcDlUeCb *ueCb; } } - RETVOID; + return; } /** @@ -943,7 +938,7 @@ RlcDlDataToBeFreed *toBeFreed; cmLListInit(&(toBeFreed->reTxLst)); cmLListInit(&(toBeFreed->txLst)); - RETVOID; + return; } /** @@ -1034,7 +1029,7 @@ RlcRetx *retx; #endif { cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.reTxLst), &(retx->lstEnt)); - RETVOID; + return; } /** @@ -1060,7 +1055,7 @@ RlcTx *pdu; { pdu->rlsLnk.node = (PTR)pdu; cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.txLst), &(pdu->rlsLnk)); - RETVOID; + return; } /* @@ -1080,26 +1075,23 @@ RlcTx *pdu; * - FALSE if all the data has been freed */ #ifdef ANSI -PRIVATE Bool rlcUtlFreeDlAmRbMemory +static Bool rlcUtlFreeDlAmRbMemory ( RlcCb *gCb, RlcDlRbCb *rbCb, -U32 *toBeFreed +uint32_t *toBeFreed ) #else -PRIVATE Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed) +static Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed) RlcCb *gCb; RlcDlRbCb *rbCb; -U32 *toBeFreed +uint32_t *toBeFreed #endif { 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 +1166,7 @@ U32 *toBeFreed (*toBeFreed)--; } - return (FALSE);; + return (FALSE); } /** @@ -1195,13 +1187,13 @@ Void rlcUtlFreeDlMemory(gCb) RlcCb *gCb; #endif { - 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 +1299,7 @@ RlcCb *gCb; rlcUtlRaiseDlCleanupEvent(gCb); } - RETVOID; + return; } @@ -1325,12 +1317,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; @@ -1360,26 +1352,25 @@ 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; +S32 dataVol; +uint32_t 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 +1409,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 +1428,7 @@ U32 schPduSz; /*stopping Task*/ SStopTask(startTime, PID_RLC_DLIP_TPT_BURSTCALC); - RETVOID; + return; } /** * @brief @@ -1456,12 +1447,12 @@ U32 schPduSz; #ifdef ANSI Void rlcUtlUpdateContainedSduLst ( -U8 sduIdx, +uint8_t sduIdx, RlcContSduLst *contSduLst ) #else Void rlcUtlUpdateContainedSduLst(sduIdx, contSduLst) -U8 sduIdx; +uint8_t sduIdx; RlcContSduLst *contSduLst; #endif { @@ -1470,7 +1461,7 @@ RlcContSduLst *contSduLst; contSduLst->sduIdx[contSduLst->numSdus] = sduIdx; contSduLst->numSdus++; } - RETVOID; + return; } /** @@ -1495,17 +1486,17 @@ RlcContSduLst *contSduLst; Void rlcUtlUpdateOutStandingSduLst ( RlcL2MeasDlIpTh *dlIpThPut, -U8 sduIdx, +uint8_t sduIdx, MsgLen sduLen, -U32 sduId, +uint32_t sduId, Bool newIdx ) #else Void rlcUtlUpdateOutStandingSduLst(dlIpThPut, sduIdx, sduLen, sduId, newIdx) RlcL2MeasDlIpTh *dlIpThPut; -U8 sduIdx; +uint8_t sduIdx; MsgLen sduLen; -U32 sduId; +uint32_t sduId; Bool newIdx; #endif { @@ -1519,7 +1510,7 @@ Bool newIdx; dlIpThPut->outStngSduArr[sduIdx].sduId = sduId; dlIpThPut->outStngSduArr[sduIdx].sduLen = sduLen; } - RETVOID; + return; } #ifdef ANSI RlcL2MeasTb * rlcUtlGetCurMeasTb @@ -1534,10 +1525,8 @@ RlcDlRbCb *rbCb; #endif { 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 */ @@ -1588,37 +1577,35 @@ RlcDlRbCb *rbCb; #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; +RguHarqStatusInd *hqStaInd; +RlcDlUeCb *ueCb; +uint8_t 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); @@ -1807,22 +1794,19 @@ RlcCb *gCb; RlcL2MeasEvtCb *measEvtCb; #endif { - 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 +1817,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; @@ -1969,7 +1953,6 @@ RlcL2MeasReqEvt *measReqEvt; RlcL2MeasCfmEvt *measCfmEvt; #endif { - TRC3(rlcUtlSndDlL2MeasNCfm) RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); return ROK; @@ -1994,17 +1977,17 @@ Void rlcUtlResetDlL2MeasInRlcRb ( RlcCb *gCb, RlcL2MeasCb *measCb, -U8 measType +uint8_t measType ) #else Void rlcUtlResetDlL2MeasInRlcRb(gCb, measCb, measType) RlcCb *gCb; RlcL2MeasCb *measCb; -U8 measType; +uint8_t measType; #endif { - U32 ueIdx; - U32 qciIdx; + uint32_t ueIdx; + uint32_t qciIdx; RlcDlUeCb *ueCb = NULL; @@ -2039,10 +2022,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 +2034,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 +2047,7 @@ U8 measType; } /* rlcUtlResetDlL2MeasInRlcRb */ #endif -PRIVATE Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) +static Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) { if(dlRbCb->mode == CM_LTE_MODE_UM) { @@ -2076,7 +2059,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 +2096,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]; @@ -2169,7 +2152,7 @@ Void; * @b Description * This function returns current time * - * @param[in] U32 + * @param[in] uint32_t * * * @return Void @@ -2240,13 +2223,13 @@ Void rlcUtlTrigPdbFlowCntrl ( RlcCb *gCb, RlcDlRbCb *rbCb, -U32 pktAdmitCnt +uint32_t pktAdmitCnt ) #else Void rlcUtlTrigPdbFlowCntrl(gCb,rbCb,pktAdmitCnt) RlcCb *gCb; RlcDlRbCb *rbCb; -U32 pktAdmitCnt; +uint32_t pktAdmitCnt; #endif { KwuFlowCntrlIndInfo *flowCntrlInfo; @@ -2354,18 +2337,16 @@ RlcTx *txBuf; RlcCb *gCb; #endif { - 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 */ /** @@ -2396,17 +2377,15 @@ RlcTx *txBuf; RlcCb *gCb; #endif { - 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 */