*/
/* header include files -- defines (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-#include "gen.h" /* general layer */
-#include "ssi.h" /* system service interface */
-#include "cm_hash.h" /* common hash list */
-#include "cm_llist.h" /* common linked list library */
-#include "cm_err.h" /* common error */
-#include "cm_lte.h" /* common LTE */
+#include "common_def.h"
#include "lrg.h"
#include "crg.h"
#include "rgr.h"
#include "rg.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general layer typedefs */
-#include "ssi.x" /* system services typedefs */
-#include "cm5.x" /* common timers */
-#include "cm_hash.x" /* common hash list */
-#include "cm_lib.x" /* common library */
-#include "cm_llist.x" /* common linked list */
-#include "cm_mblk.x" /* memory management */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_lte.x" /* common tokens */
#include "rgu.x" /* RGU types */
#include "tfu.x" /* TFU types */
#include "lrg.x" /* layer management typedefs for MAC */
if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
- RETVALUE(RFAILED);
+ return RFAILED;
}
//Memcpy is already done in rgL2mAllocMeasCb
/*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
}
cell->qciArray[measInfo->t.prbReq.qci[idx]].mask = TRUE;
}
- RETVALUE(ROK);
+ return ROK;
} /* rgL2mCreateMeasCb */
LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK)
{
/* Clear Downlink MeasCb created Above If exists*/
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgL2mMeasReq */
/** @brief This function sends the measurement confirm
* from mac to scheduler
(cellCb->cellId != measInfo->cellId))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,"unable to get the cellCb");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Call L2M Function to store Meas req */
ret = rgL2mMeasReq(cellCb, measInfo, &err);
RLOG_ARG2(L_ERROR,DBG_CELLID,measInfo->cellId,
"Meas req Failed errType(%d) errCause(%d)",
err.errType, err.errCause);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ret);
+ return (ret);
} /* -- RgSchMacL2MeasReq-- */
/**
RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
"Unable to get the cellCb");
- RETVALUE(RFAILED);
+ return RFAILED;
}
node = cellCb->l2mList.first;
while(node != NULLP)
measCfm.measType = measInfo->measType;
measCfm.cfm.status = LCM_PRIM_OK;
rgSndL2MeasStopCfm(cellCb, &measCfm);
- RETVALUE(ret);
+ return (ret);
} /* -- RgSchMacL2MeasStopReq-- */
/**
RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
"Unable to get the cellCb");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/*set sndL2Meas as applicatoin sent l2 meas info request*/
cellCb->sndL2Meas = TRUE;
- RETVALUE(ret);
+ return (ret);
}/*RgSchMacL2MeasSendReq*/
/** @brief This function inserts the MeasCb in to data base
{
cell->l2mList.crnt = lnk;
cmLListInsCrnt(&(cell->l2mList), node);
- RETVALUE(ROK);
+ return ROK;
}
else
{
} /* End of While */
cmLListAdd2Tail(&(cell->l2mList), node);
- RETVALUE(ROK);
+ return ROK;
} /* rgL2mInsertMeasCb */
/** @brief This function allocates memory from the heap
"Allocation of RgL2MeasCb failed");
err->errType = RGERR_L2M_MEASREQ;
err->errCause = RGERR_RAM_MEM_EXHAUST;
- RETVALUE(NULLP);
+ return (NULLP);
}
cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq));
RGCPYTIMEINFO(cell->crntTime, measCb->startTime);
- RETVALUE(measCb);
+ return (measCb);
} /* rgL2mAllocMeasCb */
continue;
}
}
- RETVALUE(ROK);
+ return ROK;
} /* rgL2MEas */
#endif /* LTE_L2_MEAS */