/* local defines */
#ifdef LTE_L2_MEAS
-PRIVATE S16 rgL2mInsertMeasCb ARGS((
+static S16 rgL2mInsertMeasCb ARGS((
RgCellCb *cell,
RgL2MeasCb *measCb,
RgInfL2MeasReq *measInfo ));
-PRIVATE RgL2MeasCb * rgL2mAllocMeasCb ARGS((
+static RgL2MeasCb * rgL2mAllocMeasCb ARGS((
RgCellCb *cell,
RgInfL2MeasReq *measInfo,
RgErrInfo *err));
*
* @param [in] RgCellCb *cell
* @param [in] RgInfL2MeasReq *measInfo
- * @param [in] U8 measType
+ * @param [in] uint8_t measType
* @param [out] RgErrInfo *err
* @return S16
* -# ROK
(
RgCellCb *cell,
RgInfL2MeasReq *measInfo,
-U8 measType,
+uint8_t measType,
RgErrInfo *err
)
#else
S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
RgCellCb *cell;
RgInfL2MeasReq *measInfo;
-U8 measType;
+uint8_t measType;
RgErrInfo *err;
#endif
{
// Inst inst = cell->macInst - RG_INST_START;
- U32 idx;
- RgL2MeasCb *measCb = NULLP;
- U8 qciVal = 0;
+ uint32_t idx;
+ RgL2MeasCb *measCb = NULLP;
+ uint8_t qciVal = 0;
UNUSED(measType);
UNUSED(err);
- TRC3(rgL2mCreateMeasCb)
-
- if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
- {
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
- return RFAILED;
- }
+ if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
+ {
+ RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
+ return RFAILED;
+ }
//Memcpy is already done in rgL2mAllocMeasCb
- /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
+ /*memcpy(&measCb->measReq, (const uint8_t *)measInfo,\
sizeof(RgInfL2MeasReq));*/
rgL2mInsertMeasCb(cell, measCb, measInfo);
measCb->measReq.timePrd = measInfo->timePrd;
{
S16 ret=RFAILED;
- TRC3(rgL2mMeasReq)
/* Creaet MeasCb Insert in cell->l2mList and return*/
if ( (ret = rgL2mCreateMeasCb(cell, measInfo,
LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK)
* @param [in] RgInfL2MeasCfm *measCfm
*/
#ifdef ANSI
-PRIVATE Void rgSndL2MeasCfm
+static Void rgSndL2MeasCfm
(
RgCellCb *cell,
RgInfL2MeasCfm *measCfm
)
#else
-PRIVATE Void rgSndL2MeasCfm (cell, measCfm)
+static Void rgSndL2MeasCfm (cell, measCfm)
RgCellCb *cell;
RgInfL2MeasCfm *measCfm;
#endif
{
Pst pst;
Inst macInst = cell->macInst - RG_INST_START;
- TRC3(rgSndL2MeasCfm)
- cmMemset((U8 *)&pst, 0, sizeof(Pst));
+ memset(&pst, 0, sizeof(Pst));
rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst);
RgMacSchL2Meas(&pst, measCfm);
- RETVOID;
+ return;
}/* rgSndL2MeasCfm */
/** @brief This function sends the measurement stop confirm
* @param [in] RgInfL2MeasCfm *measCfm
*/
#ifdef ANSI
-PRIVATE Void rgSndL2MeasStopCfm
+static Void rgSndL2MeasStopCfm
(
RgCellCb *cell,
RgInfL2MeasCfm *measCfm
)
#else
-PRIVATE Void rgSndL2MeasStopCfm (cell, measCfm)
+static Void rgSndL2MeasStopCfm (cell, measCfm)
RgCellCb *cell;
RgInfL2MeasCfm *measCfm;
#endif
Pst pst;
Inst macInst = cell->macInst - RG_INST_START;
- TRC3(rgSndL2MeasStopCfm)
- cmMemset((U8 *)&pst, 0, sizeof(Pst));
+ memset(&pst, 0, sizeof(Pst));
rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst);
RgMacSchL2MeasStop(&pst, measCfm);
- RETVOID;
+ return;
}/* rgSndL2MeasStopCfm */
/**
S16 ret = ROK;
RgInfL2MeasCfm measCfm;
- TRC3(RgSchMacL2MeasReq)
-
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cellCb = rgCb[inst].cell;
ret = rgL2mMeasReq(cellCb, measInfo, &err);
if (ret != ROK)
{
- cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+ memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
measCfm.transId = measInfo->transId;
measCfm.cellId = measInfo->cellId;
measCfm.measType = measInfo->measType;
RgInfL2MeasStopReq *measInfo; /* Meas Req Info */
#endif
{
- S16 ret = ROK;
- CmLList *node = NULLP;
- RgL2MeasCb *measCb = NULLP;
- U8 idx;
- U8 qciVal;
- Inst inst;
- RgCellCb *cellCb = NULLP;
-
+ S16 ret = ROK;
+ CmLList *node = NULLP;
+ RgL2MeasCb *measCb = NULLP;
+ uint8_t idx;
+ uint8_t qciVal;
+ Inst inst;
+ RgCellCb *cellCb = NULLP;
RgInfL2MeasCfm measCfm;
- TRC3(RgSchMacL2MeasStopReq)
-
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cellCb = rgCb[inst].cell;
cmLListDelFrm(&cellCb->l2mList, &measCb->measLnk);
rgFreeSBuf(inst,(Data**)&measCb, sizeof(RgL2MeasCb));
}
- cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+ memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
measCfm.transId = measInfo->transId;
measCfm.cellId = measInfo->cellId;
measCfm.measType = measInfo->measType;
RgCellCb *cellCb = NULLP;
S16 ret = ROK;
- TRC3(RgSchMacL2MeasSendReq)
-
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cellCb = rgCb[inst].cell;
* -# RFAILED
*/
#ifdef ANSI
-PRIVATE S16 rgL2mInsertMeasCb
+static S16 rgL2mInsertMeasCb
(
RgCellCb *cell,
RgL2MeasCb *measCb,
RgInfL2MeasReq *measInfo
)
#else
-PRIVATE S16 rgL2mInsertMeasCb(cell, measCb, measInfo)
+static S16 rgL2mInsertMeasCb(cell, measCb, measInfo)
RgCellCb *cell;
RgL2MeasCb *measCb;
RgInfL2MeasReq *measInfo;
#endif
{
- CmLList *lnk, *node;
- RgL2MeasCb *oldMeasCb;
- U16 diffTime;
-
- TRC3(rgL2mInsertMeasCb)
+ CmLList *lnk, *node;
+ RgL2MeasCb *oldMeasCb;
+ uint16_t diffTime;
/*
* 1. Check if l2mList has any entries.
* @return RgSchL2MeasCb *
*/
#ifdef ANSI
-PRIVATE RgL2MeasCb * rgL2mAllocMeasCb
+static RgL2MeasCb * rgL2mAllocMeasCb
(
RgCellCb *cell,
RgInfL2MeasReq *measInfo,
RgErrInfo *err
)
#else
-PRIVATE RgL2MeasCb * rgL2mAllocMeasCb(cell, measInfo, err)
+static RgL2MeasCb * rgL2mAllocMeasCb(cell, measInfo, err)
RgCellCb *cell;
RgInfL2MeasReq *measInfo;
RgErrInfo *err;
RgL2MeasCb *measCb = NULLP;
Inst inst = cell->macInst - RG_INST_START;
- TRC3(rgL2mAllocMeasCb)
if((rgAllocSBuf(inst,(Data **)&(measCb),
sizeof(RgL2MeasCb))) == RFAILED)
err->errCause = RGERR_RAM_MEM_EXHAUST;
return (NULLP);
}
- cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq));
+ memcpy(&measCb->measReq, measInfo, sizeof(RgInfL2MeasReq));
RGCPYTIMEINFO(cell->crntTime, measCb->startTime);
return (measCb);
{
CmLList *node = NULLP;
RgL2MeasCb *measCb = NULLP;
- RgInfL2MeasCfm measCfm;
- U8 idx = 0;
- U8 qciVal = 0;
- U32 measPrd; /*LTE_L2_MEAS_PHASE2*/
+ RgInfL2MeasCfm measCfm;
+ uint8_t idx = 0;
+ uint8_t qciVal = 0;
+ uint32_t measPrd; /*LTE_L2_MEAS_PHASE2*/
CmLteTimingInfo crntTime;
- Inst inst = cell->macInst - RG_INST_START;
+ Inst inst = cell->macInst - RG_INST_START;
- TRC3(rgL2Meas)
-
node = cell->l2mList.first;
while(node != NULLP)
/*LTE_L2_MEAS_PHASE2*/
if (cell->sndL2Meas || measPrd == measCb->measReq.timePrd)
{
- cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+ memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
for(idx = 0; idx < measCb->measReq.t.prbReq.numQci; idx++)
{
qciVal = measCb->measReq.t.prbReq.qci[idx];