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
Merge "Get alarm-list implementation.[Issue-Id: ODUHIGH-230]"
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_cfg_ul.c
diff --git
a/src/5gnrrlc/kw_cfg_ul.c
b/src/5gnrrlc/kw_cfg_ul.c
index
a3765da
..
9372c21
100755
(executable)
--- a/
src/5gnrrlc/kw_cfg_ul.c
+++ b/
src/5gnrrlc/kw_cfg_ul.c
@@
-24,9
+24,9
@@
Desc: It contains the following configuraiton primtives
for different actions
Desc: It contains the following configuraiton primtives
for different actions
- --
kw
CfgValdtEntCfg
- --
kw
CfgFillRbCb
- --
kw
CfgRbInit
+ --
rlc
CfgValdtEntCfg
+ --
rlc
CfgFillRbCb
+ --
rlc
CfgRbInit
File: kw_cfg_ul.c
File: kw_cfg_ul.c
@@
-63,9
+63,9
@@
static int RLOG_FILE_ID=192;
#include "l2_tenb_stats.x" /* Total EnodeB Stats declarations */
#endif
#endif
#include "l2_tenb_stats.x" /* Total EnodeB Stats declarations */
#endif
#endif
-
PUBLIC S16 kwValidateRbCfgParams (Kw
Cb *gCb, CmLteRnti ueId, CmLteCellId cellId,
-
Ckw
EntCfgInfo *cfgToValidate, CmStatus *status);
-#define
KW_MODULE KW
_DBGMASK_CFG
+
S16 rlcValidateRbCfgParams (Rlc
Cb *gCb, CmLteRnti ueId, CmLteCellId cellId,
+
Rlc
EntCfgInfo *cfgToValidate, CmStatus *status);
+#define
RLC_MODULE RLC
_DBGMASK_CFG
#ifdef LTE_L2_MEAS
/**
*
#ifdef LTE_L2_MEAS
/**
*
@@
-79,15
+79,15
@@
PUBLIC S16 kwValidateRbCfgParams (KwCb *gCb, CmLteRnti ueId, CmLteCellId cellId,
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-
PRIVATE S16 kwHdlMeasUlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8
newUeId)
+
static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t
newUeId)
{
{
-
Kw
L2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
ueIdx = 0;
+
Rlc
L2MeasCb *measCb = NULLP;
+
uint16_t
cntr;
+
uint16_t
ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measCb = &(gCb->u.ulCb->
kwL2Cb.kw
L2EvtCb[cntr].measCb);
+ measCb = &(gCb->u.ulCb->
rlcL2Cb.rlc
L2EvtCb[cntr].measCb);
if( measCb->measType & LKW_L2MEAS_UL_IP)
{
if( measCb->measType & LKW_L2MEAS_UL_IP)
{
@@
-102,7
+102,7
@@
PRIVATE S16 kwHdlMeasUlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
}
}
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/**
}
/**
@@
-117,15
+117,15
@@
PRIVATE S16 kwHdlMeasUlUeIdChg(KwCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-
PRIVATE S16 kwDelFrmUlL2Meas(KwCb *gCb, U8 cellId,U8
ueId)
+
static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t
ueId)
{
{
-
Kw
L2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
ueIdx = 0;
+
Rlc
L2MeasCb *measCb = NULLP;
+
uint16_t
cntr;
+
uint16_t
ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measCb = &(gCb->u.ulCb->
kwL2Cb.kw
L2EvtCb[cntr].measCb);
+ measCb = &(gCb->u.ulCb->
rlcL2Cb.rlc
L2EvtCb[cntr].measCb);
if( measCb->measType & LKW_L2MEAS_UL_IP)
if( measCb->measType & LKW_L2MEAS_UL_IP)
@@
-147,41
+147,41
@@
PRIVATE S16 kwDelFrmUlL2Meas(KwCb *gCb, U8 cellId,U8 ueId)
{
{
-
U32
myIdx =0;
+
uint32_t
myIdx =0;
S16 ret; /* Return value */
S16 ret; /* Return value */
-
Kw
UlUeCb *ueCb = NULL;
+
Rlc
UlUeCb *ueCb = NULL;
for (myIdx = 0; myIdx < measCb->val.ipThMeas.numUes; myIdx++)
{
ueCb = NULL;
for (myIdx = 0; myIdx < measCb->val.ipThMeas.numUes; myIdx++)
{
ueCb = NULL;
- ret =
kw
DbmFetchUlUeCb(gCb, measCb->val.ipThMeas.ueInfoLst[myIdx].ueId, cellId, &ueCb);
+ ret =
rlc
DbmFetchUlUeCb(gCb, measCb->val.ipThMeas.ueInfoLst[myIdx].ueId, cellId, &ueCb);
}
}
}
}
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
-
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8
ueId)
+
static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t
ueId)
{
{
-
Kw
L2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
cntr1;
-
U16
ueIdx = 0;
-
U16
qciIdx = 0;
-
U16
*numQci;
+
Rlc
L2MeasCb *measCb = NULLP;
+
uint16_t
cntr;
+
uint16_t
cntr1;
+
uint16_t
ueIdx = 0;
+
uint16_t
qciIdx = 0;
+
uint16_t
*numQci;
#ifndef XEON_SPECIFIC_CHANGES
#ifndef XEON_SPECIFIC_CHANGES
-
U8
freeIdx = gCb->genCfg.maxUe;
+
uint8_t
freeIdx = gCb->genCfg.maxUe;
#else
#else
-
U16
freeIdx = LKW_MAX_UE;
+
uint16_t
freeIdx = LKW_MAX_UE;
#endif
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
#endif
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measCb = &(gCb->u.ulCb->
kwL2Cb.kw
L2EvtCb[cntr].measCb);
+ measCb = &(gCb->u.ulCb->
rlcL2Cb.rlc
L2EvtCb[cntr].measCb);
freeIdx = gCb->genCfg.maxUe;
freeIdx = gCb->genCfg.maxUe;
@@
-189,42
+189,42
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
{
for(cntr1 =0;cntr1<measCb->val.nonIpThMeas.numQci;cntr1++)
{
{
for(cntr1 =0;cntr1<measCb->val.nonIpThMeas.numQci;cntr1++)
{
- if(measCb->val.nonIpThMeas.qci[cntr1] !=
kw
RbCb->qci)
+ if(measCb->val.nonIpThMeas.qci[cntr1] !=
rlc
RbCb->qci)
{
{
- measCb->val.nonIpThMeas.qci[cntr1] =
kw
RbCb->qci;
- gCb->u.ulCb->
kwL2Cb.measOn[kw
RbCb->qci] |=measCb->measType;
+ measCb->val.nonIpThMeas.qci[cntr1] =
rlc
RbCb->qci;
+ gCb->u.ulCb->
rlcL2Cb.measOn[rlc
RbCb->qci] |=measCb->measType;
break;
}
}
}
break;
}
}
}
- if(((
kw
RbCb->rbL2Cb.measOn & measCb->measType) == LKW_L2MEAS_NONE))
+ if(((
rlc
RbCb->rbL2Cb.measOn & measCb->measType) == LKW_L2MEAS_NONE))
{
#ifdef LTE_L2_MEAS_RLC
if (measCb->measType & LKW_L2MEAS_ACT_UE)
{
{
#ifdef LTE_L2_MEAS_RLC
if (measCb->measType & LKW_L2MEAS_ACT_UE)
{
- if((
kw
RbCb->mode == CM_LTE_MODE_UM) &&
- (
kwRbCb->dir & KW
_DIR_DL ))
+ if((
rlc
RbCb->mode == CM_LTE_MODE_UM) &&
+ (
rlcRbCb->dir & RLC
_DIR_DL ))
{
{
- if (
kw
RbCb->m.um.umDl.sduQ.count)
+ if (
rlc
RbCb->m.um.umDl.sduQ.count)
{
{
- if (
kwRbCb->ueCb->numActRb[kw
RbCb->qci] == 0)
+ if (
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci] == 0)
{
{
-
kwRbCb->ueCb->numActRb[kw
RbCb->qci]++;
- gCb->u.ulCb->
kwL2Cb.numActUe[kw
RbCb->qci]++;
+
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci]++;
+ gCb->u.ulCb->
rlcL2Cb.numActUe[rlc
RbCb->qci]++;
}
}
}
}
}
}
- else if (
kw
RbCb->mode == CM_LTE_MODE_AM)
+ else if (
rlc
RbCb->mode == CM_LTE_MODE_AM)
{
{
- if ((
kw
RbCb->m.am.amDl.cntrlBo) ||
- (
kw
RbCb->m.am.amDl.retxBo) ||
- (
kw
RbCb->m.am.amDl.bo))
+ if ((
rlc
RbCb->m.am.amDl.cntrlBo) ||
+ (
rlc
RbCb->m.am.amDl.retxBo) ||
+ (
rlc
RbCb->m.am.amDl.bo))
{
{
- if (
kwRbCb->ueCb->numActRb[kw
RbCb->qci] == 0)
+ if (
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci] == 0)
{
{
-
kwRbCb->ueCb->numActRb[kw
RbCb->qci]++;
- gCb->u.ulCb->
kwL2Cb.numActUe[kw
RbCb->qci]++;
+
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci]++;
+ gCb->u.ulCb->
rlcL2Cb.numActUe[rlc
RbCb->qci]++;
}
}
}
}
}
}
@@
-252,7
+252,7
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
{
if (gCb->genCfg.maxUe == measCb->val.ipThMeas.numUes)
{
{
if (gCb->genCfg.maxUe == measCb->val.ipThMeas.numUes)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if (gCb->genCfg.maxUe == freeIdx)
{
}
if (gCb->genCfg.maxUe == freeIdx)
{
@@
-263,7
+263,7
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
ueIdx = freeIdx;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE;
ueIdx = freeIdx;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE;
-
cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(Kw
L2Cntr) *LKW_MAX_QCI));
+
memset(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(Rlc
L2Cntr) *LKW_MAX_QCI));
measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId;
measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId;
@@
-272,7
+272,7
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
for (qciIdx =0; qciIdx < *numQci; qciIdx++)
{
for (qciIdx =0; qciIdx < *numQci; qciIdx++)
{
- if (measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] ==
kw
RbCb->qci)
+ if (measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] ==
rlc
RbCb->qci)
{
break;
}
{
break;
}
@@
-280,17
+280,17
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
if (qciIdx == *numQci)
{
if (qciIdx == *numQci)
{
- measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] =
kw
RbCb->qci;
+ measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] =
rlc
RbCb->qci;
(*numQci)++;
}
\f
(*numQci)++;
}
\f
-
kwUtlPlcMeasDatInL2Sts(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[kw
RbCb->qci],
- &
kw
RbCb->rbL2Cb, measCb->measType);
+
rlcUtlPlcMeasDatInL2Sts(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[rlc
RbCb->qci],
+ &
rlc
RbCb->rbL2Cb, measCb->measType);
}
}
-
kw
RbCb->rbL2Cb.measOn |= measCb->measType;
+
rlc
RbCb->rbL2Cb.measOn |= measCb->measType;
}
}
-
RETVALUE
(ROK);
-}/*
kw
AddToDlL2Meas*/
+
return
(ROK);
+}/*
rlc
AddToDlL2Meas*/
#endif /*LTE_L2_MEAS*/
\f
/**
#endif /*LTE_L2_MEAS*/
\f
/**
@@
-306,26
+306,11
@@
PRIVATE S16 kwAddToUlL2Meas(KwCb *gCb, KwUlRbCb *kwRbCb,U8 cellId,U8 ueId)
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 kwCfgFillUlRbCb
-(
-KwCb *gCb,
-KwUlRbCb *rbCb,
-KwUlUeCb *ueCb,
-CkwEntCfgInfo *entCfg
-)
-#else
-PRIVATE S16 kwCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg)
-KwCb *gCb;
-KwUlRbCb *rbCb;
-KwUlUeCb *ueCb;
-CkwEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg)
{
{
- TRC3(kwCfgFillUlRbCb)
RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId,
RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId,
- "
kw
CfgFillRbCb(cellId(%d), rbId(%d), rbType(%d))",
+ "
rlc
CfgFillRbCb(cellId(%d), rbId(%d), rbType(%d))",
rbCb->rlcId.cellId,
entCfg->rbId,
entCfg->rbType);
rbCb->rlcId.cellId,
entCfg->rbId,
entCfg->rbType);
@@
-364,26
+349,26
@@
CkwEntCfgInfo *entCfg;
* indx = 1 as Up Link */
rbCb->lch.lChId = entCfg->lCh[1].lChId;
rbCb->lch.lChType = entCfg->lCh[1].type;
* indx = 1 as Up Link */
rbCb->lch.lChId = entCfg->lCh[1].lChId;
rbCb->lch.lChType = entCfg->lCh[1].type;
- rbCb->dir =
KW
_DIR_BOTH;
+ rbCb->dir =
RLC
_DIR_BOTH;
rbCb->m.amUl.staProhTmrInt = entCfg->m.amInfo.ul.staProhTmr;
rbCb->m.amUl.reOrdTmrInt = entCfg->m.amInfo.ul.reOrdTmr;
rbCb->m.amUl.snLen = entCfg->m.amInfo.ul.snLen; /* 5GNR */
rbCb->m.amUl.staProhTmrInt = entCfg->m.amInfo.ul.staProhTmr;
rbCb->m.amUl.reOrdTmrInt = entCfg->m.amInfo.ul.reOrdTmr;
rbCb->m.amUl.snLen = entCfg->m.amInfo.ul.snLen; /* 5GNR */
- if(
KW
_AM_CFG_12BIT_SN_LEN == rbCb->m.amUl.snLen)
+ if(
RLC
_AM_CFG_12BIT_SN_LEN == rbCb->m.amUl.snLen)
{
{
- rbCb->m.amUl.snModMask = (1 <<
KW
_SN_LEN_12BITS) - 1; /* 5GNR */
+ rbCb->m.amUl.snModMask = (1 <<
RLC
_SN_LEN_12BITS) - 1; /* 5GNR */
}
else
{
}
else
{
- rbCb->m.amUl.snModMask = (1 <<
KW
_SN_LEN_18BITS) - 1; /* 5GNR */
+ rbCb->m.amUl.snModMask = (1 <<
RLC
_SN_LEN_18BITS) - 1; /* 5GNR */
}
cmInitTimers(&(rbCb->m.amUl.reOrdTmr), 1);
cmInitTimers(&(rbCb->m.amUl.staProhTmr), 1);
}
cmInitTimers(&(rbCb->m.amUl.reOrdTmr), 1);
cmInitTimers(&(rbCb->m.amUl.staProhTmr), 1);
- rbCb->m.amUl.vrMr = rbCb->m.amUl.rxNext + (
KW
_AM_GET_WIN_SZ(rbCb->m.amUl.snLen));
+ rbCb->m.amUl.vrMr = rbCb->m.amUl.rxNext + (
RLC
_AM_GET_WIN_SZ(rbCb->m.amUl.snLen));
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb;
@@
-395,12
+380,12
@@
CkwEntCfgInfo *entCfg;
"INVALID RB Mode cellId(%d), rbId(%d)",
rbCb->rlcId.cellId,
entCfg->rbId);
"INVALID RB Mode cellId(%d), rbId(%d)",
rbCb->rlcId.cellId,
entCfg->rbId);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
rbCb->mode = entCfg->entMode;
}
}
rbCb->mode = entCfg->entMode;
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-416,29
+401,14
@@
CkwEntCfgInfo *entCfg;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 kwCfgUpdateUlRb
-(
-KwCb *gCb,
-KwUlRbCb *rbCb,
-void *ptr,
-CkwEntCfgInfo *entCfg
-)
-#else
-PRIVATE S16 kwCfgUpdateUlRb(gCb,rbCb, ptr, entCfg)
-KwCb *gCb;
-KwUlRbCb *rbCb;
-void *ptr;
-CkwEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg)
{
{
- TRC3(kwCfgUpdateUlRb)
switch (rbCb->mode)
{
case CM_LTE_MODE_TM:
{
switch (rbCb->mode)
{
case CM_LTE_MODE_TM:
{
-
KwUlCellCb *cellCb = (Kw
UlCellCb *)ptr;
+
RlcUlCellCb *cellCb = (Rlc
UlCellCb *)ptr;
rbCb->dir = entCfg->dir;
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
rbCb->dir = entCfg->dir;
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
@@
-448,14
+418,14
@@
CkwEntCfgInfo *entCfg;
}
case CM_LTE_MODE_UM:
{
}
case CM_LTE_MODE_UM:
{
-
KwUlUeCb *ueCb = (Kw
UlUeCb *)ptr;
+
RlcUlUeCb *ueCb = (Rlc
UlUeCb *)ptr;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP;
-
kw
CfgFillUlRbCb(gCb,rbCb, ueCb, entCfg);
+
rlc
CfgFillUlRbCb(gCb,rbCb, ueCb, entCfg);
break;
}
case CM_LTE_MODE_AM:
{
break;
}
case CM_LTE_MODE_AM:
{
-
KwUlUeCb *ueCb = (Kw
UlUeCb *)ptr;
+
RlcUlUeCb *ueCb = (Rlc
UlUeCb *)ptr;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP;
ueCb->lCh[entCfg->lCh[1].lChId - 1].ulRbCb = rbCb;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP;
ueCb->lCh[entCfg->lCh[1].lChId - 1].ulRbCb = rbCb;
@@
-467,7
+437,7
@@
CkwEntCfgInfo *entCfg;
break;
}
}
break;
}
}
-
RETVALUE
(CKW_CFG_REAS_NONE);
+
return
(CKW_CFG_REAS_NONE);
}
\f
}
\f
@@
-486,35
+456,19
@@
CkwEntCfgInfo *entCfg;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwValidateRbCfgParams
-(
-KwCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-CkwEntCfgInfo *cfgToValidate,
-CmStatus *status
-)
-#else
-PUBLIC S16 kwValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status)
-KwCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-CkwEntCfgInfo *cfgToValidate;
-CmStatus *status;
-#endif
+S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status)
{
if (cellId == 0)
{
status->reason = CKW_CFG_REAS_CELL_UNKWN;
{
if (cellId == 0)
{
status->reason = CKW_CFG_REAS_CELL_UNKWN;
-
RETVALUE
(RFAILED);
+
return
(RFAILED);
}
if ((cfgToValidate->rguSapId >= gCb->genCfg.maxRguSaps) || (cfgToValidate->rguSapId < 0))
{
}
if ((cfgToValidate->rguSapId >= gCb->genCfg.maxRguSaps) || (cfgToValidate->rguSapId < 0))
{
-
KWDBGP_ERROR(gCb, "kw
ValidateRbCfgParams ueId (%u) cellId (%u) Invalid rguSapId (%d))\n",
+
RLCDBGP_ERROR(gCb, "rlc
ValidateRbCfgParams ueId (%u) cellId (%u) Invalid rguSapId (%d))\n",
ueId, cellId, cfgToValidate->rguSapId);
status->reason = CKW_CFG_REAS_INVALID_RGUSAP;
ueId, cellId, cfgToValidate->rguSapId);
status->reason = CKW_CFG_REAS_INVALID_RGUSAP;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if((CKW_CFG_ADD == cfgToValidate->cfgType) ||
}
if((CKW_CFG_ADD == cfgToValidate->cfgType) ||
@@
-526,26
+480,26
@@
CmStatus *status;
(cfgToValidate->lCh[1].lChId <= 0)))
{
status->reason = CKW_CFG_REAS_INVALID_LCHID;
(cfgToValidate->lCh[1].lChId <= 0)))
{
status->reason = CKW_CFG_REAS_INVALID_LCHID;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if((cfgToValidate->entMode == CM_LTE_MODE_UM) &&
}
if((cfgToValidate->entMode == CM_LTE_MODE_UM) &&
- (cfgToValidate->m.umInfo.ul.snLen !=
KW
_UM_CFG_5BIT_SN_LEN) &&
- (cfgToValidate->m.umInfo.ul.snLen !=
KW
_UM_CFG_10BIT_SN_LEN))
+ (cfgToValidate->m.umInfo.ul.snLen !=
RLC
_UM_CFG_5BIT_SN_LEN) &&
+ (cfgToValidate->m.umInfo.ul.snLen !=
RLC
_UM_CFG_10BIT_SN_LEN))
{
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CellId[%u]:UM Mode RB[%d],Invalid SN Len[%d]",
cfgToValidate->rbId,
cfgToValidate->m.umInfo.ul.snLen);
status->reason = CKW_CFG_REAS_INVALID_SNLEN;
{
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CellId[%u]:UM Mode RB[%d],Invalid SN Len[%d]",
cfgToValidate->rbId,
cfgToValidate->m.umInfo.ul.snLen);
status->reason = CKW_CFG_REAS_INVALID_SNLEN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Process Adding new RB */
if (ueId == 0)
{
}
/* Process Adding new RB */
if (ueId == 0)
{
- if(cfgToValidate->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(cfgToValidate->rbId >=
RLC
_MAX_RB_PER_CELL)
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if ((cfgToValidate->lCh[0].type != CM_LTE_LCH_CCCH) &&
}
if ((cfgToValidate->lCh[0].type != CM_LTE_LCH_CCCH) &&
@@
-553,28
+507,28
@@
CmStatus *status;
{
status->reason= (cfgToValidate->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
CKW_CFG_REAS_LCHTYPE_MIS;
{
status->reason= (cfgToValidate->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
CKW_CFG_REAS_LCHTYPE_MIS;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
else
{
}
}
else
{
- if (!(
KW
_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId)))
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if(cfgToValidate->entMode == CM_LTE_MODE_TM)
{
status->reason = CKW_CFG_REAS_LCHTYPE_MIS;
}
if(cfgToValidate->entMode == CM_LTE_MODE_TM)
{
status->reason = CKW_CFG_REAS_LCHTYPE_MIS;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if (!(((cfgToValidate->lCh[0].type == CM_LTE_LCH_DCCH) &&
(cfgToValidate->entMode != CM_LTE_MODE_UM))||
(cfgToValidate->lCh[0].type == CM_LTE_LCH_DTCH)) )
{
status->reason = CKW_CFG_REAS_RB_MODE_MIS;
}
if (!(((cfgToValidate->lCh[0].type == CM_LTE_LCH_DCCH) &&
(cfgToValidate->entMode != CM_LTE_MODE_UM))||
(cfgToValidate->lCh[0].type == CM_LTE_LCH_DTCH)) )
{
status->reason = CKW_CFG_REAS_RB_MODE_MIS;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
}
}
@@
-582,23
+536,23
@@
CmStatus *status;
{
if (ueId == 0)
{
{
if (ueId == 0)
{
- if(cfgToValidate->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(cfgToValidate->rbId >=
RLC
_MAX_RB_PER_CELL)
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
else
{
}
}
else
{
- if (!(
KW
_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId)))
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
{
status->reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-616,36
+570,27
@@
CmStatus *status;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgValidateUlRb
+S16 rlcCfgValidateUlRb
(
(
-
Kw
Cb *gCb,
-
Ckw
EntCfgInfo *cfgToValidate,
-
Kw
UlEntTmpData *cfgEntData,
-
Kw
UlCfgTmpData *cfgTmpData
+
Rlc
Cb *gCb,
+
Rlc
EntCfgInfo *cfgToValidate,
+
Rlc
UlEntTmpData *cfgEntData,
+
Rlc
UlCfgTmpData *cfgTmpData
)
)
-#else
-PUBLIC S16 kwCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData)
-KwCb *gCb;
-CkwEntCfgInfo *cfgToValidate;
-KwUlEntTmpData *cfgEntData;
-KwUlCfgTmpData *cfgTmpData;
-#endif
{
{
- TRC3(kwCfgValidateUlRb)
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
cfgTmpData->cellId,
cfgToValidate->cfgType);
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
cfgTmpData->cellId,
cfgToValidate->cfgType);
- if(ROK !=
kw
ValidateRbCfgParams(gCb,
+ if(ROK !=
rlc
ValidateRbCfgParams(gCb,
cfgTmpData->ueId,
cfgTmpData->cellId,
cfgToValidate,
&cfgEntData->entUlCfgCfm.status))
{
cfgTmpData->ueId,
cfgTmpData->cellId,
cfgToValidate,
&cfgEntData->entUlCfgCfm.status))
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_NONE;
}
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_NONE;
@@
-657,95
+602,95
@@
KwUlCfgTmpData *cfgTmpData;
{
/* Cell Cb is added if it not present , it is not roll backed if the
* configuration fails */
{
/* Cell Cb is added if it not present , it is not roll backed if the
* configuration fails */
-
kw
DbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb);
+
rlc
DbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb);
if(!cfgTmpData->cellCb)
{
/* cell cb does not exist we need to create a new one */
if(!cfgTmpData->cellCb)
{
/* cell cb does not exist we need to create a new one */
-
KW_ALLOC(gCb,cfgTmpData->cellCb, sizeof(Kw
UlCellCb));
+
RLC_ALLOC(gCb,cfgTmpData->cellCb, sizeof(Rlc
UlCellCb));
if(!cfgTmpData->cellCb)
{
RLOG_ARG1(L_FATAL,DBG_UEID,cfgTmpData->ueId,
"Memory allocation failure CELLID:%d",
cfgTmpData->cellId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_CREAT_FAIL;
if(!cfgTmpData->cellCb)
{
RLOG_ARG1(L_FATAL,DBG_UEID,cfgTmpData->ueId,
"Memory allocation failure CELLID:%d",
cfgTmpData->cellId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_CREAT_FAIL;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
kw
DbmAddUlCellCb(gCb, cfgTmpData->cellId, cfgTmpData->cellCb);
+
rlc
DbmAddUlCellCb(gCb, cfgTmpData->cellId, cfgTmpData->cellCb);
}
else
{
if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP))
{
}
else
{
if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP))
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
;
-
RETVALUE(RFAILED)
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
+
return RFAILED
;
}
}
}
}
-
KW_ALLOC(gCb,cfgEntData->rbCb, sizeof (Kw
UlRbCb));
+
RLC_ALLOC(gCb,cfgEntData->rbCb, sizeof (Rlc
UlRbCb));
if (!cfgEntData->rbCb)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL;
if (!cfgEntData->rbCb)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
else
{
/* Ue Cb is added if it not present , it is not roll backed if the
* configuration fails */
}
}
else
{
/* Ue Cb is added if it not present , it is not roll backed if the
* configuration fails */
-
kw
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb);
+
rlc
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb);
if(!cfgTmpData->ueCb)
{
if(!cfgTmpData->ueCb)
{
-
KW_ALLOC(gCb,cfgTmpData->ueCb, sizeof(Kw
UlUeCb));
+
RLC_ALLOC(gCb,cfgTmpData->ueCb, sizeof(Rlc
UlUeCb));
if(!cfgTmpData->ueCb)
{
RLOG_ARG1(L_FATAL,DBG_UEID,cfgTmpData->ueId,
"Memory allocation failure CELLID:%d",
cfgTmpData->cellId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_CREAT_FAIL;
if(!cfgTmpData->ueCb)
{
RLOG_ARG1(L_FATAL,DBG_UEID,cfgTmpData->ueId,
"Memory allocation failure CELLID:%d",
cfgTmpData->cellId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_CREAT_FAIL;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
kw
DbmAddUlUeCb(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgTmpData->ueCb);
+
rlc
DbmAddUlUeCb(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgTmpData->ueCb);
}
else
{
}
else
{
-
KW
_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId,
+
RLC
_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId,
cfgToValidate->rbType,
cfgTmpData->ueCb,
cfgEntData->rbCb);
if(cfgEntData->rbCb != NULLP)
{
cfgToValidate->rbType,
cfgTmpData->ueCb,
cfgEntData->rbCb);
if(cfgEntData->rbCb != NULLP)
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
;
-
RETVALUE(RFAILED)
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
+
return RFAILED
;
}
}
}
}
-
KW_ALLOC(gCb,cfgEntData->rbCb, sizeof (Kw
UlRbCb));
+
RLC_ALLOC(gCb,cfgEntData->rbCb, sizeof (Rlc
UlRbCb));
if (!cfgEntData->rbCb)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL;
if (!cfgEntData->rbCb)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
/*Allocating the memory for receive buffer */
if(CM_LTE_MODE_UM == cfgToValidate->entMode)
{
}
}
/*Allocating the memory for receive buffer */
if(CM_LTE_MODE_UM == cfgToValidate->entMode)
{
-
U16
winLen;
+
uint16_t
winLen;
- cfgEntData->rbCb->m.umUl.umWinSz =
KW
_POWER(2,
+ cfgEntData->rbCb->m.umUl.umWinSz =
RLC
_POWER(2,
((cfgToValidate->m.umInfo.ul.snLen *5)-1));
winLen = cfgEntData->rbCb->m.umUl.umWinSz << 1;
((cfgToValidate->m.umInfo.ul.snLen *5)-1));
winLen = cfgEntData->rbCb->m.umUl.umWinSz << 1;
-
KW
_ALLOC(gCb,
+
RLC
_ALLOC(gCb,
cfgEntData->rbCb->m.umUl.recBuf,
cfgEntData->rbCb->m.umUl.recBuf,
- (winLen * sizeof(
Kw
UmRecBuf*)));
+ (winLen * sizeof(
Rlc
UmRecBuf*)));
}
else if(CM_LTE_MODE_AM == cfgToValidate->entMode)
{
#ifndef LTE_TDD
}
else if(CM_LTE_MODE_AM == cfgToValidate->entMode)
{
#ifndef LTE_TDD
-
U32
hashIndex;
-
KW
_ALLOC(gCb,
+
uint32_t
hashIndex;
+
RLC
_ALLOC(gCb,
cfgEntData->rbCb->m.amUl.recBufLst,
cfgEntData->rbCb->m.amUl.recBufLst,
- (
KW
_RCV_BUF_BIN_SIZE * sizeof(CmLListCp )));
- for(hashIndex = 0; hashIndex <
KW
_RCV_BUF_BIN_SIZE; hashIndex++)
+ (
RLC
_RCV_BUF_BIN_SIZE * sizeof(CmLListCp )));
+ for(hashIndex = 0; hashIndex <
RLC
_RCV_BUF_BIN_SIZE; hashIndex++)
{
cmLListInit(&(cfgEntData->rbCb->m.amUl.recBufLst[hashIndex]));
}
{
cmLListInit(&(cfgEntData->rbCb->m.amUl.recBufLst[hashIndex]));
}
@@
-759,7
+704,7
@@
KwUlCfgTmpData *cfgTmpData;
if (cfgTmpData->ueId == 0)
{
/* Try to get the CellCb if it already exists */
if (cfgTmpData->ueId == 0)
{
/* Try to get the CellCb if it already exists */
-
kw
DbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb);
+
rlc
DbmFetchUlCellCb(gCb,cfgTmpData->cellId, &cfgTmpData->cellCb);
if(!cfgTmpData->cellCb)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cfgTmpData->cellId,
if(!cfgTmpData->cellCb)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cfgTmpData->cellId,
@@
-767,7
+712,7
@@
KwUlCfgTmpData *cfgTmpData;
cfgTmpData->ueId);
/*how can a modify request come for a cell which does not exist*/
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
cfgTmpData->ueId);
/*how can a modify request come for a cell which does not exist*/
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
cfgEntData->rbCb = cfgTmpData->cellCb->rbCb[cfgToValidate->rbId];
}
cfgEntData->rbCb = cfgTmpData->cellCb->rbCb[cfgToValidate->rbId];
@@
-775,33
+720,33
@@
KwUlCfgTmpData *cfgTmpData;
{
/* something is wrong the rbId for this cell does not exist */
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
{
/* something is wrong the rbId for this cell does not exist */
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
else
{
}
else
{
-
kw
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb);
+
rlc
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb);
if(!cfgTmpData->ueCb)
{
RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId,
"UeId [%d]: UeCb not found",
cfgTmpData->ueId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
if(!cfgTmpData->ueCb)
{
RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId,
"UeId [%d]: UeCb not found",
cfgTmpData->ueId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Get rbCb */
}
/* Get rbCb */
-
KW
_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId,
+
RLC
_DBM_GET_RBCB_FROM_UECB(cfgToValidate->rbId,
cfgToValidate->rbType,
cfgTmpData->ueCb,
cfgEntData->rbCb);
if ( cfgEntData->rbCb == NULLP)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
cfgToValidate->rbType,
cfgTmpData->ueCb,
cfgEntData->rbCb);
if ( cfgEntData->rbCb == NULLP)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
break;
}
}
break;
}
@@
-812,16
+757,16
@@
KwUlCfgTmpData *cfgTmpData;
if(cfgToValidate->entMode != cfgEntData->rbCb->mode)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_MODE_MIS;
if(cfgToValidate->entMode != cfgEntData->rbCb->mode)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_MODE_MIS;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if(cfgToValidate->m.umInfo.ul.snLen != cfgEntData->rbCb->m.umUl.snLen)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_SNLEN_MIS;
}
if(cfgToValidate->m.umInfo.ul.snLen != cfgEntData->rbCb->m.umUl.snLen)
{
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_SNLEN_MIS;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-838,44
+783,33
@@
KwUlCfgTmpData *cfgTmpData;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgRollBackUlRb
+S16 rlcCfgRollBackUlRb
(
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
CmLteRnti ueId,
CmLteRnti ueId,
-CkwEntCfgInfo *cfg,
-KwUlEntTmpData *cfgEntData
-)
-#else
-PUBLIC S16 kwCfgRollBackUlRb(gCb, cfg, cfgEntData)
-(
-KwCb *gCb;
-CmLteRnti ueId;
-CkwEntCfgInfo *cfg;
-KwUlEntTmpData *cfgEntData;
+RlcEntCfgInfo *cfg,
+RlcUlEntTmpData *cfgEntData
)
)
-#endif
{
{
- TRC3(kwCfgRollBackUlRb)
if(CKW_CFG_ADD == cfg->cfgType)
{
if(CM_LTE_MODE_UM == cfg->entMode)
{
if(CKW_CFG_ADD == cfg->cfgType)
{
if(CM_LTE_MODE_UM == cfg->entMode)
{
-
KW
_FREE(gCb,
+
RLC
_FREE(gCb,
cfgEntData->rbCb->m.umUl.recBuf,
cfgEntData->rbCb->m.umUl.recBuf,
- (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(
Kw
UmRecBuf*));
+ (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(
Rlc
UmRecBuf*));
}
else if(CM_LTE_MODE_AM == cfg->entMode)
{
#ifndef LTE_TDD
}
else if(CM_LTE_MODE_AM == cfg->entMode)
{
#ifndef LTE_TDD
-
KW_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (KW
_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
+
RLC_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (RLC
_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
#endif
}
#endif
}
-
KW_FREE(gCb,cfgEntData->rbCb, sizeof(Kw
UlRbCb));
+
RLC_FREE(gCb,cfgEntData->rbCb, sizeof(Rlc
UlRbCb));
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-892,25
+826,14
@@
KwUlEntTmpData *cfgEntData;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC Void kwCfgApplyUlRb
-(
-KwCb *gCb,
-CkwEntCfgInfo *cfgToAply,
-KwUlEntTmpData *cfgEntData,
-KwUlCfgTmpData *cfgTmpData
-)
-#else
-PUBLIC Void kwCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData)
+Void rlcCfgApplyUlRb
(
(
-KwCb *gCb;
-CkwEntCfgInfo *cfgToAply;
-KwUlEntTmpData *cfgEntData;
-KwUlCfgTmpData *cfgTmpData;
+RlcCb *gCb,
+RlcEntCfgInfo *cfgToAply,
+RlcUlEntTmpData *cfgEntData,
+RlcUlCfgTmpData *cfgTmpData
)
)
-#endif
{
{
- TRC3(kwCfgApplyUlRb)
switch(cfgToAply->cfgType)
{
switch(cfgToAply->cfgType)
{
@@
-935,7
+858,7
@@
KwUlCfgTmpData *cfgTmpData;
}
}
}
}
-
KW
_LMM_RB_STS_INC(gCb);
+
RLC
_LMM_RB_STS_INC(gCb);
cfgEntData->rbCb->rlcId.cellId = cfgTmpData->cellId;
cfgEntData->rbCb->rlcId.ueId = cfgTmpData->ueId;
cfgEntData->rbCb->rlcId.cellId = cfgTmpData->cellId;
cfgEntData->rbCb->rlcId.ueId = cfgTmpData->ueId;
@@
-943,7
+866,7
@@
KwUlCfgTmpData *cfgTmpData;
cfgEntData->rbCb->inst = gCb->init.inst;
/* Fill RB CB */
cfgEntData->rbCb->inst = gCb->init.inst;
/* Fill RB CB */
-
kw
CfgFillUlRbCb(gCb,
+
rlc
CfgFillUlRbCb(gCb,
cfgEntData->rbCb,
cfgTmpData->ueCb,
cfgToAply);
cfgEntData->rbCb,
cfgTmpData->ueCb,
cfgToAply);
@@
-954,7
+877,7
@@
KwUlCfgTmpData *cfgTmpData;
if (cfgToAply->lCh[1].type == CM_LTE_LCH_DTCH)
{
/* ccpu00129778 */
if (cfgToAply->lCh[1].type == CM_LTE_LCH_DTCH)
{
/* ccpu00129778 */
-
kw
AddToUlL2Meas(gCb, cfgEntData->rbCb,
+
rlc
AddToUlL2Meas(gCb, cfgEntData->rbCb,
cfgTmpData->cellId,cfgTmpData->ueId);
}
#endif /* LTE_L2_MEAS */
cfgTmpData->cellId,cfgTmpData->ueId);
}
#endif /* LTE_L2_MEAS */
@@
-964,14
+887,14
@@
KwUlCfgTmpData *cfgTmpData;
{
if(cfgTmpData->ueId == 0)
{
{
if(cfgTmpData->ueId == 0)
{
-
kw
CfgUpdateUlRb(gCb,
+
rlc
CfgUpdateUlRb(gCb,
cfgEntData->rbCb,
(void *)cfgTmpData->cellCb,
cfgToAply);
}
else
{
cfgEntData->rbCb,
(void *)cfgTmpData->cellCb,
cfgToAply);
}
else
{
-
kw
CfgUpdateUlRb(gCb,
+
rlc
CfgUpdateUlRb(gCb,
cfgEntData->rbCb,
(void*)cfgTmpData->ueCb,
cfgToAply);
cfgEntData->rbCb,
(void*)cfgTmpData->ueCb,
cfgToAply);
@@
-994,11
+917,11
@@
KwUlCfgTmpData *cfgTmpData;
/* Free the Buffers of RbCb */
if( CM_LTE_MODE_UM == cfgEntData->rbCb->mode )
{
/* Free the Buffers of RbCb */
if( CM_LTE_MODE_UM == cfgEntData->rbCb->mode )
{
-
kw
UmmFreeUlRbCb(gCb, cfgEntData->rbCb);
+
rlc
UmmFreeUlRbCb(gCb, cfgEntData->rbCb);
}
else if(CM_LTE_MODE_AM == cfgEntData->rbCb->mode)
{
}
else if(CM_LTE_MODE_AM == cfgEntData->rbCb->mode)
{
-
kw
AmmFreeUlRbCb(gCb,cfgEntData->rbCb);
+
rlc
AmmFreeUlRbCb(gCb,cfgEntData->rbCb);
}
/* Assign NULLP to rbCb in rbCbLst */
}
/* Assign NULLP to rbCb in rbCbLst */
@@
-1012,13
+935,13
@@
KwUlCfgTmpData *cfgTmpData;
}
}
/* Delete RbCb */
}
}
/* Delete RbCb */
-
KW_FREE(gCb,cfgEntData->rbCb, sizeof(Kw
UlRbCb));
+
RLC_FREE(gCb,cfgEntData->rbCb, sizeof(Rlc
UlRbCb));
-
KW
_LMM_RB_STS_DEC(gCb);
+
RLC
_LMM_RB_STS_DEC(gCb);
break;
}
}
break;
}
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-1036,23
+959,14
@@
KwUlCfgTmpData *cfgTmpData;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgValidateDelUlUe
+S16 rlcCfgValidateDelUlUe
(
(
-
Kw
Cb *gCb,
-
Ckw
EntCfgInfo *cfgToValidate,
-
Kw
UlEntTmpData *cfgEntData,
-
Kw
UlCfgTmpData *cfgTmpData
+
Rlc
Cb *gCb,
+
Rlc
EntCfgInfo *cfgToValidate,
+
Rlc
UlEntTmpData *cfgEntData,
+
Rlc
UlCfgTmpData *cfgTmpData
)
)
-#else
-PUBLIC S16 kwCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData)
-KwCb *gCb;
-CkwEntCfgInfo *cfgToValidate;
-KwUlEntTmpData *cfgEntData;
-KwUlCfgTmpData *cfgTmpData;
-#endif
{
{
- TRC3(kwCfgValidateDelUlUe)
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
@@
-1061,23
+975,23
@@
KwUlCfgTmpData *cfgTmpData;
/* Check for ueId is present or not */
if ( cfgTmpData->ueId == 0 )
{
/* Check for ueId is present or not */
if ( cfgTmpData->ueId == 0 )
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
RLOG_ARG1(L_ERROR,DBG_UEID,cfgTmpData->ueId,
"UeId is 0 for CELLID;%d",
cfgTmpData->cellId);
RLOG_ARG1(L_ERROR,DBG_UEID,cfgTmpData->ueId,
"UeId is 0 for CELLID;%d",
cfgTmpData->cellId);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Fetch Ue Cb */
}
/* Fetch Ue Cb */
- if(ROK !=
kw
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb))
+ if(ROK !=
rlc
DbmFetchUlUeCb(gCb,cfgTmpData->ueId, cfgTmpData->cellId, &cfgTmpData->ueCb))
{
RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId,
"UeId [%d]: UeCb not found",
cfgTmpData->ueId);
{
RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId,
"UeId [%d]: UeCb not found",
cfgTmpData->ueId);
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
;
-
RETVALUE(RFAILED)
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-1091,27
+1005,18
@@
KwUlCfgTmpData *cfgTmpData;
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-#ifdef ANSI
-PUBLIC Void kwCfgApplyDelUlUe
-(
-KwCb *gCb,
-KwUlCfgTmpData *cfgTmpData
-)
-#else
-PUBLIC Void kwCfgApplyDelUlUe(gCb, cfgTmpData)
+Void rlcCfgApplyDelUlUe
(
(
-KwCb *gCb;
-KwUlCfgTmpData *cfgTmpData;
+RlcCb *gCb,
+RlcUlCfgTmpData *cfgTmpData
)
)
-#endif
{
{
- TRC3(kwCfgApplyDelUlUe)
#ifdef LTE_L2_MEAS
#ifdef LTE_L2_MEAS
-
kw
DelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId);
+
rlc
DelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId);
#endif
#endif
-
kw
DbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE);
-
RETVOID
;
+
rlc
DbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE);
+
return
;
}
\f
}
\f
@@
-1130,25
+1035,15
@@
KwUlCfgTmpData *cfgTmpData;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgValidateDelUlCell
+S16 rlcCfgValidateDelUlCell
(
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
CmLteCellId cellId,
CmLteCellId cellId,
-
Ckw
EntCfgInfo *cfgToValidate,
-
Kw
UlEntTmpData *cfgEntData,
-
Kw
UlCfgTmpData *cfgTmpData
+
Rlc
EntCfgInfo *cfgToValidate,
+
Rlc
UlEntTmpData *cfgEntData,
+
Rlc
UlCfgTmpData *cfgTmpData
)
)
-#else
-PUBLIC S16 kwCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData)
-KwCb *gCb;
-CmLteCellId cellId;
-CkwEntCfgInfo *cfgToValidate;
-KwUlEntTmpData *cfgEntData;
-KwUlCfgTmpData *cfgTmpData;
-#endif
{
{
- TRC3(kwCfgValidateDelUlCell)
RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
cfgToValidate->cfgType);
RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
cfgToValidate->cfgType);
@@
-1158,20
+1053,20
@@
KwUlCfgTmpData *cfgTmpData;
/* Check for cellId is present or not */
if ( cellId == 0 )
{
/* Check for cellId is present or not */
if ( cellId == 0 )
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
RLOG_ARG0(L_ERROR,DBG_CELLID,cellId , "CellId is 0");
RLOG_ARG0(L_ERROR,DBG_CELLID,cellId , "CellId is 0");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Fetch Cell Cb */
}
/* Fetch Cell Cb */
-
kw
DbmFetchUlCellCb(gCb,cellId, &cfgTmpData->cellCb);
+
rlc
DbmFetchUlCellCb(gCb,cellId, &cfgTmpData->cellCb);
if (!cfgTmpData->cellCb)
{
if (!cfgTmpData->cellCb)
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;
RLOG_ARG0(L_ERROR, DBG_CELLID,cellId, "CellCb not found");
RLOG_ARG0(L_ERROR, DBG_CELLID,cellId, "CellCb not found");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-1185,24
+1080,11
@@
KwUlCfgTmpData *cfgTmpData;
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-#ifdef ANSI
-PUBLIC Void kwCfgApplyDelUlCell
-(
-KwCb *gCb,
-KwUlCfgTmpData *cfgInfo
-)
-#else
-PUBLIC Void kwCfgApplyDelUlCell(gCb, cfgEntData)
-(
-KwCb *gCb;
-KwUlCfgTmpData *cfgInfo;
-)
-#endif
+Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo)
{
{
- TRC3(kwCfgApplyDelUlCell)
-
kw
DbmDelUlCellCb(gCb,cfgInfo->cellCb);
-
RETVOID
;
+
rlc
DbmDelUlCellCb(gCb,cfgInfo->cellCb);
+
return
;
}
\f
/**
}
\f
/**
@@
-1219,26
+1101,16
@@
KwUlCfgTmpData *cfgInfo;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgValidateReEstRb
+S16 rlcCfgValidateReEstRb
(
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
CmLteRnti ueId,
CmLteCellId cellId,
CmLteRnti ueId,
CmLteCellId cellId,
-
Ckw
EntCfgInfo *cfgToValidate,
-
Kw
UlEntTmpData *cfgEntData
+
Rlc
EntCfgInfo *cfgToValidate,
+
Rlc
UlEntTmpData *cfgEntData
)
)
-#else
-PUBLIC S16 kwCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData)
-KwCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-CkwEntCfgInfo *cfgToValidate;
-KwUlEntTmpData *cfgEntData;
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
{
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(kwCfgValidateReEstRb)
RLOG_ARG2(L_DEBUG, DBG_UEID,ueId,
"cellId(%d) RBID:%d",
RLOG_ARG2(L_DEBUG, DBG_UEID,ueId,
"cellId(%d) RBID:%d",
@@
-1251,7
+1123,7
@@
KwUlEntTmpData *cfgEntData;
rlcId.rbId = cfgToValidate->rbId;
rlcId.rbType = cfgToValidate->rbType;
rlcId.rbId = cfgToValidate->rbId;
rlcId.rbType = cfgToValidate->rbType;
-
kw
DbmFetchUlRbCbByRbId(gCb,&rlcId, &cfgEntData->rbCb);
+
rlc
DbmFetchUlRbCbByRbId(gCb,&rlcId, &cfgEntData->rbCb);
if (cfgEntData->rbCb == NULLP)
{
RLOG_ARG2(L_WARNING, DBG_UEID,ueId,
if (cfgEntData->rbCb == NULLP)
{
RLOG_ARG2(L_WARNING, DBG_UEID,ueId,
@@
-1259,10
+1131,10
@@
KwUlEntTmpData *cfgEntData;
cellId,
cfgToValidate->rbId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
cellId,
cfgToValidate->rbId);
cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
@@
-1280,28
+1152,16
@@
KwUlEntTmpData *cfgEntData;
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-#ifdef ANSI
-PUBLIC Void kwCfgApplyReEstUlRb
+Void rlcCfgApplyReEstUlRb
(
(
-KwCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-Bool sndReEstInd,
-KwUlEntTmpData *cfgEntData
-)
-#else
-PUBLIC Void kwCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData)
-(
-KwCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-Bool sndReEstInd;
-KwUlEntTmpData *cfgEntData;
+RlcCb *gCb,
+CmLteRnti ueId,
+CmLteCellId cellId,
+Bool sndReEstInd,
+RlcUlEntTmpData *cfgEntData
)
)
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
{
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(kwCfgApplyReEstUlRb)
rlcId.ueId = ueId;
rlcId.cellId = cellId;
rlcId.ueId = ueId;
rlcId.cellId = cellId;
@@
-1312,23
+1172,23
@@
KwUlEntTmpData *cfgEntData;
{
case CM_LTE_MODE_TM:
{
{
case CM_LTE_MODE_TM:
{
-
kw
TmmUlReEstablish(gCb,cfgEntData->rbCb);
+
rlc
TmmUlReEstablish(gCb,cfgEntData->rbCb);
break;
}
case CM_LTE_MODE_UM:
{
break;
}
case CM_LTE_MODE_UM:
{
-
kw
UmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb);
+
rlc
UmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb);
break;
}
case CM_LTE_MODE_AM:
{
break;
}
case CM_LTE_MODE_AM:
{
-
kw
AmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb);
+
rlc
AmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb);
break;
}
}
break;
}
}
-
RETVOID
;
+
return
;
}
\f
/**
}
\f
/**
@@
-1344,24
+1204,15
@@
KwUlEntTmpData *cfgEntData;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwCfgValidateUeIdChng
+S16 rlcCfgValidateUeIdChng
(
(
-
KwCb
*gCb,
+
RlcCb
*gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-
KwUlCfgTmpData
*cfgTmpData
+
RlcUlCfgTmpData
*cfgTmpData
)
)
-#else
-PUBLIC S16 kwCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData)
-KwCb *gCb;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-KwUlCfgTmpData *cfgTmpData;
-#endif
{
{
- KwUlUeCb *ueCb;
- TRC3(kwCfgValidateUeIdChng)
+ RlcUlUeCb *ueCb;
#define CFM_STATUS cfgTmpData->cfgEntData[0].entUlCfgCfm.status
if ( (ueInfo->ueId == newUeInfo->ueId) &&
#define CFM_STATUS cfgTmpData->cfgEntData[0].entUlCfgCfm.status
if ( (ueInfo->ueId == newUeInfo->ueId) &&
@@
-1369,20
+1220,20
@@
KwUlCfgTmpData *cfgTmpData;
{
CFM_STATUS.reason = CKW_CFG_REAS_SAME_UEID;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
{
CFM_STATUS.reason = CKW_CFG_REAS_SAME_UEID;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
- if(ROK ==
kw
DbmFetchUlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb))
+ if(ROK ==
rlc
DbmFetchUlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb))
{
RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId,
"NewUeId[%d]:ueCb already exists",
newUeInfo->ueId);
CFM_STATUS.reason = CKW_CFG_REAS_UE_EXISTS;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
{
RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId,
"NewUeId[%d]:ueCb already exists",
newUeInfo->ueId);
CFM_STATUS.reason = CKW_CFG_REAS_UE_EXISTS;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
- if(ROK !=
kw
DbmFetchUlUeCb(gCb,ueInfo->ueId, ueInfo->cellId,
+ if(ROK !=
rlc
DbmFetchUlUeCb(gCb,ueInfo->ueId, ueInfo->cellId,
&cfgTmpData->ueCb))
{
RLOG_ARG1(L_ERROR,DBG_CELLID, ueInfo->cellId,
&cfgTmpData->ueCb))
{
RLOG_ARG1(L_ERROR,DBG_CELLID, ueInfo->cellId,
@@
-1390,10
+1241,10
@@
KwUlCfgTmpData *cfgTmpData;
ueInfo->ueId);
CFM_STATUS.reason = CKW_CFG_REAS_UE_UNKWN;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
ueInfo->ueId);
CFM_STATUS.reason = CKW_CFG_REAS_UE_UNKWN;
CFM_STATUS.status = CKW_CFG_CFM_NOK;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
#undef CFM_STATUS
}
#undef CFM_STATUS
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
@@
-1410,28
+1261,17
@@
KwUlCfgTmpData *cfgTmpData;
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-#ifdef ANSI
-PUBLIC Void kwCfgApplyUlUeIdChng
+Void rlcCfgApplyUlUeIdChng
(
(
-
KwCb
*gCb,
+
RlcCb
*gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-
KwUlCfgTmpData
*cfgTmpData
+
RlcUlCfgTmpData
*cfgTmpData
)
)
-#else
-PUBLIC Void kwCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData)
-(
-KwCb *gCb;
-CkwUeInfo *ueInfo,
-CkwUeInfo *newUeInfo,
-KwUlCfgTmpData *cfgTmpData;
-)
-#endif
{
{
- TRC3(kwCfgApplyUlUeIdChng)
#ifdef LTE_L2_MEAS
#ifdef LTE_L2_MEAS
-
kw
HdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId);
+
rlc
HdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId);
#endif
cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) cfgTmpData->ueCb);
/* update the hash key with new values */
#endif
cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) cfgTmpData->ueCb);
/* update the hash key with new values */
@@
-1439,8
+1279,8
@@
KwUlCfgTmpData *cfgTmpData;
cfgTmpData->ueCb->cellId =newUeInfo->cellId;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
(PTR)cfgTmpData->ueCb,
cfgTmpData->ueCb->cellId =newUeInfo->cellId;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
(PTR)cfgTmpData->ueCb,
- (
U8
*)&(cfgTmpData->ueCb->ueId),
- (
U16
) sizeof(CmLteRnti)))
+ (
uint8_t
*)&(cfgTmpData->ueCb->ueId),
+ (
uint16_t
) sizeof(CmLteRnti)))
{
RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,
{
RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,
@@
-1448,7
+1288,7
@@
KwUlCfgTmpData *cfgTmpData;
newUeInfo->ueId);
}
newUeInfo->ueId);
}
-
RETVOID
;
+
return
;
}
/********************************************************************30**
}
/********************************************************************30**