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
fix for Tb Size
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_tmr.c
diff --git
a/src/5gnrrlc/kw_tmr.c
b/src/5gnrrlc/kw_tmr.c
index
055c40c
..
6a74672
100755
(executable)
--- a/
src/5gnrrlc/kw_tmr.c
+++ b/
src/5gnrrlc/kw_tmr.c
@@
-105,13
+105,13
@@
PRIVATE Void kwBndTmrExpiry(PTR cb);
#ifdef ANSI
PUBLIC Void kwStartTmr
(
#ifdef ANSI
PUBLIC Void kwStartTmr
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
PTR cb,
S16 tmrEvnt
)
#else
PUBLIC Void kwStartTmr (gCb,cb, tmrEvnt)
PTR cb,
S16 tmrEvnt
)
#else
PUBLIC Void kwStartTmr (gCb,cb, tmrEvnt)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
PTR cb;
S16 tmrEvnt;
#endif
PTR cb;
S16 tmrEvnt;
#endif
@@
-131,7
+131,7
@@
S16 tmrEvnt;
{
case KW_EVT_UMUL_REORD_TMR:
{
{
case KW_EVT_UMUL_REORD_TMR:
{
- KwUmUl* umUl = &(((
Kw
UlRbCb *)cb)->m.umUl);
+ KwUmUl* umUl = &(((
Rlc
UlRbCb *)cb)->m.umUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes);
@@
-141,7
+141,7
@@
S16 tmrEvnt;
}
case KW_EVT_AMUL_REORD_TMR:
{
}
case KW_EVT_AMUL_REORD_TMR:
{
- KwAmUl* amUl = &(((
Kw
UlRbCb *)cb)->m.amUl);
+ KwAmUl* amUl = &(((
Rlc
UlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait, amUl->reOrdTmrInt, gCb->genCfg.timeRes);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait, amUl->reOrdTmrInt, gCb->genCfg.timeRes);
@@
-151,7
+151,7
@@
S16 tmrEvnt;
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
- KwAmUl* amUl = &(((
Kw
UlRbCb *)cb)->m.amUl);
+ KwAmUl* amUl = &(((
Rlc
UlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait,
amUl->staProhTmrInt,
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait,
amUl->staProhTmrInt,
@@
-163,7
+163,7
@@
S16 tmrEvnt;
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
- KwAmDl* amDl = &(((
Kw
DlRbCb *)cb)->m.amDl);
+ KwAmDl* amDl = &(((
Rlc
DlRbCb *)cb)->m.amDl);
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait,
amDl->pollRetxTmrInt,
/* kw005.201 Changed wait calculation ccpu00117634*/
KW_TMR_CALCUATE_WAIT(arg.wait,
amDl->pollRetxTmrInt,
@@
-231,13
+231,13
@@
S16 tmrEvnt;
#ifdef ANSI
PUBLIC Void kwStopTmr
(
#ifdef ANSI
PUBLIC Void kwStopTmr
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
PTR cb,
U8 tmrType
)
#else
PUBLIC Void kwStopTmr (gCb, cb, tmrType)
PTR cb,
U8 tmrType
)
#else
PUBLIC Void kwStopTmr (gCb, cb, tmrType)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
PTR cb;
U8 tmrType;
#endif
PTR cb;
U8 tmrType;
#endif
@@
-255,25
+255,25
@@
U8 tmrType;
{
case KW_EVT_UMUL_REORD_TMR:
{
{
case KW_EVT_UMUL_REORD_TMR:
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.umUl.reOrdTmr;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.umUl.reOrdTmr;
arg.max = KW_MAX_UM_TMR;
break;
}
case KW_EVT_AMUL_REORD_TMR:
{
arg.max = KW_MAX_UM_TMR;
break;
}
case KW_EVT_AMUL_REORD_TMR:
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.amUl.reOrdTmr;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.amUl.reOrdTmr;
arg.max = KW_MAX_AM_TMR;
break;
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
arg.max = KW_MAX_AM_TMR;
break;
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.amUl.staProhTmr;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.amUl.staProhTmr;
arg.max = KW_MAX_AM_TMR;
break;
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
arg.max = KW_MAX_AM_TMR;
break;
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
- arg.timers = &((
Kw
DlRbCb *)cb)->m.amDl.pollRetxTmr;
+ arg.timers = &((
Rlc
DlRbCb *)cb)->m.amDl.pollRetxTmr;
arg.max = KW_MAX_AM_TMR;
break;
}
arg.max = KW_MAX_AM_TMR;
break;
}
@@
-344,28
+344,28
@@
S16 tmrEvnt;
{
case KW_EVT_UMUL_REORD_TMR:
{
{
case KW_EVT_UMUL_REORD_TMR:
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
- kwUmmReOrdTmrExp(
KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+ kwUmmReOrdTmrExp(
RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
case KW_EVT_AMUL_REORD_TMR:
{
break;
}
case KW_EVT_AMUL_REORD_TMR:
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
- kwAmmReOrdTmrExp(
KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+ kwAmmReOrdTmrExp(
RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
break;
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
- kwAmmStaProTmrExp(
KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+ kwAmmStaProTmrExp(
RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
break;
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
-
KwDlRbCb *dlRbCb = (Kw
DlRbCb *)cb;
-
KwCb *gCb = KW_GET_KW
CB(dlRbCb->inst);
+
RlcDlRbCb *dlRbCb = (Rlc
DlRbCb *)cb;
+
RlcCb *gCb = RLC_GET_RLC
CB(dlRbCb->inst);
kwAmmPollRetxTmrExp(gCb, dlRbCb);
kwAmmPollRetxTmrExp(gCb, dlRbCb);
@@
-402,13
+402,13
@@
S16 tmrEvnt;
#ifdef ANSI
PUBLIC Bool kwChkTmr
(
#ifdef ANSI
PUBLIC Bool kwChkTmr
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
PTR cb,
S16 tmrEvnt
)
#else
PUBLIC Bool kwChkTmr(gCb,cb, tmrEvnt)
PTR cb,
S16 tmrEvnt
)
#else
PUBLIC Bool kwChkTmr(gCb,cb, tmrEvnt)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
PTR cb;
S16 tmrEvnt;
#endif
PTR cb;
S16 tmrEvnt;
#endif
@@
-419,22
+419,22
@@
S16 tmrEvnt;
{
case KW_EVT_UMUL_REORD_TMR:
{
{
case KW_EVT_UMUL_REORD_TMR:
{
- return (((
Kw
UlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt ==
+ return (((
Rlc
UlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt ==
KW_EVT_UMUL_REORD_TMR);
}
case KW_EVT_AMUL_REORD_TMR:
{
KW_EVT_UMUL_REORD_TMR);
}
case KW_EVT_AMUL_REORD_TMR:
{
- return (((
Kw
UlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
+ return (((
Rlc
UlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
KW_EVT_AMUL_REORD_TMR);
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
KW_EVT_AMUL_REORD_TMR);
}
case KW_EVT_AMUL_STA_PROH_TMR:
{
- return (((
Kw
UlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
+ return (((
Rlc
UlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
KW_EVT_AMUL_STA_PROH_TMR);
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
KW_EVT_AMUL_STA_PROH_TMR);
}
case KW_EVT_AMDL_POLL_RETX_TMR:
{
- return (((
Kw
DlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
+ return (((
Rlc
DlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
KW_EVT_AMDL_POLL_RETX_TMR);
}
case KW_EVT_WAIT_BNDCFM:
KW_EVT_AMDL_POLL_RETX_TMR);
}
case KW_EVT_WAIT_BNDCFM:
@@
-483,7
+483,7
@@
PTR cb;
if (rguSapCb->retryCnt < KW_MAX_SAP_BND_RETRY)
{
/* start timer to wait for bind confirm */
if (rguSapCb->retryCnt < KW_MAX_SAP_BND_RETRY)
{
/* start timer to wait for bind confirm */
- kwStartTmr(
KW_GET_KW
CB(rguSapCb->pst.srcInst),
+ kwStartTmr(
RLC_GET_RLC
CB(rguSapCb->pst.srcInst),
(PTR)rguSapCb,
KW_EVT_WAIT_BNDCFM);
(PTR)rguSapCb,
KW_EVT_WAIT_BNDCFM);
@@
-498,7
+498,7
@@
PTR cb;
/* Send alarm to the layer manager */
#ifdef LTE_L2_MEAS
/* Send alarm to the layer manager */
#ifdef LTE_L2_MEAS
- kwLmmSendAlarm(
KW_GET_KW
CB(rguSapCb->pst.srcInst),
+ kwLmmSendAlarm(
RLC_GET_RLC
CB(rguSapCb->pst.srcInst),
LCM_CATEGORY_INTERFACE,
LCM_EVENT_BND_FAIL,
LCM_CAUSE_TMR_EXPIRED,
LCM_CATEGORY_INTERFACE,
LCM_EVENT_BND_FAIL,
LCM_CAUSE_TMR_EXPIRED,
@@
-506,7
+506,7
@@
PTR cb;
0,
0);
#else
0,
0);
#else
- kwLmmSendAlarm(
KW_GET_KW
CB(rguSapCb->pst.srcInst),
+ kwLmmSendAlarm(
RLC_GET_RLC
CB(rguSapCb->pst.srcInst),
LCM_CATEGORY_INTERFACE,
LCM_EVENT_BND_FAIL,
LCM_CAUSE_TMR_EXPIRED,
LCM_CATEGORY_INTERFACE,
LCM_EVENT_BND_FAIL,
LCM_CAUSE_TMR_EXPIRED,