X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lmm.c;h=25a5429c1a49d6a8482652f02e1c0d05ff17adca;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=615d6c605a124077aa8d5adf3e4f648ed626cf56;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c index 615d6c605..25a5429c1 100755 --- a/src/5gnrrlc/kw_lmm.c +++ b/src/5gnrrlc/kw_lmm.c @@ -18,7 +18,7 @@ /********************************************************************20** - Name: LTE - RLC - Layer Manager file + Name: NR RLC - Layer Manager file Type: C source file @@ -38,9 +38,6 @@ File: kw_lmm.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="LMM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=197; /** @file kw_lmm.c @brief RLC Layer Manager Module **/ @@ -79,23 +76,23 @@ RLCStats gRlcStats; * Forward Declaration of LKW Porting Functions ********************************************************************/ RlcCb *rlcCb[MAX_RLC_INSTANCES]; -EXTERN S16 rlcActvTmr ARGS ((Ent ent, Inst inst)); +S16 rlcActvTmr ARGS ((Ent ent, Inst inst)); -PRIVATE Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,U8 type, +static Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,uint8_t type, Header *hdr)); -PRIVATE S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg)); -PRIVATE S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta)); -PRIVATE S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta)); -PRIVATE S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta)); -PRIVATE S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action)); -PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action +static S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg)); +static S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta)); +static S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta)); +static S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta)); +static S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action)); +static S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action action)); @@ -122,17 +119,7 @@ PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action * LCM_REASON_INVALID_PAR_VAL * LCM_REASON_HASHING_FAILED */ -#ifdef ANSI -PRIVATE S16 rlcLmmGenCfg -( -RlcCb *gCb, -RlcGenCfg *cfg -) -#else -PRIVATE S16 rlcLmmGenCfg(gCB,cfg) -RlcCb *gCb; -RlcGenCfg *cfg; -#endif +static S16 rlcLmmGenCfg(RlcCb *gCb,RlcGenCfg *cfg) { Size rlcSapSize; Size rlcUdxSapSize; @@ -143,7 +130,7 @@ RlcGenCfg *cfg; if(cfg->maxUe > RLC_MAX_UE) { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG2(L_ERROR, "Invalid maxUe : Max [%lu] Received [%lu]", + DU_LOG("\nERROR --> RLC : Invalid maxUe : Max [%lu] Received [%lu]", RLC_MAX_UE, cfg->maxUe); #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -153,7 +140,7 @@ RlcGenCfg *cfg; if(cfg->maxKwuSaps > RLC_MAX_KWUSAPS) { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG2(L_ERROR, "Invalid maxKwuSaps : Max [%lu] Received [%lu]", + DU_LOG("\nERROR --> RLC : Invalid maxKwuSaps : Max [%lu] Received [%lu]", RLC_MAX_KWUSAPS, cfg->maxKwuSaps); #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -163,7 +150,7 @@ RlcGenCfg *cfg; if(cfg->maxUdxSaps > RLC_MAX_UDXSAPS) { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG2(L_ERROR, "Invalid maxUduSaps : Max [%lu] Received [%lu]", + DU_LOG("\nERROR --> RLC : Invalid maxUduSaps : Max [%lu] Received [%lu]", RLC_MAX_UDXSAPS, cfg->maxUdxSaps); #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -194,7 +181,7 @@ RlcGenCfg *cfg; RLC_ALLOC(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); if (gCb->u.dlCb == NULLP) { - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } @@ -208,7 +195,7 @@ RlcGenCfg *cfg; if(gCb->u.dlCb->rlcKwuDlSap == NULLP) { RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -224,7 +211,7 @@ RlcGenCfg *cfg; { RLC_FREE(gCb,gCb->u.dlCb->rlcKwuDlSap, rlcSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -254,13 +241,12 @@ RlcGenCfg *cfg; RLC_FREE(gCb,gCb->u.dlCb->rlcKwuDlSap, rlcSapSize); RLC_FREE(gCb,gCb->u.dlCb->rguDlSap, rguSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); - RLOG0(L_FATAL,"RLC DL Initialization failed"); + DU_LOG("\nERROR --> RLC_DL : RLC DL Initialization failed"); return (LCM_REASON_MEM_NOAVAIL); } -#if 0 + /* Register the timer */ -/*Pradeep: changing the SRegTmrMt() to SRegTmr()*/ - if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes, + if(ODU_REG_TMR_MT(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes, rlcActvTmr) != ROK) { RLC_FREE(gCb,gCb->u.dlCb->udxDlSap, rlcUdxSapSize); @@ -270,7 +256,7 @@ RlcGenCfg *cfg; return (LCM_REASON_REGTMR_FAIL); } -#endif + /* initializations for background processing of freeing memory */ rlcUtlInitToBeFreed(gCb, &(gCb->u.dlCb->toBeFreed)); rlcUtlInitializeSelfPst(gCb); @@ -296,7 +282,7 @@ RlcGenCfg *cfg; RLC_ALLOC(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); if (gCb->u.ulCb == NULLP) { - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } @@ -310,7 +296,7 @@ RlcGenCfg *cfg; if(gCb->u.ulCb->rlcKwuUlSap == NULLP) { RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -328,7 +314,7 @@ RlcGenCfg *cfg; { RLC_FREE(gCb,gCb->u.ulCb->rlcKwuUlSap, rlcSapSize); RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -357,12 +343,11 @@ RlcGenCfg *cfg; RLC_FREE(gCb,gCb->u.ulCb->rlcKwuUlSap, rlcSapSize); RLC_FREE(gCb,gCb->u.ulCb->rguUlSap, rlcSapSize); RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); - RLOG0(L_FATAL,"RLC DL Initialization failed"); + DU_LOG("\nERROR --> RLC_DL : RLC DL Initialization failed"); } /* Register the timer */ -#if 0 - if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes, + if(ODU_REG_TMR_MT(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes, rlcActvTmr) != ROK) { RLC_FREE(gCb,gCb->u.ulCb->udxUlSap, rlcUdxSapSize); @@ -372,7 +357,7 @@ RlcGenCfg *cfg; return (LCM_REASON_REGTMR_FAIL); } -#endif + #ifdef LTE_L2_MEAS rlcUtlL2MeasUlInit(gCb); #endif @@ -380,7 +365,7 @@ RlcGenCfg *cfg; else { #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG0(L_ERROR, "Received Invalid RLC Mode"); + DU_LOG("\nERROR --> RLC : Received Invalid RLC Mode"); #endif /* ERRCLASS & ERRCLS_INT_PAR */ return (LCM_REASON_INVALID_PAR_VAL); @@ -422,23 +407,14 @@ RlcGenCfg *cfg; * @return S16 * -# ROK */ -#ifdef ANSI -PRIVATE Void rlcLmmSendCfm +static Void rlcLmmSendCfm ( RlcCb *gCb, -Pst *pst, +Pst *pst, RlcMngmt *cfm, -U8 type, -Header *hdr +uint8_t type, +Header *hdr ) -#else -PRIVATE Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr) -RlcCb gCb; -Pst *pst; -RlcMngmt *cfm; -U8 type; -Header *hdr; -#endif { Pst rPst; /* Reply post structure */ @@ -492,7 +468,7 @@ Header *hdr; break; default: #if (ERRCLASS & ERRCLS_INT_PAR) - RLOG0(L_ERROR, "Received Invalid Message Type"); + DU_LOG("\nERROR --> RLC : Received Invalid Message Type"); if(!gCb) { fflush(stdout); @@ -501,7 +477,7 @@ Header *hdr; break; } - RETVOID; + return; } @@ -561,17 +537,7 @@ Header *hdr; * -# Failure : RFAILED */ -#ifdef ANSI -uint8_t RlcMiRlcConfigReq -( -Pst *pst, -RlcMngmt *cfg -) -#else -uint8_t RlcMiRlcConfigReq (pst, cfg) -Pst *pst; -RlcMngmt *cfg; -#endif +uint8_t RlcMiRlcConfigReq (Pst *pst,RlcMngmt *cfg) { Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; @@ -611,7 +577,7 @@ RlcMngmt *cfg; return (RFAILED); } - RLOG1(L_DEBUG, "RlcMiRlcConfigReq elmId(%d)", cfg->hdr.elmId.elmnt); + DU_LOG("\nDEBUG --> RLC : RlcMiRlcConfigReq elmId(%d)", cfg->hdr.elmId.elmnt); switch(cfg->hdr.elmId.elmnt) { @@ -715,17 +681,7 @@ RlcMngmt *cfg; * -# ROK * -# RFAILED */ -#ifdef ANSI -uint8_t RlcMiLkwCntrlReq -( -Pst *pst, -RlcMngmt *cntrl -) -#else -uint8_t RlcMiLkwCntrlReq(pst, cntrl) -Pst *pst; -RlcMngmt *cntrl; -#endif +uint8_t RlcMiLkwCntrlReq(Pst *pst, RlcMngmt *cntrl) { Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; @@ -759,7 +715,7 @@ RlcMngmt *cntrl; rlcLmmSendCfm(tRlcCb,pst, cntrl, TCNTRL, &cntrl->hdr); return (RFAILED); } - RLOG1(L_DEBUG, "RlcMiLkwCntrlReq(elmId(%d))", cntrl->hdr.elmId.elmnt); + DU_LOG("\nDEBUG --> RLC : RlcMiLkwCntrlReq(elmId(%d))", cntrl->hdr.elmId.elmnt); /* In normal cases, LCM_REASON_NOT_APPL is returned in cfm. * In all error cases appropriate reason is returned @@ -821,17 +777,7 @@ RlcMngmt *cntrl; * -# ROK (SUCCESS) * -# RFAILED */ -#ifdef ANSI -S16 RlcMiLkwStaReq -( -Pst *pst, -RlcMngmt *sta -) -#else -S16 RlcMiLkwStaReq(pst, sta) -Pst *pst; -RlcMngmt *sta; -#endif +S16 RlcMiLkwStaReq(Pst *pst,RlcMngmt *sta) { RlcMngmt rSta; /* Status */ Reason reason; /* Failure reason */ @@ -859,7 +805,7 @@ RlcMngmt *sta; return (RFAILED); } - RLOG1(L_DEBUG, "Status request for elmId(%d))", sta->hdr.elmId.elmnt); + DU_LOG("\nDEBUG --> RLC : Status request for elmId(%d))", sta->hdr.elmId.elmnt); reason = LCM_REASON_NOT_APPL; @@ -953,19 +899,7 @@ RlcMngmt *sta; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 RlcMiLkwStsReq -( -Pst *pst, -Action action, -RlcMngmt *sts -) -#else -S16 RlcMiLkwStsReq (pst, action, sts) -Pst *pst; -Action action; -RlcMngmt *sts; -#endif +S16 RlcMiLkwStsReq (Pst *pst, Action action,RlcMngmt *sts) { RlcMngmt rSts; /* Statistics */ Reason reason; /* Reason for failure */ @@ -993,7 +927,7 @@ RlcMngmt *sts; return (RFAILED); } - RLOG2(L_DEBUG, "RlcMiLkwStsReq(elmId(%d),action(%d))", + DU_LOG("\nDEBUG --> RLC : RlcMiLkwStsReq(elmId(%d),action(%d))", action, sts->hdr.elmId.elmnt); @@ -1069,21 +1003,11 @@ measurement confirm is sent. * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI -S16 RlcMiLkwL2MeasReq -( -Pst *pst, -RlcL2MeasReqEvt *measReqEvt -) -#else -S16 RlcMiLkwL2MeasReq (pst, measReqEvt) -Pst *pst; -RlcL2MeasReqEvt *measReqEvt; -#endif +S16 RlcMiLkwL2MeasReq(Pst *pst, RlcL2MeasReqEvt *measReqEvt) { S16 ret = ROK; - U16 cntr; - U8 measType; + uint16_t cntr; + uint8_t measType; RlcL2MeasCfmEvt measCfmEvt; RlcCb *tRlcCb; @@ -1157,7 +1081,7 @@ RlcL2MeasReqEvt *measReqEvt; #if (ERRCLASS & ERRCLS_ADD_RES) /* KW_FIX */ if(measEvt == NULLP) { - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return RFAILED; } #endif @@ -1196,23 +1120,13 @@ After receving this request, RLC stops L2 Measurement * -# Failure : RFAILED */ -#ifdef ANSI -S16 RlcMiLkwL2MeasStopReq -( -Pst *pst, -U8 measType -) -#else -S16 RlcMiLkwL2MeasStopReq (pst, measType) -Pst *pst; -U8 measType; -#endif +S16 RlcMiLkwL2MeasStopReq(Pst *pst,uint8_t measType) { S16 ret = ROK; RlcL2MeasEvtCb *measEvtCb = NULLP; - U16 cntr; - U8 status = ROK; + uint16_t cntr; + uint8_t status = ROK; RlcCb *tRlcCb; tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -1262,21 +1176,11 @@ After receving this request, RLC sends L2 Measurement * -# Failure : RFAILED */ -#ifdef ANSI -S16 RlcMiLkwL2MeasSendReq -( -Pst *pst, -U8 measType -) -#else -S16 RlcMiLkwL2MeasSendReq (pst, measType) -Pst *pst; -U8 measType; -#endif +S16 RlcMiLkwL2MeasSendReq(Pst *pst,uint8_t measType) { /*S16 ret = ROK;*/ RlcL2MeasEvtCb *measEvtCb = NULLP; - U16 cntr; + uint16_t cntr; RlcCb *tRlcCb; tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -1320,17 +1224,7 @@ U8 measType; * -# LCM_REASON_MEM_NOAVAIL * -# LCM_REASON_RECONFIG_FAIL */ -#ifdef ANSI -PRIVATE S16 rlcLmmCfgKwuSap -( -RlcCb *gCb, -RlcSapCfg *cfg -) -#else -PRIVATE S16 rlcLmmCfgKwuSap(gCb,cfg) -RlcCb *gCb; -RlcSapCfg *cfg; -#endif +static S16 rlcLmmCfgKwuSap(RlcCb *gCb,RlcSapCfg *cfg) { RlcKwuSapCb *rlcKwuSapCb; @@ -1350,7 +1244,7 @@ RlcSapCfg *cfg; /* Check for reconfiguration */ if (rlcKwuSapCb->state != RLC_SAP_NOT_CFG) { - RLOG2(L_ERROR,"RLC Mode [%d] : Invalid rlckwuSap State [%d]", + DU_LOG("\nERROR --> RLC : RLC Mode [%d] : Invalid rlckwuSap State [%d]", gCb->genCfg.rlcMode, rlcKwuSapCb->state); /* reconfiguration not allowed */ return (LCM_REASON_RECONFIG_FAIL); @@ -1376,17 +1270,7 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_SAP * -# LCM_REASON_RECONFIG_FAIL */ -#ifdef ANSI -PRIVATE S16 rlcLmmCfgCkwSap -( -RlcCb *gCb, -RlcSapCfg *cfg -) -#else -PRIVATE S16 rlcLmmCfgCkwSap(gCb,cfg) -RlcCb *gCb; -RlcSapCfg *cfg; -#endif +static S16 rlcLmmCfgCkwSap(RlcCb *gCb,RlcSapCfg *cfg) { RlcCkwSapCb *ckwSap; @@ -1410,7 +1294,7 @@ RlcSapCfg *cfg; /* Check for reconfiguration */ if(ckwSap->state != RLC_SAP_NOT_CFG) { - RLOG1(L_ERROR,"Invalid rlckwuSap State [%d]",ckwSap->state); + DU_LOG("\nERROR --> RLC : Invalid rlckwuSap State [%d]",ckwSap->state); return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1434,17 +1318,7 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_SAP * -# LCM_REASON_RECONFIG_FAIL */ -#ifdef ANSI -PRIVATE S16 rlcLmmCfgUdxSap -( -RlcCb *gCb, -RlcSapCfg *cfg -) -#else -PRIVATE S16 rlcLmmCfgUdxSap(gCb,cfg) -RlcCb *gCb; -RlcSapCfg *cfg; -#endif +static S16 rlcLmmCfgUdxSap(RlcCb *gCb,RlcSapCfg *cfg) { RlcUdxDlSapCb *udxDlSap; RlcUdxUlSapCb *udxUlSap; @@ -1464,7 +1338,7 @@ RlcSapCfg *cfg; /* Check for reconfiguration */ if(udxDlSap->state != RLC_SAP_NOT_CFG) { - RLOG1(L_ERROR,"Invalid udxDlSap State [%d]",udxDlSap->state); + DU_LOG("\nERROR --> RLC : Invalid udxDlSap State [%d]",udxDlSap->state); return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1480,7 +1354,7 @@ RlcSapCfg *cfg; /* Check for reconfiguration */ if(udxUlSap->state != RLC_SAP_NOT_CFG) { - RLOG1(L_ERROR,"Invalid udxUlSap State [%d]", udxUlSap->state); + DU_LOG("\nERROR --> RLC : Invalid udxUlSap State [%d]", udxUlSap->state); return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1508,17 +1382,7 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_SAP * -# LCM_REASON_RECONFIG_FAIL */ -#ifdef ANSI -PRIVATE S16 rlcLmmCfgRguSap -( -RlcCb *gCb, -RlcSapCfg *cfg -) -#else -PRIVATE S16 rlcLmmCfgRguSap(gCb,cfg) -RlcCb *gCb; -RlcSapCfg *cfg; -#endif +static S16 rlcLmmCfgRguSap(RlcCb *gCb,RlcSapCfg *cfg) { RlcRguSapCb *rguSap; @@ -1540,7 +1404,7 @@ RlcSapCfg *cfg; /* Check for reconfiguration */ if(rguSap->state != RLC_SAP_NOT_CFG) { - RLOG2(L_ERROR,"RLC Mode [%d]: Invalid rguSap State [%d]", + DU_LOG("\nERROR --> RLC : RLC Mode [%d]: Invalid rguSap State [%d]", gCb->genCfg.rlcMode, rguSap->state); return (LCM_REASON_RECONFIG_FAIL); } @@ -1569,18 +1433,10 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_SUBACTION * -# LCM_REASON_INVALID_ACTION */ -#ifdef ANSI -PRIVATE S16 rlcLmmValidateGenCntrl -( -RlcMngmt *cntrl -) -#else -PRIVATE S16 rlcLmmValidateGenCntrl(cntrl) -RlcMngmt *cntrl; -#endif +static S16 rlcLmmValidateGenCntrl(RlcMngmt *cntrl) { - S16 reason; /* reason for failure */ - U8 sAction; /* subaction field */ + S16 reason; /* reason for failure */ + uint8_t sAction; /* subaction field */ reason = LCM_REASON_NOT_APPL; sAction = cntrl->t.cntrl.subAction; @@ -1614,15 +1470,7 @@ RlcMngmt *cntrl; * * @return Void */ -#ifdef ANSI -PRIVATE Void rlcLmmCleanGblRsrcs -( -RlcCb *gCb -) -#else -PRIVATE Void rlcLmmCleanGblRsrcs(gCb) -RlcCb *gCb; -#endif +static Void rlcLmmCleanGblRsrcs(RlcCb *gCb) { Size rlcSapSize; Size rlcUdxSapSize; @@ -1703,7 +1551,7 @@ RlcCb *gCb; gCb->init.usta = FALSE; } - RETVOID; + return; } /** @@ -1721,18 +1569,10 @@ RlcCb *gCb; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_HASHING_FAILED */ -#ifdef ANSI -PRIVATE S16 rlcLmmShutdown -( -RlcCb *gCb -) -#else -PRIVATE S16 rlcLmmShutdown(gCb) -RlcCb *gCb; -#endif +static S16 rlcLmmShutdown(RlcCb *gCb) { RlcRguSapCb *rguSap; - U32 idx; + uint32_t idx; if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { @@ -1785,17 +1625,7 @@ RlcCb *gCb; * -# LCM_REASON_INVALID_SUBACTION * -# LCM_REASON_INVALID_ACTION */ -#ifdef ANSI -PRIVATE S16 rlcLmmGenCntrl -( -RlcCb *gCb, -RlcMngmt *cntrl -) -#else -PRIVATE S16 rlcLmmGenCntrl(gCb,cntrl) -RlcCb *gCb; -RlcMngmt *cntrl; -#endif +static S16 rlcLmmGenCntrl(RlcCb *gCb,RlcMngmt *cntrl) { RlcTrcCntrl *trcCntrl; /* trace */ #ifdef DEBUGP @@ -1890,17 +1720,7 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_STATE * -# LCM_REASON_INVALID_ACTION */ -#ifdef ANSI -PRIVATE S16 rlcLmmUdxSapCntrl -( -RlcCb *gCb, -RlcMngmt *cntrl -) -#else -PRIVATE S16 rlcLmmUdxSapCntrl(gCb,cntrl) -RlcCb *gCb; -RlcMngmt *cntrl; -#endif +static S16 rlcLmmUdxSapCntrl(RlcCb *gCb,RlcMngmt *cntrl) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1921,7 +1741,7 @@ RlcMngmt *cntrl; /* validate SAP */ if(UDX_SAP.state == RLC_SAP_NOT_CFG) { - RLOG0(L_ERROR,"udxUlSap not configured yet"); + DU_LOG("\nERROR --> RLC : udxUlSap not configured yet"); return (LCM_REASON_INVALID_STATE); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1933,7 +1753,7 @@ RlcMngmt *cntrl; if(UDX_SAP.state != RLC_SAP_BND) { /* start timer to wait for bind confirm */ - rlcStartTmr(gCb,(PTR)(&UDX_SAP), RLC_EVT_WAIT_BNDCFM); + rlcStartTmr(gCb,(PTR)(&UDX_SAP), EVENT_RLC_WAIT_BNDCFM); UDX_SAP.state = RLC_SAP_BINDING; rlcUlUdxBndReq(&(UDX_SAP.pst), UDX_SAP.suId, UDX_SAP.spId); } @@ -1971,17 +1791,7 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_STATE * -# LCM_REASON_INVALID_ACTION */ -#ifdef ANSI -PRIVATE S16 rlcLmmLSapCntrl -( -RlcCb *gCb, -RlcMngmt *cntrl -) -#else -PRIVATE S16 rlcLmmLSapCntrl(gCb,cntrl) -RlcCb *gCb; -RlcMngmt *cntrl; -#endif +static S16 rlcLmmLSapCntrl(RlcCb *gCb,RlcMngmt *cntrl) { RlcRguSapCb *rguSap; /* rgu sap pointer */ @@ -2003,7 +1813,7 @@ RlcMngmt *cntrl; /* validate SAP */ if(rguSap->state == RLC_SAP_NOT_CFG) { - RLOG1(L_ERROR,"RLC Mode [%d]:rguSap not configured yet", gCb->genCfg.rlcMode); + DU_LOG("\nERROR --> RLC : RLC Mode [%d]:rguSap not configured yet", gCb->genCfg.rlcMode); return (LCM_REASON_INVALID_STATE); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2015,7 +1825,7 @@ RlcMngmt *cntrl; if(rguSap->state != RLC_SAP_BND) { /* start timer to wait for bind confirm */ - rlcStartTmr(gCb,(PTR)(rguSap), RLC_EVT_WAIT_BNDCFM); + rlcStartTmr(gCb,(PTR)(rguSap), EVENT_RLC_WAIT_BNDCFM); rguSap->state = RLC_SAP_BINDING; rguSap->spId = cntrl->t.cntrl.s.sapCntrl.spId; rguSap->suId = cntrl->t.cntrl.s.sapCntrl.suId; @@ -2054,17 +1864,7 @@ RlcMngmt *cntrl; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ -#ifdef ANSI -PRIVATE S16 rlcLmmGetKwuSapSta -( -RlcCb *gCb, -RlcKwuSapSta *sta -) -#else -PRIVATE S16 rlcLmmGetKwuSapSta(gCb,sta) -RlcCb *gCb; -RlcKwuSapSta *sta; -#endif +static S16 rlcLmmGetKwuSapSta (RlcCb *gCb,RlcKwuSapSta *sta) { RlcKwuSapCb *rlcKwSapCb; @@ -2097,17 +1897,7 @@ RlcKwuSapSta *sta; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ -#ifdef ANSI -PRIVATE S16 rlcLmmGetRguSapSta -( -RlcCb *gCb, -RlcRguSapSta *sta -) -#else -PRIVATE S16 rlcLmmGetRguSapSta(gCb,sta) -RlcCb *gCb; -RlcRguSapSta *sta; -#endif +static S16 rlcLmmGetRguSapSta(RlcCb *gCb,RlcRguSapSta *sta) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -2135,17 +1925,7 @@ RlcRguSapSta *sta; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ -#ifdef ANSI -PRIVATE S16 rlcLmmGetCkwCntSapSta -( -RlcCb *gCb, -RlcCkwCntSapSta *sta -) -#else -PRIVATE S16 rlcLmmGetCkwCntSapSta(gCb,sta) -rlcCb *gCb, -RlcCkwCntSapSta *sta; -#endif +static S16 rlcLmmGetCkwCntSapSta(RlcCb *gCb,RlcCkwCntSapSta *sta) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -2174,19 +1954,7 @@ RlcCkwCntSapSta *sta; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ -#ifdef ANSI -PRIVATE S16 rlcLmmGetGenSts -( -RlcCb *gCb, -RlcGenSts *sts, -Action action -) -#else -PRIVATE S16 rlcLmmGetGenSts(gCb,sts, action) -RlcCb *gCb; -RlcGenSts *sts; -Action action; -#endif +static S16 rlcLmmGetGenSts(RlcCb *gCb,RlcGenSts *sts,Action action) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -2220,21 +1988,7 @@ Action action; * -# LCM_REASON_NOT_APPL (SUCCESS) * -# LCM_REASON_INVALID_PAR_VAL (FAIL) */ -#ifdef ANSI -PRIVATE S16 rlcLmmGetSapSts -( -RlcCb *gCb, -RlcMngmt *sts, -Elmnt elmnt, -Action action -) -#else -PRIVATE S16 rlcLmmGetSapSts(sts, elmnt, action) -RlcCb *gCb; -RlcMngmt *sts; -Elmnt elmnt; -Action action; -#endif +static S16 rlcLmmGetSapSts(RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt, Action action) { /* Validate protocol parameters */ @@ -2307,54 +2061,33 @@ Action action; * @return Void */ #ifdef LTE_L2_MEAS -#ifdef ANSI Void rlcLmmSendAlarm ( -RlcCb *gCb, -U16 category, -U16 event, -U16 cause, -SuId suId, -U32 ueId, -U8 qci +RlcCb *gCb, +uint16_t category, +uint16_t event, +uint16_t cause, +SuId suId, +uint32_t ueId, +uint8_t qci ) -#else -Void rlcLmmSendAlarm(category, event, cause, suId, ueId, qci) -RlcCb *gCb; -U16 category; -U16 event; -U16 cause; -SuId suId; -U32 ueId; -U8 qci; -#endif #else /* LTE_L2_MEAS */ -#ifdef ANSI Void rlcLmmSendAlarm ( -RlcCb *gCb, -U16 category, -U16 event, -U16 cause, -SuId suId, -U32 ueId +RlcCb *gCb, +uint16_t category, +uint16_t event, +uint16_t cause, +SuId suId, +uint32_t ueId ) -#else -Void rlcLmmSendAlarm(category, event, cause, suId, ueId) -RlcCb *gCb; -U16 category; -U16 event; -U16 cause; -SuId suId; -U32 ueId; -#endif #endif /* LTE_L2_MEAS */ { RlcMngmt usta; /* Rlc Management Structure */ if(gCb->init.usta == FALSE) { - RETVOID; + return; } usta.hdr.elmId.elmnt = STGEN; @@ -2381,7 +2114,7 @@ U32 ueId; RlcMiLkwStaInd(&(gCb->init.lmPst), &usta); - RETVOID; + return; } @@ -2397,19 +2130,7 @@ U32 ueId; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rlcLmmSendTrc -( -RlcCb *gCb, -Event event, -Buffer *mBuf -) -#else -S16 rlcLmmSendTrc(gCb,event, mBuf) -RlcCb *gCb; -Event event; -Buffer *mBuf; -#endif +S16 rlcLmmSendTrc(RlcCb *gCb,Event event,Buffer *mBuf) { RlcMngmt trc; /* RLC management control block */ Buffer *dstMbuf; @@ -2418,7 +2139,7 @@ Buffer *mBuf; MsgLen tempCnt; Pst pst; - RLOG2(L_DEBUG, "rlcLmmSendTrc(): Trace for event=%d, gCb->trcLen=%d", + DU_LOG("\nDEBUG --> RLC : rlcLmmSendTrc(): Trace for event=%d, gCb->trcLen=%d", event, gCb->trcLen); @@ -2440,7 +2161,7 @@ Buffer *mBuf; != ROK) { /* rg005.201 removed SPutSBuf on error */ - RLOG0(L_ERROR,"SCpyMsgMsg Failed"); + DU_LOG("\nERROR --> RLC : SCpyMsgMsg Failed"); return RFAILED; } /* Send Trace Indication to Layer manager */ @@ -2452,7 +2173,7 @@ Buffer *mBuf; /* Get the length of the recvd message buffer */ if (SFndLenMsg(mBuf, &bufLen) != ROK) { - RLOG0(L_ERROR,"SFndLenMsg Failed"); + DU_LOG("\nERROR --> RLC : SFndLenMsg Failed"); return RFAILED; } /* Check if the recvd buffer size is less than request trace len */ @@ -2463,7 +2184,7 @@ Buffer *mBuf; if (SCpyMsgMsg(mBuf, pst.region, pst.pool, &dstMbuf) != ROK) { - RLOG0(L_ERROR,"SCpyMsgMsg Failed"); + DU_LOG("\nERROR --> RLC : SCpyMsgMsg Failed"); return RFAILED; } @@ -2481,7 +2202,7 @@ Buffer *mBuf; { (Void) SPutSMem(RLC_GET_MEM_REGION(gCb), RLC_GET_MEM_POOL(gCb)); - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2489,19 +2210,19 @@ Buffer *mBuf; /* Copy trcLen nos of bytes from the recvd message */ if (SCpyMsgFix(mBuf,0,gCb->trcLen,tempBuf,&tempCnt) != ROK) { - RLOG0(L_ERROR,"SCpyMsgFix Failed"); + DU_LOG("\nERROR --> RLC : SCpyMsgFix Failed"); return RFAILED; } if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK) { - RLOG0(L_FATAL,"Memory Allocation failed"); + DU_LOG("\nERROR --> RLC : Memory Allocation failed"); return RFAILED; } /* Copy the tempBuf data to dst mBuf */ if (SCpyFixMsg(tempBuf,dstMbuf,0,gCb->trcLen,&tempCnt) != ROK) { - RLOG0(L_ERROR,"SCpyMsgFix Failed"); + DU_LOG("\nERROR --> RLC : SCpyMsgFix Failed"); return RFAILED; } @@ -2537,17 +2258,7 @@ Buffer *mBuf; * */ -#ifdef ANSI -S16 rlcActvTmr -( -Ent ent, -Inst inst -) -#else -S16 rlcActvTmr(ent,inst) -Ent ent; -Inst inst; -#endif +S16 rlcActvTmr(Ent ent,Inst inst) { RlcCb *gCb;