Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enabled timer at MAC and SCH [Issue-ID: ODUHIGH-283]
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_tmr.c
diff --git
a/src/5gnrrlc/kw_tmr.c
b/src/5gnrrlc/kw_tmr.c
index
1d1db7b
..
dc5c794
100755
(executable)
--- a/
src/5gnrrlc/kw_tmr.c
+++ b/
src/5gnrrlc/kw_tmr.c
@@
-32,10
+32,6
@@
File: kw_tmr.c
*********************************************************************21*/
File: kw_tmr.c
*********************************************************************21*/
-static const char* RLOG_MODULE_NAME="TMR";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=202;
-
/* header (.h) include files */
#include "common_def.h"
/* header (.h) include files */
#include "common_def.h"
@@
-90,7
+86,7
@@
static int RLOG_FILE_ID=202;
}
/* private function declarations */
}
/* private function declarations */
-
PRIVATE
Void rlcBndTmrExpiry(PTR cb);
+
static
Void rlcBndTmrExpiry(PTR cb);
/**
* @brief Handler to start timer
/**
* @brief Handler to start timer
@@
-102,19
+98,7
@@
PRIVATE Void rlcBndTmrExpiry(PTR cb);
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcStartTmr
-(
-RlcCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-Void rlcStartTmr (gCb,cb, tmrEvnt)
-RlcCb *gCb;
-PTR cb;
-S16 tmrEvnt;
-#endif
+void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
{
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
{
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
@@
-124,32
+108,30
@@
S16 tmrEvnt;
CmTmrArg arg;
arg.wait = 0;
CmTmrArg arg;
arg.wait = 0;
- TRC2(rlcStartTmr)
-
/* kw002.201 Adjusting the wait time as per timeRes configured by layer manager */
switch (tmrEvnt)
{
/* kw002.201 Adjusting the wait time as per timeRes configured by layer manager */
switch (tmrEvnt)
{
- case
RLC_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
RlcUmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
{
RlcUmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
- RLC_TMR_CALCUATE_WAIT(arg.wait, umUl->re
Ord
TmrInt, gCb->genCfg.timeRes);
+ RLC_TMR_CALCUATE_WAIT(arg.wait, umUl->re
Asmbl
TmrInt, gCb->genCfg.timeRes);
- arg.timers = &umUl->re
Ord
Tmr;
+ arg.timers = &umUl->re
Asmbl
Tmr;
arg.max = RLC_MAX_UM_TMR;
break;
}
arg.max = RLC_MAX_UM_TMR;
break;
}
- case
RLC_EVT_AMUL_REORD
_TMR:
+ case
EVENT_RLC_AMUL_REASSEMBLE
_TMR:
{
RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
{
RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
- RLC_TMR_CALCUATE_WAIT(arg.wait, amUl->re
Ord
TmrInt, gCb->genCfg.timeRes);
+ RLC_TMR_CALCUATE_WAIT(arg.wait, amUl->re
Asmbl
TmrInt, gCb->genCfg.timeRes);
- arg.timers = &amUl->re
Ord
Tmr;
+ arg.timers = &amUl->re
Asmbl
Tmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
{
RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
@@
-161,7
+143,7
@@
S16 tmrEvnt;
arg.max = RLC_MAX_AM_TMR;
break;
}
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
RlcAmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl);
/* kw005.201 Changed wait calculation ccpu00117634*/
{
RlcAmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl);
/* kw005.201 Changed wait calculation ccpu00117634*/
@@
-173,7
+155,7
@@
S16 tmrEvnt;
arg.max = RLC_MAX_AM_TMR;
break;
}
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
RlcRguSapCb* rguSap = (RlcRguSapCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
{
RlcRguSapCb* rguSap = (RlcRguSapCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
@@
-185,7
+167,7
@@
S16 tmrEvnt;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- case
RLC_EVT
_L2_TMR:
+ case
EVENT_RLC
_L2_TMR:
{
measEvtCb = (RlcL2MeasEvtCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
{
measEvtCb = (RlcL2MeasEvtCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
@@
-200,7
+182,7
@@
S16 tmrEvnt;
#endif
default:
{
#endif
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nERROR --> RLC : rlcStartTmr: Invalid tmr Evnt [%d]", tmrEvnt
);
}
}
}
}
@@
-215,7
+197,7
@@
S16 tmrEvnt;
cmPlcCbTq(&arg);
}
cmPlcCbTq(&arg);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-228,56
+210,43
@@
S16 tmrEvnt;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcStopTmr
-(
-RlcCb *gCb,
-PTR cb,
-U8 tmrType
-)
-#else
-Void rlcStopTmr (gCb, cb, tmrType)
-RlcCb *gCb;
-PTR cb;
-U8 tmrType;
-#endif
+void rlcStopTmr(RlcCb *gCb, PTR cb, uint8_t tmrType)
{
CmTmrArg arg;
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
RlcL2MeasEvtCb *measEvtCb = NULLP;
#endif
{
CmTmrArg arg;
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
RlcL2MeasEvtCb *measEvtCb = NULLP;
#endif
- TRC2(rlcStopTmr)
arg.timers = NULLP;
switch (tmrType)
{
arg.timers = NULLP;
switch (tmrType)
{
- case
RLC_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
{
- arg.timers = &((RlcUlRbCb *)cb)->m.umUl.re
Ord
Tmr;
+ arg.timers = &((RlcUlRbCb *)cb)->m.umUl.re
Asmbl
Tmr;
arg.max = RLC_MAX_UM_TMR;
break;
}
arg.max = RLC_MAX_UM_TMR;
break;
}
- case
RLC_EVT_AMUL_REORD
_TMR:
+ case
EVENT_RLC_AMUL_REASSEMBLE
_TMR:
{
{
- arg.timers = &((RlcUlRbCb *)cb)->m.amUl.re
Ord
Tmr;
+ arg.timers = &((RlcUlRbCb *)cb)->m.amUl.re
Asmbl
Tmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
{
arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
- case
RLC_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
arg.timers = &((RlcRguSapCb *)cb)->bndTmr;
arg.max = RLC_MAX_RGUSAP_TMR;
{
arg.timers = &((RlcRguSapCb *)cb)->bndTmr;
arg.max = RLC_MAX_RGUSAP_TMR;
@@
-285,7
+254,7
@@
U8 tmrType;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- case
RLC_EVT
_L2_TMR:
+ case
EVENT_RLC
_L2_TMR:
{
measEvtCb = (RlcL2MeasEvtCb *)cb;
arg.timers = &measEvtCb->l2Tmr;
{
measEvtCb = (RlcL2MeasEvtCb *)cb;
arg.timers = &measEvtCb->l2Tmr;
@@
-295,7
+264,7
@@
U8 tmrType;
#endif
default:
{
#endif
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nERROR --> RLC : rlcStopTmr: Invalid tmr Evnt[%d]", tmrType
);
}
}
if (tmrType != TMR0)
}
}
if (tmrType != TMR0)
@@
-309,7
+278,7
@@
U8 tmrType;
cmRmvCbTq(&arg);
}
cmRmvCbTq(&arg);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-325,44
+294,33
@@
U8 tmrType;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcTmrExpiry
-(
-PTR cb,
-S16 tmrEvnt
-)
-#else
-Void rlcTmrExpiry (cb, tmrEvnt)
-PTR cb;
-S16 tmrEvnt;
-#endif
+Void rlcTmrExpiry(PTR cb,S16 tmrEvnt)
{
/* kw005.201 added support for L2 Measurement */
{
/* kw005.201 added support for L2 Measurement */
- TRC2(rlcTmrExpiry)
switch (tmrEvnt)
{
switch (tmrEvnt)
{
- case
RLC_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
- rlcUmmRe
Ord
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+ rlcUmmRe
Asmbl
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
RLC_EVT_AMUL_REORD
_TMR:
+ case
EVENT_RLC_AMUL_REASSEMBLE
_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
- rlcAmmRe
Ord
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+ rlcAmmRe
Asmbl
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
RLC_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
rlcAmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
rlcAmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
- case
RLC_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
RlcDlRbCb *dlRbCb = (RlcDlRbCb *)cb;
RlcCb *gCb = RLC_GET_RLCCB(dlRbCb->inst);
{
RlcDlRbCb *dlRbCb = (RlcDlRbCb *)cb;
RlcCb *gCb = RLC_GET_RLCCB(dlRbCb->inst);
@@
-372,7
+330,7
@@
S16 tmrEvnt;
gCb->genSts.protTimeOut++;
break;
}
gCb->genSts.protTimeOut++;
break;
}
- case
RLC_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
rlcBndTmrExpiry(cb);
break;
{
rlcBndTmrExpiry(cb);
break;
@@
-384,7
+342,7
@@
S16 tmrEvnt;
}
}
}
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-399,55
+357,41
@@
S16 tmrEvnt;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-Bool rlcChkTmr
-(
-RlcCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-Bool rlcChkTmr(gCb,cb, tmrEvnt)
-RlcCb *gCb;
-PTR cb;
-S16 tmrEvnt;
-#endif
+bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
{
{
- TRC2(rlcChkTmr)
-
switch (tmrEvnt)
{
switch (tmrEvnt)
{
- case
RLC_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
{
- return (((RlcUlRbCb *)cb)->m.umUl.re
Ord
Tmr.tmrEvnt ==
-
RLC_EVT_UMUL_REORD
_TMR);
+ return (((RlcUlRbCb *)cb)->m.umUl.re
Asmbl
Tmr.tmrEvnt ==
+
EVENT_RLC_UMUL_REASSEMBLE
_TMR);
}
}
- case
RLC_EVT_AMUL_REORD
_TMR:
+ case
EVENT_RLC_AMUL_REASSEMBLE
_TMR:
{
{
- return (((RlcUlRbCb *)cb)->m.amUl.re
Ord
Tmr.tmrEvnt ==
-
RLC_EVT_AMUL_REORD
_TMR);
+ return (((RlcUlRbCb *)cb)->m.amUl.re
Asmbl
Tmr.tmrEvnt ==
+
EVENT_RLC_AMUL_REASSEMBLE
_TMR);
}
}
- case
RLC_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
return (((RlcUlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
{
return (((RlcUlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
-
RLC_EVT
_AMUL_STA_PROH_TMR);
+
EVENT_RLC
_AMUL_STA_PROH_TMR);
}
}
- case
RLC_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
return (((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
{
return (((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
-
RLC_EVT
_AMDL_POLL_RETX_TMR);
+
EVENT_RLC
_AMDL_POLL_RETX_TMR);
}
}
- case
RLC_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
{
- return (((RlcRguSapCb *)cb)->bndTmr.tmrEvnt ==
RLC_EVT
_WAIT_BNDCFM);
+ return (((RlcRguSapCb *)cb)->bndTmr.tmrEvnt ==
EVENT_RLC
_WAIT_BNDCFM);
}
default:
{
}
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nERROR --> RLC : rlcChkTmr: Invalid tmr Evnt [%d]", tmrEvnt
);
}
}
}
}
- return
(FALSE)
;
+ return
FALSE
;
}
/**
}
/**
@@
-462,20
+406,10
@@
S16 tmrEvnt;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-PRIVATE Void rlcBndTmrExpiry
-(
-PTR cb
-)
-#else
-PRIVATE Void rlcBndTmrExpiry(cb)
-PTR cb;
-#endif
+static Void rlcBndTmrExpiry(PTR cb)
{
RlcRguSapCb *rguSapCb;
{
RlcRguSapCb *rguSapCb;
- TRC2(rlcBndTmrExpiry)
-
rguSapCb = (RlcRguSapCb *) cb;
if (rguSapCb->state == RLC_SAP_BINDING)
rguSapCb = (RlcRguSapCb *) cb;
if (rguSapCb->state == RLC_SAP_BINDING)
@@
-485,7
+419,7
@@
PTR cb;
/* start timer to wait for bind confirm */
rlcStartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
(PTR)rguSapCb,
/* start timer to wait for bind confirm */
rlcStartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
(PTR)rguSapCb,
-
RLC_EVT
_WAIT_BNDCFM);
+
EVENT_RLC
_WAIT_BNDCFM);
/* Send bind request */
rguSapCb->retryCnt++;
/* Send bind request */
rguSapCb->retryCnt++;
@@
-516,7
+450,7
@@
PTR cb;
}
}
}
}
-
RETVOID
;
+
return
;
}
}