X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_amm_dl.c;h=7e4d6ced5e2b7684df6c47fddb1b4610277bf400;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=d46abe924e869080e820a13a2b5402a70b551473;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index d46abe924..7e4d6ced5 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -64,8 +64,8 @@ static int RLOG_FILE_ID=189; //UDAY #ifdef L2_OPTMZ -extern U32 rlcAmmStaPduList[512]; - U32 rlcAmmStaPduListCnt = 0; +uint32_t rlcAmmStaPduList[512]; +uint32_t rlcAmmStaPduListCnt = 0; #endif @@ -74,14 +74,14 @@ extern U32 rlcAmmStaPduList[512]; **/ #define RLC_MODULE (RLC_DBGMASK_AM | RLC_DBGMASK_DL) -U32 rlcStatusPduCnt, rlcStatusAckCnt, rlcStatusNcnt, rlcSduSndCnt; +uint32_t rlcStatusPduCnt, rlcStatusAckCnt, rlcStatusNcnt, rlcSduSndCnt; /* local defines */ /* local externs */ /* forward references */ -EXTERN Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, +Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcUdxStaPdu *pStaPdu)); @@ -96,7 +96,7 @@ EXTERN Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, {\ Buffer *_pduInfo; \ SSegMsg((_retx)->seg, (_retx)->hdrSz, &_pduInfo); \ - RLC_FREE_BUF((_retx)->seg); \ + ODU_PUT_MSG_BUF((_retx)->seg); \ (_retx)->seg = _pduInfo; \ }\ (_rbCb)->m.amDl.estHdrSz -= retx->hdrSz;\ @@ -104,77 +104,77 @@ EXTERN Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, /* private function declarations */ -PRIVATE Void rlcResegRetxPdus ARGS ((RlcCb *gCb, +static Void rlcResegRetxPdus ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -PRIVATE Void rlcRemRetxPdu ARGS ((RlcCb *gCb, +static Void rlcRemRetxPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcAmmCreateStatusPdu ARGS ((RlcCb *gCb, +static Void rlcAmmCreateStatusPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -PRIVATE Void rlcAmmDlMarkPduForReTx ARGS ((RlcCb *gCb, +static Void rlcAmmDlMarkPduForReTx ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu ARGS((RlcCb *gCb, +static Void rlcAmmDlProcessSuccessfulTxPdu ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn sn, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmDlSetTxNextAck ARGS((RlcAmDl *amDl, RlcSn sn)); +static Void rlcAmmDlSetTxNextAck ARGS((RlcAmDl *amDl, RlcSn sn)); -PRIVATE Void rlcAmmDlCheckAndStopPollTmr ARGS((RlcCb *gCb, +static Void rlcAmmDlCheckAndStopPollTmr ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn mAckSn)); -PRIVATE Void rlcAssembleSdus ARGS ((RlcCb *gCb, +static Void rlcAssembleSdus ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -bool rlcAmmDlCheckAndSetPoll ARGS ((RlcCb *gCb, +static bool rlcAmmDlCheckAndSetPoll ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz)); -PRIVATE Void rlcAmmCreatePdu ARGS ((RlcCb *gCb, +static Void rlcAmmCreatePdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, RlcDlPduInfo *pduInfo, Buffer *pdu)); -PRIVATE Void rlcAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, RlcRetx *retx)); +static Void rlcAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcGetNxtRetx ARGS ((RlcCb *gCb, RlcRetx **retx)); +static Void rlcGetNxtRetx ARGS ((RlcCb *gCb, RlcRetx **retx)); -PRIVATE Void rlcConstructAmHdr ARGS ((RlcAmHdr *amHdr, - U8 *hdr, - U8 snLen, - U16 *idx)); +static Void rlcConstructAmHdr ARGS ((RlcAmHdr *amHdr, + uint8_t *hdr, + uint8_t snLen, + uint16_t *idx)); -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb, +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn mAckSn, CmLList *retx, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer ARGS ((RlcCb *gCb, +static Void rlcAmmDlMoveFrmTxtoRetxBuffer ARGS ((RlcCb *gCb, RlcAmDl *amDl, RlcRetx **retx, RlcSn sn)); -PRIVATE Void rlcAmmDlCheckIsSDUDelivered ARGS((RlcCb *gCb, +static Void rlcAmmDlCheckIsSDUDelivered ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSduMap *sduMap, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmAddPduToRetxLst ARGS((RlcAmDl *amDl, +static Void rlcAmmAddPduToRetxLst ARGS((RlcAmDl *amDl, RlcRetx *retx)); -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ARGS( +static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ARGS( ( RlcCb *gCb, RlcAmDl *amDl, @@ -182,7 +182,7 @@ RlcRetx **retx, RlcDlPduInfo *pduInfo )); -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ARGS( +static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -191,7 +191,7 @@ RlcRetx **retx, KwuDatCfmInfo **datCfm )); -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( +static Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -200,16 +200,16 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( KwuDatCfmInfo **datCfm )); -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ARGS( +static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ARGS( ( RlcAmDl *amDl, RlcNackInfo *nackInfo, CmLList *retxNode, RlcNackInfo *nackSnInfo, -U8 idx +uint8_t idx )); -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS( +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -274,19 +274,7 @@ void rlcAmmSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmDl *amDl) * * @return Void */ -#ifdef ANSI -PRIVATE Void rlcAmmDlCheckAndStopPollTmr -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcSn mAckSn -) -#else -PRIVATE Void rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn mAckSn; -#endif +static Void rlcAmmDlCheckAndStopPollTmr(RlcCb *gCb,RlcDlRbCb *rbCb,RlcSn mAckSn) { RlcSn mPollSn; @@ -294,13 +282,13 @@ RlcSn mAckSn; if (mPollSn <= mAckSn) { - if (rlcChkTmr(gCb, (PTR)rbCb, RLC_EVT_AMDL_POLL_RETX_TMR)) + if (rlcChkTmr(gCb, (PTR)rbCb, EVENT_RLC_AMDL_POLL_RETX_TMR)) { - rlcStopTmr(gCb, (PTR)rbCb, RLC_EVT_AMDL_POLL_RETX_TMR); + rlcStopTmr(gCb, (PTR)rbCb, EVENT_RLC_AMDL_POLL_RETX_TMR); } } - RETVOID; + return; } /** @@ -311,21 +299,11 @@ RlcSn mAckSn; * * @return Void */ -#ifdef ANSI -PRIVATE Void rlcAmmDlSetTxNextAck -( -RlcAmDl *amDl, -RlcSn sn -) -#else -PRIVATE Void rlcAmmDlSetTxNextAck(amDl, sn) -RlcAmDl *amDl; -RlcSn sn -#endif +static Void rlcAmmDlSetTxNextAck(RlcAmDl *amDl,RlcSn sn) { amDl->txNextAck = sn; - RETVOID; + return; } /** @@ -341,27 +319,19 @@ RlcSn sn * * @return Void */ -#ifdef ANSI -PRIVATE Void rlcAmmDlProcessSuccessfulReTx +static Void rlcAmmDlProcessSuccessfulReTx ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -PRIVATE Void rlcAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -KwuDatCfmInfo **datCfm; -#endif { rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, &(retx->sduMap), datCfm); rlcRemRetxPdu(gCb, rbCb, retx); - RETVOID; + return; } /** @@ -380,21 +350,13 @@ KwuDatCfmInfo **datCfm; * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer +static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ( RlcCb *gCb, RlcAmDl *amDl, RlcRetx **retx, RlcDlPduInfo *pduInfo ) -#else -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo) -RlcCb *gCb; -RlcAmDl *amDl; -RlcRetx **retx; -RlcDlPduInfo *pduInfo; -#endif { RLC_ALLOC_WC(gCb,*retx, sizeof(RlcRetx)); @@ -403,7 +365,7 @@ RlcDlPduInfo *pduInfo; if (*retx == NULLP) { RLOG0(L_FATAL, "Memory allocation failed"); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -434,7 +396,7 @@ RlcDlPduInfo *pduInfo; gRlcStats.amRlcStats.numDLRetransPdus++; - RETVOID; + return; } /*rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer */ /** @@ -454,8 +416,7 @@ RlcDlPduInfo *pduInfo; * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf +static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -463,25 +424,15 @@ RlcNackInfo *nackSnInfo, RlcRetx **retx, KwuDatCfmInfo ** datCfm ) -#else -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf(gCb, rbCb, nackSnInfo, retx, datCfm) -( -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcNackInfo *nackSnInfo; -RlcRetx **retx; -KwuDatCfmInfo **datCfm; -) -#endif { RlcTx *txBuf=NULLP; CmLList *lnk; CmLList *nextLnk; - txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, nackSnInfo->sn); + txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, nackSnInfo->sn); if (txBuf == NULLP) { - RETVOID; + return; } lnk = txBuf->pduLst.first; while(lnk) @@ -515,16 +466,16 @@ KwuDatCfmInfo **datCfm; nextLnk = lnk->next; /* Delete node from the txBuf Pdu lst */ cmLListDelFrm(&txBuf->pduLst, lnk); - RLC_FREE_WC(gCb, pduInfo, sizeof(RlcDlPduInfo)); + RLC_FREE(gCb, pduInfo, sizeof(RlcDlPduInfo)); lnk = nextLnk; } if(!txBuf->pduLst.count) { /*No more Sdu byte segment are left. Hence delete txBuf*/ - rlcUtlDelTxBuf(AMDL.txBufLst, txBuf,gCb); + rlcUtlDelTxBuf(RLC_AMDL.txBufLst, txBuf,gCb); } - RETVOID; + return; } /** @@ -543,25 +494,14 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn +static Void rlcAmmDlUpdateTxAndReTxBufForNackSn ( - RlcCb *gCb, - RlcDlRbCb *rbCb, - RlcNackInfo *nackSnInfo, - CmLList **retxNode, - KwuDatCfmInfo **datCfm - ) -#else -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, datCfm) -( - RlcCb *gCb; - RlcDlRbCb *rbCb; - RlcNackInfo *nackSnInfo; - CmLList **retxNode; - KwuDatCfmInfo **datCfm; - ) -#endif +RlcCb *gCb, +RlcDlRbCb *rbCb, +RlcNackInfo *nackSnInfo, +CmLList **retxNode, +KwuDatCfmInfo **datCfm +) { RlcTx *txBuf; RlcRetx *retx; @@ -572,7 +512,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode /* if the NACK_SN is in the transmit buffer, move it to the re- transmit buffer */ - txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, nackSnInfo->sn); + txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, nackSnInfo->sn); if (txBuf != NULLP) { if(nackSnInfo->isSegment) @@ -598,7 +538,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode (*retxNode) = retx->lstEnt.next; } - RETVOID; + return; } /* process the pdus/segments in the re-transmit buffer with @@ -644,7 +584,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode break; } } /* end of retxNode while loop*/ - RETVOID; + return; } /** @@ -658,30 +598,19 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode * @param[in]RlcNackInfo *nackSnInfo, * @param[in]RlcRetx *retx; * @param[in]RlcSn sn, -* @param[in]U8 idx +* @param[in]uint8_t idx * * @return Void * */ -#ifdef ANSI -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx +static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ( RlcAmDl *amDl, RlcNackInfo *nackInfo, CmLList *retxNode, RlcNackInfo *nackSnInfo, -U8 idx +uint8_t idx ) -#else -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx) -( -RlcAmDl *amDl; -RlcNackInfo *nackInfo; -CmLList *retxNode; -RlcNackInfo *nackSnInfo; -U8 idx; -) -#endif { RlcTx *txBuf; RlcRetx *retx; @@ -693,7 +622,7 @@ U8 idx; { nackSnInfo->soStart = 0; nackSnInfo->soEnd = 0; - RETVOID; + return; } txBuf = rlcUtlGetTxBuf(amDl->txBufLst, nackSnInfo->sn); if(txBuf != NULLP) @@ -702,7 +631,7 @@ U8 idx; while(node) { RlcDlPduInfo *pduInfo = (RlcDlPduInfo *)(node->node); - U16 pduSoEnd = pduInfo->amHdr.so + pduInfo->sduMap.sduSz - 1; + uint16_t pduSoEnd = pduInfo->amHdr.so + pduInfo->sduMap.sduSz - 1; if((!idx) && (pduInfo->amHdr.so == nackInfo->soStart)) { nackSnInfo->isSegment = TRUE; @@ -774,19 +703,7 @@ U8 idx; * * @return Void */ -#ifdef ANSI -Void rlcAmmDlHndlStatusPdu -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcUdxStaPdu *pStaPdu -) -#else -Void rlcAmmDlHndlStatusPdu(gCb, rbCb, pStaPdu) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcUdxStaPdu *pStaPdu; -#endif +Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) { RlcSn mAckSn; S32 oldRetxBo; @@ -800,7 +717,7 @@ RlcUdxStaPdu *pStaPdu; rlckwuSap = gCb->u.dlCb->rlcKwuDlSap + RLC_UI_PDCP; /* store the re-transmission bo, to check if it changes due to the processing of the status pdu */ - oldRetxBo = AMDL.retxBo; + oldRetxBo = RLC_AMDL.retxBo; /* Allocate memory for datCfm Info */ RLC_SHRABL_STATIC_BUF_ALLOC(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); @@ -813,15 +730,15 @@ RlcUdxStaPdu *pStaPdu; rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ datCfm->numSduIds = 0; datCfm->rlcId = rbCb->rlcId; - MODAMT(pStaPdu->ackSn, mAckSn, AMDL.txNextAck,AMDL.snModMask); - MODAMT(AMDL.txNext,mTxNext, AMDL.txNextAck,AMDL.snModMask); + MODAMT(pStaPdu->ackSn, mAckSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); + MODAMT(RLC_AMDL.txNext,mTxNext, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); if(mAckSn > mTxNext) { @@ -829,12 +746,12 @@ RlcUdxStaPdu *pStaPdu; "Invalid ACK SN = %d received. Current Vta =%d" "UEID:%d CELLID:%d", pStaPdu->ackSn, - AMDL.txNextAck, + RLC_AMDL.txNextAck, rbCb->rlcId.ueId, rbCb->rlcId.cellId); /* RLC_SHRABL_STATIC_BUF_ALLOC(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); */ RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); - RETVOID; + return; } /* Venki - stopping the poll retx timer */ @@ -842,7 +759,7 @@ RlcUdxStaPdu *pStaPdu; rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn); /* Set the first node in retx list to retxNode */ - retxNode = AMDL.retxLst.first; + retxNode = RLC_AMDL.retxLst.first; /* If NACK exists in control PDU */ if (pStaPdu->nackCnt) @@ -851,10 +768,10 @@ RlcUdxStaPdu *pStaPdu; RlcNackInfo nackSnInfo; RlcSn mNackSn; RlcSn txNextAck; - RlcSn transWinStartSn = AMDL.txNextAck; /*used to track the SN from which + RlcSn transWinStartSn = RLC_AMDL.txNextAck; /*used to track the SN from which to start processing the transmission buffer */ - U32 idx = 0; + uint32_t idx = 0; /* if any NACKs then txNextAck should be equal to the first NACK_SN*/ txNextAck = pStaPdu->nackInfo[0].sn; @@ -884,10 +801,10 @@ RlcUdxStaPdu *pStaPdu; /* move transWinStartSn to nackSnInfo.sn + 1, as the pdu's before that will be removed from the buffer */ transWinStartSn = (nackSnInfo.sn + (nackSnInfo.nackRange ?\ - (nackSnInfo.nackRange - 1) : 0) + 1) & AMDL.snModMask; + (nackSnInfo.nackRange - 1) : 0) + 1) & RLC_AMDL.snModMask; /* Clear the acked SNs from the retx list */ - MODAMT(nackSnInfo.sn, mNackSn, AMDL.txNextAck,AMDL.snModMask); + MODAMT(nackSnInfo.sn, mNackSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); if ((mNackSn > mAckSn) || (mNackSn >= mTxNext)) { @@ -897,7 +814,7 @@ RlcUdxStaPdu *pStaPdu; rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); - RETVOID; + return; } /* clear all the SNs < NACK_SN from re-transmission list */ @@ -911,17 +828,17 @@ RlcUdxStaPdu *pStaPdu; } else { - U8 idx1 = 0; + uint8_t idx1 = 0; /* Update issegment, soStart, soEnd ,sn in nackSnInfo and handle * nack sn*/ do { - RlcDlAmmGetNackSnInfoFrmNackRangeIdx(&AMDL, &pStaPdu->nackInfo[idx], + RlcDlAmmGetNackSnInfoFrmNackRangeIdx(&RLC_AMDL, &pStaPdu->nackInfo[idx], retxNode, &nackSnInfo, idx1); rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, &nackSnInfo, &retxNode, &datCfm); - nackSnInfo.sn = ((nackSnInfo.sn + 1) & (AMDL.snModMask)); + nackSnInfo.sn = ((nackSnInfo.sn + 1) & (RLC_AMDL.snModMask)); gRlcStats.amRlcStats.numRlcAmCellNackRx++; }while((++idx1) < (nackSnInfo.nackRange)); @@ -935,7 +852,7 @@ RlcUdxStaPdu *pStaPdu; rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb,rbCb, mAckSn, retxNode, &datCfm); /* Update txNextAck */ - rlcAmmDlSetTxNextAck(&AMDL,txNextAck); + rlcAmmDlSetTxNextAck(&RLC_AMDL,txNextAck); } else { @@ -950,7 +867,7 @@ RlcUdxStaPdu *pStaPdu; rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb,rbCb, mAckSn, retxNode, &datCfm); /* update txNextAck */ - rlcAmmDlSetTxNextAck(&AMDL, pStaPdu->ackSn); + rlcAmmDlSetTxNextAck(&RLC_AMDL, pStaPdu->ackSn); } if(datCfm->numSduIds != 0) @@ -976,15 +893,15 @@ RlcUdxStaPdu *pStaPdu; } /* Fix for memory corruption */ - RLC_LLIST_FIRST_RETX(AMDL.retxLst, AMDL.nxtRetx); - /* BO update, if retransmission BO has changed. AMDL.retxBo would have + RLC_LLIST_FIRST_RETX(RLC_AMDL.retxLst, RLC_AMDL.nxtRetx); + /* BO update, if retransmission BO has changed. RLC_AMDL.retxBo would have canged inside the above called functions */ - if (oldRetxBo != AMDL.retxBo) + if (oldRetxBo != RLC_AMDL.retxBo) { - rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); } - RETVOID; + return; } /** @@ -1001,15 +918,7 @@ RlcUdxStaPdu *pStaPdu; * @return S16 * Calculated bo */ -#ifdef ANSI -S32 rlcAmmCalculateBo -( -RlcAmDl *amDl -) -#else -S32 rlcAmmCalculateBo(amDl) -RlcAmDl *amDl; -#endif +S32 rlcAmmCalculateBo(RlcAmDl *amDl) { S32 bo; @@ -1039,7 +948,7 @@ RlcAmDl *amDl; return bo; } -U32 kwRxSdu; +uint32_t kwRxSdu; /** * @brief Handler to queue the SDUs received from PDCP @@ -1061,7 +970,7 @@ U32 kwRxSdu; * @param[in] datReq Ptr to the datReq sent from PDCP * * @return Void - * -# RETVOID + * -# void */ void rlcAmmQSdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *mBuf, KwuDatReqInfo *datReq) { @@ -1102,33 +1011,33 @@ void rlcAmmQSdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *mBuf, KwuDatReqInfo *datReq #ifndef RGL_SPECIFIC_CHANGES #ifdef MSPD { -extern uint32_t dlrate_kwu; +uint32_t dlrate_kwu; dlrate_kwu += sdu->sduSz; } #endif #endif /* Update nxtTx to point to the added sdu if this is the first SDU in the * queue */ - if (AMDL.nxtTx == NULLP) + if (RLC_AMDL.nxtTx == NULLP) { DU_LOG("\nRLC : rlcAmmQSdu: Received SDU will be transmitted next \ UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - AMDL.nxtTx = sdu; + RLC_AMDL.nxtTx = sdu; } /* Add sdu to the sdu list */ - cmLListAdd2Tail(&AMDL.sduQ, &sdu->lstEnt); + cmLListAdd2Tail(&RLC_AMDL.sduQ, &sdu->lstEnt); sdu->lstEnt.node = (PTR)sdu; #ifdef LTE_L2_MEAS #ifndef L2_L3_SPLIT #ifdef TENB_STATS if (rbCb->ueCb->tenbStats) { - if (AMDL.sduQ.count > rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxPktsInSduQ) + if (RLC_AMDL.sduQ.count > rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxPktsInSduQ) { - rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxPktsInSduQ = AMDL.sduQ.count; + rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxPktsInSduQ = RLC_AMDL.sduQ.count; } - rlcWinSz = RLC_AM_TRANS_WIN_SIZE(&AMDL); + rlcWinSz = RLC_AM_TRANS_WIN_SIZE(&RLC_AMDL); if (rlcWinSz > rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxWindowSz) { rbCb->ueCb->tenbStats->stats.nonPersistent.rlc.dlMaxWindowSz = rlcWinSz; @@ -1138,14 +1047,14 @@ dlrate_kwu += sdu->sduSz; #endif #endif /* Update BO and estimate header size for the current BO */ - AMDL.bo = AMDL.bo + sdu->sduSz; - if(AMDL.snLen == RLC_AM_CFG_12BIT_SN_LEN) + RLC_AMDL.bo = RLC_AMDL.bo + sdu->sduSz; + if(RLC_AMDL.snLen == RLC_AM_CFG_12BIT_SN_LEN) { - AMDL.estHdrSz += 2; + RLC_AMDL.estHdrSz += 2; } else { - AMDL.estHdrSz += 3; + RLC_AMDL.estHdrSz += 3; } #ifdef LTE_L2_MEAS_RLC /* Update numActUe if it is not active */ @@ -1159,7 +1068,7 @@ dlrate_kwu += sdu->sduSz; if(!rlcDlUtlIsReestInProgress(rbCb)) { - rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); } return; @@ -1181,7 +1090,7 @@ dlrate_kwu += sdu->sduSz; * @return Void * */ -void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcUdxDlSapCb *sapCb; MsgLen macHdrEstmt; @@ -1205,17 +1114,17 @@ void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq sapCb->suId, &(rbCb->rlcId)); /* Update number of pdus in pduInfo */ - rlcDatReq->pduInfo.mBuf[rlcDatReq->pduInfo.numPdu] = AMDL.mBuf; + rlcDatReq->pduInfo.mBuf[rlcDatReq->pduInfo.numPdu] = RLC_AMDL.mBuf; rlcDatReq->pduInfo.numPdu++; gRlcStats.amRlcStats.numDLStaPduSent++; RLC_FREE_SHRABL_BUF(gCb->u.dlCb->udxDlSap->pst.region, gCb->u.dlCb->udxDlSap->pst.pool, - AMDL.pStaPdu, + RLC_AMDL.pStaPdu, sizeof(RlcUdxDlStaPdu)); - AMDL.pStaPdu = NULLP; - AMDL.mBuf = NULLP; + RLC_AMDL.pStaPdu = NULLP; + RLC_AMDL.mBuf = NULLP; gRlcStats.amRlcStats.numDLStaPduSent++; } @@ -1256,16 +1165,16 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f * flag will always be TRUE. In CA case, for PCELL it is TRUE and for SCEll * it is FALSE */ - if ((AMDL.cntrlBo != 0) + if ((RLC_AMDL.cntrlBo != 0) #ifdef LTE_ADV && (fillCtrlPdu) #endif ) { rlcDatReq->boRep.staPduPrsnt = TRUE; - rlcDatReq->boRep.staPduBo = AMDL.cntrlBo; + rlcDatReq->boRep.staPduBo = RLC_AMDL.cntrlBo; - if (AMDL.pStaPdu != NULLP) + if (RLC_AMDL.pStaPdu != NULLP) { rlcAmmDlAssembleCntrlInfo (gCb, rbCb, rlcDatReq); } @@ -1274,35 +1183,35 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f DU_LOG("\nRLC: rlcAmmProcessSdus: Miscomputation of control Bo. \ UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); } - AMDL.cntrlBo = 0; + RLC_AMDL.cntrlBo = 0; } /* Retransmit PDUs /portions of PDUs available in retxLst */ - if ((rlcDatReq->pduSz > 0) && (AMDL.nxtRetx != NULLP)) + if ((rlcDatReq->pduSz > 0) && (RLC_AMDL.nxtRetx != NULLP)) { rlcResegRetxPdus (gCb,rbCb, rlcDatReq); } /* Assemble SDUs to form new PDUs */ - if ((rlcDatReq->pduSz > 0) && (AMDL.nxtTx != 0)) + if ((rlcDatReq->pduSz > 0) && (RLC_AMDL.nxtTx != 0)) { rlcAssembleSdus(gCb,rbCb, rlcDatReq); } - if (AMDL.nxtRetx != NULLP) + if (RLC_AMDL.nxtRetx != NULLP) { - rlcDatReq->boRep.oldestSduArrTime = AMDL.nxtRetx->sduMap.sdu->arrTime; + rlcDatReq->boRep.oldestSduArrTime = RLC_AMDL.nxtRetx->sduMap.sdu->arrTime; } - else if (AMDL.nxtTx != NULLP) + else if (RLC_AMDL.nxtTx != NULLP) { - rlcDatReq->boRep.oldestSduArrTime = AMDL.nxtTx->arrTime; + rlcDatReq->boRep.oldestSduArrTime = RLC_AMDL.nxtTx->arrTime; } /* Accumulate bo */ - rlcDatReq->boRep.bo = rlcAmmCalculateBo(&AMDL); - rlcDatReq->boRep.staPduBo = AMDL.cntrlBo; + rlcDatReq->boRep.bo = rlcAmmCalculateBo(&RLC_AMDL); + rlcDatReq->boRep.staPduBo = RLC_AMDL.cntrlBo; /* Hdr estimation is moved to kwAmmCreatePDu */ - rlcDatReq->boRep.estHdrSz = AMDL.estHdrSz; + rlcDatReq->boRep.estHdrSz = RLC_AMDL.estHdrSz; if(rlcDatReq->pduSz > 0) { @@ -1329,10 +1238,10 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f * @return Void * */ -void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint16_t size) +static void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint16_t size) { uint8_t si; - RlcAmDl *amDl = &AMDL; + RlcAmDl *amDl = &RLC_AMDL; /* Set the SN for the new segment */ next->amHdr.sn = crnt->amHdr.sn; @@ -1401,9 +1310,9 @@ void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint } /* Add the next to the retx list */ - AMDL.retxLst.crnt = &crnt->lstEnt; - CM_LLIST_INS_AFT_CRNT(AMDL.retxLst, next); - AMDL.nxtRetx = next; + RLC_AMDL.retxLst.crnt = &crnt->lstEnt; + CM_LLIST_INS_AFT_CRNT(RLC_AMDL.retxLst, next); + RLC_AMDL.nxtRetx = next; amDl->estHdrSz += next->hdrSz; return; @@ -1434,7 +1343,7 @@ void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint * @return Void * */ -void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcAmDl *amDl; RlcRetx *retx; @@ -1449,7 +1358,7 @@ void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) uint8_t numSdus; #endif - amDl = &AMDL; + amDl = &RLC_AMDL; #ifdef LTE_L2_MEAS /* TODO : This shoould be taken care in new Trasmissions */ /* This lchInfo should be retrieved there */ @@ -1514,7 +1423,7 @@ void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) RLC_UPD_POLL_BIT(gCb, retx, pollBit); rlcDatReq->pduSz -= pduSz; - AMDL.estHdrSz -= retx->hdrSz; + RLC_AMDL.estHdrSz -= retx->hdrSz; #ifdef LTE_L2_MEAS if (rbCb->rlcId.rbType == CM_LTE_DRB) @@ -1665,11 +1574,11 @@ void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) * @return Void * */ -void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { Buffer *pdu = NULLP; MsgLen macGrntSz = rlcDatReq->pduSz; - RlcAmDl *amDl = &AMDL; + RlcAmDl *amDl = &RLC_AMDL; RlcSdu *sdu = amDl->nxtTx; RlcSduMap sduMap; bool nxtTxUpd = FALSE; @@ -1698,7 +1607,7 @@ void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) uint8_t numNewPdu = 0; RlcTx *txBuf = NULLP; /* Discard new changes ends */ - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; uint32_t hdrEstmt; uint32_t fixedHdrSz; uint32_t pduSz; @@ -2123,10 +2032,8 @@ void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, discSduInfo, sizeof(KwuDiscSduInfo)); } - DU_LOG("\nRLC: rlcAssembleSdus: BO after assembly = %d UEID:%d CELLID:%d", amDl->bo, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - return; } @@ -2153,7 +2060,7 @@ void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) * -# 0 - Poll bit is not set * */ -bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz) +static bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz) { bool pollBit = FALSE; RlcAmDl *amDl = &(rbCb->m.amDl); @@ -2195,12 +2102,12 @@ bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bu * then starting the timer. Fixes crs * ccpu00117216 and ccpu00118284 . * */ - if( TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMDL_POLL_RETX_TMR) ) + if( TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMDL_POLL_RETX_TMR) ) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMDL_POLL_RETX_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMDL_POLL_RETX_TMR); } - rlcStartTmr(gCb,(PTR)rbCb, RLC_EVT_AMDL_POLL_RETX_TMR); + rlcStartTmr(gCb,(PTR)rbCb, EVENT_RLC_AMDL_POLL_RETX_TMR); } return (pollBit); @@ -2222,7 +2129,7 @@ bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bu * @return Void * */ -void rlcAmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, +static void rlcAmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, RlcDlPduInfo *pduInfo, Buffer *pdu) { uint8_t hdr[RLC_MAX_HDRSZ]; @@ -2290,37 +2197,25 @@ RlcDlPduInfo *pduInfo, Buffer *pdu) * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcRemRetxPdu -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcRetx *retx -) -#else -PRIVATE Void rlcRemRetxPdu(gCb, rbCb, retx) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -#endif +static Void rlcRemRetxPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcRetx *retx) { - cmLListDelFrm(&AMDL.retxLst, &retx->lstEnt); + cmLListDelFrm(&RLC_AMDL.retxLst, &retx->lstEnt); - if( AMDL.retxLst.count == 0) + if( RLC_AMDL.retxLst.count == 0) { - AMDL.nxtRetx = NULLP; + RLC_AMDL.nxtRetx = NULLP; } if(retx->pendingReTrans == TRUE) { - AMDL.retxBo -= retx->segSz; - AMDL.estHdrSz -= retx->hdrSz; + RLC_AMDL.retxBo -= retx->segSz; + RLC_AMDL.estHdrSz -= retx->hdrSz; } rlcUtlAddReTxPduToBeFreedQueue(gCb, retx); rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -2339,23 +2234,11 @@ RlcRetx *retx; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlMarkPduForReTx -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcRetx *retx -) -#else -PRIVATE Void rlcAmmDlMarkPduForReTx(*gCb, rbCb, retx) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -#endif +static Void rlcAmmDlMarkPduForReTx(RlcCb *gCb,RlcDlRbCb *rbCb,RlcRetx *retx) { - if (AMDL.maxReTxReached == TRUE) + if (RLC_AMDL.maxReTxReached == TRUE) { - RETVOID; + return; } if(retx->pendingReTrans == FALSE) @@ -2363,10 +2246,10 @@ RlcRetx *retx; retx->pendingReTrans = TRUE; ++retx->retxCnt; - AMDL.retxBo += retx->segSz; - AMDL.estHdrSz += retx->hdrSz; + RLC_AMDL.retxBo += retx->segSz; + RLC_AMDL.estHdrSz += retx->hdrSz; - if (retx->retxCnt > AMDL.maxRetx) + if (retx->retxCnt > RLC_AMDL.maxRetx) { /* RLC_DL_MAX_RETX fix */ /* Marking the RB stalled for DL scheduling. This is to avoid unnecessary */ @@ -2386,20 +2269,20 @@ RlcRetx *retx; rlcRemRetxPdu(gCb,rbCb, retx); - RETVOID; + return; } - if (AMDL.nxtRetx == NULLP) + if (RLC_AMDL.nxtRetx == NULLP) { - AMDL.nxtRetx = retx; + RLC_AMDL.nxtRetx = retx; } gRlcStats.amRlcStats.numDLRetransPdus++; } - RETVOID; + return; } /** @@ -2418,21 +2301,13 @@ RlcRetx *retx; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlCheckIsSDUDelivered +static Void rlcAmmDlCheckIsSDUDelivered ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcSduMap *sduMap, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -PRIVATE Void rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSduMap *sduMap; -KwuDatCfmInfo **datCfm; -#endif { RlcSdu *sdu; @@ -2468,7 +2343,7 @@ KwuDatCfmInfo **datCfm; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2480,12 +2355,12 @@ KwuDatCfmInfo **datCfm; } /* Remove SDU from the sduQ */ - cmLListDelFrm(&AMDL.sduQ, &sdu->lstEnt); + cmLListDelFrm(&RLC_AMDL.sduQ, &sdu->lstEnt); rlcUtlAddSduToBeFreedQueue(gCb, sdu); rlcUtlRaiseDlCleanupEvent(gCb); } - RETVOID; + return; } /** @@ -2503,29 +2378,21 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu +static Void rlcAmmDlProcessSuccessfulTxPdu ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn sn, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu(gCb, rbCb, sn, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn sn; -KwuDatCfmInfo **datCfm; -#endif { CmLList *pduNode; - RlcTx *txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, sn); + RlcTx *txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, sn); if (txBuf == NULLP) { - RETVOID; + return; } pduNode = txBuf->pduLst.first; while(pduNode) @@ -2541,9 +2408,9 @@ KwuDatCfmInfo **datCfm; rlcUtlAddTxPduToBeFreedQueue(gCb, txBuf); rlcUtlRaiseDlCleanupEvent(gCb); /* so that it is not processed again */ - rlcUtlRemovTxBuf(AMDL.txBufLst, txBuf, gCb); + rlcUtlRemovTxBuf(RLC_AMDL.txBufLst, txBuf, gCb); - RETVOID; + return; } /** @@ -2560,19 +2427,12 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmSndStaInd +static Void rlcAmmSndStaInd ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx ) -#else -PRIVATE Void rlcAmmSndStaInd(gCb, rbCb, retx) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -#endif { KwuStaIndInfo *staInd; RlcKwuSapCb *rlckwuSap; @@ -2590,7 +2450,7 @@ RlcRetx *retx; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2605,7 +2465,7 @@ RlcRetx *retx; RlcUiKwuStaInd(&rlckwuSap->pst, rlckwuSap->suId, staInd); #endif /* KW_PDCP */ - RETVOID; + return; } /** @@ -2622,7 +2482,7 @@ RlcRetx *retx; * @return Void * */ -void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) +static void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) { CmLList *tNode; @@ -2638,7 +2498,7 @@ void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) else { *retx = NULLP; - RETVOID; + return; } }while((*retx)->pendingReTrans == FALSE); @@ -2657,19 +2517,12 @@ void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) * @return Void * */ -#ifdef ANSI Void rlcAmmDlReEstablish ( RlcCb *gCb, CmLteRlcId rlcId, RlcDlRbCb *rbCb ) -#else -Void rlcAmmDlReEstablish(gCb, rlcId, rbCb) -RlcCb *gCb; -CmLteRlcId rlcId; -RlcDlRbCb *rbCb; -#endif { /* create a new AM DL RB, reset it and replace in the UeCb*/ RlcDlUeCb *ueCb; @@ -2681,7 +2534,7 @@ RlcDlRbCb *rbCb; /* ccpu00135170 Removing KLOCK warning */ if(resetRb == NULLP) { - RETVOID; + return; } RLC_MEM_CPY(resetRb, rbCb, sizeof(RlcDlRbCb)); @@ -2698,8 +2551,8 @@ RlcDlRbCb *rbCb; newAmDl->snLen = oldAmDl->snLen; newAmDl->snModMask = oldAmDl->snModMask; newAmDl->pollRetxTmrInt = oldAmDl->pollRetxTmrInt; - rbCb->boUnRprtdCnt = (U32)0; - rbCb->lastRprtdBoToMac = (U32)0; + rbCb->boUnRprtdCnt = (uint32_t)0; + rbCb->lastRprtdBoToMac = (uint32_t)0; cmInitTimers(&(resetRb->m.amDl.pollRetxTmr), 1); /* AGHOSH changes end */ @@ -2709,7 +2562,7 @@ RlcDlRbCb *rbCb; "UeId [%d]: UeCb not found RBID;%d", rlcId.ueId, rlcId.rbId); - RETVOID; + return; } if(rlcId.rbType == CM_LTE_SRB) @@ -2736,7 +2589,7 @@ RlcDlRbCb *rbCb; /* allocate the TX array again */ #ifndef LTE_TDD - U32 hashIndex; + uint32_t hashIndex; RLC_ALLOC(gCb, resetRb->m.amDl.txBufLst, (RLC_TX_BUF_BIN_SIZE * sizeof(CmLListCp))); @@ -2761,7 +2614,7 @@ RlcDlRbCb *rbCb; rlcDlUtlResetReestInProgress(ueCb->drbCb[rlcId.rbId]); } - RETVOID; + return; } /** @@ -2780,19 +2633,7 @@ RlcDlRbCb *rbCb; * -# ROK In case of successful discard * -# RFAILED In case the SDU is not found or already mapped */ -#ifdef ANSI -S16 rlcAmmDiscSdu -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -U32 sduId -) -#else -S16 rlcAmmDiscSdu(gCb, rbCb, sduId) -RlcCb *gCb; -RlcDlRbCb *rbCb; -U32 sduId; -#endif +S16 rlcAmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId ) { return (RFAILED); } @@ -2809,17 +2650,7 @@ U32 sduId; * * @return Void */ -#ifdef ANSI -Void rlcAmmPollRetxTmrExp -( -RlcCb *gCb, -RlcDlRbCb *rbCb -) -#else -Void rlcAmmPollRetxTmrExp(gCb, rbCb) -RlcCb *gCb; -RlcDlRbCb *rbCb; -#endif +Void rlcAmmPollRetxTmrExp(RlcCb *gCb,RlcDlRbCb *rbCb) { RlcRetx *retx; RlcAmDl *amDl = &(rbCb->m.amDl); @@ -2852,13 +2683,13 @@ RlcDlRbCb *rbCb; { rlcAmmDlMoveFrmTxtoRetxBuffer(gCb,amDl, &retx, sn); - if (AMDL.nxtRetx == NULLP) + if (RLC_AMDL.nxtRetx == NULLP) { - AMDL.nxtRetx = retx; + RLC_AMDL.nxtRetx = retx; } - rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); - RETVOID; + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); + return; } /* Get the last node in retxLst */ RLC_LLIST_LAST_RETX(amDl->retxLst, retx); @@ -2867,11 +2698,11 @@ RlcDlRbCb *rbCb; if (retx != NULLP) { rlcAmmDlMarkPduForReTx(gCb, rbCb, retx); - rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); } } - RETVOID; + return; } /** @@ -2892,8 +2723,7 @@ RlcDlRbCb *rbCb; * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2901,14 +2731,6 @@ RlcSn mAckSn, CmLList *retxNode, KwuDatCfmInfo **datCfm ) -#else -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn mAckSn; -CmLList *retxNode; -KwuDatCfmInfo **datCfm; -#endif { RlcSn mSn; RlcSn sn; @@ -2920,7 +2742,7 @@ KwuDatCfmInfo **datCfm; { retx = (RlcRetx *)(retxNode->node); retxNode = retxNode->next; - MODAMT(retx->amHdr.sn, mSn, AMDL.txNextAck,AMDL.snModMask); + MODAMT(retx->amHdr.sn, mSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); if (mSn < mAckSn) { rlcAmmDlProcessSuccessfulReTx(gCb,rbCb, retx, datCfm); @@ -2931,11 +2753,11 @@ KwuDatCfmInfo **datCfm; acknowledged by the ACK_SN*/ /* start from the starting of the transmission window and remove till just before ACK_SN*/ - mSn = 0; /* same as MODAMT(AMDL.txNextAck, mSn, AMDL.txNextAck);*/ - sn = AMDL.txNextAck; + mSn = 0; /* same as MODAMT(RLC_AMDL.txNextAck, mSn, RLC_AMDL.txNextAck);*/ + sn = RLC_AMDL.txNextAck; while(mSn < mAckSn) { - txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, sn); + txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, sn); if (txBuf != NULLP) { RLOG_ARG3(L_UNUSED,DBG_RBID,rbCb->rlcId.rbId, @@ -2948,11 +2770,11 @@ KwuDatCfmInfo **datCfm; rlcAmmDlProcessSuccessfulTxPdu(gCb,rbCb, sn, datCfm); } - sn = (sn + 1) & AMDL.snModMask; - MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); + sn = (sn + 1) & RLC_AMDL.snModMask; + MODAMT(sn, mSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); } - RETVOID; + return; } /** @@ -2972,8 +2794,7 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2982,15 +2803,6 @@ RlcSn mNackSn, CmLList **retxNode, KwuDatCfmInfo **datCfm ) -#else -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn(gCb, rbCb, sn, mNackSn, retxNode, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn sn; -RlcSn mNackSn; -CmLList **retxNode; -KwuDatCfmInfo **datCfm; -#endif { RlcSn mSn; RlcRetx *retx; @@ -2999,7 +2811,7 @@ KwuDatCfmInfo **datCfm; while (*retxNode) { retx = (RlcRetx *)((*retxNode)->node); - MODAMT(retx->amHdr.sn, mSn, AMDL.txNextAck,AMDL.snModMask); + MODAMT(retx->amHdr.sn, mSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); if (mSn < mNackSn) { (*retxNode) = (*retxNode)->next; @@ -3012,12 +2824,12 @@ KwuDatCfmInfo **datCfm; } /* Remove all pdus with SN < NACK_SN from the transmission buffer */ - MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); + MODAMT(sn, mSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); while (mSn < mNackSn) { /* this if check seems redundant,why should mSn ever be mTxSn (which actually is VT(A) */ - txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, sn); + txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, sn); if ((txBuf != NULLP)) { RLOG_ARG3(L_DEBUG,DBG_RBID, rbCb->rlcId.rbId, @@ -3030,11 +2842,11 @@ KwuDatCfmInfo **datCfm; rlcAmmDlProcessSuccessfulTxPdu(gCb,rbCb, sn, datCfm); } - sn = (sn + 1) & AMDL.snModMask; - MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); + sn = (sn + 1) & RLC_AMDL.snModMask; + MODAMT(sn, mSn, RLC_AMDL.txNextAck,RLC_AMDL.snModMask); } - RETVOID; + return; } @@ -3054,7 +2866,7 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *idx) +static void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *idx) { *idx = 0; hdr[0] = RLC_DATA_BITMASK; @@ -3063,25 +2875,25 @@ void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *i hdr[0] = hdr[0] | ((amHdr->si & 0x3) << 4); if(snLen == RLC_AM_CFG_12BIT_SN_LEN) { - hdr[0] = hdr[0] | (U8)((amHdr->sn & 0xF00) >> 8); - hdr[1] = (U8)(amHdr->sn & 0x0FF); + hdr[0] = hdr[0] | (uint8_t)((amHdr->sn & 0xF00) >> 8); + hdr[1] = (uint8_t)(amHdr->sn & 0x0FF); (*idx)++; } else { - hdr[0] = hdr[0] | (U8)((amHdr->sn & 0x30000) >> 16); - hdr[1] = (U8)((amHdr->sn & 0xFF00) >> 8); + hdr[0] = hdr[0] | (uint8_t)((amHdr->sn & 0x30000) >> 16); + hdr[1] = (uint8_t)((amHdr->sn & 0xFF00) >> 8); (*idx)++; - hdr[2] = (U8)(amHdr->sn & 0xFF); + hdr[2] = (uint8_t)(amHdr->sn & 0xFF); (*idx)++; } if ((amHdr->si == RLC_SI_MID_SEG) || (amHdr->si == RLC_SI_LAST_SEG)) { (*idx)++; - hdr[(*idx)] = (U8)((amHdr->so & 0xFF00)>> 8); + hdr[(*idx)] = (uint8_t)((amHdr->so & 0xFF00)>> 8); (*idx)++; - hdr[(*idx)] = (U8)(amHdr->so & 0xFF); + hdr[(*idx)] = (uint8_t)(amHdr->so & 0xFF); } return; @@ -3101,17 +2913,7 @@ void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *i * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmAddPduToRetxLst -( -RlcAmDl *amDl, -RlcRetx *retx -) -#else -PRIVATE Void rlcAmmAddPduToRetxLst(amDl, retx) -RlcAmDl *amDl; -RlcRetx *retx; -#endif +static Void rlcAmmAddPduToRetxLst(RlcAmDl *amDl,RlcRetx *retx) { CmLList *node; RlcRetx *tRetx; @@ -3151,7 +2953,7 @@ RlcRetx *retx; amDl->nxtRetx = retx; } - RETVOID; + return; } /** @@ -3170,27 +2972,19 @@ RlcRetx *retx; * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer +static Void rlcAmmDlMoveFrmTxtoRetxBuffer ( RlcCb *gCb, RlcAmDl *amDl, RlcRetx **retx, RlcSn sn ) -#else -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn) -RlcCb *gCb; -RlcAmDl *amDl; -RlcRetx **retx; -RlcSn sn; -#endif { RlcTx* txBuf = rlcUtlGetTxBuf(amDl->txBufLst, sn); if (txBuf == NULLP) { - RETVOID; + return; } while(txBuf->pduLst.first) { @@ -3201,7 +2995,7 @@ RlcSn sn; if (*retx == NULLP) { RLOG0(L_FATAL, "Memory allocation failed"); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -3213,12 +3007,12 @@ RlcSn sn; /* Delete node from the txBuf Pdu lst */ cmLListDelFrm(&txBuf->pduLst, txBuf->pduLst.first); - RLC_FREE_WC(gCb, pduInfo, sizeof(RlcDlPduInfo)); + RLC_FREE(gCb, pduInfo, sizeof(RlcDlPduInfo)); } /* Remove PDU from txBuf */ rlcUtlDelTxBuf(amDl->txBufLst, txBuf,gCb); - RETVOID; + return; } @@ -3236,22 +3030,12 @@ RlcSn sn; * * @return Void */ -#ifdef ANSI -Void rlcAmmFreeDlRbCb -( -RlcCb *gCb, -RlcDlRbCb *rbCb -) -#else -Void rlcAmmFreeDlRbCb(gCb,rbCb) -RlcCb *gCb; -RlcDlRbCb *rbCb; -#endif +Void rlcAmmFreeDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb) { /* stop the re-transmission timer */ - if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMDL_POLL_RETX_TMR)) + if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMDL_POLL_RETX_TMR)) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMDL_POLL_RETX_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMDL_POLL_RETX_TMR); } /* store the entire Rb pointer */ @@ -3263,7 +3047,7 @@ RlcDlRbCb *rbCb; rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -3279,7 +3063,7 @@ RlcDlRbCb *rbCb; * @return Void * */ -void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcSn sn; /* sequence number */ RlcSn ack_sn; /* Ack sequence number */ @@ -3293,7 +3077,7 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) RlcNackInfo *rlcNackInfo; uint16_t nkCnt = 0; - pStaPdu = AMDL.pStaPdu; + pStaPdu = RLC_AMDL.pStaPdu; /* D/C| CPT| */ @@ -3417,7 +3201,7 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) "UEID:%d CELLID:%d", ack_sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); cntrlPdu[0] |= (ack_sn & 0xF00)>> 8; - cntrlPdu[1] = (U8)ack_sn; + cntrlPdu[1] = (uint8_t)ack_sn; } } @@ -3466,13 +3250,13 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) } /* 18 BIT Nack SN encode */ - cntrlPdu[encIdx] = (U8)((sn & 0x3FC00) >> 10); + cntrlPdu[encIdx] = (uint8_t)((sn & 0x3FC00) >> 10); /* Next Octet */ - cntrlPdu[encIdx + 1] = (U8)((sn & 0x3FC) >> 2); + cntrlPdu[encIdx + 1] = (uint8_t)((sn & 0x3FC) >> 2); /* Next Octet */ - cntrlPdu[encIdx + 2] = (U8)((sn & 0x3)<< 6); + cntrlPdu[encIdx + 2] = (uint8_t)((sn & 0x3)<< 6); if (rlcNackInfo->isSegment) { @@ -3484,11 +3268,11 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* Add soStart and soEnd */ /* SOstart */ cntrlPdu[encIdx + 3] = (rlcNackInfo->soStart) >> 8; - cntrlPdu[encIdx + 4] = (U8)rlcNackInfo->soStart; + cntrlPdu[encIdx + 4] = (uint8_t)rlcNackInfo->soStart; /* SOend */ cntrlPdu[encIdx + 5] = (rlcNackInfo->soEnd) >> 8; - cntrlPdu[encIdx + 6] = (U8)(rlcNackInfo->soEnd); + cntrlPdu[encIdx + 6] = (uint8_t)(rlcNackInfo->soEnd); } if (rlcNackInfo->nackRange) @@ -3562,8 +3346,8 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) ODU_ADD_POST_MSG_MULT(cntrlPdu, cntrlPduSz, mBuf); rlcDatReq->pduSz -= cntrlPduSz; - /* Add mBuf to AMDL.mBuf */ - AMDL.mBuf = mBuf; + /* Add mBuf to RLC_AMDL.mBuf */ + RLC_AMDL.mBuf = mBuf; return; } @@ -3573,29 +3357,17 @@ void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu); -#ifdef ANSI -PRIVATE Void rgAmmExtractElmnt -( -RlcCb *gCb, -Buffer *pdu, -RlcExtHdr *hdrInfo -) -#else -PRIVATE Void rgAmmExtractElmnt(gCb, pdu, hdrInfo) -RlcCb *gCb; -Buffer *pdu; -RlcExtHdr *hdrInfo; -#endif +static Void rgAmmExtractElmnt(RlcCb *gCb,Buffer *pdu,RlcExtHdr *hdrInfo) { - U8 hdr; - U8 pLen = hdrInfo->pLen; - U8 len = (U8)hdrInfo->len; - U16 val; - U8 tHdr; - U8 fLen; - U8 rLen; - /* U8 rLen1 = 0; */ - U16 tVal; + uint8_t hdr; + uint8_t pLen = hdrInfo->pLen; + uint8_t len = (uint8_t)hdrInfo->len; + uint16_t val; + uint8_t tHdr; + uint8_t fLen; + uint8_t rLen; + /* uint8_t rLen1 = 0; */ + uint16_t tVal; hdr = hdrInfo->hdr; @@ -3647,40 +3419,30 @@ RlcExtHdr *hdrInfo; hdrInfo->hdr = hdr; hdrInfo->val = val; - RETVOID; + return; } -#ifdef ANSI -PRIVATE Void rgAmmUlHndlStatusPdu +static Void rgAmmUlHndlStatusPdu ( Pst *udxPst, SuId suId, -RlcCb *gCb, -RlcDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, Buffer *cntrlPdu, -U8 *fByte +uint8_t *fByte ) -#else -PRIVATE Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte) -Pst *udxPst; -SuId suId; -RlcCb *gCb; -RlcDlRbCb *rbCb; -Buffer *cntrlPdu; -U8 *fByte; -#endif { - U8 e1; + uint8_t e1; RlcExtHdr hdrInfo; RlcUdxStaPdu *pStaPdu; - U8 e3; /* NACK RANGE : 5GNR */ - U32 snLen; - U32 snRange; - U32 resrvdBitsAckSn; - U32 resrvdBitsNackSn; + uint8_t e3; /* NACK RANGE : 5GNR */ + uint32_t snLen; + uint32_t snRange; + uint32_t resrvdBitsAckSn; + uint32_t resrvdBitsNackSn; RLCDBGP_BRIEF(gCb, "rgAmmUlHndlStatusPdu(rbCb, cntrlPdu, fByte) \n"); @@ -3694,7 +3456,7 @@ U8 *fByte; if (hdrInfo.hdr & 0xE0) { RLCDBGP_ERROR(gCb, "rgAmmUlHndlStatusPdu: Reserved value for CPT received \n"); - RETVOID; + return; } RLC_ALLOC_SHRABL_BUF(udxPst->region, @@ -3706,7 +3468,7 @@ U8 *fByte; /* Memory allocation failure can not be expected */ if(!pStaPdu) { - RETVOID; + return; } #endif @@ -3741,7 +3503,7 @@ U8 *fByte; /* Check if NACK Exists */ hdrInfo.len = RLC_E1_LEN; rgAmmExtractElmnt(gCb, cntrlPdu, &hdrInfo); - e1 = (U8)hdrInfo.val; + e1 = (uint8_t)hdrInfo.val; RLCDBGP_DETAIL(gCb, "rgAmmUlHndlStatusPdu: ACK SN = %d \n", pStaPdu->ackSn); /* Extract the Reserved Bits after ACK SN field */ @@ -3759,22 +3521,22 @@ U8 *fByte; hdrInfo.len = RLC_E1_LEN; rgAmmExtractElmnt(gCb, cntrlPdu, &hdrInfo); - e1 = (U8)hdrInfo.val; + e1 = (uint8_t)hdrInfo.val; /* Extract e2 */ /* hdrInfo.len = RLC_E1_LEN; --> previusly stored value (for e1) is already present*/ rgAmmExtractElmnt(gCb, cntrlPdu, &hdrInfo); - /* e2 = (U8) hdrInfo.val;*/ + /* e2 = (uint8_t) hdrInfo.val;*/ /* Store e2 value */ - pStaPdu->nackInfo[pStaPdu->nackCnt].isSegment = (U8) hdrInfo.val; + pStaPdu->nackInfo[pStaPdu->nackCnt].isSegment = (uint8_t) hdrInfo.val; /* Extract e3 : 5GNR */ /* hdrInfo.len = RLC_E1_LEN; --> previusly stored value (for e1) is already present*/ rgAmmExtractElmnt(gCb, cntrlPdu, &hdrInfo); - e3 = (U8) hdrInfo.val; + e3 = (uint8_t) hdrInfo.val; /* Extract Reserved Bits after NACK SN */ hdrInfo.len = resrvdBitsNackSn; @@ -3808,7 +3570,7 @@ U8 *fByte; /* Extract NACK range field */ hdrInfo.len = RLC_NACK_RANGE_LEN; rgAmmExtractElmnt(gCb, cntrlPdu, &hdrInfo); - snRange = (U8)hdrInfo.val; + snRange = (uint8_t)hdrInfo.val; pStaPdu->nackInfo[pStaPdu->nackCnt].nackRange = snRange; @@ -3831,7 +3593,7 @@ U8 *fByte; //rlcUlUdxStaUpdReq(&(sapCb->pst), sapCb->spId, &rbCb->rlcId, pStaPdu); rlcUlUdxStaUpdReq(udxPst, suId, &rbCb->rlcId, pStaPdu); - RETVOID; + return; } S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, @@ -3839,8 +3601,8 @@ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, { RlcDlRbCb *rbCb = NULLP; RlcDlUeCb *ueCb = NULLP; - U8 fByte; - U8 temp; + uint8_t fByte; + uint8_t temp; S16 retVal = RFAILED; RlcCb *gCb; Pst dlRlcPst = *udxPst; @@ -3857,7 +3619,7 @@ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, rbCb = ueCb->lCh[lcId - 1].dlRbCb; /* Skip if mode is not AM */ - if((rbCb == NULLP) || (rbCb->mode != CM_LTE_MODE_AM)) + if((rbCb == NULLP) || (rbCb->mode != RLC_MODE_AM)) { return RFAILED; }