X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_amm_ul.c;h=adf5385b262e89ca25680751939f3dd92693b5d8;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=500235226a7b62bb3f140aaab671122f8d323afa;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c index 500235226..adf5385b2 100755 --- a/src/5gnrrlc/kw_amm_ul.c +++ b/src/5gnrrlc/kw_amm_ul.c @@ -172,7 +172,7 @@ static uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ * 4) NACK_SN is continuous with previous but previous NACK_SN segments * are not missing in sequence till end */ - if((*prevNackSn == 0xffffffff) || ((((*prevNackSn) + 1) & AMUL.snModMask) != sn) || + if((*prevNackSn == 0xffffffff) || ((((*prevNackSn) + 1) & RLC_AMUL.snModMask) != sn) || (((*prevNackSn) == sn) && (((nackInfo->soEnd + 1) != soStart))) || ((nackInfo->isSegment) && (((*prevNackSn) + 1) == sn) && (nackInfo->soEnd != RLC_ALL_BYTES_MISSING))) { @@ -205,11 +205,11 @@ static uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ if(isSegment) { - sizeToBeEncd += ((AMUL.snLen == RLC_AM_CFG_12BIT_SN_LEN)?6:7); /* NACK,E1,E2,Sostart,SoEnd */ + sizeToBeEncd += ((RLC_AMUL.snLen == RLC_AM_CFG_12BIT_SN_LEN)?6:7); /* NACK,E1,E2,Sostart,SoEnd */ } else { - sizeToBeEncd += ((AMUL.snLen == RLC_AM_CFG_12BIT_SN_LEN)?2:3); /* NACK,E1,E2 */ + sizeToBeEncd += ((RLC_AMUL.snLen == RLC_AM_CFG_12BIT_SN_LEN)?2:3); /* NACK,E1,E2 */ } } else @@ -221,7 +221,7 @@ static uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ /* This case means there are continuous SNs/Segments. If it is the next * Sn then increment nackRnage. if same SN but different segment then * dont increment nackRange */ - if((((*prevNackSn) + 1) & AMUL.snModMask) == sn) + if((((*prevNackSn) + 1) & RLC_AMUL.snModMask) == sn) { nackInfo->nackRange++; } @@ -310,11 +310,11 @@ static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) } #endif - sn = AMUL.rxNext; - MODAMR(sn, mSn, AMUL.rxNext, AMUL.snModMask); - MODAMR(AMUL.rxHighestStatus, rxHighestStatus, AMUL.rxNext, AMUL.snModMask); + sn = RLC_AMUL.rxNext; + MODAMR(sn, mSn, RLC_AMUL.rxNext, RLC_AMUL.snModMask); + MODAMR(RLC_AMUL.rxHighestStatus, rxHighestStatus, RLC_AMUL.rxNext, RLC_AMUL.snModMask); - recBuf = rlcUtlGetRecBuf(AMUL.recBufLst, sn); + recBuf = rlcUtlGetRecBuf(RLC_AMUL.recBufLst, sn); while (mSn < rxHighestStatus ) { @@ -386,11 +386,11 @@ static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) } - sn = (sn + 1) & (AMUL.snModMask); /* MOD 1024 */ - MODAMR(sn, mSn, AMUL.rxNext, AMUL.snModMask); + sn = (sn + 1) & (RLC_AMUL.snModMask); /* MOD 1024 */ + MODAMR(sn, mSn, RLC_AMUL.rxNext, RLC_AMUL.snModMask); /* Get the received Buffer the updated/next SN */ - recBuf = rlcUtlGetRecBuf(AMUL.recBufLst, sn); + recBuf = rlcUtlGetRecBuf(RLC_AMUL.recBufLst, sn); /* Find the next missing sequence number if nackCnt reaches maximum and still Reordering window has some missing AMDPDUs / AMDPDU segments. The @@ -430,7 +430,7 @@ static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) /* Update ACK SN with the last sn for which feedback is not assembled */ if ( mSn == rxHighestStatus) { - pStatusPdu->ackSn = AMUL.rxHighestStatus; + pStatusPdu->ackSn = RLC_AMUL.rxHighestStatus; } else { @@ -443,8 +443,8 @@ static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) pStatusPdu->controlBo = staPduEncSize; /*Its already in bytes */ - AMUL.staTrg = FALSE; - AMUL.gatherStaPduInfo = FALSE; + RLC_AMUL.staTrg = FALSE; + RLC_AMUL.gatherStaPduInfo = FALSE; if (rlcUlUdxStaPduReq(&sapCb->pst, @@ -506,7 +506,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) MsgLen rlcSduSz; /*Holds length of Rlc Sdu*/ #endif /* LTE_L2_MEAS */ - amUl = &AMUL; + amUl = &RLC_AMUL; numPduToProcess = RLC_MIN(pduInfo->numPdu, RGU_MAX_PDU); DU_LOG("\nRLC : rlcAmmProcessPdus: numPdu[%d],numPduToProcess[%d] UEID:%d CELLID:%d", @@ -542,7 +542,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) { DU_LOG("\nRLC : rlcAmmProcessPdus: Header Extraction Failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); gCb->genSts.errorPdusRecv++; continue; } @@ -550,7 +550,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) if (amHdr.dc == 0) { rlcAmmUlHndlStatusPdu(gCb, rbCb, pdu, &fByte); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); continue; } if((amHdr.si == RLC_SI_LAST_SEG) && (!amHdr.so)) @@ -558,7 +558,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) DU_LOG("\nRLC: rlcAmmProcessPdus: Dropping PDU because SO can't be zero\ for last segment sn:%u UEID:%d CELLID:%d", amHdr.sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); continue; } #ifndef RGL_SPECIFIC_CHANGES @@ -571,7 +571,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) { uint32_t rlculdrop; rlculdrop++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); continue; } #endif @@ -582,7 +582,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) { uint32_t rlculdrop; rlculdrop++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); continue; } #endif @@ -596,7 +596,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) { if(rbCb->rlcId.rbType == CM_LTE_DRB) { - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); continue; } } @@ -696,7 +696,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) } /* Check if reOrdTmr is running and update rxNextStatusTrig accordingly */ - tmrRunning = rlcChkTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + tmrRunning = rlcChkTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); if (tmrRunning) { Bool snInWin = RLC_AM_CHK_SN_WITHIN_RECV_WINDOW(amUl->rxNextStatusTrig, amUl); @@ -704,7 +704,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) if ( (amUl->rxNextStatusTrig == amUl->rxNext) || ( (!snInWin) && (amUl->rxNextStatusTrig != amUl->vrMr) ) ) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); tmrRunning = FALSE; } } @@ -713,7 +713,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) { if (amUl->rxNextHighestRcvd > amUl->rxNext) { - rlcStartTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + rlcStartTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); amUl->rxNextStatusTrig = amUl->rxNextHighestRcvd; DU_LOG("\nRLC: rlcAmmProcessPdus: Updated rxNextStatusTrig = %d \ @@ -841,21 +841,7 @@ static uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmH * -# RFAILED * */ -#ifdef ANSI -static S16 rlcAmmExtractHdrOld -( -RlcCb *gCb, -Buffer *pdu, -RlcAmHdr *amHdr, -uint8_t *fByte -) -#else -static S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte) -RlcCb *gCb; -Buffer *pdu; -RlcAmHdr *amHdr; -uint8_t *fByte; -#endif +static S16 rlcAmmExtractHdrOld(RlcCb *gCb,Buffer *pdu,RlcAmHdr *amHdr,uint8_t *fByte) { uint8_t e; uint8_t snByte; @@ -1148,9 +1134,9 @@ static void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) RLC_LLIST_FIRST_SEG(recBuf->segLst, seg); while (seg != NULLP) { - RLC_FREE_BUF_WC(seg->seg); + ODU_PUT_MSG_BUF(seg->seg); cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt)); - RLC_FREE_WC(gCb,seg, sizeof(RlcSeg)); + RLC_FREE(gCb,seg, sizeof(RlcSeg)); RLC_LLIST_FIRST_SEG(recBuf->segLst, seg); } @@ -1186,7 +1172,7 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe uint16_t expSo = 0; /* Expected SO */ soEnd = amHdr->so + pduSz - 1; - recBuf = rlcUtlGetRecBuf(AMUL.recBufLst, amHdr->sn); + recBuf = rlcUtlGetRecBuf(RLC_AMUL.recBufLst, amHdr->sn); if (NULLP == recBuf) { @@ -1197,17 +1183,17 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe DU_LOG("\nRLC: rlcAmmAddRcvdSeg: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } #endif /* ERRCLASS & ERRCLS_RES */ - rlcUtlStoreRecBuf(AMUL.recBufLst, recBuf, amHdr->sn); + rlcUtlStoreRecBuf(RLC_AMUL.recBufLst, recBuf, amHdr->sn); } else { if (recBuf->allRcvd == TRUE) { - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } } @@ -1227,7 +1213,7 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe { /* This is a duplicate segment */ gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } @@ -1235,7 +1221,7 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe { /* This is a duplicate segment */ gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } @@ -1248,7 +1234,7 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe { DU_LOG("\nRLC: rlcAmmAddRcvdSeg: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -1269,7 +1255,7 @@ static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffe cmLListInsCrnt(&recBuf->segLst, &tseg->lstEnt); } tseg->lstEnt.node = (PTR)tseg; - rlcAmmUpdExpByteSeg(gCb,&AMUL,tseg); + rlcAmmUpdExpByteSeg(gCb,&RLC_AMUL,tseg); return TRUE; } @@ -1310,7 +1296,7 @@ static bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, R "UEID:%d CELLID:%d", sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); gCb->genSts.unexpPdusRecv++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } @@ -1329,11 +1315,11 @@ static bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, R { DU_LOG("\nRLC: rlcAmmUlPlacePduInRecBuf: Memory allocation failed \ UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } #endif /* ERRCLASS & ERRCLS_RES */ - rlcUtlStoreRecBuf(AMUL.recBufLst, recBuf, sn); + rlcUtlStoreRecBuf(RLC_AMUL.recBufLst, recBuf, sn); } else if (recBuf->allRcvd != TRUE) { @@ -1343,7 +1329,7 @@ static bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, R { gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; gCb->genSts.unexpPdusRecv++; - RLC_FREE_BUF(pdu); + ODU_PUT_MSG_BUF(pdu); return FALSE; } recBuf->isDelvUpperLayer = FALSE; @@ -1408,7 +1394,7 @@ static void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool disc amUl->gatherStaPduInfo = FALSE; /* Check if staProhTmr is running */ - tmrRunning = rlcChkTmr(gCb,(PTR) rbCb, RLC_EVT_AMUL_STA_PROH_TMR); + tmrRunning = rlcChkTmr(gCb,(PTR) rbCb, EVENT_RLC_AMUL_STA_PROH_TMR); if (!tmrRunning) { @@ -1440,39 +1426,39 @@ static void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool disc static void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu) { - if ((AMUL.expSn != amHdr->sn) || (AMUL.expSo != amHdr->so)) + if ((RLC_AMUL.expSn != amHdr->sn) || (RLC_AMUL.expSo != amHdr->so)) { /* Release the existing partial SDU as we have PDUs or */ /* segments that are out of sequence */ rbCb->m.amUl.isOutOfSeq = TRUE; - RLC_FREE_BUF(AMUL.partialSdu); + ODU_PUT_MSG_BUF(RLC_AMUL.partialSdu); } //if (amHdr->fi & RLC_FI_FIRST_SEG) if (amHdr->si == 0x01) {/* first Segment of the SDU */ - if (AMUL.partialSdu != NULLP) + if (RLC_AMUL.partialSdu != NULLP) { /* Some old SDU may be present */ - RLC_FREE_BUF_WC(AMUL.partialSdu); + ODU_PUT_MSG_BUF(RLC_AMUL.partialSdu); } - AMUL.partialSdu = pdu; + RLC_AMUL.partialSdu = pdu; pdu = NULLP; } else if(amHdr->si == 0x03) {/* Middle or last segment of the SUD */ - ODU_CAT_MSG(AMUL.partialSdu,pdu, M1M2); - RLC_FREE_BUF_WC(pdu); + ODU_CAT_MSG(RLC_AMUL.partialSdu,pdu, M1M2); + ODU_PUT_MSG_BUF(pdu); pdu = NULLP; } else if (amHdr->si == 0x02) { - ODU_CAT_MSG(pdu,AMUL.partialSdu,M2M1); - RLC_FREE_BUF_WC(AMUL.partialSdu); + ODU_CAT_MSG(pdu,RLC_AMUL.partialSdu,M2M1); + ODU_PUT_MSG_BUF(RLC_AMUL.partialSdu); } if (pdu != NULLP) { - AMUL.partialSdu = NULLP; + RLC_AMUL.partialSdu = NULLP; rlcUtlSendUlDataToDu(gCb,rbCb, pdu); } @@ -1510,27 +1496,27 @@ static uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf * rlcAmmProcPduOrSeg(gCb,rbCb, &recBuf->amHdr, recBuf->pdu); /* Assign NULLP to recBuf->pdu as this PDU is sent to PDCP */ recBuf->pdu = NULLP; - AMUL.expSn = (recBuf->amHdr.sn + 1) & (AMUL.snModMask); /* MOD 1024 */ - AMUL.expSo = 0; + RLC_AMUL.expSn = (recBuf->amHdr.sn + 1) & (RLC_AMUL.snModMask); /* MOD 1024 */ + RLC_AMUL.expSo = 0; } else { /* This is a set of segments */ RLC_LLIST_FIRST_SEG(recBuf->segLst, seg); - AMUL.expSn = recBuf->amHdr.sn; - AMUL.expSo = 0; + RLC_AMUL.expSn = recBuf->amHdr.sn; + RLC_AMUL.expSo = 0; while(seg) { rlcAmmProcPduOrSeg(gCb,rbCb, &seg->amHdr, seg->seg); - AMUL.expSo = seg->soEnd + 1; + RLC_AMUL.expSo = seg->soEnd + 1; cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt)); - RLC_FREE_WC(gCb, seg, sizeof(RlcSeg)); + RLC_FREE(gCb, seg, sizeof(RlcSeg)); RLC_LLIST_FIRST_SEG(recBuf->segLst, seg); } - AMUL.expSn = (recBuf->amHdr.sn + 1) & (AMUL.snModMask); /* MOD 1024 */ - AMUL.expSo = 0; + RLC_AMUL.expSn = (recBuf->amHdr.sn + 1) & (RLC_AMUL.snModMask); /* MOD 1024 */ + RLC_AMUL.expSo = 0; } return ROK; @@ -1547,21 +1533,7 @@ static uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf * * @return Void * */ -#ifdef ANSI -Void rlcAmmUlReEstablish -( -RlcCb *gCb, -CmLteRlcId rlcId, -Bool sendReEst, -RlcUlRbCb *rbCb -) -#else -Void rlcAmmUlReEstablish(gCb, rlcId, sendReEst, rbCb) -RlcCb *gCb; -CmLteRlcId rlcId; -Bool sendReEst; -RlcUlRbCb *rbCb; -#endif +Void rlcAmmUlReEstablish(RlcCb *gCb,CmLteRlcId rlcId,Bool sendReEst,RlcUlRbCb *rbCb) { RlcSn sn; RlcSn mSn; @@ -1572,15 +1544,15 @@ RlcUlRbCb *rbCb; #endif RlcAmRecBuf *recBuf = NULLP; - sn = AMUL.rxNext; + sn = RLC_AMUL.rxNext; - MODAMR(AMUL.vrMr, mVrMr, AMUL.rxNext, AMUL.snModMask); - MODAMR(sn, mSn, AMUL.rxNext, AMUL.snModMask); + MODAMR(RLC_AMUL.vrMr, mVrMr, RLC_AMUL.rxNext, RLC_AMUL.snModMask); + MODAMR(sn, mSn, RLC_AMUL.rxNext, RLC_AMUL.snModMask); /* Reassemble SDUs from PDUs with SN less than upper edge of the window */ while (mSn < mVrMr) { - recBuf = rlcUtlGetRecBuf(AMUL.recBufLst, sn); + recBuf = rlcUtlGetRecBuf(RLC_AMUL.recBufLst, sn); if (NULLP != recBuf) { if (recBuf->allRcvd == TRUE) @@ -1592,40 +1564,40 @@ RlcUlRbCb *rbCb; /* Remove PDU and segments */ if(recBuf->pdu) { - RLC_FREE_BUF_WC(recBuf->pdu); + ODU_PUT_MSG_BUF(recBuf->pdu); } /* Release all the segments*/ rlcAmmUlRlsAllSegs(gCb,recBuf); } - rlcUtlDelRecBuf(AMUL.recBufLst, recBuf, gCb); + rlcUtlDelRecBuf(RLC_AMUL.recBufLst, recBuf, gCb); } - sn = (sn + 1) & (AMUL.snModMask); /* MOD 1024 */ - MODAMR(sn, mSn, AMUL.rxNext, AMUL.snModMask); + sn = (sn + 1) & (RLC_AMUL.snModMask); /* MOD 1024 */ + MODAMR(sn, mSn, RLC_AMUL.rxNext, RLC_AMUL.snModMask); } /* Discard remaining PDUs and bytesegments in recBuf */ /* Stop all timers and reset variables */ - if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMUL_REORD_TMR)) + if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMUL_REORD_TMR)) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); } - if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMUL_STA_PROH_TMR)) + if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMUL_STA_PROH_TMR)) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_STA_PROH_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_STA_PROH_TMR); } - AMUL.rxNext = 0; - AMUL.rxNextHighestRcvd = 0; - AMUL.rxNextStatusTrig = 0; + RLC_AMUL.rxNext = 0; + RLC_AMUL.rxNextHighestRcvd = 0; + RLC_AMUL.rxNextStatusTrig = 0; rbCb->m.amUl.vrMr = (rbCb->m.amUl.rxNext + RLC_AM_GET_WIN_SZ(rbCb->m.amUl.snLen)) & (rbCb->m.amUl.snModMask); - AMUL.rxHighestStatus = 0; - AMUL.staTrg = FALSE; - AMUL.gatherStaPduInfo = FALSE; - AMUL.expSn = 0; - AMUL.expSo = 0; - if (AMUL.partialSdu != NULLP) + RLC_AMUL.rxHighestStatus = 0; + RLC_AMUL.staTrg = FALSE; + RLC_AMUL.gatherStaPduInfo = FALSE; + RLC_AMUL.expSn = 0; + RLC_AMUL.expSo = 0; + if (RLC_AMUL.partialSdu != NULLP) { - RLC_FREE_BUF(AMUL.partialSdu); + ODU_PUT_MSG_BUF(RLC_AMUL.partialSdu); } rlcKwuSap = gCb->u.ulCb->rlcKwuUlSap + RLC_UI_PDCP; @@ -1651,17 +1623,7 @@ RlcUlRbCb *rbCb; * */ -#ifdef ANSI -Void rlcAmmReOrdTmrExp -( -RlcCb *gCb, -RlcUlRbCb *rbCb -) -#else -Void rlcAmmReOrdTmrExp(rbCb) -RlcCb *gCb; -RlcUlRbCb *rbCb; -#endif +Void rlcAmmReOrdTmrExp(RlcCb *gCb,RlcUlRbCb *rbCb) { RlcAmUl *amUl = &(rbCb->m.amUl); RlcSn sn; @@ -1677,7 +1639,7 @@ RlcUlRbCb *rbCb; MODAMR(sn, mSn, amUl->rxNext, amUl->snModMask); MODAMR(amUl->vrMr, mVrMr, amUl->rxNext, amUl->snModMask); - recBuf = rlcUtlGetRecBuf(AMUL.recBufLst, sn); + recBuf = rlcUtlGetRecBuf(RLC_AMUL.recBufLst, sn); while (mSn < mVrMr) { @@ -1689,7 +1651,7 @@ RlcUlRbCb *rbCb; amUl->gatherStaPduInfo = FALSE; /* Check if staProhTmr is running */ - tmrRunning = rlcChkTmr(gCb,(PTR) rbCb, RLC_EVT_AMUL_STA_PROH_TMR); + tmrRunning = rlcChkTmr(gCb,(PTR) rbCb, EVENT_RLC_AMUL_STA_PROH_TMR); if (!tmrRunning) { @@ -1709,7 +1671,7 @@ RlcUlRbCb *rbCb; MODAMR(amUl->rxHighestStatus, mrxHighestStatus, amUl->rxNext, amUl->snModMask); if (mrxNextHighestRcvd > mrxHighestStatus) { - rlcStartTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + rlcStartTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); amUl->rxNextStatusTrig = amUl->rxNextHighestRcvd; } @@ -1730,17 +1692,7 @@ RlcUlRbCb *rbCb; * */ -#ifdef ANSI -Void rlcAmmStaProTmrExp -( -RlcCb *gCb, -RlcUlRbCb *rbCb -) -#else -Void rlcAmmStaProTmrExp(gCb, rbCb) -RlcCb *gCb; -RlcUlRbCb *rbCb; -#endif +Void rlcAmmStaProTmrExp(RlcCb *gCb,RlcUlRbCb *rbCb) { RlcAmUl *amUl = &(rbCb->m.amUl); @@ -1917,17 +1869,7 @@ static void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg) * * @return void */ -#ifdef ANSI -Void rlcAmmFreeUlRbCb -( -RlcCb *gCb, -RlcUlRbCb *rbCb -) -#else -Void rlcAmmFreeUlRbCb(gCb,rbCb) -RlcCb *gCb; -RlcUlRbCb *rbCb; -#endif +Void rlcAmmFreeUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb) { RlcSn curSn = 0; /* Sequence number of PDU */ RlcSn windSz; /* PDU window size */ @@ -1935,13 +1877,13 @@ RlcUlRbCb *rbCb; windSz = (RLC_AM_GET_WIN_SZ(rbCb->m.amUl.snLen)) << 1; - if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMUL_REORD_TMR)) + if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMUL_REORD_TMR)) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_REORD_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_REORD_TMR); } - if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMUL_STA_PROH_TMR)) + if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,EVENT_RLC_AMUL_STA_PROH_TMR)) { - rlcStopTmr(gCb,(PTR)rbCb, RLC_EVT_AMUL_STA_PROH_TMR); + rlcStopTmr(gCb,(PTR)rbCb, EVENT_RLC_AMUL_STA_PROH_TMR); } @@ -1954,7 +1896,7 @@ RlcUlRbCb *rbCb; { if (recBuf->pdu != NULLP) { - RLC_FREE_BUF_WC(recBuf->pdu); + ODU_PUT_MSG_BUF(recBuf->pdu); } /* Release all the segments */ rlcAmmUlRlsAllSegs(gCb,recBuf); @@ -1964,13 +1906,13 @@ RlcUlRbCb *rbCb; }while ( curSn < windSz ); #ifndef LTE_TDD - RLC_FREE_WC(gCb,rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); + RLC_FREE(gCb,rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp))); rbCb->m.amUl.recBufLst = NULLP; #endif if(rbCb->m.amUl.partialSdu != NULLP) { - RLC_FREE_BUF_WC(rbCb->m.amUl.partialSdu); + ODU_PUT_MSG_BUF(rbCb->m.amUl.partialSdu); } return; } /* rlcAmmFreeUlRbCb */