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
U8, U16, U32 data type changes
[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
..
a959503
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);
+PRIVATE 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
-(
-KwCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-PUBLIC Void kwStartTmr (gCb,cb, tmrEvnt)
-KwCb *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
RLC
_EVT_UMUL_REORD_TMR:
{
{
-
KwUmUl* umUl = &(((Kw
UlRbCb *)cb)->m.umUl);
+
RlcUmUl* umUl = &(((Rlc
UlRbCb *)cb)->m.umUl);
/* kw005.201 Changed wait calculation ccpu00117634*/
/* kw005.201 Changed wait calculation ccpu00117634*/
-
KW
_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes);
+
RLC
_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes);
arg.timers = &umUl->reOrdTmr;
arg.timers = &umUl->reOrdTmr;
- arg.max =
KW
_MAX_UM_TMR;
+ arg.max =
RLC
_MAX_UM_TMR;
break;
}
break;
}
- case
KW
_EVT_AMUL_REORD_TMR:
+ case
RLC
_EVT_AMUL_REORD_TMR:
{
{
-
KwAmUl* amUl = &(((Kw
UlRbCb *)cb)->m.amUl);
+
RlcAmUl* amUl = &(((Rlc
UlRbCb *)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
RLC
_EVT_AMUL_STA_PROH_TMR:
{
{
-
KwAmUl* amUl = &(((Kw
UlRbCb *)cb)->m.amUl);
+
RlcAmUl* amUl = &(((Rlc
UlRbCb *)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
RLC
_EVT_AMDL_POLL_RETX_TMR:
{
{
-
KwAmDl* amDl = &(((Kw
DlRbCb *)cb)->m.amDl);
+
RlcAmDl* amDl = &(((Rlc
DlRbCb *)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
RLC
_EVT_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
RLC
_EVT_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
-(
-KwCb *gCb,
-PTR cb,
-U8 tmrType
-)
-#else
-PUBLIC Void kwStopTmr (gCb, cb, tmrType)
-KwCb *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
RLC
_EVT_UMUL_REORD_TMR:
{
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.umUl.reOrdTmr;
- arg.max =
KW
_MAX_UM_TMR;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.umUl.reOrdTmr;
+ arg.max =
RLC
_MAX_UM_TMR;
break;
}
break;
}
- case
KW
_EVT_AMUL_REORD_TMR:
+ case
RLC
_EVT_AMUL_REORD_TMR:
{
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.amUl.reOrdTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.amUl.reOrdTmr;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW
_EVT_AMUL_STA_PROH_TMR:
+ case
RLC
_EVT_AMUL_STA_PROH_TMR:
{
{
- arg.timers = &((
Kw
UlRbCb *)cb)->m.amUl.staProhTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.timers = &((
Rlc
UlRbCb *)cb)->m.amUl.staProhTmr;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW
_EVT_AMDL_POLL_RETX_TMR:
+ case
RLC
_EVT_AMDL_POLL_RETX_TMR:
{
{
- arg.timers = &((
Kw
DlRbCb *)cb)->m.amDl.pollRetxTmr;
- arg.max =
KW
_MAX_AM_TMR;
+ arg.timers = &((
Rlc
DlRbCb *)cb)->m.amDl.pollRetxTmr;
+ arg.max =
RLC
_MAX_AM_TMR;
break;
}
break;
}
- case
KW
_EVT_WAIT_BNDCFM:
+ case
RLC
_EVT_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
RLC
_EVT_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
;
}
/**
}
/**
@@
-326,55
+295,54
@@
U8 tmrType;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
TmrExpiry
+
Void rlc
TmrExpiry
(
PTR cb,
S16 tmrEvnt
)
#else
(
PTR cb,
S16 tmrEvnt
)
#else
-
PUBLIC Void kw
TmrExpiry (cb, tmrEvnt)
+
Void rlc
TmrExpiry (cb, tmrEvnt)
PTR cb;
S16 tmrEvnt;
#endif
{
/* kw005.201 added support for L2 Measurement */
PTR cb;
S16 tmrEvnt;
#endif
{
/* kw005.201 added support for L2 Measurement */
- TRC2(kwTmrExpiry)
switch (tmrEvnt)
{
switch (tmrEvnt)
{
- case
KW
_EVT_UMUL_REORD_TMR:
+ case
RLC
_EVT_UMUL_REORD_TMR:
{
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
-
kwUmmReOrdTmrExp(KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+
rlcUmmReOrdTmrExp(RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW
_EVT_AMUL_REORD_TMR:
+ case
RLC
_EVT_AMUL_REORD_TMR:
{
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
-
kwAmmReOrdTmrExp(KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+
rlcAmmReOrdTmrExp(RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW
_EVT_AMUL_STA_PROH_TMR:
+ case
RLC
_EVT_AMUL_STA_PROH_TMR:
{
{
-
KwUlRbCb *ulRbCb = (Kw
UlRbCb *)cb;
-
kwAmmStaProTmrExp(KW_GET_KW
CB(ulRbCb->inst), ulRbCb);
+
RlcUlRbCb *ulRbCb = (Rlc
UlRbCb *)cb;
+
rlcAmmStaProTmrExp(RLC_GET_RLC
CB(ulRbCb->inst), ulRbCb);
break;
}
break;
}
- case
KW
_EVT_AMDL_POLL_RETX_TMR:
+ case
RLC
_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);
-
kw
AmmPollRetxTmrExp(gCb, dlRbCb);
+
rlc
AmmPollRetxTmrExp(gCb, dlRbCb);
gCb->genSts.protTimeOut++;
break;
}
gCb->genSts.protTimeOut++;
break;
}
- case
KW
_EVT_WAIT_BNDCFM:
+ case
RLC
_EVT_WAIT_BNDCFM:
{
{
-
kw
BndTmrExpiry(cb);
+
rlc
BndTmrExpiry(cb);
break;
}
/* kw005.201 L2 Measurement support */
break;
}
/* kw005.201 L2 Measurement support */
@@
-384,7
+352,7
@@
S16 tmrEvnt;
}
}
}
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-399,55
+367,41
@@
S16 tmrEvnt;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC Bool kwChkTmr
-(
-KwCb *gCb,
-PTR cb,
-S16 tmrEvnt
-)
-#else
-PUBLIC Bool kwChkTmr(gCb,cb, tmrEvnt)
-KwCb *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
RLC
_EVT_UMUL_REORD_TMR:
{
{
- return (((
Kw
UlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt ==
-
KW
_EVT_UMUL_REORD_TMR);
+ return (((
Rlc
UlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt ==
+
RLC
_EVT_UMUL_REORD_TMR);
}
}
- case
KW
_EVT_AMUL_REORD_TMR:
+ case
RLC
_EVT_AMUL_REORD_TMR:
{
{
- return (((
Kw
UlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
-
KW
_EVT_AMUL_REORD_TMR);
+ return (((
Rlc
UlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt ==
+
RLC
_EVT_AMUL_REORD_TMR);
}
}
- case
KW
_EVT_AMUL_STA_PROH_TMR:
+ case
RLC
_EVT_AMUL_STA_PROH_TMR:
{
{
- return (((
Kw
UlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
-
KW
_EVT_AMUL_STA_PROH_TMR);
+ return (((
Rlc
UlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt ==
+
RLC
_EVT_AMUL_STA_PROH_TMR);
}
}
- case
KW
_EVT_AMDL_POLL_RETX_TMR:
+ case
RLC
_EVT_AMDL_POLL_RETX_TMR:
{
{
- return (((
Kw
DlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
-
KW
_EVT_AMDL_POLL_RETX_TMR);
+ return (((
Rlc
DlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt ==
+
RLC
_EVT_AMDL_POLL_RETX_TMR);
}
}
- case
KW
_EVT_WAIT_BNDCFM:
+ case
RLC
_EVT_WAIT_BNDCFM:
{
{
- return (((
KwRguSapCb *)cb)->bndTmr.tmrEvnt == KW
_EVT_WAIT_BNDCFM);
+ return (((
RlcRguSapCb *)cb)->bndTmr.tmrEvnt == RLC
_EVT_WAIT_BNDCFM);
}
default:
{
}
default:
{
-
RLOG0(L_ERROR, "Invalid tmr Evnt"
);
+
DU_LOG("\nRLC : rlcChkTmr: Invalid tmr Evnt [%d]", tmrEvnt
);
}
}
}
}
-
RETVALUE(FALSE)
;
+
return FALSE
;
}
/**
}
/**
@@
-463,42
+417,40
@@
S16 tmrEvnt;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-PRIVATE Void
kw
BndTmrExpiry
+PRIVATE Void
rlc
BndTmrExpiry
(
PTR cb
)
#else
(
PTR cb
)
#else
-PRIVATE Void
kw
BndTmrExpiry(cb)
+PRIVATE Void
rlc
BndTmrExpiry(cb)
PTR cb;
#endif
{
PTR cb;
#endif
{
- 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 */
-
kwStartTmr(KW_GET_KW
CB(rguSapCb->pst.srcInst),
+
rlcStartTmr(RLC_GET_RLC
CB(rguSapCb->pst.srcInst),
(PTR)rguSapCb,
(PTR)rguSapCb,
-
KW
_EVT_WAIT_BNDCFM);
+
RLC
_EVT_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
-
kwLmmSendAlarm(KW_GET_KW
CB(rguSapCb->pst.srcInst),
+
rlcLmmSendAlarm(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
+458,7
@@
PTR cb;
0,
0);
#else
0,
0);
#else
-
kwLmmSendAlarm(KW_GET_KW
CB(rguSapCb->pst.srcInst),
+
rlcLmmSendAlarm(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,
@@
-516,7
+468,7
@@
PTR cb;
}
}
}
}
-
RETVOID
;
+
return
;
}
}