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
JIRA-ID ODUHIGH-275 classification of logs of RLC part -3
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_tmr.c
diff --git
a/src/5gnrrlc/kw_tmr.c
b/src/5gnrrlc/kw_tmr.c
index
76bfb93
..
d2927e2
100755
(executable)
--- a/
src/5gnrrlc/kw_tmr.c
+++ b/
src/5gnrrlc/kw_tmr.c
@@
-111,17
+111,17
@@
void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
/* 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_REORD_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*/
@@
-131,7
+131,7
@@
void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
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*/
@@
-143,7
+143,7
@@
void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t 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*/
@@
-155,7
+155,7
@@
void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t 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*/
@@
-167,7
+167,7
@@
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
- 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*/
@@
-222,31
+222,31
@@
void rlcStopTmr(RlcCb *gCb, PTR cb, uint8_t tmrType)
switch (tmrType)
{
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_REORD_TMR:
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr;
arg.max = RLC_MAX_AM_TMR;
break;
}
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr;
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;
@@
-254,7
+254,7
@@
void rlcStopTmr(RlcCb *gCb, PTR cb, uint8_t 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;
@@
-300,27
+300,27
@@
Void rlcTmrExpiry(PTR cb,S16 tmrEvnt)
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_REORD_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
rlcAmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
rlcAmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
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);
@@
-330,7
+330,7
@@
Void rlcTmrExpiry(PTR cb,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;
@@
-361,29
+361,29
@@
bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
{
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_REORD_TMR:
{
return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
{
return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
-
RLC_EVT
_AMUL_REORD_TMR);
+
EVENT_RLC
_AMUL_REORD_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:
{
@@
-419,7
+419,7
@@
static Void rlcBndTmrExpiry(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++;