X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_uim.c;h=39eb209950908b7a47cdd910807cdd7bf189a1c8;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=daf15f8d73bc85c2a308674c4178ad1fb01ca731;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c index daf15f8d7..39eb20995 100755 --- a/src/5gnrrlc/kw_uim.c +++ b/src/5gnrrlc/kw_uim.c @@ -18,7 +18,7 @@ /********************************************************************20** - Name: LTE-RLC Layer - Upper Interface Functions + Name: NR RLC Layer - Upper Interface Functions Type: C file @@ -37,10 +37,6 @@ File: kw_uim.c **********************************************************************/ -static const char* RLOG_MODULE_NAME="UIM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=205; - /** * @file kw_uim.c * @brief RLC Upper Interface Module @@ -97,25 +93,16 @@ static int RLOG_FILE_ID=205; * -# RFAILED * */ -#ifdef ANSI S16 RlcUiCkwBndReq ( Pst *pst, SuId suId, SpId spId ) -#else -S16 RlcUiCkwBndReq (pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif { RlcCkwSapCb *ckwSap; RlcCb *tRlcCb; - TRC3(RlcUiCkwBndReq); - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -125,7 +112,7 @@ SpId spId; tRlcCb = RLC_GET_RLCCB(pst->dstInst); - RLOG2(L_DEBUG, "spId(%d), suId(%d)", spId, suId); + DU_LOG("\nDEBUG --> RLC_UL : spId(%d), suId(%d)", spId, suId); ckwSap = &(tRlcCb->u.ulCb->ckwSap); /* Take action based on the current state of the SAP */ switch(ckwSap->state) @@ -143,7 +130,7 @@ SpId spId; /* Update the State */ ckwSap->state = RLC_SAP_BND; - RLOG1(L_DEBUG, "RlcUiCkwBndReq: state (%d)", ckwSap->state); + DU_LOG("\nDEBUG --> RLC_UL : RlcUiCkwBndReq: state (%d)", ckwSap->state); break; } case RLC_SAP_BND: @@ -160,7 +147,7 @@ SpId spId; LKW_EVENT_CKW_BND_REQ, LCM_CAUSE_INV_PAR_VAL); - RLOG0(L_ERROR, "CKW SAP already Bound"); + DU_LOG("\nERROR --> RLC_UL : CKW SAP already Bound"); RlcUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK); return (RFAILED); } @@ -169,7 +156,7 @@ SpId spId; default: { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG0(L_ERROR, "Invalid CKW SAP State in Bind Req"); + DU_LOG("\nERROR --> RLC_UL : Invalid CKW SAP State in Bind Req"); RLC_SEND_SAPID_ALARM(tRlcCb, spId, LKW_EVENT_CKW_BND_REQ, @@ -204,24 +191,15 @@ SpId spId; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiCkwUbndReq ( Pst *pst, SpId spId, Reason reason ) -#else -S16 RlcUiCkwUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif { RlcCb *tRlcCb; - TRC3(RlcUiCkwUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -230,7 +208,7 @@ Reason reason; #endif /* ERRCLASS & ERRCLS_INT_PAR */ tRlcCb = RLC_GET_RLCCB(pst->dstInst); - RLOG2(L_DEBUG,"spId(%d), reason(%d)", + DU_LOG("\nDEBUG --> RLC_UL : spId(%d), reason(%d)", spId, reason); @@ -264,26 +242,17 @@ Reason reason; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcProcCfgReq ( Pst *pst, RlcCfgInfo *cfg ) -#else -S16 RlcProcCfgReq(pst, cfg) -Pst *pst; -RlcCfgInfo *cfg; -#endif { RlcCb *tRlcCb; RlcUlCfgTmpData *cfgTmpData; - static U32 transCount; - + static uint32_t transCount; - TRC3(RlcProcCfgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -307,9 +276,10 @@ RlcCfgInfo *cfg; cfgTmpData->cfgInfo = cfg; + tRlcCb->u.ulCb->rlcUlUdxEventType = pst->event; if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData) != ROK) { - RLOG0(L_ERROR, "Addition to UL transId Lst Failed"); + DU_LOG("\nERROR --> RLC_UL : Addition to UL transId Lst Failed"); RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); return RFAILED; @@ -340,30 +310,19 @@ RlcCfgInfo *cfg; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiCkwUeIdChgReq ( Pst *pst, SpId spId, -U32 transId, +uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo ) -#else -S16 RlcUiCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo) -Pst *pst; -SpId spId; -U32 transId; -CkwUeInfo *ueInfo; -CkwUeInfo *newUeInfo; -#endif { S16 ret = ROK; RlcCb *tRlcCb; RlcUlCfgTmpData *cfgTmpData = NULLP; - TRC3(RlcUiCkwUeIdChgReq) - do { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -376,15 +335,12 @@ CkwUeInfo *newUeInfo; tRlcCb = RLC_GET_RLCCB(pst->dstInst); #ifndef ALIGN_64BIT - RLOG_ARG2(L_DEBUG,DBG_CELLID,newUeInfo->cellId, - "RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%ld))", + DU_LOG("\nDEBUG --> RLC_UL : RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%ld))", spId, transId); #else - RLOG_ARG2(L_DEBUG,DBG_CELLID,newUeInfo->cellId, - "RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%d))\n", - spId, - transId); + DU_LOG("\nDEBUG --> RLC_UL : RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%d))\n", + spId, transId); #endif RLC_ALLOC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData)); @@ -400,7 +356,7 @@ CkwUeInfo *newUeInfo; if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData)) { - RLOG0(L_ERROR, "Addition to UL transId Lst Failed"); + DU_LOG("\nERROR --> RLC_UL : Addition to UL transId Lst Failed"); ret = RFAILED; break; } @@ -424,8 +380,7 @@ CkwUeInfo *newUeInfo; if(ROK != rlcCfgValidateUeIdChng(tRlcCb,ueInfo,newUeInfo,cfgTmpData)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgTmpData->ueInfo->cellId, - "Validation Failure for UeId change"); + DU_LOG("\nERROR --> RLC_UL : Validation Failure for UeId change"); } rlcUlUdxUeIdChgReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst), @@ -450,23 +405,14 @@ CkwUeInfo *newUeInfo; * -# ROK * -# RFAILED */ -#ifdef ANSI Void rlcUlHdlCfgReq ( -RlcCb *gCb, -RlcUlCfgTmpData *cfgTmpData, -RlcCfgInfo *cfg +RlcCb *gCb, +RlcUlCfgTmpData *cfgTmpData, +RlcCfgInfo *cfg ) -#else -Void rlcUlHdlCfgReq(gCb, cfgTmpData, cfg) -RlcCb *gCb; -RlcUlCfgTmpData *cfgTmpData; -RlcCfgInfo *cfg; -#endif { - U8 idx; - - TRC3(rlcUlHdlCfgReq) + uint8_t idx; cfgTmpData->ueId = cfg->ueId; cfgTmpData->cellId = cfg->cellId; @@ -490,8 +436,7 @@ RlcCfgInfo *cfg; &cfgTmpData->cfgEntData[idx], cfgTmpData)) { - RLOG_ARG2(L_ERROR,DBG_UEID, cfgTmpData->ueId, - "CELLID [%u]:Validation Failure for UL RB [%d]", + DU_LOG("\nERROR --> RLC_UL : CELLID [%u]:Validation Failure for UL RB [%d]", cfg->cellId,cfg->entCfg[idx].rbId); cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK; /*Validation is getting failed so no need to do configuration at DL. @@ -522,8 +467,7 @@ RlcCfgInfo *cfg; &cfg->entCfg[idx], &cfgTmpData->cfgEntData[idx])) { - RLOG_ARG2(L_ERROR,DBG_UEID,cfg->ueId, - "CellID [%u]:Validation Failure for Reest UL RB [%d]", + DU_LOG("\nERROR --> RLC_UL : CellID [%u]:Validation Failure for Reest UL RB [%d]", cfg->cellId,cfg->entCfg[idx].rbId); cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK; /* Setting dir as UL, so that no configuration is done at DL */ @@ -552,8 +496,7 @@ RlcCfgInfo *cfg; &cfgTmpData->cfgEntData[idx], cfgTmpData)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->cellId, - "UL UEID [%d]:Validation Failure", + DU_LOG("\nERROR --> RLC_UL : UL UEID [%d]:Validation Failure", cfgTmpData->ueId); cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK; /* Setting dir as UL, so that no configuration is done at DL */ @@ -569,8 +512,7 @@ RlcCfgInfo *cfg; &cfgTmpData->cfgEntData[idx], cfgTmpData)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfg->cellId, - "Del UL Cell Validation Failure"); + DU_LOG("\nERROR --> RLC_UL : Del UL Cell Validation Failure"); cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK; /* Setting dir as UL, so that no configuration is done at DL */ cfg->entCfg[idx].dir = RLC_DIR_UL; @@ -579,7 +521,7 @@ RlcCfgInfo *cfg; } }/* switch end */ }/* for end */ - RETVOID; + return; } @@ -606,25 +548,16 @@ RlcCfgInfo *cfg; * -# RFAILED * */ -#ifdef ANSI S16 RlcUiKwuBndReq ( Pst *pst, SuId suId, SpId spId ) -#else -S16 RlcUiKwuBndReq (pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif { RlcKwuSapCb *rlckwuSap; /* SAP Config Block */ RlcCb *tRlcCb; - TRC3(RlcUiKwuBndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -632,13 +565,13 @@ SpId spId; } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); - RLOG2(L_DEBUG, "RlcUiKwuBndReq(pst, spId(%d), suId(%d))", spId, suId); + DU_LOG("\nDEBUG --> RLC_UL : RlcUiKwuBndReq(pst, spId(%d), suId(%d))", spId, suId); /* Validation of input parameters */ #if (ERRCLASS & ERRCLS_INT_PAR) if(!((spId < (S16) tRlcCb->genCfg.maxKwuSaps) && (spId >=0))) { - RLOG0(L_ERROR,"Invalid spId"); + DU_LOG("\nERROR --> RLC_UL : Invalid spId"); RLC_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP); return RFAILED; } @@ -665,7 +598,7 @@ SpId spId; /* Update the State */ rlckwuSap->state = RLC_SAP_BND; - RLOG1(L_DEBUG, "RlcUiKwuBndReq: state (%d)", rlckwuSap->state); + DU_LOG("\nDEBUG --> RLC_UL : RlcUiKwuBndReq: state (%d)", rlckwuSap->state); break; } case RLC_SAP_BND: @@ -680,7 +613,7 @@ SpId spId; spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_PAR_VAL); - RLOG1(L_ERROR,"RLC Mode [%d] : KWU SAP already Bound", + DU_LOG("\nERROR --> RLC_UL : RLC Mode [%d] : KWU SAP already Bound", tRlcCb->genCfg.rlcMode); RlcUiKwuBndCfm(&(rlckwuSap->pst), rlckwuSap->suId, CM_BND_NOK); return (RFAILED); @@ -691,7 +624,7 @@ SpId spId; default: { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG1(L_ERROR,"RLC Mode [%d]:Invalid KWU SAP State in Bind Req", + DU_LOG("\nERROR --> RLC_UL : RLC Mode [%d]:Invalid KWU SAP State in Bind Req", tRlcCb->genCfg.rlcMode); RLC_SEND_SAPID_ALARM(tRlcCb, spId, @@ -725,25 +658,16 @@ SpId spId; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuUbndReq ( Pst *pst, SpId spId, Reason reason ) -#else -S16 RlcUiKwuUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif { RlcKwuSapCb *rlckwuSap; /* KWU SAP control block */ RlcCb *tRlcCb; - TRC3(RlcUiKwuUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if ((pst->dstInst >= MAX_RLC_INSTANCES) || (spId >= (S16) rlcCb[pst->dstInst]->genCfg.maxKwuSaps) || @@ -755,7 +679,7 @@ Reason reason; tRlcCb = RLC_GET_RLCCB(pst->dstInst); - RLOG2(L_DEBUG, "spId(%d), reason(%d)", + DU_LOG("\nDEBUG --> RLC_UL : spId(%d), reason(%d)", spId, reason); @@ -785,13 +709,13 @@ Reason reason; * -# ROK * -# RFAILED */ -uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf) +uint8_t rlcProcDlData(Pst *pst, RlcDatReqInfo *datReq, Buffer *mBuf) { uint8_t ret = ROK; /* Return Value */ RlcDlRbCb *rbCb; /* RB Control Block */ RlcCb *tRlcCb; - DU_LOG("\nRLC : Received DL Data"); + DU_LOG("\nDEBUG --> RLC_DL : Received DL Data"); #if (ERRCLASS & ERRCLS_INT_PAR) if(pst->dstInst >= MAX_RLC_INSTANCES) @@ -807,9 +731,9 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf) rlcDbmFetchDlRbCbByRbId(tRlcCb, &datReq->rlcId, &rbCb); if(!rbCb) { - DU_LOG("\nRLC : CellId[%u]:DL RbId [%d] not found", + DU_LOG("\nERROR --> RLC_DL : CellId[%u]:DL RbId [%d] not found", datReq->rlcId.cellId,datReq->rlcId.rbId); - RLC_FREE_BUF(mBuf); + ODU_PUT_MSG_BUF(mBuf); return RFAILED; } @@ -817,15 +741,15 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf) /* Dispatch according to mode of the rbCb */ switch (rbCb->mode) { - case CM_LTE_MODE_TM: + case RLC_MODE_TM: { /* Verify the user */ if (pst->srcEnt != ENTNH) { /* kw002.201 Freeing from proper region */ RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq, - sizeof(KwuDatReqInfo)); - RLC_FREE_BUF(mBuf); + sizeof(RlcDatReqInfo)); + ODU_PUT_MSG_BUF(mBuf); return RFAILED; } @@ -833,20 +757,19 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf) rlcTmmQSdu(tRlcCb,rbCb, datReq, mBuf); break; } - case CM_LTE_MODE_UM: + case RLC_MODE_UM: { rlcUmmQSdu(tRlcCb,rbCb, datReq, mBuf); - break; } - case CM_LTE_MODE_AM: + case RLC_MODE_AM: { rlcAmmQSdu(tRlcCb,rbCb, mBuf, datReq); break; } default: { - DU_LOG("\nRLC : Invalid RB Mode"); + DU_LOG("\nERROR --> RLC_DL : Invalid RB Mode"); break; } } @@ -872,19 +795,12 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuDiscSduReq ( Pst *pst, SpId spId, KwuDiscSduInfo *discSdu ) -#else -S16 RlcUiKwuDiscSduReq(pst, spId, discSdu) -Pst *pst; -SpId spId; -KwuDiscSduInfo *discSdu; -#endif { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo)); return ROK;