X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_utl_ul.c;h=6472e15a5eca9b30bb92268724e6808ffb25cbc0;hb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;hp=1b70dcec66256d890fa5bfb2b204a88549cf0c28;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c index 1b70dcec6..6472e15a5 100755 --- a/src/5gnrrlc/kw_utl_ul.c +++ b/src/5gnrrlc/kw_utl_ul.c @@ -25,10 +25,10 @@ Desc: Source code for RLC Utility Module This file contains following functions - --rlcUtlSndToLi - --rlcUtlRcvFrmLi + --rlcUtlSendToMac + --rlcUtlRcvFrmMac --rlcUtlEmptySduQ - --rlcUtlSndDatInd + --rlcUtlSendUlDataToDu --kwUtlShutDown File: kw_utl_ul.c @@ -67,8 +67,10 @@ static int RLOG_FILE_ID=210; #include "kw.x" /* RLC inlcudes */ #include "kw_ul.x" /* RLC uplink includes */ -#include "ss_rbuf.h" -#include "ss_rbuf.x" +#include "rlc_utils.h" +#include "du_app_rlc_inf.h" +#include "rlc_upr_inf_api.h" + #ifdef SS_RBUF S16 SMrkUlPkt(Buffer *mbuf); #endif @@ -95,26 +97,12 @@ RlcAmRecBuf* rlcUtlGetRecBuf(CmLListCp *recBufLst, RlcSn sn); * -# RFAILED * */ -#ifdef ANSI -S16 rlcUtlRcvFrmLi -( -RlcCb *gCb, -KwDatIndInfo *datIndInfo -) -#else -S16 rlcUtlRcvFrmLi(gCb,datIndInfo) -RlcCb *gCb; -KwDatIndInfo *datIndInfo; -#endif +uint8_t rlcUtlRcvFrmMac(RlcCb *gCb, KwDatIndInfo *datIndInfo) { - U32 count; /* Loop Counter */ + uint32_t count; /* Loop Counter */ KwPduInfo *pduInfo; /* PDU Information */ RlcUlRbCb *rbCb; /* RB Control Block */ RlcUlUeCb *ueCb; /* UE Control Block */ -/* kw005.201 added support for L2 Measurement */ - - TRC2(rlcUtlRcvFrmLi) - ueCb = NULLP; @@ -122,11 +110,10 @@ KwDatIndInfo *datIndInfo; if( ROK != rlcDbmFetchUlUeCb(gCb,datIndInfo->rnti,datIndInfo->cellId,&(ueCb))) { /* Fetch UeCb failed */ - RLOG_ARG1(L_ERROR,DBG_CELLID,datIndInfo->cellId, - "UEID:%d UeCb not found", + DU_LOG("\nRLC : rlcUtlRcvFrmMac : UEID:%d UeCb not found", datIndInfo->rnti); /* free the buffers inside the datIndInfo */ - U32 i,j; + uint32_t i,j; for(i = 0; i< datIndInfo->numLch; i++) { for(j = 0; j < datIndInfo->lchData[i].pdu.numPdu; j++) @@ -163,7 +150,7 @@ KwDatIndInfo *datIndInfo; */ if(rbCb == NULLP) { - U32 j; + uint32_t j; for(j = 0; j < pduInfo->numPdu; j++) { if(pduInfo->mBuf[j]) @@ -214,27 +201,15 @@ KwDatIndInfo *datIndInfo; * @return S16 * -# ROK */ -#ifdef ANSI -S16 rlcUtlSndDatInd -( -RlcCb *gCb, -RlcUlRbCb *rbCb, -Buffer *sdu -) -#else -S16 rlcUtlSndDatInd(gCb,rbCb,sdu) -RlcCb *gCb; -RlcUlRbCb *rbCb; -Buffer *sdu; -#endif +uint8_t rlcUtlSendUlDataToDu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *sdu) { #ifndef KW_PDCP KwuDatIndInfo *datIndInfo; /* Data Indication Information */ KwuDatIndInfo datIndInfoTmp; #endif - - TRC3(rlcUtlSndDatInd) - + RlcUlRrcMsgInfo *ulRrcMsgInfo; + uint16_t msgLen, copyLen; + Pst pst; #ifndef KW_PDCP /* Creating static memory for KwuDatIndInfo. #else will be @@ -244,10 +219,8 @@ Buffer *sdu; #if (ERRCLASS & ERRCLS_ADD_RES ) if ( datIndInfo == NULLP ) { - RLOG_ARG2(L_FATAL,DBG_RBID,rbCb->rlcId.rbId, - "Memory allocation failed UEID:%d CELLID:%d", - rbCb->rlcId.ueId, - rbCb->rlcId.cellId); + DU_LOG("\nRLC : rlcUtlSendUlDataToDu: Memory allocation failed UEID:%d \ + CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_FREE_BUF(sdu); return RFAILED; } @@ -259,18 +232,42 @@ Buffer *sdu; datIndInfo->isOutOfSeq = rbCb->m.amUl.isOutOfSeq; #endif /* KW_PDCP */ - /* If trace flag is enabled send the trace indication */ - if(gCb->init.trc == TRUE) + /* Filling UL RRC Message Info */ + RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, + ulRrcMsgInfo, sizeof(RlcUlRrcMsgInfo)); + if (ulRrcMsgInfo) { - /* Populate the trace params */ - rlcLmmSendTrc(gCb,KWU_EVT_DAT_IND, sdu); - } -#ifndef KW_PDCP + ulRrcMsgInfo->cellId = rbCb->rlcId.cellId; + ulRrcMsgInfo->ueIdx = rbCb->rlcId.ueId; + ulRrcMsgInfo->lcId = rbCb->lch.lChId; + RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, + ulRrcMsgInfo->rrcMsg, msgLen); + if (ulRrcMsgInfo->rrcMsg) + { + ODU_GET_MSG_LEN(sdu, (MsgLen *)&msgLen); + ODU_COPY_MSG_TO_FIX_BUF(sdu, 0, msgLen, ulRrcMsgInfo->rrcMsg, (MsgLen *)©Len); + ulRrcMsgInfo->msgLen = msgLen; + + /* Sending UL RRC Message transfeer to DU APP */ + memset(&pst, 0, sizeof(Pst)); + FILL_PST_RLC_TO_DUAPP(pst, RLC_UL_INST, EVENT_UL_RRC_MSG_TRANS_TO_DU); + rlcSendUlRrcMsgToDu(&pst, ulRrcMsgInfo); + } + else + { + DU_LOG("\nRLC : rlcUtlSendUlDataToDu: Memory allocation failed for rrcMsg"); + RLC_FREE_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, ulRrcMsgInfo, sizeof(RlcUlRrcMsgInfo)); + return RFAILED; + } + } + else + { + DU_LOG("\nRLC : rlcUtlSendUlDataToDu: Memory allocation failed for ulRrcMsgInfo"); + return RFAILED; + } - RlcUiKwuDatInd(&gCb->genCfg.lmPst, datIndInfo, sdu); -#endif - return (ROK); -} /* rlcUtlSndDatInd */ + return ROK; +} /* rlcUtlSendUlDataToDu */ PRIVATE Void dumpRLCUlRbInformation(RlcUlRbCb* ulRbCb) @@ -383,7 +380,7 @@ S16 rlcUtlL2MeasUlInit(RlcCb *gCb) gCb->u.ulCb->rlcL2Cb.rlcNumMeas=0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - cmMemset((U8 *)&(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); + memset(&(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); } gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_UL_IP].measCb.measType = LKW_L2MEAS_UL_IP; return ROK; @@ -418,7 +415,6 @@ U32 ttiCnt; #endif { VOLATILE U32 startTime = 0; - TRC2(rlcUtlCalUlIpThrPutIncTTI) /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCTTI); @@ -500,8 +496,6 @@ Void rlcUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt) { MsgLen rlcSduSz = 0; /*Holds length of Rlc Sdu*/ VOLATILE U32 startTime = 0; - TRC2(rlcUtlCalUlIpThrPut) - /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCVOL); @@ -551,7 +545,6 @@ RlcCb *gCb; RlcL2MeasEvtCb *measEvtCb; #endif { - TRC3(rlcUtlHdlL2TmrExp) #ifdef LTE_L2_MEAS_RLC U16 qciIdx; @@ -619,8 +612,6 @@ RlcL2MeasEvtCb *measEvtCb; U32 cfmIdx =0; /* Discard new changes ends */ - TRC3(rlcUtlSndUlL2MeasCfm) - /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT RLOG1(L_DEBUG,"rlcUtlSndUlL2MeasCfm(transId(%ld))", measEvtCb->transId); @@ -631,7 +622,7 @@ RlcL2MeasEvtCb *measEvtCb; /* Clean up the RB data structures */ measCb = &measEvtCb->measCb; - cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); + memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); measCfmEvt.transId = measEvtCb->transId; measCfmEvt.measType = measCb->measType; @@ -717,7 +708,6 @@ RlcL2MeasReqEvt *measReqEvt; RlcL2MeasCfmEvt *measCfmEvt; #endif { - TRC3(rlcUtlSndUlL2MeasNCfm) RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); return ROK; @@ -770,9 +760,6 @@ U8 *numLCh; U8 msbNibble = 0; U8 numFaild = 0; - - TRC3(rlcUtlValidateL2Meas) - idx = 0; rbCb = NULLP; ret = ROK; @@ -899,8 +886,6 @@ RlcL2MeasCfmEvt *measCfmEvt; U8 lsbNibble = 0; U8 msbNibble = 0; - TRC3(rlcUtlValidateIpThL2Meas) - measType = measReqEvt->measReq.measType; /* Check for the range of measType */ /* LKW_L2MEAS_DL_IP+ LKW_L2MEAS_UL_IP = 0x0030*/ @@ -1028,8 +1013,6 @@ RlcL2MeasRbCb *rbL2Cb; U8 measType; #endif { - TRC3(rlcUtlPlcMeasDatInL2Sts) - /* We should check the number of measType in the request. This can be done * by looking at each bit in the measType. Also store the measData in the * correct index of l2Sts in RbCb. @@ -1077,29 +1060,15 @@ U8 measType; * * @return Void */ -#ifdef ANSI -Void rlcUtlStoreRecBuf -( -CmLListCp *recBufLst, -RlcAmRecBuf *recBuf, -RlcSn sn -) -#else -Void rlcUtlStoreRecBuf(recBufLst, recBuf, sn) -CmLListCp *recBufLst; -RlcAmRecBuf *recBuf; -RlcSn sn; -#endif +void rlcUtlStoreRecBuf(CmLListCp *recBufLst, RlcAmRecBuf *recBuf, RlcSn sn) { - U32 hashKey; - - TRC3(rlcUtlStoreRecBuf) + uint32_t hashKey; hashKey = (sn % RLC_RCV_BUF_BIN_SIZE ); recBuf->lnk.node = (PTR)recBuf; cmLListAdd2Tail(&(recBufLst[hashKey]), &recBuf->lnk); - RETVOID; + return; } /* rlcUtlStoreRecBuf */ /** @@ -1116,25 +1085,13 @@ RlcSn sn; * * @return Void */ -#ifdef ANSI -RlcAmRecBuf* rlcUtlGetRecBuf -( -CmLListCp *recBufLst, -RlcSn sn -) -#else -RlcAmRecBuf* rlcUtlGetRecBuf(recBufLst, sn) -CmLListCp *recBufLst; -RlcSn sn; -#endif +RlcAmRecBuf* rlcUtlGetRecBuf(CmLListCp *recBufLst, RlcSn sn) { - U32 hashKey; + uint32_t hashKey; CmLListCp *recBufLstCp; RlcAmRecBuf *recBuf; CmLList *node = NULLP; - TRC3(rlcUtlGetRecBuf) - hashKey = (sn % RLC_RCV_BUF_BIN_SIZE ); recBufLstCp = &recBufLst[hashKey]; @@ -1144,11 +1101,11 @@ RlcSn sn; recBuf = (RlcAmRecBuf *) node->node; if(recBuf->amHdr.sn == sn) { - return (recBuf); + return recBuf; } CM_LLIST_NEXT_NODE(recBufLstCp, node); } - return (NULLP); + return NULLP; } /* rlcUtlStoreRecBuf */ /** * @@ -1164,32 +1121,18 @@ RlcSn sn; * * @return Void */ -#ifdef ANSI -Void rlcUtlDelRecBuf -( -CmLListCp *recBufLst, -RlcAmRecBuf *recBuf, -RlcCb *gCb -) -#else -Void rlcUtlDelRecBuf(recBufLst, recBufi, gCb) -CmLListCp *recBufLst; -RlcAmRecBuf *recBuf; -RlcCb *gCb; -#endif +void rlcUtlDelRecBuf(CmLListCp *recBufLst, RlcAmRecBuf *recBuf, RlcCb *gCb) { - U32 hashKey; + uint32_t hashKey; CmLListCp *recBufLstCp; - TRC3(rlcUtlDelRecBuf) - hashKey = (recBuf->amHdr.sn % RLC_RCV_BUF_BIN_SIZE ); recBufLstCp = &recBufLst[hashKey]; cmLListDelFrm(recBufLstCp, &recBuf->lnk); RLC_FREE_WC(gCb, recBuf, sizeof(RlcAmRecBuf)); - RETVOID; + return; } /* rlcUtlDelRecBuf */