X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_amm_dl.c;h=8d642d40102b54072c5c371541163a1498cd6b34;hb=ed6746a6081339633c3baa314251fcc11b98ce10;hp=77b13f83e4c331059a6756aa95f06ee5cced8563;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index 77b13f83e..8d642d401 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)); @@ -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; @@ -300,7 +288,7 @@ RlcSn mAckSn; } } - 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,16 +424,6 @@ 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; @@ -481,7 +432,7 @@ KwuDatCfmInfo **datCfm; txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, nackSnInfo->sn); if (txBuf == NULLP) { - RETVOID; + return; } lnk = txBuf->pduLst.first; while(lnk) @@ -524,7 +475,7 @@ KwuDatCfmInfo **datCfm; rlcUtlDelTxBuf(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; @@ -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; @@ -813,7 +730,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; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -834,7 +751,7 @@ RlcUdxStaPdu *pStaPdu; 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 */ @@ -854,7 +771,7 @@ RlcUdxStaPdu *pStaPdu; RlcSn transWinStartSn = 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; @@ -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,7 +828,7 @@ RlcUdxStaPdu *pStaPdu; } else { - U8 idx1 = 0; + uint8_t idx1 = 0; /* Update issegment, soStart, soEnd ,sn in nackSnInfo and handle * nack sn*/ do @@ -984,7 +901,7 @@ RlcUdxStaPdu *pStaPdu; rlcAmmSendDedLcBoStatus(gCb, rbCb, &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,7 +1011,7 @@ 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 @@ -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; @@ -1329,7 +1238,7 @@ 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; @@ -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; @@ -1665,7 +1574,7 @@ 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; @@ -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; @@ -2151,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); @@ -2220,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]; @@ -2288,19 +2197,7 @@ 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); @@ -2318,7 +2215,7 @@ RlcRetx *retx; rlcUtlAddReTxPduToBeFreedQueue(gCb, retx); rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -2337,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) { - RETVOID; + return; } if(retx->pendingReTrans == FALSE) @@ -2384,7 +2269,7 @@ RlcRetx *retx; rlcRemRetxPdu(gCb,rbCb, retx); - RETVOID; + return; } @@ -2397,7 +2282,7 @@ RlcRetx *retx; } - RETVOID; + return; } /** @@ -2416,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; @@ -2466,7 +2343,7 @@ KwuDatCfmInfo **datCfm; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2483,7 +2360,7 @@ KwuDatCfmInfo **datCfm; rlcUtlRaiseDlCleanupEvent(gCb); } - RETVOID; + return; } /** @@ -2501,21 +2378,13 @@ 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; @@ -2523,7 +2392,7 @@ KwuDatCfmInfo **datCfm; if (txBuf == NULLP) { - RETVOID; + return; } pduNode = txBuf->pduLst.first; while(pduNode) @@ -2541,7 +2410,7 @@ KwuDatCfmInfo **datCfm; /* so that it is not processed again */ rlcUtlRemovTxBuf(AMDL.txBufLst, txBuf, gCb); - RETVOID; + return; } /** @@ -2558,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; @@ -2588,7 +2450,7 @@ RlcRetx *retx; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2603,7 +2465,7 @@ RlcRetx *retx; RlcUiKwuStaInd(&rlckwuSap->pst, rlckwuSap->suId, staInd); #endif /* KW_PDCP */ - RETVOID; + return; } /** @@ -2620,7 +2482,7 @@ RlcRetx *retx; * @return Void * */ -void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) +static void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) { CmLList *tNode; @@ -2636,7 +2498,7 @@ void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) else { *retx = NULLP; - RETVOID; + return; } }while((*retx)->pendingReTrans == FALSE); @@ -2655,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; @@ -2679,7 +2534,7 @@ RlcDlRbCb *rbCb; /* ccpu00135170 Removing KLOCK warning */ if(resetRb == NULLP) { - RETVOID; + return; } RLC_MEM_CPY(resetRb, rbCb, sizeof(RlcDlRbCb)); @@ -2696,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 */ @@ -2707,7 +2562,7 @@ RlcDlRbCb *rbCb; "UeId [%d]: UeCb not found RBID;%d", rlcId.ueId, rlcId.rbId); - RETVOID; + return; } if(rlcId.rbType == CM_LTE_SRB) @@ -2734,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))); @@ -2759,7 +2614,7 @@ RlcDlRbCb *rbCb; rlcDlUtlResetReestInProgress(ueCb->drbCb[rlcId.rbId]); } - RETVOID; + return; } /** @@ -2778,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); } @@ -2807,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); @@ -2856,7 +2689,7 @@ RlcDlRbCb *rbCb; } rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); - RETVOID; + return; } /* Get the last node in retxLst */ RLC_LLIST_LAST_RETX(amDl->retxLst, retx); @@ -2869,7 +2702,7 @@ RlcDlRbCb *rbCb; } } - RETVOID; + return; } /** @@ -2890,8 +2723,7 @@ RlcDlRbCb *rbCb; * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2899,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; @@ -2950,7 +2774,7 @@ KwuDatCfmInfo **datCfm; MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); } - RETVOID; + return; } /** @@ -2970,8 +2794,7 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2980,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; @@ -3032,7 +2846,7 @@ KwuDatCfmInfo **datCfm; MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); } - RETVOID; + return; } @@ -3052,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; @@ -3061,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; @@ -3099,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; @@ -3149,7 +2953,7 @@ RlcRetx *retx; amDl->nxtRetx = retx; } - RETVOID; + return; } /** @@ -3168,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) { @@ -3199,7 +2995,7 @@ RlcSn sn; if (*retx == NULLP) { RLOG0(L_FATAL, "Memory allocation failed"); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -3216,7 +3012,7 @@ RlcSn sn; /* Remove PDU from txBuf */ rlcUtlDelTxBuf(amDl->txBufLst, txBuf,gCb); - RETVOID; + return; } @@ -3234,17 +3030,7 @@ 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)) @@ -3261,7 +3047,7 @@ RlcDlRbCb *rbCb; rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -3277,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 */ @@ -3415,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; } } @@ -3464,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) { @@ -3482,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) @@ -3571,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; @@ -3645,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"); @@ -3692,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, @@ -3704,7 +3468,7 @@ U8 *fByte; /* Memory allocation failure can not be expected */ if(!pStaPdu) { - RETVOID; + return; } #endif @@ -3739,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 */ @@ -3757,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; @@ -3806,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; @@ -3829,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, @@ -3837,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;