X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_amm_dl.c;h=7e4d6ced5e2b7684df6c47fddb1b4610277bf400;hb=6d01b1cb797bb2b47115eee21ad7d1a6ff3fcfe7;hp=0c4d596fced86f341d17fab24f33875bbc1eca3a;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index 0c4d596fc..7e4d6ced5 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -96,7 +96,7 @@ 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;\ @@ -274,19 +274,7 @@ void rlcAmmSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmDl *amDl) * * @return Void */ -#ifdef ANSI -static Void rlcAmmDlCheckAndStopPollTmr -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcSn mAckSn -) -#else -static Void rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn mAckSn; -#endif +static Void rlcAmmDlCheckAndStopPollTmr(RlcCb *gCb,RlcDlRbCb *rbCb,RlcSn mAckSn) { RlcSn mPollSn; @@ -294,9 +282,9 @@ 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); } } @@ -311,17 +299,7 @@ RlcSn mAckSn; * * @return Void */ -#ifdef ANSI -static Void rlcAmmDlSetTxNextAck -( -RlcAmDl *amDl, -RlcSn sn -) -#else -static Void rlcAmmDlSetTxNextAck(amDl, sn) -RlcAmDl *amDl; -RlcSn sn -#endif +static Void rlcAmmDlSetTxNextAck(RlcAmDl *amDl,RlcSn sn) { amDl->txNextAck = sn; @@ -341,21 +319,13 @@ RlcSn sn * * @return Void */ -#ifdef ANSI static Void rlcAmmDlProcessSuccessfulReTx ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -static Void rlcAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -KwuDatCfmInfo **datCfm; -#endif { rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, &(retx->sduMap), datCfm); @@ -380,7 +350,6 @@ KwuDatCfmInfo **datCfm; * */ -#ifdef ANSI static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ( RlcCb *gCb, @@ -388,13 +357,6 @@ RlcAmDl *amDl, RlcRetx **retx, RlcDlPduInfo *pduInfo ) -#else -static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo) -RlcCb *gCb; -RlcAmDl *amDl; -RlcRetx **retx; -RlcDlPduInfo *pduInfo; -#endif { RLC_ALLOC_WC(gCb,*retx, sizeof(RlcRetx)); @@ -454,7 +416,6 @@ RlcDlPduInfo *pduInfo; * */ -#ifdef ANSI static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ( RlcCb *gCb, @@ -463,22 +424,12 @@ RlcNackInfo *nackSnInfo, RlcRetx **retx, KwuDatCfmInfo ** datCfm ) -#else -static 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) { return; @@ -515,13 +466,13 @@ 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); } return; @@ -543,25 +494,14 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI static Void rlcAmmDlUpdateTxAndReTxBufForNackSn ( - RlcCb *gCb, - RlcDlRbCb *rbCb, - RlcNackInfo *nackSnInfo, - CmLList **retxNode, - KwuDatCfmInfo **datCfm - ) -#else -static 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 @@ static 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) @@ -663,7 +603,6 @@ static Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, * @return Void * */ -#ifdef ANSI static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ( RlcAmDl *amDl, @@ -672,16 +611,6 @@ CmLList *retxNode, RlcNackInfo *nackSnInfo, uint8_t idx ) -#else -static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx) -( -RlcAmDl *amDl; -RlcNackInfo *nackInfo; -CmLList *retxNode; -RlcNackInfo *nackSnInfo; -uint8_t idx; -) -#endif { RlcTx *txBuf; RlcRetx *retx; @@ -774,19 +703,7 @@ uint8_t 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)); @@ -820,8 +737,8 @@ RlcUdxStaPdu *pStaPdu; 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,7 +746,7 @@ 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)); */ @@ -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,7 +768,7 @@ 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 */ uint32_t idx = 0; @@ -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)) { @@ -916,12 +833,12 @@ RlcUdxStaPdu *pStaPdu; * 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,12 +893,12 @@ 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); } 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; @@ -1109,26 +1018,26 @@ dlrate_kwu += sdu->sduSz; #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; @@ -1205,17 +1114,17 @@ static void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rl 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) { @@ -1332,7 +1241,7 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f 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 @@ static void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *nex } /* 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; @@ -1449,7 +1358,7 @@ static 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 @@ static 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) @@ -1669,7 +1578,7 @@ 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; @@ -2193,12 +2102,12 @@ static bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, Ms * 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); @@ -2288,31 +2197,19 @@ RlcDlPduInfo *pduInfo, Buffer *pdu) * @return Void * */ -#ifdef ANSI -static Void rlcRemRetxPdu -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcRetx *retx -) -#else -static 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); @@ -2337,21 +2234,9 @@ RlcRetx *retx; * @return Void * */ -#ifdef ANSI -static Void rlcAmmDlMarkPduForReTx -( -RlcCb *gCb, -RlcDlRbCb *rbCb, -RlcRetx *retx -) -#else -static 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) { return; } @@ -2361,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 */ @@ -2388,9 +2273,9 @@ RlcRetx *retx; } - if (AMDL.nxtRetx == NULLP) + if (RLC_AMDL.nxtRetx == NULLP) { - AMDL.nxtRetx = retx; + RLC_AMDL.nxtRetx = retx; } gRlcStats.amRlcStats.numDLRetransPdus++; @@ -2416,21 +2301,13 @@ RlcRetx *retx; * @return Void * */ -#ifdef ANSI static Void rlcAmmDlCheckIsSDUDelivered ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcSduMap *sduMap, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -static Void rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSduMap *sduMap; -KwuDatCfmInfo **datCfm; -#endif { RlcSdu *sdu; @@ -2478,7 +2355,7 @@ KwuDatCfmInfo **datCfm; } /* Remove SDU from the sduQ */ - cmLListDelFrm(&AMDL.sduQ, &sdu->lstEnt); + cmLListDelFrm(&RLC_AMDL.sduQ, &sdu->lstEnt); rlcUtlAddSduToBeFreedQueue(gCb, sdu); rlcUtlRaiseDlCleanupEvent(gCb); } @@ -2501,25 +2378,17 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI static Void rlcAmmDlProcessSuccessfulTxPdu ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn sn, -KwuDatCfmInfo **datCfm +KwuDatCfmInfo **datCfm ) -#else -static 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) { @@ -2539,7 +2408,7 @@ 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); return; } @@ -2558,19 +2427,12 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI static Void rlcAmmSndStaInd ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx ) -#else -static Void rlcAmmSndStaInd(gCb, rbCb, retx) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcRetx *retx; -#endif { KwuStaIndInfo *staInd; RlcKwuSapCb *rlckwuSap; @@ -2655,19 +2517,12 @@ static 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; @@ -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, -uint32_t sduId -) -#else -S16 rlcAmmDiscSdu(gCb, rbCb, sduId) -RlcCb *gCb; -RlcDlRbCb *rbCb; -uint32_t sduId; -#endif +S16 rlcAmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId ) { return (RFAILED); } @@ -2807,17 +2650,7 @@ uint32_t 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); @@ -2850,12 +2683,12 @@ 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); + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); return; } /* Get the last node in retxLst */ @@ -2865,7 +2698,7 @@ RlcDlRbCb *rbCb; if (retx != NULLP) { rlcAmmDlMarkPduForReTx(gCb, rbCb, retx); - rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); + rlcAmmSendDedLcBoStatus(gCb, rbCb, &RLC_AMDL); } } @@ -2890,7 +2723,6 @@ RlcDlRbCb *rbCb; * */ -#ifdef ANSI static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ( RlcCb *gCb, @@ -2899,14 +2731,6 @@ RlcSn mAckSn, CmLList *retxNode, KwuDatCfmInfo **datCfm ) -#else -static Void rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm) -RlcCb *gCb; -RlcDlRbCb *rbCb; -RlcSn mAckSn; -CmLList *retxNode; -KwuDatCfmInfo **datCfm; -#endif { RlcSn mSn; RlcSn sn; @@ -2918,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); @@ -2929,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, @@ -2946,8 +2770,8 @@ 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); } return; @@ -2970,7 +2794,6 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -#ifdef ANSI static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ( RlcCb *gCb, @@ -2980,15 +2803,6 @@ RlcSn mNackSn, CmLList **retxNode, KwuDatCfmInfo **datCfm ) -#else -static 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; @@ -2997,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; @@ -3010,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, @@ -3028,8 +2842,8 @@ 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); } return; @@ -3099,17 +2913,7 @@ static void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint * @return Void * */ -#ifdef ANSI -static Void rlcAmmAddPduToRetxLst -( -RlcAmDl *amDl, -RlcRetx *retx -) -#else -static Void rlcAmmAddPduToRetxLst(amDl, retx) -RlcAmDl *amDl; -RlcRetx *retx; -#endif +static Void rlcAmmAddPduToRetxLst(RlcAmDl *amDl,RlcRetx *retx) { CmLList *node; RlcRetx *tRetx; @@ -3168,7 +2972,6 @@ RlcRetx *retx; * */ -#ifdef ANSI static Void rlcAmmDlMoveFrmTxtoRetxBuffer ( RlcCb *gCb, @@ -3176,13 +2979,6 @@ RlcAmDl *amDl, RlcRetx **retx, RlcSn sn ) -#else -static Void rlcAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn) -RlcCb *gCb; -RlcAmDl *amDl; -RlcRetx **retx; -RlcSn sn; -#endif { RlcTx* txBuf = rlcUtlGetTxBuf(amDl->txBufLst, sn); @@ -3211,7 +3007,7 @@ 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); @@ -3234,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 */ @@ -3291,7 +3077,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat RlcNackInfo *rlcNackInfo; uint16_t nkCnt = 0; - pStaPdu = AMDL.pStaPdu; + pStaPdu = RLC_AMDL.pStaPdu; /* D/C| CPT| */ @@ -3560,8 +3346,8 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat 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; } @@ -3571,19 +3357,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu); -#ifdef ANSI -static Void rgAmmExtractElmnt -( -RlcCb *gCb, -Buffer *pdu, -RlcExtHdr *hdrInfo -) -#else -static Void rgAmmExtractElmnt(gCb, pdu, hdrInfo) -RlcCb *gCb; -Buffer *pdu; -RlcExtHdr *hdrInfo; -#endif +static Void rgAmmExtractElmnt(RlcCb *gCb,Buffer *pdu,RlcExtHdr *hdrInfo) { uint8_t hdr; uint8_t pLen = hdrInfo->pLen; @@ -3651,25 +3425,15 @@ RlcExtHdr *hdrInfo; -#ifdef ANSI static Void rgAmmUlHndlStatusPdu ( Pst *udxPst, SuId suId, -RlcCb *gCb, -RlcDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, Buffer *cntrlPdu, -uint8_t *fByte +uint8_t *fByte ) -#else -static Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte) -Pst *udxPst; -SuId suId; -RlcCb *gCb; -RlcDlRbCb *rbCb; -Buffer *cntrlPdu; -uint8_t *fByte; -#endif { uint8_t e1; RlcExtHdr hdrInfo; @@ -3855,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; }