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
6a74672
..
d2927e2
100755
(executable)
--- a/
src/5gnrrlc/kw_tmr.c
+++ b/
src/5gnrrlc/kw_tmr.c
@@
-24,18
+24,14
@@
Desc: Source code for timer functions such as,
Desc: Source code for timer functions such as,
- -
kw
StartTmr
- -
kw
StopTmr
- -
kw
TmrExpiry
- -
kw
BndTmrExpiry
+ -
rlc
StartTmr
+ -
rlc
StopTmr
+ -
rlc
TmrExpiry
+ -
rlc
BndTmrExpiry
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"
@@
-68,7
+64,7
@@
static int RLOG_FILE_ID=202;
*/
/**
*/
/**
- * @def
KW
_TMR_CALCUATE_WAIT
+ * @def
RLC
_TMR_CALCUATE_WAIT
*
* This macro calculates and assigns wait time based on the value of the
* timer and the timer resolution. Timer value of 0 signifies that the
*
* This macro calculates and assigns wait time based on the value of the
* timer and the timer resolution. Timer value of 0 signifies that the
@@
-80,7
+76,7
@@
static int RLOG_FILE_ID=202;
* @param[in] _timerRes Resolution of the timer
*
*/
* @param[in] _timerRes Resolution of the timer
*
*/
-#define
KW
_TMR_CALCUATE_WAIT(_wait, _tmrVal, _timerRes) \
+#define
RLC
_TMR_CALCUATE_WAIT(_wait, _tmrVal, _timerRes) \
{ \
(_wait) = ((_tmrVal) * SS_TICKS_SEC)/((_timerRes) * 1000); \
if((0 != (_tmrVal)) && (0 == (_wait))) \
{ \
(_wait) = ((_tmrVal) * SS_TICKS_SEC)/((_timerRes) * 1000); \
if((0 != (_tmrVal)) && (0 == (_wait))) \
@@
-90,7
+86,7
@@
static int RLOG_FILE_ID=202;
}
/* private function declarations */
}
/* private function declarations */
-
PRIVATE Void kw
BndTmrExpiry(PTR cb);
+
static Void rlc
BndTmrExpiry(PTR cb);
/**
* @brief Handler to start timer
/**
* @brief Handler to start timer
@@
-102,112
+98,98
@@
PRIVATE Void kwBndTmrExpiry(PTR cb);
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-PUBLIC Void kwStartTmr
-(
-RlcCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-PUBLIC Void kwStartTmr (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
-
Kw
L2MeasEvtCb *measEvtCb = NULLP;
+
Rlc
L2MeasEvtCb *measEvtCb = NULLP;
#endif
CmTmrArg arg;
arg.wait = 0;
#endif
CmTmrArg arg;
arg.wait = 0;
- TRC2(kwStartTmr)
-
/* 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
KW_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
{
-
Kw
UmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl);
+
Rlc
UmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrd
TmrInt, gCb->genCfg.timeRes);
+
RLC_TMR_CALCUATE_WAIT(arg.wait, umUl->reAsmbl
TmrInt, gCb->genCfg.timeRes);
- arg.timers = &umUl->re
Ord
Tmr;
- arg.max =
KW
_MAX_UM_TMR;
+ arg.timers = &umUl->re
Asmbl
Tmr;
+ arg.max =
RLC
_MAX_UM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMUL_REORD_TMR:
+ case
EVENT_RLC
_AMUL_REORD_TMR:
{
{
-
Kw
AmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
+
Rlc
AmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait, amUl->reOrdTmrInt, gCb->genCfg.timeRes);
+
RLC
_TMR_CALCUATE_WAIT(arg.wait, amUl->reOrdTmrInt, gCb->genCfg.timeRes);
arg.timers = &amUl->reOrdTmr;
arg.timers = &amUl->reOrdTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
{
-
Kw
AmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
+
Rlc
AmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait,
+
RLC
_TMR_CALCUATE_WAIT(arg.wait,
amUl->staProhTmrInt,
gCb->genCfg.timeRes);
arg.timers = &amUl->staProhTmr;
amUl->staProhTmrInt,
gCb->genCfg.timeRes);
arg.timers = &amUl->staProhTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
{
-
Kw
AmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl);
+
Rlc
AmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl);
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait,
+
RLC
_TMR_CALCUATE_WAIT(arg.wait,
amDl->pollRetxTmrInt,
gCb->genCfg.timeRes);
arg.timers = &amDl->pollRetxTmr;
amDl->pollRetxTmrInt,
gCb->genCfg.timeRes);
arg.timers = &amDl->pollRetxTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
{
-
KwRguSapCb* rguSap = (Kw
RguSapCb *)cb;
+
RlcRguSapCb* rguSap = (Rlc
RguSapCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait, rguSap->bndTmrInt, gCb->genCfg.timeRes);
+
RLC
_TMR_CALCUATE_WAIT(arg.wait, rguSap->bndTmrInt, gCb->genCfg.timeRes);
arg.timers = &rguSap->bndTmr;
arg.timers = &rguSap->bndTmr;
- arg.max =
KW
_MAX_RGUSAP_TMR;
+ arg.max =
RLC
_MAX_RGUSAP_TMR;
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- case
KW_EVT
_L2_TMR:
+ case
EVENT_RLC
_L2_TMR:
{
{
- measEvtCb = (
Kw
L2MeasEvtCb *)cb;
+ measEvtCb = (
Rlc
L2MeasEvtCb *)cb;
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait,
+
RLC
_TMR_CALCUATE_WAIT(arg.wait,
measEvtCb->l2TmrCfg.val,
gCb->genCfg.timeRes);
arg.timers = &measEvtCb->l2Tmr;
measEvtCb->l2TmrCfg.val,
gCb->genCfg.timeRes);
arg.timers = &measEvtCb->l2Tmr;
- arg.max =
KW
_L2_MAX_TIMERS;
+ arg.max =
RLC
_L2_MAX_TIMERS;
break;
}
#endif
default:
{
break;
}
#endif
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nRLC : rlcStartTmr: Invalid tmr Evnt [%d]", tmrEvnt
);
}
}
if(arg.wait != 0)
{
}
}
if(arg.wait != 0)
{
- arg.tqCp = &gCb->
kw
TqCp;
- arg.tq = gCb->
kw
Tq;
+ arg.tqCp = &gCb->
rlc
TqCp;
+ arg.tq = gCb->
rlc
Tq;
arg.cb = cb;
arg.evnt = tmrEvnt;
arg.tNum = 0;
arg.cb = cb;
arg.evnt = tmrEvnt;
arg.tNum = 0;
@@
-215,7
+197,7
@@
S16 tmrEvnt;
cmPlcCbTq(&arg);
}
cmPlcCbTq(&arg);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-228,80
+210,67
@@
S16 tmrEvnt;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-PUBLIC Void kwStopTmr
-(
-RlcCb *gCb,
-PTR cb,
-U8 tmrType
-)
-#else
-PUBLIC Void kwStopTmr (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
{
CmTmrArg arg;
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
-
Kw
L2MeasEvtCb *measEvtCb = NULLP;
+
Rlc
L2MeasEvtCb *measEvtCb = NULLP;
#endif
#endif
- TRC2(kwStopTmr)
arg.timers = NULLP;
switch (tmrType)
{
arg.timers = NULLP;
switch (tmrType)
{
- case
KW_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
{
- arg.timers = &((RlcUlRbCb *)cb)->m.umUl.re
Ord
Tmr;
- arg.max =
KW
_MAX_UM_TMR;
+ arg.timers = &((RlcUlRbCb *)cb)->m.umUl.re
Asmbl
Tmr;
+ arg.max =
RLC
_MAX_UM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMUL_REORD_TMR:
+ case
EVENT_RLC
_AMUL_REORD_TMR:
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr;
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr;
{
arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_AMDL_POLL_RETX_TMR:
+ case
EVENT_RLC
_AMDL_POLL_RETX_TMR:
{
arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr;
{
arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
{
- arg.timers = &((
Kw
RguSapCb *)cb)->bndTmr;
- arg.max =
KW
_MAX_RGUSAP_TMR;
+ arg.timers = &((
Rlc
RguSapCb *)cb)->bndTmr;
+ arg.max =
RLC
_MAX_RGUSAP_TMR;
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- case
KW_EVT
_L2_TMR:
+ case
EVENT_RLC
_L2_TMR:
{
{
- measEvtCb = (
Kw
L2MeasEvtCb *)cb;
+ measEvtCb = (
Rlc
L2MeasEvtCb *)cb;
arg.timers = &measEvtCb->l2Tmr;
arg.timers = &measEvtCb->l2Tmr;
- arg.max =
KW
_L2_MAX_TIMERS;
+ arg.max =
RLC
_L2_MAX_TIMERS;
break;
}
#endif
default:
{
break;
}
#endif
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nRLC : rlcStopTmr: Invalid tmr Evnt[%d]", tmrType
);
}
}
if (tmrType != TMR0)
{
}
}
if (tmrType != TMR0)
{
- arg.tqCp = &gCb->
kw
TqCp;
- arg.tq = gCb->
kw
Tq;
+ arg.tqCp = &gCb->
rlc
TqCp;
+ arg.tq = gCb->
rlc
Tq;
arg.cb = cb;
arg.evnt = tmrType;
arg.wait = 0;
arg.cb = cb;
arg.evnt = tmrType;
arg.wait = 0;
@@
-309,7
+278,7
@@
U8 tmrType;
cmRmvCbTq(&arg);
}
cmRmvCbTq(&arg);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-325,56
+294,45
@@
U8 tmrType;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-PUBLIC Void kwTmrExpiry
-(
-PTR cb,
-S16 tmrEvnt
-)
-#else
-PUBLIC Void kwTmrExpiry (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(kwTmrExpiry)
switch (tmrEvnt)
{
switch (tmrEvnt)
{
- case
KW_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
-
kwUmmReOrd
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+
rlcUmmReAsmbl
TmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW_EVT
_AMUL_REORD_TMR:
+ case
EVENT_RLC
_AMUL_REORD_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
-
kw
AmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+
rlc
AmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW_EVT
_AMUL_STA_PROH_TMR:
+ case
EVENT_RLC
_AMUL_STA_PROH_TMR:
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
{
RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
-
kw
AmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+
rlc
AmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW_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);
-
kw
AmmPollRetxTmrExp(gCb, dlRbCb);
+
rlc
AmmPollRetxTmrExp(gCb, dlRbCb);
gCb->genSts.protTimeOut++;
break;
}
gCb->genSts.protTimeOut++;
break;
}
- case
KW_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
{
-
kw
BndTmrExpiry(cb);
+
rlc
BndTmrExpiry(cb);
break;
}
/* kw005.201 L2 Measurement support */
break;
}
/* kw005.201 L2 Measurement support */
@@
-384,7
+342,7
@@
S16 tmrEvnt;
}
}
}
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-399,55
+357,41
@@
S16 tmrEvnt;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC Bool kwChkTmr
-(
-RlcCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-PUBLIC Bool kwChkTmr(gCb,cb, tmrEvnt)
-RlcCb *gCb;
-PTR cb;
-S16 tmrEvnt;
-#endif
+bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
{
{
- TRC2(kwChkTmr)
-
switch (tmrEvnt)
{
switch (tmrEvnt)
{
- case
KW_EVT_UMUL_REORD
_TMR:
+ case
EVENT_RLC_UMUL_REASSEMBLE
_TMR:
{
{
- return (((RlcUlRbCb *)cb)->m.umUl.re
Ord
Tmr.tmrEvnt ==
-
KW_EVT_UMUL_REORD
_TMR);
+ return (((RlcUlRbCb *)cb)->m.umUl.re
Asmbl
Tmr.tmrEvnt ==
+
EVENT_RLC_UMUL_REASSEMBLE
_TMR);
}
}
- case
KW_EVT
_AMUL_REORD_TMR:
+ case
EVENT_RLC
_AMUL_REORD_TMR:
{
return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
{
return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
-
KW_EVT
_AMUL_REORD_TMR);
+
EVENT_RLC
_AMUL_REORD_TMR);
}
}
- case
KW_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 ==
-
KW_EVT
_AMUL_STA_PROH_TMR);
+
EVENT_RLC
_AMUL_STA_PROH_TMR);
}
}
- case
KW_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 ==
-
KW_EVT
_AMDL_POLL_RETX_TMR);
+
EVENT_RLC
_AMDL_POLL_RETX_TMR);
}
}
- case
KW_EVT
_WAIT_BNDCFM:
+ case
EVENT_RLC
_WAIT_BNDCFM:
{
{
- return (((
KwRguSapCb *)cb)->bndTmr.tmrEvnt == KW_EVT
_WAIT_BNDCFM);
+ return (((
RlcRguSapCb *)cb)->bndTmr.tmrEvnt == EVENT_RLC
_WAIT_BNDCFM);
}
default:
{
}
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nRLC : rlcChkTmr: Invalid tmr Evnt [%d]", tmrEvnt
);
}
}
}
}
-
RETVALUE(FALSE)
;
+
return FALSE
;
}
/**
}
/**
@@
-462,43
+406,33
@@
S16 tmrEvnt;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-PRIVATE Void kwBndTmrExpiry
-(
-PTR cb
-)
-#else
-PRIVATE Void kwBndTmrExpiry(cb)
-PTR cb;
-#endif
+static Void rlcBndTmrExpiry(PTR cb)
{
{
- KwRguSapCb *rguSapCb;
-
- TRC2(kwBndTmrExpiry)
+ RlcRguSapCb *rguSapCb;
- rguSapCb = (
Kw
RguSapCb *) cb;
+ rguSapCb = (
Rlc
RguSapCb *) cb;
- if (rguSapCb->state ==
KW
_SAP_BINDING)
+ if (rguSapCb->state ==
RLC
_SAP_BINDING)
{
{
- if (rguSapCb->retryCnt <
KW
_MAX_SAP_BND_RETRY)
+ if (rguSapCb->retryCnt <
RLC
_MAX_SAP_BND_RETRY)
{
/* start timer to wait for bind confirm */
{
/* start timer to wait for bind confirm */
-
kw
StartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
+
rlc
StartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
(PTR)rguSapCb,
(PTR)rguSapCb,
-
KW_EVT
_WAIT_BNDCFM);
+
EVENT_RLC
_WAIT_BNDCFM);
/* Send bind request */
rguSapCb->retryCnt++;
/* Send bind request */
rguSapCb->retryCnt++;
-
Kw
LiRguBndReq (&rguSapCb->pst, rguSapCb->suId, rguSapCb->spId);
+
Rlc
LiRguBndReq (&rguSapCb->pst, rguSapCb->suId, rguSapCb->spId);
}
else
{
rguSapCb->retryCnt = 0;
}
else
{
rguSapCb->retryCnt = 0;
- rguSapCb->state =
KW
_SAP_CFG;
+ rguSapCb->state =
RLC
_SAP_CFG;
/* Send alarm to the layer manager */
#ifdef LTE_L2_MEAS
/* Send alarm to the layer manager */
#ifdef LTE_L2_MEAS
-
kw
LmmSendAlarm(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
+
rlc
LmmSendAlarm(RLC_GET_RLCCB(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
+440,7
@@
PTR cb;
0,
0);
#else
0,
0);
#else
-
kw
LmmSendAlarm(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
+
rlc
LmmSendAlarm(RLC_GET_RLCCB(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,
@@
-516,7
+450,7
@@
PTR cb;
}
}
}
}
-
RETVOID
;
+
return
;
}
}