* -# RFAILED
*
*/
-PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
+static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId)
{
RlcL2MeasCb *measCb = NULLP;
- U16 cntr;
- U16 ueIdx = 0;
+ uint16_t cntr;
+ uint16_t ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
* -# RFAILED
*
*/
-PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
+static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId)
{
RlcL2MeasCb *measCb = NULLP;
- U16 cntr;
- U16 ueIdx = 0;
+ uint16_t cntr;
+ uint16_t ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
{
- U32 myIdx =0;
+ uint32_t myIdx =0;
S16 ret; /* Return value */
RlcUlUeCb *ueCb = NULL;
}
-PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId)
+static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId)
{
RlcL2MeasCb *measCb = NULLP;
- U16 cntr;
- U16 cntr1;
- U16 ueIdx = 0;
- U16 qciIdx = 0;
- U16 *numQci;
+ uint16_t cntr;
+ uint16_t cntr1;
+ uint16_t ueIdx = 0;
+ uint16_t qciIdx = 0;
+ uint16_t *numQci;
#ifndef XEON_SPECIFIC_CHANGES
- U8 freeIdx = gCb->genCfg.maxUe;
+ uint8_t freeIdx = gCb->genCfg.maxUe;
#else
- U16 freeIdx = LKW_MAX_UE;
+ uint16_t freeIdx = LKW_MAX_UE;
#endif
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
ueIdx = freeIdx;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE;
- cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI));
+ memset(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI));
measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId;
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rlcCfgFillUlRbCb
-(
-RlcCb *gCb,
-RlcUlRbCb *rbCb,
-RlcUlUeCb *ueCb,
-RlcEntCfgInfo *entCfg
-)
-#else
-PRIVATE S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg)
-RlcCb *gCb;
-RlcUlRbCb *rbCb;
-RlcUlUeCb *ueCb;
-RlcEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg)
{
- TRC3(rlcCfgFillUlRbCb)
RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId,
"rlcCfgFillRbCb(cellId(%d), rbId(%d), rbType(%d))",
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rlcCfgUpdateUlRb
-(
-RlcCb *gCb,
-RlcUlRbCb *rbCb,
-void *ptr,
-RlcEntCfgInfo *entCfg
-)
-#else
-PRIVATE S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg)
-RlcCb *gCb;
-RlcUlRbCb *rbCb;
-void *ptr;
-RlcEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg)
{
- TRC3(rlcCfgUpdateUlRb)
switch (rbCb->mode)
{
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-S16 rlcValidateRbCfgParams
-(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-RlcEntCfgInfo *cfgToValidate,
-CmStatus *status
-)
-#else
-S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-CmStatus *status;
-#endif
+S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status)
{
if (cellId == 0)
{
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateUlRb
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData)
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
- TRC3(rlcCfgValidateUlRb)
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
{
if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP))
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
return RFAILED;
}
}
cfgEntData->rbCb);
if(cfgEntData->rbCb != NULLP)
{
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;
return RFAILED;
}
}
/*Allocating the memory for receive buffer */
if(CM_LTE_MODE_UM == cfgToValidate->entMode)
{
- U16 winLen;
-
-
+ uint32_t hashIndex;
cfgEntData->rbCb->m.umUl.umWinSz = RLC_POWER(2,
((cfgToValidate->m.umInfo.ul.snLen *5)-1));
- winLen = cfgEntData->rbCb->m.umUl.umWinSz << 1;
+#ifdef NR_RLC_UL
RLC_ALLOC(gCb,
- cfgEntData->rbCb->m.umUl.recBuf,
- (winLen * sizeof(RlcUmRecBuf*)));
+ cfgEntData->rbCb->m.umUl.recBufLst,
+ (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp )));
+ for(hashIndex = 0; hashIndex < RLC_RCV_BUF_BIN_SIZE; hashIndex++)
+ {
+ cmLListInit(&(cfgEntData->rbCb->m.umUl.recBufLst[hashIndex]));
+ }
+#endif
}
else if(CM_LTE_MODE_AM == cfgToValidate->entMode)
{
#ifndef LTE_TDD
- U32 hashIndex;
+ uint32_t hashIndex;
RLC_ALLOC(gCb,
cfgEntData->rbCb->m.amUl.recBufLst,
(RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp )));
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgRollBackUlRb
(
RlcCb *gCb,
RlcEntCfgInfo *cfg,
RlcUlEntTmpData *cfgEntData
)
-#else
-S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData)
-(
-RlcCb *gCb;
-CmLteRnti ueId;
-RlcEntCfgInfo *cfg;
-RlcUlEntTmpData *cfgEntData;
-)
-#endif
{
- TRC3(rlcCfgRollBackUlRb)
if(CKW_CFG_ADD == cfg->cfgType)
{
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
Void rlcCfgApplyUlRb
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData)
-(
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToAply;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-)
-#endif
{
- TRC3(rlcCfgApplyUlRb)
switch(cfgToAply->cfgType)
{
break;
}
}
- RETVOID;
+ return;
}
\f
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateDelUlUe
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData)
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
- TRC3(rlcCfgValidateDelUlUe)
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
"cellId(%d), cfgType(%d)",
/* 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_CELLID, cfgTmpData->cellId,
"UeId [%d]: UeCb not found",
cfgTmpData->ueId);
- cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;;
+ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;
return RFAILED;
}
return ROK;
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyDelUlUe
(
RlcCb *gCb,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-Void rlcCfgApplyDelUlUe(gCb, cfgTmpData)
-(
-RlcCb *gCb;
-RlcUlCfgTmpData *cfgTmpData;
-)
-#endif
{
- TRC3(rlcCfgApplyDelUlUe)
#ifdef LTE_L2_MEAS
rlcDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId);
#endif
rlcDbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE);
- RETVOID;
+ return;
}
\f
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateDelUlCell
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData)
-RlcCb *gCb;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
- TRC3(rlcCfgValidateDelUlCell)
RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
cfgToValidate->cfgType);
/* 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");
return RFAILED;
}
rlcDbmFetchUlCellCb(gCb,cellId, &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");
return RFAILED;
}
* @return S16
* -# ROK
*/
-#ifdef ANSI
-Void rlcCfgApplyDelUlCell
-(
-RlcCb *gCb,
-RlcUlCfgTmpData *cfgInfo
-)
-#else
-Void rlcCfgApplyDelUlCell(gCb, cfgEntData)
-(
-RlcCb *gCb;
-RlcUlCfgTmpData *cfgInfo;
-)
-#endif
+Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo)
{
- TRC3(rlcCfgApplyDelUlCell)
rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb);
- RETVOID;
+ return;
}
\f
/**
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateReEstRb
(
RlcCb *gCb,
RlcEntCfgInfo *cfgToValidate,
RlcUlEntTmpData *cfgEntData
)
-#else
-S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(rlcCfgValidateReEstRb)
RLOG_ARG2(L_DEBUG, DBG_UEID,ueId,
"cellId(%d) RBID:%d",
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyReEstUlRb
(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-Bool sndReEstInd,
-RlcUlEntTmpData *cfgEntData
-)
-#else
-Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData)
-(
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-Bool sndReEstInd;
-RlcUlEntTmpData *cfgEntData;
+RlcCb *gCb,
+CmLteRnti ueId,
+CmLteCellId cellId,
+Bool sndReEstInd,
+RlcUlEntTmpData *cfgEntData
)
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(rlcCfgApplyReEstUlRb)
rlcId.ueId = ueId;
rlcId.cellId = cellId;
break;
}
}
- RETVOID;
+ return;
}
\f
/**
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateUeIdChng
(
-RlcCb *gCb,
+RlcCb *gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData
+RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData)
-RlcCb *gCb;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
RlcUlUeCb *ueCb;
- TRC3(rlcCfgValidateUeIdChng)
#define CFM_STATUS cfgTmpData->cfgEntData[0].entUlCfgCfm.status
if ( (ueInfo->ueId == newUeInfo->ueId) &&
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyUlUeIdChng
(
-RlcCb *gCb,
-CkwUeInfo *ueInfo,
-CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData
-)
-#else
-Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData)
-(
-RlcCb *gCb;
+RlcCb *gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData;
+RlcUlCfgTmpData *cfgTmpData
)
-#endif
{
- TRC3(rlcCfgApplyUlUeIdChng)
#ifdef LTE_L2_MEAS
rlcHdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId);
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,
newUeInfo->ueId);
}
- RETVOID;
+ return;
}
/********************************************************************30**