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 "correction in F1AP message based on wireshark logs"
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_cfg_dl.c
diff --git
a/src/5gnrrlc/kw_cfg_dl.c
b/src/5gnrrlc/kw_cfg_dl.c
index
ab4b632
..
a6150fe
100755
(executable)
--- a/
src/5gnrrlc/kw_cfg_dl.c
+++ b/
src/5gnrrlc/kw_cfg_dl.c
@@
-67,7
+67,7
@@
static int RLOG_FILE_ID=191;
#include "kw_udx.x"
#include "kw_dl.x"
#include "kw_udx.x"
#include "kw_dl.x"
-#define
KW_MODULE KW
_DBGMASK_CFG
+#define
RLC_MODULE RLC
_DBGMASK_CFG
/*Added for adding new Ue in onging L2 Meas*/
#ifdef LTE_L2_MEAS
/**
/*Added for adding new Ue in onging L2 Meas*/
#ifdef LTE_L2_MEAS
/**
@@
-82,16
+82,16
@@
static int RLOG_FILE_ID=191;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-PRIVATE S16
kw
HdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
+PRIVATE S16
rlc
HdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
{
{
-
Kw
L2MeasEvtCb *measEvtCb = NULLP;
-
Kw
L2MeasCb *measCb = NULLP;
+
Rlc
L2MeasEvtCb *measEvtCb = NULLP;
+
Rlc
L2MeasCb *measCb = NULLP;
U16 cntr;
U16 ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
U16 cntr;
U16 ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measEvtCb = &(gCb->u.dlCb->
kwL2Cb.kw
L2EvtCb[cntr]);
+ measEvtCb = &(gCb->u.dlCb->
rlcL2Cb.rlc
L2EvtCb[cntr]);
measCb = &(measEvtCb->measCb);
measCb = &(measEvtCb->measCb);
@@
-123,17
+123,17
@@
PRIVATE S16 kwHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-PRIVATE S16
kw
DelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
+PRIVATE S16
rlc
DelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
{
{
-
Kw
L2MeasEvtCb *measEvtCb = NULLP;
-
Kw
L2MeasCb *measCb = NULLP;
+
Rlc
L2MeasEvtCb *measEvtCb = NULLP;
+
Rlc
L2MeasCb *measCb = NULLP;
U16 cntr;
U16 ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
U16 cntr;
U16 ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measEvtCb = &gCb->u.dlCb->
kwL2Cb.kw
L2EvtCb[cntr];
+ measEvtCb = &gCb->u.dlCb->
rlcL2Cb.rlc
L2EvtCb[cntr];
measCb = &(measEvtCb->measCb);
measCb = &(measEvtCb->measCb);
@@
-160,10
+160,10
@@
PRIVATE S16 kwDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
}
}
-PRIVATE S16
kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kw
RbCb,U8 cellId,U8 ueId)
+PRIVATE S16
rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlc
RbCb,U8 cellId,U8 ueId)
{
{
-
Kw
L2MeasEvtCb *measEvtCb = NULLP;
-
Kw
L2MeasCb *measCb = NULLP;
+
Rlc
L2MeasEvtCb *measEvtCb = NULLP;
+
Rlc
L2MeasCb *measCb = NULLP;
U16 cntr;
U16 cntr1;
U16 ueIdx = 0;
U16 cntr;
U16 cntr1;
U16 ueIdx = 0;
@@
-178,7
+178,7
@@
PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId)
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
- measEvtCb = &gCb->u.dlCb->
kwL2Cb.kw
L2EvtCb[cntr];
+ measEvtCb = &gCb->u.dlCb->
rlcL2Cb.rlc
L2EvtCb[cntr];
measCb = &(measEvtCb->measCb);
freeIdx = gCb->genCfg.maxUe;
measCb = &(measEvtCb->measCb);
freeIdx = gCb->genCfg.maxUe;
@@
-189,41
+189,41
@@
PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId)
for(cntr1 =0;((cntr1 < measCb->val.nonIpThMeas.numQci) &&
(cntr1 < LKW_MAX_QCI));cntr1++)
{
for(cntr1 =0;((cntr1 < measCb->val.nonIpThMeas.numQci) &&
(cntr1 < LKW_MAX_QCI));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.dlCb->
kwL2Cb.measOn[kw
RbCb->qci] |=measCb->measType;
+ measCb->val.nonIpThMeas.qci[cntr1] =
rlc
RbCb->qci;
+ gCb->u.dlCb->
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))
{
if (measCb->measType & LKW_L2MEAS_ACT_UE)
{
{
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.umDl.sduQ.count)
+ if (
rlc
RbCb->m.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.dlCb->
kwL2Cb.numActUe[kw
RbCb->qci]++;
+
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci]++;
+ gCb->u.dlCb->
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.amDl.cntrlBo) ||
- (
kw
RbCb->m.amDl.retxBo) ||
- (
kw
RbCb->m.amDl.bo))
+ if ((
rlc
RbCb->m.amDl.cntrlBo) ||
+ (
rlc
RbCb->m.amDl.retxBo) ||
+ (
rlc
RbCb->m.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.dlCb->
kwL2Cb.numActUe[kw
RbCb->qci]++;
+
rlcRbCb->ueCb->numActRb[rlc
RbCb->qci]++;
+ gCb->u.dlCb->
rlcL2Cb.numActUe[rlc
RbCb->qci]++;
}
}
}
}
}
}
@@
-262,7
+262,7
@@
PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *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 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId)
for (qciIdx =0; ((qciIdx < *numQci) &&
(qciIdx < LKW_MAX_QCI)) ; qciIdx++)
{
for (qciIdx =0; ((qciIdx < *numQci) &&
(qciIdx < LKW_MAX_QCI)) ; 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;
}
@@
-281,25
+281,25
@@
PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId)
/* Fix Klock Warning */
if ((qciIdx == *numQci) && (qciIdx < LKW_MAX_QCI))
{
/* Fix Klock Warning */
if ((qciIdx == *numQci) && (qciIdx < LKW_MAX_QCI))
{
- measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] =
kw
RbCb->qci;
+ measCb->val.ipThMeas.ueInfoLst[ueIdx].qci[qciIdx] =
rlc
RbCb->qci;
(*numQci)++;
}
(*numQci)++;
}
-
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);
}
else if (measCb->measType &
(LKW_L2MEAS_DL_DISC | LKW_L2MEAS_DL_DELAY | LKW_L2MEAS_UU_LOSS))
{
}
else if (measCb->measType &
(LKW_L2MEAS_DL_DISC | LKW_L2MEAS_DL_DELAY | LKW_L2MEAS_UU_LOSS))
{
-
kwUtlPlcMeasDatInL2Sts(&measCb->val.nonIpThMeas.measData[kw
RbCb->qci],
- &
kw
RbCb->rbL2Cb, measCb->measType);
- measCb->val.nonIpThMeas.qci[
kwRbCb->qci] = kw
RbCb->qci;
- measCb->val.nonIpThMeas.measData[
kw
RbCb->qci].totDrbsPerQci++;
+
rlcUtlPlcMeasDatInL2Sts(&measCb->val.nonIpThMeas.measData[rlc
RbCb->qci],
+ &
rlc
RbCb->rbL2Cb, measCb->measType);
+ measCb->val.nonIpThMeas.qci[
rlcRbCb->qci] = rlc
RbCb->qci;
+ measCb->val.nonIpThMeas.measData[
rlc
RbCb->qci].totDrbsPerQci++;
}
}
-
kw
RbCb->rbL2Cb.measOn |= measCb->measType;
+
rlc
RbCb->rbL2Cb.measOn |= measCb->measType;
}
return ROK;
}
return ROK;
-}/*
kw
AddToDlL2Meas*/
+}/*
rlc
AddToDlL2Meas*/
#endif /*LTE_L2_MEAS*/
\f
/**
#endif /*LTE_L2_MEAS*/
\f
/**
@@
-331,7
+331,6
@@
RlcDlUeCb *ueCb;
RlcEntCfgInfo *entCfg;
#endif
{
RlcEntCfgInfo *entCfg;
#endif
{
- TRC3(rlcCfgFillDlRbCb)
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
@@
-356,7
+355,7
@@
RlcEntCfgInfo *entCfg;
rbCb->lch.lChType = entCfg->lCh[0].type;
rbCb->dir = entCfg->dir;
rbCb->m.umDl.snLen = entCfg->m.umInfo.dl.snLen;
rbCb->lch.lChType = entCfg->lCh[0].type;
rbCb->dir = entCfg->dir;
rbCb->m.umDl.snLen = entCfg->m.umInfo.dl.snLen;
- if (entCfg->m.umInfo.dl.snLen ==
KW
_UM_CFG_5BIT_SN_LEN)
+ if (entCfg->m.umInfo.dl.snLen ==
RLC
_UM_CFG_5BIT_SN_LEN)
rbCb->m.umDl.modBitMask = 0x1f;
else
rbCb->m.umDl.modBitMask = 0x3ff;
rbCb->m.umDl.modBitMask = 0x1f;
else
rbCb->m.umDl.modBitMask = 0x3ff;
@@
-371,20
+370,20
@@
RlcEntCfgInfo *entCfg;
* indx = 0 as Down Link */
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
* indx = 0 as Down Link */
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
- rbCb->dir =
KW
_DIR_BOTH;
+ rbCb->dir =
RLC
_DIR_BOTH;
rbCb->m.amDl.pollPdu = entCfg->m.amInfo.dl.pollPdu;
rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte;
rbCb->m.amDl.maxRetx = entCfg->m.amInfo.dl.maxRetx;
rbCb->m.amDl.pollRetxTmrInt = entCfg->m.amInfo.dl.pollRetxTmr;
rbCb->m.amDl.snLen = entCfg->m.amInfo.dl.snLen;
rbCb->m.amDl.pollPdu = entCfg->m.amInfo.dl.pollPdu;
rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte;
rbCb->m.amDl.maxRetx = entCfg->m.amInfo.dl.maxRetx;
rbCb->m.amDl.pollRetxTmrInt = entCfg->m.amInfo.dl.pollRetxTmr;
rbCb->m.amDl.snLen = entCfg->m.amInfo.dl.snLen;
- if(
KW
_AM_CFG_12BIT_SN_LEN == rbCb->m.amDl.snLen)
+ if(
RLC
_AM_CFG_12BIT_SN_LEN == rbCb->m.amDl.snLen)
{
{
- rbCb->m.amDl.snModMask = (1 <<
KW
_SN_LEN_12BITS) - 1; /* 5GNR */
+ rbCb->m.amDl.snModMask = (1 <<
RLC
_SN_LEN_12BITS) - 1; /* 5GNR */
}
else
{
}
else
{
- rbCb->m.amDl.snModMask = (1 <<
KW
_SN_LEN_18BITS) - 1; /* 5GNR */
+ rbCb->m.amDl.snModMask = (1 <<
RLC
_SN_LEN_18BITS) - 1; /* 5GNR */
}
cmInitTimers(&(rbCb->m.amDl.pollRetxTmr), 1);
}
cmInitTimers(&(rbCb->m.amDl.pollRetxTmr), 1);
@@
-396,8
+395,8
@@
RlcEntCfgInfo *entCfg;
U32 hashIndex;
RLC_ALLOC(gCb,
rbCb->m.amDl.txBufLst,
U32 hashIndex;
RLC_ALLOC(gCb,
rbCb->m.amDl.txBufLst,
- (
KW
_TX_BUF_BIN_SIZE * sizeof(CmLListCp)));
- for(hashIndex = 0; hashIndex <
KW
_TX_BUF_BIN_SIZE; hashIndex++)
+ (
RLC
_TX_BUF_BIN_SIZE * sizeof(CmLListCp)));
+ for(hashIndex = 0; hashIndex <
RLC
_TX_BUF_BIN_SIZE; hashIndex++)
{
cmLListInit(&(rbCb->m.amDl.txBufLst[hashIndex]));
}
{
cmLListInit(&(rbCb->m.amDl.txBufLst[hashIndex]));
}
@@
-448,7
+447,6
@@
void *ptr;
RlcEntCfgInfo *entCfg;
#endif
{
RlcEntCfgInfo *entCfg;
#endif
{
- TRC3(rlcCfgUpdateDlRb)
if (rbCb->mode != entCfg->entMode)
{
if (rbCb->mode != entCfg->entMode)
{
@@
-549,7
+547,7
@@
RlcEntCfgInfo *entCfg;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgAddDlRb
+S16 rlcCfgAddDlRb
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-558,7
+556,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm)
+S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
@@
-568,11
+566,9
@@
RlcEntCfgCfmInfo *entCfm;
{
RlcDlUeCb *ueCb = NULLP; /* UE Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
{
RlcDlUeCb *ueCb = NULLP; /* UE Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
- RlcDlRbCb *
kw
RbCb; /* KW RB Control Block */
+ RlcDlRbCb *
rlc
RbCb; /* KW RB Control Block */
U8 reason; /* Rb Identifier */
U8 reason; /* Rb Identifier */
- TRC3(rlcCfgAddDlRb)
-
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
cellId,
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
cellId,
@@
-582,7
+578,7
@@
RlcEntCfgCfmInfo *entCfm;
if (cellId == 0)
{
/* Fill entCfm structure */
if (cellId == 0)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId,
"Add DLRb,CellId is 0 for UEID:%d",
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId,
"Add DLRb,CellId is 0 for UEID:%d",
@@
-591,7
+587,7
@@
RlcEntCfgCfmInfo *entCfm;
}
if ((entCfg->rguSapId >= gCb->genCfg.maxRguSaps) || (entCfg->rguSapId < 0))
{
}
if ((entCfg->rguSapId >= gCb->genCfg.maxRguSaps) || (entCfg->rguSapId < 0))
{
-
KW
DBGP_ERROR(gCb, "rlcCfgAddDlRb(ueId(%u), cellId(%u), Invalid rguSapId (%d)\n",
+
RLC
DBGP_ERROR(gCb, "rlcCfgAddDlRb(ueId(%u), cellId(%u), Invalid rguSapId (%d)\n",
ueId, cellId, entCfg->rguSapId);
return RFAILED;
}
ueId, cellId, entCfg->rguSapId);
return RFAILED;
}
@@
-600,15
+596,15
@@
RlcEntCfgCfmInfo *entCfm;
/* Process Adding new RB */
if (ueId == 0)
{
/* Process Adding new RB */
if (ueId == 0)
{
- if(entCfg->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(entCfg->rbId >=
RLC
_MAX_RB_PER_CELL)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
"Invalid RbId ,Max is [%d] CELLID:%d UEID:%d",
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
"Invalid RbId ,Max is [%d] CELLID:%d UEID:%d",
-
KW
_MAX_RB_PER_CELL,
+
RLC
_MAX_RB_PER_CELL,
cellId,
ueId);
return RFAILED;
cellId,
ueId);
return RFAILED;
@@
-620,14
+616,14
@@
RlcEntCfgCfmInfo *entCfm;
(entCfg->entMode == CM_LTE_MODE_TM))
{
/* Cell CB present */
(entCfg->entMode == CM_LTE_MODE_TM))
{
/* Cell CB present */
-
kw
DbmFetchDlCellCb(gCb, cellId, &cellCb);
+
rlc
DbmFetchDlCellCb(gCb, cellId, &cellCb);
if(cellCb)
{
/* Get rbCb from cellCb->rbCb List */
if (( cellCb->rbCb[entCfg->rbId] != NULLP))
{
/* Fill entCfm structure */
if(cellCb)
{
/* Get rbCb from cellCb->rbCb List */
if (( cellCb->rbCb[entCfg->rbId] != NULLP))
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_PRSNT);
RLOG_ARG2(L_WARNING, DBG_CELLID,cellId,
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_PRSNT);
RLOG_ARG2(L_WARNING, DBG_CELLID,cellId,
@@
-640,10
+636,10
@@
RlcEntCfgCfmInfo *entCfm;
else /* Cell CB UNKNOWN */
{
/* Create CELL CB */
else /* Cell CB UNKNOWN */
{
/* Create CELL CB */
- if ( ROK !=
kw
DbmCreateDlCellCb(gCb,cellId, &cellCb))
+ if ( ROK !=
rlc
DbmCreateDlCellCb(gCb,cellId, &cellCb))
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_CREAT_FAIL);
RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_CREAT_FAIL);
RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
@@
-663,45
+659,45
@@
RlcEntCfgCfmInfo *entCfm;
ueId,
entCfg->rbId);
/* Fill entCfm structure */
ueId,
entCfg->rbId);
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID);
return RFAILED;
}
/* Create RB CB */
CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID);
return RFAILED;
}
/* Create RB CB */
- RLC_ALLOC(gCb,
kw
RbCb, sizeof (RlcDlRbCb));
- if (!
kw
RbCb)
+ RLC_ALLOC(gCb,
rlc
RbCb, sizeof (RlcDlRbCb));
+ if (!
rlc
RbCb)
{
RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
"Memory allocation failed for rbId:%d CELLID:%d",
entCfg->rbId,
ueId);
/* Fill entCfm structure */
{
RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
"Memory allocation failed for rbId:%d CELLID:%d",
entCfg->rbId,
ueId);
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL);
return RFAILED;
}
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL);
return RFAILED;
}
-
kw
RbCb->rlcId.rbId = entCfg->rbId;
- cellCb->rbCb[entCfg->rbId] =
kw
RbCb;
-
KW
_LMM_RB_STS_INC(gCb);
- cellCb->lCh[entCfg->lCh[0].lChId - 1].dlRbCb =
kw
RbCb;
+
rlc
RbCb->rlcId.rbId = entCfg->rbId;
+ cellCb->rbCb[entCfg->rbId] =
rlc
RbCb;
+
RLC
_LMM_RB_STS_INC(gCb);
+ cellCb->lCh[entCfg->lCh[0].lChId - 1].dlRbCb =
rlc
RbCb;
}
else
{
reason= (entCfg->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
CKW_CFG_REAS_LCHTYPE_MIS;
/* Fill entCfm structure */
}
else
{
reason= (entCfg->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
CKW_CFG_REAS_LCHTYPE_MIS;
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, reason);
return RFAILED;
}
}
else
{
CKW_CFG_CFM_NOK, reason);
return RFAILED;
}
}
else
{
- if (!(
KW
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
"Invalid RbId for RbType[%d] UEID:%d",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
"Invalid RbId for RbType[%d] UEID:%d",
@@
-717,15
+713,15
@@
RlcEntCfgCfmInfo *entCfm;
(entCfg->entMode != CM_LTE_MODE_TM))
{
/* UE CB present */
(entCfg->entMode != CM_LTE_MODE_TM))
{
/* UE CB present */
- if (
kw
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb) == ROK)
+ if (
rlc
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb) == ROK)
{
/* Get rbCb from ueCb->rbCb list */
{
/* Get rbCb from ueCb->rbCb list */
-
KW_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, kw
RbCb);
+
RLC_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, rlc
RbCb);
- if((
kw
RbCb != NULLP))
+ if((
rlc
RbCb != NULLP))
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_PRSNT);
RLOG_ARG2(L_WARNING, DBG_UEID, ueId,
"CellId[%u]:rbId [%d] already exists",
CKW_CFG_REAS_RB_PRSNT);
RLOG_ARG2(L_WARNING, DBG_UEID, ueId,
"CellId[%u]:rbId [%d] already exists",
@@
-737,10
+733,10
@@
RlcEntCfgCfmInfo *entCfm;
else /* UE CB UNKNOWN */
{
/* Create UE CB */
else /* UE CB UNKNOWN */
{
/* Create UE CB */
- if (
kw
DbmCreateDlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
+ if (
rlc
DbmCreateDlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_UE_CREAT_FAIL);
RLOG_ARG2(L_WARNING, DBG_CELLID,cellId,
"UeId [%u]:ueCb Creation Failed RBID:%d",
CKW_CFG_REAS_UE_CREAT_FAIL);
RLOG_ARG2(L_WARNING, DBG_CELLID,cellId,
"UeId [%u]:ueCb Creation Failed RBID:%d",
@@
-756,17
+752,17
@@
RlcEntCfgCfmInfo *entCfm;
(entCfg->lCh[1].lChId <= 0)))
{
/* Fill entCfm structure */
(entCfg->lCh[1].lChId <= 0)))
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID);
return RFAILED;
}
/* Create RB CB */
CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID);
return RFAILED;
}
/* Create RB CB */
- RLC_ALLOC(gCb,
kw
RbCb, sizeof (RlcDlRbCb));
- if (
kw
RbCb == NULL)
+ RLC_ALLOC(gCb,
rlc
RbCb, sizeof (RlcDlRbCb));
+ if (
rlc
RbCb == NULL)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_CREAT_FAIL);
RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
"Memory allocation failed RBID:%d CELLID:%d",
CKW_CFG_REAS_RB_CREAT_FAIL);
RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
"Memory allocation failed RBID:%d CELLID:%d",
@@
-776,13
+772,13
@@
RlcEntCfgCfmInfo *entCfm;
}
/* copy the RB Cb into UECb */
}
/* copy the RB Cb into UECb */
-
kw
RbCb->rlcId.rbId = entCfg->rbId;
+
rlc
RbCb->rlcId.rbId = entCfg->rbId;
if(entCfg->rbType == CM_LTE_SRB)
if(entCfg->rbType == CM_LTE_SRB)
- ueCb->srbCb[entCfg->rbId] =
kw
RbCb;
+ ueCb->srbCb[entCfg->rbId] =
rlc
RbCb;
else
else
- ueCb->drbCb[entCfg->rbId] =
kw
RbCb;
+ ueCb->drbCb[entCfg->rbId] =
rlc
RbCb;
-
KW
_LMM_RB_STS_INC(gCb);
+
RLC
_LMM_RB_STS_INC(gCb);
}
else
}
else
@@
-797,48
+793,48
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Fill entCfm structure */
}
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason);
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason);
return RFAILED;
}
}
return RFAILED;
}
}
-
kw
RbCb->rlcId.cellId = cellId;
-
kw
RbCb->rlcId.ueId = ueId;
-
kw
RbCb->rlcId.rbType = entCfg->rbType;
-
kw
RbCb->inst = gCb->init.inst;
+
rlc
RbCb->rlcId.cellId = cellId;
+
rlc
RbCb->rlcId.ueId = ueId;
+
rlc
RbCb->rlcId.rbType = entCfg->rbType;
+
rlc
RbCb->inst = gCb->init.inst;
#ifdef TENB_MULT_CELL_SUPPRT
#ifdef TENB_MULT_CELL_SUPPRT
-
kw
RbCb->rguSapId = entCfg->rguSapId;
+
rlc
RbCb->rguSapId = entCfg->rguSapId;
#endif
/* Fill RB CB */
#endif
/* Fill RB CB */
- if (rlcCfgFillDlRbCb(gCb,
kw
RbCb, ueCb, entCfg) != ROK)
+ if (rlcCfgFillDlRbCb(gCb,
rlc
RbCb, ueCb, entCfg) != ROK)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_CREAT_FAIL);
/* Delete RB CB created */
CKW_CFG_REAS_RB_CREAT_FAIL);
/* Delete RB CB created */
- RLC_FREE(gCb,
kw
RbCb, sizeof(RlcDlRbCb));
+ RLC_FREE(gCb,
rlc
RbCb, sizeof(RlcDlRbCb));
RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
"Filling of RbCb failed UEID:%d CELLID:%d",
ueId,
cellId);
return RFAILED;
}
RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
"Filling of RbCb failed UEID:%d CELLID:%d",
ueId,
cellId);
return RFAILED;
}
-
kw
RbCb->qci = entCfg->qci;
+
rlc
RbCb->qci = entCfg->qci;
#ifdef LTE_L2_MEAS
#ifdef LTE_L2_MEAS
-
kw
RbCb->ueCb = ueCb;
+
rlc
RbCb->ueCb = ueCb;
if (entCfg->lCh[0].type == CM_LTE_LCH_DTCH)
{
/* ccpu00129778 */
if (entCfg->lCh[0].type == CM_LTE_LCH_DTCH)
{
/* ccpu00129778 */
-
kwAddToDlL2Meas(gCb, kw
RbCb,cellId,ueId);
+
rlcAddToDlL2Meas(gCb, rlc
RbCb,cellId,ueId);
}
#endif /* LTE_L2_MEAS */
/* Fill entCfm structure */
}
#endif /* LTE_L2_MEAS */
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
}
return ROK;
}
@@
-876,7
+872,7
@@
RlcEntCfgCfmInfo *entCfm;
* -#RFAILED
*/
#ifdef ANSI
* -#RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgReCfgDlRb
+S16 rlcCfgReCfgDlRb
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-885,7
+881,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm)
+S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
@@
-899,8
+895,6
@@
RlcEntCfgCfmInfo *entCfm;
RlcDlUeCb *ueCb; /* Ue Control Block */
U8 ret;
RlcDlUeCb *ueCb; /* Ue Control Block */
U8 ret;
- TRC3(rlcCfgReCfgDlRb)
-
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
cellId, entCfg->cfgType,entCfg->rbId);
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
cellId, entCfg->cfgType,entCfg->rbId);
@@
-909,24
+903,24
@@
RlcEntCfgCfmInfo *entCfm;
/* Check for UeCb or CellCb */
if (ueId == 0)
{
/* Check for UeCb or CellCb */
if (ueId == 0)
{
- if(entCfg->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(entCfg->rbId >=
RLC
_MAX_RB_PER_CELL)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
"Invalid RbId , Max is [%d] UEID:%d CELLID:%d",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
"Invalid RbId , Max is [%d] UEID:%d CELLID:%d",
-
KW
_MAX_RB_PER_CELL,
+
RLC
_MAX_RB_PER_CELL,
ueId,
cellId);
return RFAILED;
}
/* Get cellCb */
ueId,
cellId);
return RFAILED;
}
/* Get cellCb */
-
kw
DbmFetchDlCellCb(gCb,cellId, &cellCb);
+
rlc
DbmFetchDlCellCb(gCb,cellId, &cellCb);
if(!cellCb)
{
/* Fill entCfm structure */
if(!cellCb)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG3(L_ERROR,DBG_CELLID,cellId,
"CellCb not found ueId:%d RBID:%d CELLID:%d",
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG3(L_ERROR,DBG_CELLID,cellId,
"CellCb not found ueId:%d RBID:%d CELLID:%d",
@@
-937,12
+931,12
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Get rbCb */
}
/* Get rbCb */
-
KW
_DBM_GET_CELL_RBCB(entCfg->rbId, cellCb->rbCb, rbCb);
+
RLC
_DBM_GET_CELL_RBCB(entCfg->rbId, cellCb->rbCb, rbCb);
if (!rbCb)
{
/* Fill entCfm structure */
if (!rbCb)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CELLID:%d RBID:%d not found",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CELLID:%d RBID:%d not found",
@@
-954,14
+948,14
@@
RlcEntCfgCfmInfo *entCfm;
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
-
cmMemcpy((U8 *)&tRbCb, (U8 *)
rbCb, sizeof(RlcDlRbCb));
+
memcpy(&tRbCb,
rbCb, sizeof(RlcDlRbCb));
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg);
if (ret != ROK)
{
/* Fill entCfm structure */
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg);
if (ret != ROK)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm,
+
RLC
_CFG_FILL_CFG_CFM(entCfm,
entCfg->rbId,
entCfg->rbType,
CKW_CFG_CFM_NOK,
entCfg->rbId,
entCfg->rbType,
CKW_CFG_CFM_NOK,
@@
-971,17
+965,17
@@
RlcEntCfgCfmInfo *entCfm;
"CELLID:%u RBID:%d updation failed",
cellId,
entCfg->rbId);
"CELLID:%u RBID:%d updation failed",
cellId,
entCfg->rbId);
-
cmMemcpy((U8*)rbCb, (U8 *)
&tRbCb, sizeof(RlcDlRbCb));
+
memcpy(rbCb,
&tRbCb, sizeof(RlcDlRbCb));
return (ret);
}
}
else
{
return (ret);
}
}
else
{
- if (!(
KW
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_UEID,ueId,
"CELLID:%d Invalid RBID:%d for RbType[%d]",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_UEID,ueId,
"CELLID:%d Invalid RBID:%d for RbType[%d]",
@@
-991,11
+985,11
@@
RlcEntCfgCfmInfo *entCfm;
return RFAILED;
}
/* Get ueCb */
return RFAILED;
}
/* Get ueCb */
- ret =
kw
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
+ ret =
rlc
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
if (ret != ROK)
{
/* Fill entCfm structure */
if (ret != ROK)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UEID:%d UeCb not found RBID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UEID:%d UeCb not found RBID:%d",
@@
-1005,12
+999,12
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Get rbCb */
}
/* Get rbCb */
-
KW
_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, rbCb);
+
RLC
_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, rbCb);
if ( rbCb == NULLP)
{
/* Fill entCfm structure */
if ( rbCb == NULLP)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CELLID:%d RBID:%d not found",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CELLID:%d RBID:%d not found",
@@
-1022,27
+1016,27
@@
RlcEntCfgCfmInfo *entCfm;
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
-
cmMemcpy((U8 *)&tRbCb, (U8 *)
rbCb, sizeof(RlcDlRbCb));
+
memcpy(&tRbCb,
rbCb, sizeof(RlcDlRbCb));
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg);
if (ret != CKW_CFG_REAS_NONE)
{
/* Fill entCfm structure */
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg);
if (ret != CKW_CFG_REAS_NONE)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
ret);
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CELLID:%d RBID:%d updation failed",
cellId,
entCfg->rbId);
ret);
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CELLID:%d RBID:%d updation failed",
cellId,
entCfg->rbId);
-
cmMemcpy((U8*)rbCb, (U8 *)
&tRbCb, sizeof(RlcDlRbCb));
+
memcpy(rbCb,
&tRbCb, sizeof(RlcDlRbCb));
return (ret);
}
}
/* Fill entCfm structure */
return (ret);
}
}
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
}
return ROK;
}
@@
-1079,7
+1073,7
@@
RlcEntCfgCfmInfo *entCfm;
* -#RFAILED
*/
#ifdef ANSI
* -#RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgDelDlRb
+S16 rlcCfgDelDlRb
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-1088,7
+1082,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm)
+S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
@@
-1099,9
+1093,7
@@
RlcEntCfgCfmInfo *entCfm;
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
RlcDlCellCb *cellCb; /* UE Control Block */
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
RlcDlCellCb *cellCb; /* UE Control Block */
- RlcDlRbCb *kwRbCb; /* KW RB Control Block */
-
- TRC3(rlcCfgDelDlRb)
+ RlcDlRbCb *rlcRbCb; /* KW RB Control Block */
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
@@
-1114,24
+1106,24
@@
RlcEntCfgCfmInfo *entCfm;
/* Get cellCb and delete rbCb from it */
if (ueId == 0)
{
/* Get cellCb and delete rbCb from it */
if (ueId == 0)
{
- if(entCfg->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(entCfg->rbId >=
RLC
_MAX_RB_PER_CELL)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId ,
"Invalid RbId, Max is [%d] UEID:%d CELLID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId ,
"Invalid RbId, Max is [%d] UEID:%d CELLID:%d",
-
KW
_MAX_RB_PER_CELL,
+
RLC
_MAX_RB_PER_CELL,
ueId,
cellId);
return RFAILED;
}
/* Get cellCb */
ueId,
cellId);
return RFAILED;
}
/* Get cellCb */
-
kw
DbmFetchDlCellCb(gCb,cellId, &cellCb);
+
rlc
DbmFetchDlCellCb(gCb,cellId, &cellCb);
if (!cellCb)
{
/* Fill entCfm structure */
if (!cellCb)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
"CellCb not found UEID:%d RBID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
"CellCb not found UEID:%d RBID:%d",
@@
-1141,12
+1133,12
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Get rbCb */
}
/* Get rbCb */
-
KW_DBM_GET_CELL_RBCB(entCfg->rbId, cellCb->rbCb, kw
RbCb);
+
RLC_DBM_GET_CELL_RBCB(entCfg->rbId, cellCb->rbCb, rlc
RbCb);
- if (
kw
RbCb == NULLP)
+ if (
rlc
RbCb == NULLP)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
@@
-1160,16
+1152,16
@@
RlcEntCfgCfmInfo *entCfm;
/* Assign NULLP to dlRbCb/ulRbCb.
* Delete Hashlist allocated for it if any */
/* Assign NULLP to dlRbCb/ulRbCb.
* Delete Hashlist allocated for it if any */
- cellCb->lCh[
kw
RbCb->lch.lChId - 1].dlRbCb = NULLP;
- RLC_FREE(gCb,
kw
RbCb, sizeof(RlcDlRbCb)); /*Vartika: Mem leak fix */
+ cellCb->lCh[
rlc
RbCb->lch.lChId - 1].dlRbCb = NULLP;
+ RLC_FREE(gCb,
rlc
RbCb, sizeof(RlcDlRbCb)); /*Vartika: Mem leak fix */
}
/* Get ueCb and delete rbCb from it */
else
{
}
/* Get ueCb and delete rbCb from it */
else
{
- if (!(
KW
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(entCfg->rbType, entCfg->rbId)))
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID, entCfg->rbId,
"Invalid RbId for RbType[%d] UEID:%d CELLID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG3(L_ERROR,DBG_RBID, entCfg->rbId,
"Invalid RbId for RbType[%d] UEID:%d CELLID:%d",
@@
-1180,11
+1172,11
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Get ueCb */
}
/* Get ueCb */
- ret =
kw
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
+ ret =
rlc
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
if (ret != ROK)
{
/* Fill entCfm structure */
if (ret != ROK)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UeId [%d]: UeCb not found RBID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UeId [%d]: UeCb not found RBID:%d",
@@
-1194,12
+1186,12
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Get rbCb */
}
/* Get rbCb */
-
KW_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, kw
RbCb);
+
RLC_DBM_GET_RBCB_FROM_UECB(entCfg->rbId, entCfg->rbType, ueCb, rlc
RbCb);
- if (
kw
RbCb == NULLP)
+ if (
rlc
RbCb == NULLP)
{
/* Fill entCfm structure */
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
@@
-1208,21
+1200,21
@@
RlcEntCfgCfmInfo *entCfm;
return (ret);
}
return (ret);
}
- ueCb->lCh[
kw
RbCb->lch.lChId - 1].dlRbCb = NULLP;
+ ueCb->lCh[
rlc
RbCb->lch.lChId - 1].dlRbCb = NULLP;
#ifdef LTE_L2_MEAS
#ifdef LTE_L2_MEAS
-
KW_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, kw
RbCb);
+
RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, rlc
RbCb);
#endif
/* Free the Buffers of RbCb */
#endif
/* Free the Buffers of RbCb */
- if( CM_LTE_MODE_UM ==
kw
RbCb->mode)
+ if( CM_LTE_MODE_UM ==
rlc
RbCb->mode)
{
{
-
kwUmmFreeDlRbCb(gCb,kw
RbCb);
+
rlcUmmFreeDlRbCb(gCb,rlc
RbCb);
/* Delete RbCb */
/* Delete RbCb */
- RLC_FREE(gCb,
kw
RbCb, sizeof(RlcDlRbCb));
+ RLC_FREE(gCb,
rlc
RbCb, sizeof(RlcDlRbCb));
}
}
- else if( CM_LTE_MODE_AM ==
kw
RbCb->mode)
+ else if( CM_LTE_MODE_AM ==
rlc
RbCb->mode)
{
{
-
kwAmmFreeDlRbCb(gCb,kw
RbCb);
+
rlcAmmFreeDlRbCb(gCb,rlc
RbCb);
}
/* Assign NULLP to rbCb in rbCbLst */
}
/* Assign NULLP to rbCb in rbCbLst */
@@
-1236,10
+1228,10
@@
RlcEntCfgCfmInfo *entCfm;
}
}
}
}
-
KW
_LMM_RB_STS_DEC(gCb);
+
RLC
_LMM_RB_STS_DEC(gCb);
/* Fill entCfm structure */
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK,
CKW_CFG_REAS_NONE);
return (ret);
CKW_CFG_REAS_NONE);
return (ret);
@@
-1275,7
+1267,7
@@
RlcEntCfgCfmInfo *entCfm;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgReEstDlRb
+S16 rlcCfgReEstDlRb
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-1285,7
+1277,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm)
+S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
@@
-1297,8
+1289,6
@@
RlcEntCfgCfmInfo *entCfm;
RlcDlRbCb *rbCb; /* RB Control Block */
CmLteRlcId rlcId; /* RLC Identifier */
RlcDlRbCb *rbCb; /* RB Control Block */
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(rlcCfgReEstDlRb)
-
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
@@
-1311,11
+1301,11
@@
RlcEntCfgCfmInfo *entCfm;
rlcId.rbId = entCfg->rbId;
rlcId.rbType = entCfg->rbType;
rlcId.rbId = entCfg->rbId;
rlcId.rbType = entCfg->rbType;
-
kw
DbmFetchDlRbCbByRbId(gCb,&rlcId, &rbCb);
+
rlc
DbmFetchDlRbCbByRbId(gCb,&rlcId, &rbCb);
if (rbCb == NULLP)
{
/* Fill entCfm structure */
if (rbCb == NULLP)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, rlcId.rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, rlcId.rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
CKW_CFG_REAS_RB_UNKWN);
RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
"CellId[%u]:RbId[%d] not found",
@@
-1342,13
+1332,13
@@
RlcEntCfgCfmInfo *entCfm;
case CM_LTE_MODE_AM:
{
case CM_LTE_MODE_AM:
{
-
kw
AmmDlReEstablish(gCb, rlcId, rbCb);
+
rlc
AmmDlReEstablish(gCb, rlcId, rbCb);
break;
}
}
/* Fill entCfm structure */
break;
}
}
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
@@
-1378,7
+1368,7
@@
RlcEntCfgCfmInfo *entCfm;
* -#RFAILED
*/
#ifdef ANSI
* -#RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgDelDlUe
+S16 rlcCfgDelDlUe
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-1387,7
+1377,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm)
+S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
@@
-1398,8
+1388,6
@@
RlcEntCfgCfmInfo *entCfm;
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
- TRC3(rlcCfgDelUe)
-
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
@@
-1412,7
+1400,7
@@
RlcEntCfgCfmInfo *entCfm;
if ( ueId == 0 )
{
/* Fill entCfm structure */
if ( ueId == 0 )
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId,
"ueId(%d), cellId(%d)",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId,
"ueId(%d), cellId(%d)",
@@
-1422,11
+1410,11
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Fetch Ue Cb */
}
/* Fetch Ue Cb */
- ret =
kw
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
+ ret =
rlc
DbmFetchDlUeCb(gCb,ueId, cellId, &ueCb);
if (ret != ROK)
{
/* Fill entCfm structure */
if (ret != ROK)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UEID:%d UeCb not found RBID:%d",
CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
"UEID:%d UeCb not found RBID:%d",
@@
-1436,14
+1424,14
@@
RlcEntCfgCfmInfo *entCfm;
}
#ifdef LTE_L2_MEAS
}
#ifdef LTE_L2_MEAS
-
kw
DelFrmDlL2Meas(gCb,cellId,ueId);
-
kw
DbmDelAllDlL2MeasTbFrmUe(gCb,ueCb);
+
rlc
DelFrmDlL2Meas(gCb,cellId,ueId);
+
rlc
DbmDelAllDlL2MeasTbFrmUe(gCb,ueCb);
#endif
/* Delete Ue Cb */
#endif
/* Delete Ue Cb */
-
kw
DbmDelDlUeCb(gCb,ueCb, FALSE);
+
rlc
DbmDelDlUeCb(gCb,ueCb, FALSE);
/* Fill entCfm structure */
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE);
return ROK;
@@
-1471,7
+1459,7
@@
RlcEntCfgCfmInfo *entCfm;
* -#RFAILED
*/
#ifdef ANSI
* -#RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgDelDlCell
+S16 rlcCfgDelDlCell
(
RlcCb *gCb,
CmLteCellId cellId,
(
RlcCb *gCb,
CmLteCellId cellId,
@@
-1479,7
+1467,7
@@
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
#else
RlcEntCfgCfmInfo *entCfm
)
#else
-
PUBLIC
S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm)
+S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm)
RlcCb *gCb;
CmLteCellId cellId;
RlcEntCfgInfo *entCfg;
RlcCb *gCb;
CmLteCellId cellId;
RlcEntCfgInfo *entCfg;
@@
-1489,8
+1477,6
@@
RlcEntCfgCfmInfo *entCfm;
RlcDlCellCb *cellCb; /* UE Control Block */
U8 rbId; /* RB Identifier */
RlcDlCellCb *cellCb; /* UE Control Block */
U8 rbId; /* RB Identifier */
- TRC3(rlcCfgDelCell)
-
RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelCell( cellId(%d), cfgType(%d)",
cellId,
RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelCell( cellId(%d), cfgType(%d)",
cellId,
@@
-1503,7
+1489,7
@@
RlcEntCfgCfmInfo *entCfm;
if ( cellId == 0 )
{
/* Fill entCfm structure */
if ( cellId == 0 )
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId,
"cellId is 0 (%d) ",
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId,
"cellId is 0 (%d) ",
@@
-1512,11
+1498,11
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Fetch Ue Cb */
}
/* Fetch Ue Cb */
-
kw
DbmFetchDlCellCb(gCb,cellId, &cellCb);
+
rlc
DbmFetchDlCellCb(gCb,cellId, &cellCb);
if (!cellCb)
{
/* Fill entCfm structure */
if (!cellCb)
{
/* Fill entCfm structure */
-
KW
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,
"CellCb not found for RBID:%d",
CKW_CFG_REAS_CELL_UNKWN);
RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,
"CellCb not found for RBID:%d",
@@
-1525,11
+1511,11
@@
RlcEntCfgCfmInfo *entCfm;
}
/* Delete Ue Cb */
}
/* Delete Ue Cb */
-
kw
DbmDelDlCellCb(gCb,cellCb);
+
rlc
DbmDelDlCellCb(gCb,cellCb);
/* Fill entCfm structure */
/* kw005.201 added support for L2 Measurement */
/* Fill entCfm structure */
/* kw005.201 added support for L2 Measurement */
-
KW
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_OK,
+
RLC
_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_OK,
CKW_CFG_REAS_NONE);
return ROK;
CKW_CFG_REAS_NONE);
return ROK;
@@
-1557,7
+1543,7
@@
RlcEntCfgCfmInfo *entCfm;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PUBLIC
S16 rlcCfgDlUeIdChng
+S16 rlcCfgDlUeIdChng
(
RlcCb *gCb,
CkwUeInfo *ueInfo,
(
RlcCb *gCb,
CkwUeInfo *ueInfo,
@@
-1565,7
+1551,7
@@
CkwUeInfo *newUeInfo,
CmStatus *status
)
#else
CmStatus *status
)
#else
-
PUBLIC
S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status)
+S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status)
RlcCb *gCb;
CkwUeInfo *ueInfo;
CkwUeInfo *newUeInfo;
RlcCb *gCb;
CkwUeInfo *ueInfo;
CkwUeInfo *newUeInfo;
@@
-1574,7
+1560,6
@@
CmStatus *status;
{
RlcDlUeCb *ueCb;
/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
{
RlcDlUeCb *ueCb;
/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
- TRC3(rlcCfgUeIdChng)
if ( (ueInfo->ueId == newUeInfo->ueId) &&
(ueInfo->cellId == newUeInfo->cellId))
if ( (ueInfo->ueId == newUeInfo->ueId) &&
(ueInfo->cellId == newUeInfo->cellId))
@@
-1588,7
+1573,7
@@
CmStatus *status;
return RFAILED;
}
return RFAILED;
}
- if(ROK ==
kw
DbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb))
+ if(ROK ==
rlc
DbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb))
{
RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId,
"NewUeId[%d]:ueCb already exists",
{
RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId,
"NewUeId[%d]:ueCb already exists",
@@
-1598,7
+1583,7
@@
CmStatus *status;
return RFAILED;
}
return RFAILED;
}
- if(ROK !=
kw
DbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb))
+ if(ROK !=
rlc
DbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb))
{
RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId,
{
RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId,
@@
-1610,7
+1595,7
@@
CmStatus *status;
}
#ifdef LTE_L2_MEAS
}
#ifdef LTE_L2_MEAS
-
kw
HdlMeasDlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId);
+
rlc
HdlMeasDlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId);
#endif
if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb))
{
#endif
if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb))
{