X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_amm_dl.c;h=c7e026f8b5d28edda1998dfa0c889f6118e69357;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=77b13f83e4c331059a6756aa95f06ee5cced8563;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index 77b13f83e..c7e026f8b 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; +extern uint32_t rlcAmmStaPduList[512]; + uint32_t rlcAmmStaPduListCnt = 0; #endif @@ -74,7 +74,7 @@ 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 */ @@ -151,9 +151,9 @@ PRIVATE Void rlcAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, RlcRetx *retx)); PRIVATE Void rlcGetNxtRetx ARGS ((RlcCb *gCb, RlcRetx **retx)); PRIVATE Void rlcConstructAmHdr ARGS ((RlcAmHdr *amHdr, - U8 *hdr, - U8 snLen, - U16 *idx)); + uint8_t *hdr, + uint8_t snLen, + uint16_t *idx)); PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, @@ -206,7 +206,7 @@ RlcAmDl *amDl, RlcNackInfo *nackInfo, CmLList *retxNode, RlcNackInfo *nackSnInfo, -U8 idx +uint8_t idx )); PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS( @@ -300,7 +300,7 @@ RlcSn mAckSn; } } - RETVOID; + return; } /** @@ -325,7 +325,7 @@ RlcSn sn { amDl->txNextAck = sn; - RETVOID; + return; } /** @@ -361,7 +361,7 @@ KwuDatCfmInfo **datCfm; rlcRemRetxPdu(gCb, rbCb, retx); - RETVOID; + return; } /** @@ -403,7 +403,7 @@ RlcDlPduInfo *pduInfo; if (*retx == NULLP) { RLOG0(L_FATAL, "Memory allocation failed"); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -434,7 +434,7 @@ RlcDlPduInfo *pduInfo; gRlcStats.amRlcStats.numDLRetransPdus++; - RETVOID; + return; } /*rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer */ /** @@ -481,7 +481,7 @@ KwuDatCfmInfo **datCfm; txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, nackSnInfo->sn); if (txBuf == NULLP) { - RETVOID; + return; } lnk = txBuf->pduLst.first; while(lnk) @@ -524,7 +524,7 @@ KwuDatCfmInfo **datCfm; rlcUtlDelTxBuf(AMDL.txBufLst, txBuf,gCb); } - RETVOID; + return; } /** @@ -598,7 +598,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 +644,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode break; } } /* end of retxNode while loop*/ - RETVOID; + return; } /** @@ -658,7 +658,7 @@ 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 * @@ -670,16 +670,16 @@ 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; +CmLList *retxNode; RlcNackInfo *nackSnInfo; -U8 idx; +uint8_t idx; ) #endif { @@ -693,7 +693,7 @@ U8 idx; { nackSnInfo->soStart = 0; nackSnInfo->soEnd = 0; - RETVOID; + return; } txBuf = rlcUtlGetTxBuf(amDl->txBufLst, nackSnInfo->sn); if(txBuf != NULLP) @@ -702,7 +702,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; @@ -813,7 +813,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 +834,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 +854,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 +897,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 +911,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 +984,7 @@ RlcUdxStaPdu *pStaPdu; rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); } - RETVOID; + return; } /** @@ -1039,7 +1039,7 @@ RlcAmDl *amDl; return bo; } -U32 kwRxSdu; +uint32_t kwRxSdu; /** * @brief Handler to queue the SDUs received from PDCP @@ -1061,7 +1061,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) { @@ -2318,7 +2318,7 @@ RlcRetx *retx; rlcUtlAddReTxPduToBeFreedQueue(gCb, retx); rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -2353,7 +2353,7 @@ RlcRetx *retx; { if (AMDL.maxReTxReached == TRUE) { - RETVOID; + return; } if(retx->pendingReTrans == FALSE) @@ -2384,7 +2384,7 @@ RlcRetx *retx; rlcRemRetxPdu(gCb,rbCb, retx); - RETVOID; + return; } @@ -2397,7 +2397,7 @@ RlcRetx *retx; } - RETVOID; + return; } /** @@ -2466,7 +2466,7 @@ KwuDatCfmInfo **datCfm; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2483,7 +2483,7 @@ KwuDatCfmInfo **datCfm; rlcUtlRaiseDlCleanupEvent(gCb); } - RETVOID; + return; } /** @@ -2523,7 +2523,7 @@ KwuDatCfmInfo **datCfm; if (txBuf == NULLP) { - RETVOID; + return; } pduNode = txBuf->pduLst.first; while(pduNode) @@ -2541,7 +2541,7 @@ KwuDatCfmInfo **datCfm; /* so that it is not processed again */ rlcUtlRemovTxBuf(AMDL.txBufLst, txBuf, gCb); - RETVOID; + return; } /** @@ -2588,7 +2588,7 @@ RlcRetx *retx; "Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -2603,7 +2603,7 @@ RlcRetx *retx; RlcUiKwuStaInd(&rlckwuSap->pst, rlckwuSap->suId, staInd); #endif /* KW_PDCP */ - RETVOID; + return; } /** @@ -2636,7 +2636,7 @@ void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) else { *retx = NULLP; - RETVOID; + return; } }while((*retx)->pendingReTrans == FALSE); @@ -2679,7 +2679,7 @@ RlcDlRbCb *rbCb; /* ccpu00135170 Removing KLOCK warning */ if(resetRb == NULLP) { - RETVOID; + return; } RLC_MEM_CPY(resetRb, rbCb, sizeof(RlcDlRbCb)); @@ -2696,8 +2696,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 +2707,7 @@ RlcDlRbCb *rbCb; "UeId [%d]: UeCb not found RBID;%d", rlcId.ueId, rlcId.rbId); - RETVOID; + return; } if(rlcId.rbType == CM_LTE_SRB) @@ -2734,7 +2734,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 +2759,7 @@ RlcDlRbCb *rbCb; rlcDlUtlResetReestInProgress(ueCb->drbCb[rlcId.rbId]); } - RETVOID; + return; } /** @@ -2783,13 +2783,13 @@ S16 rlcAmmDiscSdu ( RlcCb *gCb, RlcDlRbCb *rbCb, -U32 sduId +uint32_t sduId ) #else S16 rlcAmmDiscSdu(gCb, rbCb, sduId) RlcCb *gCb; RlcDlRbCb *rbCb; -U32 sduId; +uint32_t sduId; #endif { return (RFAILED); @@ -2856,7 +2856,7 @@ RlcDlRbCb *rbCb; } rlcAmmSendDedLcBoStatus(gCb, rbCb, &AMDL); - RETVOID; + return; } /* Get the last node in retxLst */ RLC_LLIST_LAST_RETX(amDl->retxLst, retx); @@ -2869,7 +2869,7 @@ RlcDlRbCb *rbCb; } } - RETVOID; + return; } /** @@ -2950,7 +2950,7 @@ KwuDatCfmInfo **datCfm; MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); } - RETVOID; + return; } /** @@ -3032,7 +3032,7 @@ KwuDatCfmInfo **datCfm; MODAMT(sn, mSn, AMDL.txNextAck,AMDL.snModMask); } - RETVOID; + return; } @@ -3061,25 +3061,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; @@ -3149,7 +3149,7 @@ RlcRetx *retx; amDl->nxtRetx = retx; } - RETVOID; + return; } /** @@ -3188,7 +3188,7 @@ RlcSn sn; if (txBuf == NULLP) { - RETVOID; + return; } while(txBuf->pduLst.first) { @@ -3199,7 +3199,7 @@ RlcSn sn; if (*retx == NULLP) { RLOG0(L_FATAL, "Memory allocation failed"); - RETVOID; + return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -3216,7 +3216,7 @@ RlcSn sn; /* Remove PDU from txBuf */ rlcUtlDelTxBuf(amDl->txBufLst, txBuf,gCb); - RETVOID; + return; } @@ -3261,7 +3261,7 @@ RlcDlRbCb *rbCb; rlcUtlRaiseDlCleanupEvent(gCb); - RETVOID; + return; } /** @@ -3415,7 +3415,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 +3464,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 +3482,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) @@ -3585,15 +3585,15 @@ Buffer *pdu; RlcExtHdr *hdrInfo; #endif { - 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,7 +3645,7 @@ RlcExtHdr *hdrInfo; hdrInfo->hdr = hdr; hdrInfo->val = val; - RETVOID; + return; } @@ -3659,7 +3659,7 @@ SuId suId, RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *cntrlPdu, -U8 *fByte +uint8_t *fByte ) #else PRIVATE Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte) @@ -3668,17 +3668,17 @@ SuId suId; RlcCb *gCb; RlcDlRbCb *rbCb; Buffer *cntrlPdu; -U8 *fByte; +uint8_t *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 +3692,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 +3704,7 @@ U8 *fByte; /* Memory allocation failure can not be expected */ if(!pStaPdu) { - RETVOID; + return; } #endif @@ -3739,7 +3739,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 +3757,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 +3806,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 +3829,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 +3837,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;