X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx_ul.c;h=34d7330d580f0e39da443e8d8f64e188a895c56e;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=6cd5ae1bd4ce445fbc221a8804161373d209bd34;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_udx_ul.c b/src/5gnrrlc/kw_udx_ul.c index 6cd5ae1bd..34d7330d5 100755 --- a/src/5gnrrlc/kw_udx_ul.c +++ b/src/5gnrrlc/kw_udx_ul.c @@ -18,7 +18,7 @@ /********************************************************************** - Name: LTE RLC layer + Name: NR RLC layer Type: C include file @@ -27,9 +27,6 @@ File: kw_udx_ul.c **********************************************************************/ -static const char* RLOG_MODULE_NAME="UDX"; -static int RLOG_MODULE_ID=262144; -static int RLOG_FILE_ID=204; /** @file kw_udx_ul.c @brief UDX Uplink Module @@ -60,9 +57,9 @@ static int RLOG_FILE_ID=204; #include "kw_dl.x" #include "kw_ul.x" -#include "rlc.h" #include "du_app_rlc_inf.h" #include "rlc_mgr.h" +#include "rlc_utils.h" #define RLC_MODULE RLC_DBGMASK_UDX /* local defines */ @@ -72,7 +69,7 @@ static int RLOG_FILE_ID=204; /* forward references */ /* public variable declarations */ -EXTERN S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb *gCb,RlcUlCfgTmpData *cfgTmpData, +S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb *gCb,RlcUlCfgTmpData *cfgTmpData, RlcCfgCfmInfo *cfmInfo, RlcCfgCfmInfo *cfgCfm)); /** @@ -96,27 +93,18 @@ EXTERN S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb *gCb,RlcUlCfgTmpData *cfgTmpData, * -# RFAILED */ -#ifdef ANSI S16 rlcUlUdxBndCfm ( Pst *pst, SuId suId, -U8 status +uint8_t status ) -#else -S16 rlcUlUdxBndCfm (pst, suId, status) -Pst *pst; -SuId suId; -U8 status; -#endif { - U16 event; - U16 cause; + uint16_t event; + uint16_t cause; RlcUdxUlSapCb *udxSap; /* RGU SAP Control Block */ RlcCb *tRlcCb; - TRC3(rlcUlUdxBndCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -131,7 +119,7 @@ U8 status; #if (ERRCLASS & ERRCLS_INT_PAR) if (tRlcCb->init.cfgDone != TRUE) { - RLOG0(L_FATAL, "General configuration not done"); + DU_LOG("\nERROR --> RLC_UL : General configuration not done"); RLC_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_STATE); @@ -140,7 +128,7 @@ U8 status; if (suId < 0) { - RLOG0(L_ERROR, "Invalid suId"); + DU_LOG("\nERROR --> RLC_UL : Invalid suId"); RLC_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID); @@ -158,9 +146,9 @@ U8 status; { case RLC_SAP_BINDING: { - if(TRUE == rlcChkTmr(tRlcCb,(PTR)udxSap,RLC_EVT_WAIT_BNDCFM)) + if(TRUE == rlcChkTmr(tRlcCb,(PTR)udxSap,EVENT_RLC_WAIT_BNDCFM)) { - rlcStopTmr (tRlcCb,(PTR)udxSap, RLC_EVT_WAIT_BNDCFM); + rlcStopTmr (tRlcCb,(PTR)udxSap, EVENT_RLC_WAIT_BNDCFM); } udxSap->retryCnt = 0; @@ -205,19 +193,12 @@ U8 status; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcUlUdxCfgCfm ( Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo ) -#else -S16 rlcUlUdxCfgCfm (pst, suId, cfmInfo) -Pst *pst; -SuId suId; -RlcCfgCfmInfo *cfmInfo; -#endif { RlcCb *tRlcCb; RlcCfgCfmInfo *cfgCfm; @@ -225,8 +206,6 @@ RlcCfgCfmInfo *cfmInfo; Pst rspPst; memset(&rspPst, 0, sizeof(Pst)); - TRC3(rlcUlUdxCfgCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -243,7 +222,7 @@ RlcCfgCfmInfo *cfmInfo; #if (ERRCLASS & ERRCLS_INT_PAR) if (suId < 0) { - RLOG0(L_ERROR, "Invalid suId"); + DU_LOG("\nERROR --> RLC_UL : Invalid suId"); RLC_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID); RLC_FREE_SHRABL_BUF(pst->region, @@ -256,7 +235,7 @@ RlcCfgCfmInfo *cfmInfo; if(ROK != rlcDbmFindUlTransaction(tRlcCb,cfmInfo->transId, &cfgTmpData)) { - RLOG0(L_ERROR, "Invalid transId"); + DU_LOG("\nERROR --> RLC_UL : Invalid transId"); RLC_FREE_SHRABL_BUF(pst->region, pst->pool, cfmInfo, @@ -277,7 +256,7 @@ RlcCfgCfmInfo *cfmInfo; #if (ERRCLASS & ERRCLS_ADD_RES) if (cfgCfm == NULLP) { - RLOG0(L_FATAL, "Memory Allocation failed."); + DU_LOG("\nERROR --> RLC_UL : Memory Allocation failed."); RLC_FREE_SHRABL_BUF(pst->region, pst->pool, cfmInfo, @@ -286,8 +265,15 @@ RlcCfgCfmInfo *cfmInfo; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ rlcHdlCrlcUlCfgReq(tRlcCb,cfgTmpData, cfmInfo, cfgCfm); - FILL_PST_RLC_TO_DUAPP(rspPst, tRlcCb->genCfg.lmPst.dstProcId, RLC_UL_INST, EVENT_RLC_UL_UE_CREATE_RSP); - SendRlcUlUeCreateRspToDu(&rspPst, cfgCfm); + if(tRlcCb->u.ulCb->rlcUlUdxEventType == EVENT_RLC_UE_CREATE_REQ) + { + FILL_PST_RLC_TO_DUAPP(rspPst, RLC_UL_INST, EVENT_RLC_UE_CREATE_RSP); + } + else if(tRlcCb->u.ulCb->rlcUlUdxEventType == EVENT_RLC_UE_RECONFIG_REQ) + { + FILL_PST_RLC_TO_DUAPP(rspPst, RLC_UL_INST, EVENT_RLC_UE_RECONFIG_RSP); + } + SendRlcUeRspToDu(&rspPst, cfgCfm); /* free the memory from DL */ RLC_FREE_SHRABL_BUF(pst->region, @@ -318,27 +304,17 @@ RlcCfgCfmInfo *cfmInfo; * -# RFAILED */ -#ifdef ANSI S16 rlcUlUdxUeIdChgCfm ( Pst *pst, SuId suId, -U32 transId, +uint32_t transId, CmStatus status ) -#else -S16 rlcUlUdxUeIdChgCfm (pst, suId, cfmInfo) -Pst *pst; -SuId suId; -U32 transId; -CmStatus status; -#endif { RlcCb *tRlcCb; RlcUlCfgTmpData *cfgTmpData; - TRC3(rlcUlUdxUeIdChgCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -352,14 +328,14 @@ CmStatus status; #if (ERRCLASS & ERRCLS_INT_PAR) if (suId < 0) { - RLOG0(L_ERROR, "Invalid suId"); + DU_LOG("\nERROR --> RLC_UL : Invalid suId"); return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ if(ROK != rlcDbmFindUlTransaction(tRlcCb, transId, &cfgTmpData)) { - RLOG0(L_ERROR, "Invalid transId"); + DU_LOG("\nERROR --> RLC_UL : Invalid transId"); return (RFAILED); } @@ -381,7 +357,7 @@ CmStatus status; /* only newUeInfo needs to be freed here, ueInfo would be freed at the interface or by he receipient in case of tight coupling */ RLC_PST_FREE(pst->region, pst->pool, cfgTmpData->newUeInfo, sizeof(CkwUeInfo)); - RLC_FREE_WC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData)); + RLC_FREE(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData)); return ROK; } @@ -417,13 +393,13 @@ CmLteRlcId *rlcId rlcDbmFetchUlRbCbByRbId(tRlcCb, rlcId, &rbCb); if (rbCb == NULLP) { - RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found", + DU_LOG("\nERROR --> RLC_UL : CellId [%u]:RbId[%d] not found", rlcId->cellId,rlcId->rbId); return RFAILED; } /* Start staProhTmr */ - rlcStartTmr(tRlcCb,(PTR)rbCb, RLC_EVT_AMUL_STA_PROH_TMR); + rlcStartTmr(tRlcCb,(PTR)rbCb, EVENT_RLC_AMUL_STA_PROH_TMR); return (ROK); } @@ -441,7 +417,6 @@ CmLteRlcId *rlcId * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcHdlCrlcUlCfgReq ( RlcCb *gCb, @@ -449,17 +424,10 @@ RlcUlCfgTmpData *cfgTmpData, RlcCfgCfmInfo *cfmInfo, RlcCfgCfmInfo *cfgCfm ) -#else -S16 rlcHdlCrlcUlCfgReq(gCb,cfgTmpData,cfmInfo,cfmInfo) -RlcCb *gCb; -RlcUlCfgTmpData *cfgTmpData; -RlcCfgCfmInfo *cfmInfo; -RlcCfgCfmInfo *cfgCfm; -#endif { RlcCfgInfo *cfg; - U32 idx; - U32 maxEnt; + uint32_t idx; + uint32_t maxEnt; cfg = cfgTmpData->cfgInfo; maxEnt = (cfg->numEnt < CKW_MAX_ENT_CFG)? cfg->numEnt:CKW_MAX_ENT_CFG; @@ -511,7 +479,7 @@ RlcCfgCfmInfo *cfgCfm; { RLC_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_DIR); - RLOG_ARG2(L_ERROR,DBG_UEID,cfg->ueId,"RBID[%d] direction[%d] is invalid", + DU_LOG("\nDEBUG --> RLC_UL : RBID[%d] direction[%d] is invalid", entCfg->rbId,entCfg->dir); } break; @@ -582,7 +550,7 @@ RlcCfgCfmInfo *cfgCfm; RLC_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_CFG); - RLOG0(L_ERROR,"Invalid configuration type"); + DU_LOG("\nERROR --> RLC_UL : Invalid configuration type"); } } }