X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_udx_dl.c;h=8a2790055d0e064f439c07d750e8d3b24680c64d;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=6e3ee49ab5e8b460be137775191922403a00f85c;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c index 6e3ee49ab..8a2790055 100755 --- a/src/5gnrrlc/kw_udx_dl.c +++ b/src/5gnrrlc/kw_udx_dl.c @@ -18,7 +18,7 @@ /********************************************************************** - Name: LTE RLC layer + Name: NR RLC layer Type: C include file @@ -27,9 +27,6 @@ File: kw_udx_dl.c **********************************************************************/ -static const char* RLOG_MODULE_NAME="UDX"; -static int RLOG_MODULE_ID=262144; -static int RLOG_FILE_ID=203; /* header include files (.h) */ #include "common_def.h" @@ -58,7 +55,7 @@ static int RLOG_FILE_ID=203; #define RLC_MODULE RLC_DBGMASK_UDX /* local defines */ -EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb, +S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb, RlcUdxStaPdu *pStaPdu, RlcUdxBufLst *rlsPduLst)); @@ -82,25 +79,16 @@ EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb, * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcDlUdxBndReq ( Pst *pst, SuId suId, SpId spId ) -#else -S16 rlcDlUdxBndReq (pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif { RlcUdxDlSapCb *udxSap; /* pointer to session SAP */ RlcCb *tRlcCb; - TRC3(rlcDlUdxBndReq); - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -130,7 +118,7 @@ SpId spId; /* Update the State */ udxSap->state = RLC_SAP_BND; - RLOG1(L_INFO, "UDX SAP state [%d]", udxSap->state); + DU_LOG("\nINFO --> RLC_DL : UDX SAP state [%d]", udxSap->state); break; } /* SAP is already bound */ @@ -148,7 +136,7 @@ SpId spId; RLC_SEND_SAPID_ALARM(tRlcCb, spId, LKW_EVENT_UDX_BND_REQ, LCM_CAUSE_INV_PAR_VAL); - RLOG0(L_ERROR, "UDX SAP already Bound"); + DU_LOG("\nERROR --> RLC_DL : UDX SAP already Bound"); rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK); } break; @@ -160,7 +148,7 @@ SpId spId; RLC_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_CKW_BND_REQ, LCM_CAUSE_INV_STATE); #endif /* ERRCLASS & ERRCLS_INT_PAR */ - RLOG0(L_ERROR, "Invalid UDX SAP State in Bind Req"); + DU_LOG("\nERROR --> RLC_DL : Invalid UDX SAP State in Bind Req"); rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK); break; } @@ -181,25 +169,16 @@ SpId spId; * @return S16 * -# ROK */ -#ifdef ANSI S16 rlcDlUdxUbndReq ( Pst *pst, SpId spId, Reason reason ) -#else -S16 rlcDlUdxUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif { RlcUdxDlSapCb *udxSap; RlcCb *tRlcCb; - TRC3(rlcDlUdxUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -209,7 +188,7 @@ Reason reason; tRlcCb = RLC_GET_RLCCB(pst->dstInst); - RLOG2(L_DEBUG,"Unbind Req for spId[%d], reason[%d]", + DU_LOG("\nDEBUG --> RLC_DL : Unbind Req for spId[%d], reason[%d]", spId, reason); UNUSED(reason); /* disable upper sap (CKW) */ @@ -244,27 +223,18 @@ Reason reason; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcDlUdxCfgReq ( Pst *pst, SpId spId, RlcCfgInfo *cfg ) -#else -S16 rlcDlUdxCfgReq(pst, spId, cfg) -Pst *pst; -SpId spId; -RlcCfgInfo *cfg; -#endif { RlcCfgCfmInfo *cfgCfm; - U8 idx; - RlcCb *tRlcCb; + uint8_t idx; + RlcCb *tRlcCb; Pst *pstUdxCfm; - TRC3(rlcDlUdxCfgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -285,7 +255,7 @@ RlcCfgInfo *cfg; #if (ERRCLASS & ERRCLS_ADD_RES) if (cfgCfm == NULLP) { - RLOG0(L_FATAL,"Memory Allocation Failed."); + DU_LOG("\nERROR --> RLC_DL : Memory Allocation Failed."); /* kw002.201 Freeing from proper region */ /* RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); */ return RFAILED; @@ -311,7 +281,7 @@ RlcCfgInfo *cfg; if (rlcCfgAddDlRb(tRlcCb,cfg->ueId, cfg->cellId,\ entCfg, entCfgCfm) != ROK) { - RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Addition Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : Addition Failed due to[%d]", entCfgCfm->status.reason); } } @@ -325,7 +295,7 @@ RlcCfgInfo *cfg; if (rlcCfgReCfgDlRb(tRlcCb,cfg->ueId, cfg->cellId,\ entCfg, entCfgCfm) != ROK) { - RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"ReCfg Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : ReCfg Failed due to[%d]", entCfgCfm->status.reason); } } @@ -340,7 +310,7 @@ RlcCfgInfo *cfg; if (rlcCfgDelDlRb(tRlcCb,cfg->ueId, cfg->cellId,\ entCfg, entCfgCfm) != ROK) { - RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Deletion Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : Deletion Failed due to[%d]", entCfgCfm->status.reason); } } @@ -363,7 +333,7 @@ RlcCfgInfo *cfg; if (rlcCfgReEstDlRb(tRlcCb,cfg->ueId, cfg->cellId, sndReEst,entCfg, entCfgCfm) != ROK) { - RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Reest Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : Reest Failed due to[%d]", entCfgCfm->status.reason); } } @@ -376,7 +346,7 @@ RlcCfgInfo *cfg; if (rlcCfgDelDlUe(tRlcCb,cfg->ueId, cfg->cellId, entCfg, entCfgCfm) != ROK) { - RLOG_ARG1(L_ERROR,DBG_UEID,cfg->ueId,"deletion Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : deletion Failed due to[%d]", entCfgCfm->status.reason); } break; @@ -386,7 +356,7 @@ RlcCfgInfo *cfg; if (rlcCfgDelDlCell(tRlcCb,cfg->cellId,entCfg,entCfgCfm) != ROK ) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->cellId,"deletion Failed due to[%d]", + DU_LOG("\nERROR --> RLC_DL : deletion Failed due to[%d]", entCfgCfm->status.reason); } break; @@ -396,7 +366,7 @@ RlcCfgInfo *cfg; { RLC_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType,\ CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_CFG); - RLOG0(L_ERROR, "Invalid CfgType"); + DU_LOG("\nERROR --> RLC_DL : Invalid CfgType"); } } } @@ -433,29 +403,18 @@ RlcCfgInfo *cfg; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcDlUdxUeIdChgReq ( Pst *pst, SpId spId, -U32 transId, +uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo ) -#else -S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo) -Pst *pst; -SpId spId; -U32 transId; -CkwUeInfo *ueInfo; -CkwUeInfo *newUeInfo; -#endif { CmStatus status; RlcCb *tRlcCb; - TRC3(rlcDlUdxUeIdChgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -477,7 +436,7 @@ CkwUeInfo *newUeInfo; if (rlcCfgDlUeIdChng(tRlcCb, ueInfo, newUeInfo, &status) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,"Failure due to[%d]", + DU_LOG("\nERROR --> RLC_DL : Failure due to[%d]", status.reason); } rlcDlUdxUeIdChgCfm(&(tRlcCb->u.dlCb->udxDlSap[spId].pst), @@ -501,7 +460,6 @@ CkwUeInfo *newUeInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rlcDlUdxStaPduReq ( Pst *pst, @@ -509,13 +467,6 @@ SpId spId, CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu ) -#else -S16 rlcDlUdxStaPduReq(pst, spId, rlcId, pStaPdu) -Pst *pst; -SpId spId; -CmLteRlcId *rlcId; -RlcUdxDlStaPdu *pStaPdu; -#endif { RlcDlRbCb *rbCb; RlcCb *tRlcCb; @@ -525,7 +476,7 @@ RlcUdxDlStaPdu *pStaPdu; rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb); /* Fetch DBM RbCb */ if (!rbCb) { - RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId [%u]:RbId[%d] not found", rlcId->cellId,rlcId->rbId); RLC_FREE_SHRABL_BUF(pst->region, pst->pool, @@ -534,19 +485,19 @@ RlcUdxDlStaPdu *pStaPdu; return RFAILED; } - AMDL.cntrlBo = pStaPdu->controlBo; + RLC_AMDL.cntrlBo = pStaPdu->controlBo; /* If there already exists a STAUS PDU, free it and take the new one into account */ - if(AMDL.pStaPdu) + if(RLC_AMDL.pStaPdu) { RLC_FREE_SHRABL_BUF(pst->region, pst->pool, - AMDL.pStaPdu, + RLC_AMDL.pStaPdu, sizeof(RlcUdxDlStaPdu)); } - AMDL.pStaPdu = pStaPdu; - rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &AMDL); + RLC_AMDL.pStaPdu = pStaPdu; + rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &RLC_AMDL); return (ROK); } @@ -564,7 +515,6 @@ RlcUdxDlStaPdu *pStaPdu; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rlcDlUdxStaUpdReq ( Pst* pst, @@ -572,13 +522,6 @@ SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu ) -#else -S16 rlcDlUdxStaUpdReq(pst, spId, rlcId,pStaPdu) -Pst* pst; -SpId spId; -CmLteRlcId *rlcId; -RlcUdxStaPdu *pStaPdu; -#endif { RlcCb *tRlcCb; RlcDlRbCb *rbCb; @@ -588,7 +531,7 @@ RlcUdxStaPdu *pStaPdu; rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb); if (!rbCb) { - RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId [%u]:RbId[%d] not found", rlcId->cellId,rlcId->rbId); return RFAILED; } @@ -606,25 +549,17 @@ RlcUdxStaPdu *pStaPdu; #ifdef LTE_L2_MEAS /** */ -#ifdef ANSI S16 rlcDlUdxL2MeasReq ( Pst *pst, RlcL2MeasReqEvt *measReqEvt ) -#else -S16 rlcDlUdxL2MeasReq (pst, measReqEvt) -Pst *pst; -RlcL2MeasReqEvt *measReqEvt; -#endif { - U32 cntr; - U8 measType; - VOLATILE U32 startTime = 0; + uint32_t cntr; + uint8_t measType; + volatile uint32_t startTime = 0; RlcCb *tRlcCb; - TRC3(rlcDlUdxL2MeasReq); - /*starting Task*/ SStartTask(&startTime, PID_RLC_MEAS_START); @@ -648,7 +583,7 @@ RlcL2MeasReqEvt *measReqEvt; else { /* for nonIpThroughput meas, enable only for the sent QCIs */ - U32 i; + uint32_t i; for(i = 0; i < LKW_MAX_QCI; i++) { tRlcCb->u.dlCb->rlcL2Cb.measOn[i] |= measType; @@ -681,32 +616,25 @@ After receving this request, RLC stops L2 Measurement * -# Failure : RFAILED */ -#ifdef ANSI S16 rlcDlUdxL2MeasStopReq ( Pst *pst, -U8 measType +uint8_t measType ) -#else -S16 rlcDlUdxL2MeasStopReq (pst, measType) -Pst *pst; -U8 measType; -#endif { /* S16 ret = ROK;*/ RlcL2MeasEvtCb *measEvtCb = NULLP; - U16 cntr; - U8 status = ROK; + uint16_t cntr; + uint8_t status = ROK; /* RlcL2MeasCfmEvt measCfmEvt; */ - VOLATILE U32 startTime = 0; + volatile uint32_t startTime = 0; RlcCb *tRlcCb=NULLP; - TRC3(rlcDlUdxMeasStopReq); /*starting Task*/ SStartTask(&startTime, PID_RLC_MEAS_STOP); tRlcCb = RLC_GET_RLCCB(pst->dstInst); -/* cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ +/* memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ /* reset the counters for the measurement type passed */ for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { @@ -743,24 +671,16 @@ After receving this request, RLC sends L2 Measurement * -# Failure : RFAILED */ -#ifdef ANSI S16 rlcDlUdxL2MeasSendReq ( Pst *pst, -U8 measType +uint8_t measType ) -#else -S16 rlcDlUdxL2MeasSendReq (pst, measType) -Pst *pst; -U8 measType; -#endif { RlcL2MeasEvtCb *measEvtCb; - U16 cntr; - - VOLATILE U32 startTime = 0; + uint16_t cntr; + volatile uint32_t startTime = 0; RlcCb *tRlcCb; - TRC3(rlcDlUdxMeasSendReq); tRlcCb = RLC_GET_RLCCB(pst->dstInst); for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)