X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lmm.c;h=08eae8cbdcc983446493a60cc045917a9851c8e6;hb=528b3d3a09d7486a0c549820bac601db60fde18e;hp=2772e41072451b59b70b347febf28c148558478c;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c index 2772e4107..08eae8cbd 100755 --- a/src/5gnrrlc/kw_lmm.c +++ b/src/5gnrrlc/kw_lmm.c @@ -79,23 +79,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)); @@ -123,13 +123,13 @@ PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action * LCM_REASON_HASHING_FAILED */ #ifdef ANSI -PRIVATE S16 rlcLmmGenCfg +static S16 rlcLmmGenCfg ( RlcCb *gCb, RlcGenCfg *cfg ) #else -PRIVATE S16 rlcLmmGenCfg(gCB,cfg) +static S16 rlcLmmGenCfg(gCB,cfg) RlcCb *gCb; RlcGenCfg *cfg; #endif @@ -140,8 +140,6 @@ RlcGenCfg *cfg; CmTqCp *rlcTqCp; Size rguSapSize; - TRC2(rlcLmmGenCfg) - if(cfg->maxUe > RLC_MAX_UE) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -262,7 +260,7 @@ RlcGenCfg *cfg; #if 0 /* Register the timer */ /*Pradeep: changing the SRegTmrMt() to SRegTmr()*/ - if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes, + if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes, rlcActvTmr) != ROK) { RLC_FREE(gCb,gCb->u.dlCb->udxDlSap, rlcUdxSapSize); @@ -364,7 +362,7 @@ RlcGenCfg *cfg; /* Register the timer */ #if 0 - if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes, + if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes, rlcActvTmr) != ROK) { RLC_FREE(gCb,gCb->u.ulCb->udxUlSap, rlcUdxSapSize); @@ -390,7 +388,7 @@ RlcGenCfg *cfg; /* Timer Initialization */ gCb->rlcTqCp.tmrLen = RLC_TMR_LEN; - cmMemset((U8*)gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN); + memset(gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN); RLC_MEM_CPY(&(gCb->init.lmPst), &cfg->lmPst, sizeof(Pst)); @@ -425,27 +423,25 @@ RlcGenCfg *cfg; * -# 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) +static Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr) RlcCb gCb; -Pst *pst; +Pst *pst; RlcMngmt *cfm; -U8 type; -Header *hdr; +uint8_t type; +Header *hdr; #endif { Pst rPst; /* Reply post structure */ - TRC2(rlcLmmSendCfm); - RLC_MEM_SET(&rPst, 0, sizeof(Pst)); /* reply post structure for confirmation */ @@ -505,7 +501,7 @@ Header *hdr; break; } - RETVOID; + return; } @@ -580,8 +576,6 @@ RlcMngmt *cfg; Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiRlcConfigReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -736,8 +730,6 @@ RlcMngmt *cntrl; Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwCntrlReq) - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -845,8 +837,6 @@ RlcMngmt *sta; Reason reason; /* Failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwStaReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -981,8 +971,6 @@ RlcMngmt *sts; Reason reason; /* Reason for failure */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwStsReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -1094,14 +1082,12 @@ RlcL2MeasReqEvt *measReqEvt; #endif { S16 ret = ROK; - U16 cntr; - U8 measType; + uint16_t cntr; + uint8_t measType; RlcL2MeasCfmEvt measCfmEvt; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasReq); - tRlcCb = RLC_GET_RLCCB(pst->dstInst); /* Initialize measCfmEvt */ @@ -1175,7 +1161,7 @@ RlcL2MeasReqEvt *measReqEvt; return RFAILED; } #endif - cmMemcpy((Void*)measEvt, (Void*)measReqEvt, sizeof(RlcL2MeasReqEvt)); + memcpy(measEvt, measReqEvt, sizeof(RlcL2MeasReqEvt)); /*Redirect the request to DL task */ /* NOTE:As of today, there are no cases where the Req will fail at DL as long as it reached the DL, so we don't wait for a confirmation from @@ -1214,23 +1200,21 @@ After receving this request, RLC stops L2 Measurement S16 RlcMiLkwL2MeasStopReq ( Pst *pst, -U8 measType +uint8_t measType ) #else S16 RlcMiLkwL2MeasStopReq (pst, measType) Pst *pst; -U8 measType; +uint8_t measType; #endif { S16 ret = ROK; RlcL2MeasEvtCb *measEvtCb = NULLP; - U16 cntr; - U8 status = ROK; + uint16_t cntr; + uint8_t status = ROK; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasStopReq); - tRlcCb = RLC_GET_RLCCB(pst->dstInst); /* reset the counter values for the measurement that is stopped */ @@ -1260,7 +1244,7 @@ U8 measType; rlcUlUdxL2MeasStopReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst),measType); /*return ROK;*/ } - /*cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ + /*memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ status = LCM_PRIM_OK; RlcMiLkwL2MeasStopCfm(&tRlcCb->genCfg.lmPst, measType,status); @@ -1282,19 +1266,18 @@ After receving this request, RLC sends L2 Measurement S16 RlcMiLkwL2MeasSendReq ( Pst *pst, -U8 measType +uint8_t measType ) #else S16 RlcMiLkwL2MeasSendReq (pst, measType) Pst *pst; -U8 measType; +uint8_t measType; #endif { /*S16 ret = ROK;*/ RlcL2MeasEvtCb *measEvtCb = NULLP; - U16 cntr; + uint16_t cntr; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasSendReq); tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -1338,19 +1321,18 @@ U8 measType; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgKwuSap +static S16 rlcLmmCfgKwuSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgKwuSap(gCb,cfg) +static S16 rlcLmmCfgKwuSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif { RlcKwuSapCb *rlcKwuSapCb; - TRC2(rlcLmmCfgKwuSap) #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ @@ -1395,21 +1377,19 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgCkwSap +static S16 rlcLmmCfgCkwSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgCkwSap(gCb,cfg) +static S16 rlcLmmCfgCkwSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif { RlcCkwSapCb *ckwSap; - TRC2(rlcLmmCfgCkwSap) - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate config parameters */ if ((cfg->sapId >= RLC_MAX_CKWSAPS) || (cfg->sapId < 0) ) @@ -1455,13 +1435,13 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgUdxSap +static S16 rlcLmmCfgUdxSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgUdxSap(gCb,cfg) +static S16 rlcLmmCfgUdxSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif @@ -1469,8 +1449,6 @@ RlcSapCfg *cfg; RlcUdxDlSapCb *udxDlSap; RlcUdxUlSapCb *udxUlSap; - TRC2(rlcLmmCfgUdxSap); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if((cfg->sapId >= RLC_MAX_UDXSAPS) || (cfg->sapId < 0)) @@ -1531,21 +1509,19 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgRguSap +static S16 rlcLmmCfgRguSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgRguSap(gCb,cfg) +static S16 rlcLmmCfgRguSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif { RlcRguSapCb *rguSap; - TRC2(rlcLmmCfgRguSap); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if((cfg->sapId >= gCb->genCfg.maxRguSaps) || \ @@ -1594,19 +1570,17 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmValidateGenCntrl +static S16 rlcLmmValidateGenCntrl ( RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmValidateGenCntrl(cntrl) +static S16 rlcLmmValidateGenCntrl(cntrl) RlcMngmt *cntrl; #endif { - S16 reason; /* reason for failure */ - U8 sAction; /* subaction field */ - - TRC2(rlcLmmValidateGenCntrl); + S16 reason; /* reason for failure */ + uint8_t sAction; /* subaction field */ reason = LCM_REASON_NOT_APPL; sAction = cntrl->t.cntrl.subAction; @@ -1641,20 +1615,18 @@ RlcMngmt *cntrl; * @return Void */ #ifdef ANSI -PRIVATE Void rlcLmmCleanGblRsrcs +static Void rlcLmmCleanGblRsrcs ( RlcCb *gCb ) #else -PRIVATE Void rlcLmmCleanGblRsrcs(gCb) +static Void rlcLmmCleanGblRsrcs(gCb) RlcCb *gCb; #endif { Size rlcSapSize; Size rlcUdxSapSize; - TRC2(rlcLmmCleanGblRsrcs) - if (gCb->init.cfgDone) { /* Deregister the timers */ @@ -1731,7 +1703,7 @@ RlcCb *gCb; gCb->init.usta = FALSE; } - RETVOID; + return; } /** @@ -1750,19 +1722,17 @@ RlcCb *gCb; * -# LCM_REASON_HASHING_FAILED */ #ifdef ANSI -PRIVATE S16 rlcLmmShutdown +static S16 rlcLmmShutdown ( RlcCb *gCb ) #else -PRIVATE S16 rlcLmmShutdown(gCb) +static S16 rlcLmmShutdown(gCb) RlcCb *gCb; #endif { RlcRguSapCb *rguSap; - U32 idx; - - TRC2(rlcLmmShutdown) + uint32_t idx; if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { @@ -1816,13 +1786,13 @@ RlcCb *gCb; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmGenCntrl +static S16 rlcLmmGenCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmGenCntrl(gCb,cntrl) +static S16 rlcLmmGenCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif @@ -1833,8 +1803,6 @@ RlcMngmt *cntrl; #endif /* DEBUGP */ S16 reason; /* reason for failure */ - TRC2(rlcLmmGenCntrl); - /* Validate control parameters */ reason = rlcLmmValidateGenCntrl (cntrl); @@ -1923,18 +1891,17 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmUdxSapCntrl +static S16 rlcLmmUdxSapCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmUdxSapCntrl(gCb,cntrl) +static S16 rlcLmmUdxSapCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif { - TRC2(rlcLmmUdxSapCntrl) #if (ERRCLASS & ERRCLS_INT_PAR) if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) @@ -2005,21 +1972,19 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmLSapCntrl +static S16 rlcLmmLSapCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmLSapCntrl(gCb,cntrl) +static S16 rlcLmmLSapCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif { RlcRguSapCb *rguSap; /* rgu sap pointer */ - TRC2(rlcLmmLSapCntrl) - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate SuId */ if((cntrl->t.cntrl.s.sapCntrl.suId < 0) || @@ -2090,21 +2055,19 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetKwuSapSta +static S16 rlcLmmGetKwuSapSta ( RlcCb *gCb, RlcKwuSapSta *sta ) #else -PRIVATE S16 rlcLmmGetKwuSapSta(gCb,sta) +static S16 rlcLmmGetKwuSapSta(gCb,sta) RlcCb *gCb; RlcKwuSapSta *sta; #endif { RlcKwuSapCb *rlcKwSapCb; - TRC2(rlcLmmGetKwuSapSta); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if ((sta->spId >= (S16)gCb->genCfg.maxKwuSaps)|| @@ -2135,18 +2098,17 @@ RlcKwuSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetRguSapSta +static S16 rlcLmmGetRguSapSta ( RlcCb *gCb, RlcRguSapSta *sta ) #else -PRIVATE S16 rlcLmmGetRguSapSta(gCb,sta) +static S16 rlcLmmGetRguSapSta(gCb,sta) RlcCb *gCb; RlcRguSapSta *sta; #endif { - TRC2(rlcLmmGetRguSapSta); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ @@ -2174,18 +2136,17 @@ RlcRguSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetCkwCntSapSta +static S16 rlcLmmGetCkwCntSapSta ( RlcCb *gCb, RlcCkwCntSapSta *sta ) #else -PRIVATE S16 rlcLmmGetCkwCntSapSta(gCb,sta) +static S16 rlcLmmGetCkwCntSapSta(gCb,sta) rlcCb *gCb, RlcCkwCntSapSta *sta; #endif { - TRC2(rlcLmmGetCkwCntSapSta); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate config parameters */ @@ -2214,20 +2175,19 @@ RlcCkwCntSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetGenSts +static S16 rlcLmmGetGenSts ( RlcCb *gCb, RlcGenSts *sts, Action action ) #else -PRIVATE S16 rlcLmmGetGenSts(gCb,sts, action) +static S16 rlcLmmGetGenSts(gCb,sts, action) RlcCb *gCb; RlcGenSts *sts; Action action; #endif { - TRC2(rlcLmmGetGenSts); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate protocol parameters */ @@ -2261,7 +2221,7 @@ Action action; * -# LCM_REASON_INVALID_PAR_VAL (FAIL) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetSapSts +static S16 rlcLmmGetSapSts ( RlcCb *gCb, RlcMngmt *sts, @@ -2269,14 +2229,13 @@ Elmnt elmnt, Action action ) #else -PRIVATE S16 rlcLmmGetSapSts(sts, elmnt, action) +static S16 rlcLmmGetSapSts(sts, elmnt, action) RlcCb *gCb; RlcMngmt *sts; Elmnt elmnt; Action action; #endif { - TRC2(rlcLmmGetSapSts); /* Validate protocol parameters */ if (action != LKW_ZEROSTS && action != LKW_NOZEROSTS) @@ -2351,53 +2310,51 @@ Action action; #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; +uint16_t category; +uint16_t event; +uint16_t cause; +SuId suId; +uint32_t ueId; +uint8_t 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; +RlcCb *gCb; +uint16_t category; +uint16_t event; +uint16_t cause; +SuId suId; +uint32_t ueId; #endif #endif /* LTE_L2_MEAS */ { RlcMngmt usta; /* Rlc Management Structure */ - TRC2(rlcLmmSendAlarm); - if(gCb->init.usta == FALSE) { - RETVOID; + return; } usta.hdr.elmId.elmnt = STGEN; @@ -2424,7 +2381,7 @@ U32 ueId; RlcMiLkwStaInd(&(gCb->init.lmPst), &usta); - RETVOID; + return; } @@ -2461,13 +2418,11 @@ Buffer *mBuf; MsgLen tempCnt; Pst pst; - TRC2(rlcLmmSendTrc) - RLOG2(L_DEBUG, "rlcLmmSendTrc(): Trace for event=%d, gCb->trcLen=%d", event, gCb->trcLen); - cmMemset((U8 *)&trc, 0, sizeof(RlcMngmt)); + memset(&trc, 0, sizeof(RlcMngmt)); pst = gCb->init.lmPst; @@ -2595,7 +2550,6 @@ Inst inst; #endif { RlcCb *gCb; - TRC2(rlcActvTmr) if (inst >= MAX_RLC_INSTANCES) {