invoked by RRM towards MAC.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_MODULE_ID=4096;
-static int RLOG_FILE_ID=164;
/* 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_mblk.h" /* common memory link list library */
-#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 "rgr.h"
#include "tfu.h"
#include "rg_sch_inf.h"
#include "rg_sch.h"
#include "rg_sch_err.h"
-#include "rl_interface.h"
-#include "rl_common.h"
+#include "sch_utils.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general layer */
-#include "ssi.x" /* system service interface */
-#include "cm5.x" /* common timers */
-#include "cm_lib.x" /* common library */
-#include "cm_hash.x" /* common hash list */
-#include "cm_llist.x" /* common linked list library */
-#include "cm_mblk.x" /* memory management */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_lte.x" /* common LTE */
#include "lrg.x"
#include "rgr.x"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_sch.x"
+#include "mac_sch_interface.h"
/* local defines */
-PRIVATE S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId,
+static S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId,
RgrCfg *cfg, RgSchErrInfo *errInfo));
-PRIVATE S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId,
+static S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId,
RgrRecfg *recfg, RgSchErrInfo *errInfo));
-PRIVATE S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset,
+static S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset,
RgSchErrInfo *errInfo));
-PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq,
+static S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq,
CmLteCellId *cellId));
-PRIVATE S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb,
+static S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb,
RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo));
-PRIVATE S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell,
+static S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell,
RgrCfgTransId transId, RgrCfgReqInfo *rgrCfgReq));
-PRIVATE S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId,
+static S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId,
RgrDel *del,RgSchErrInfo *errInfo));
#ifdef LTE_ADV
-PRIVATE S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId,
- RgrSCellActDeactEvnt *sCellActDeactEvnt, RgSchErrInfo *errInfo, U8 action));
+static S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId,
+ RgrSCellActDeactEvnt *sCellActDeactEvnt, RgSchErrInfo *errInfo, uint8_t action));
#endif /* LTE_ADV */
#ifdef EMTC_ENABLE
-EXTERN S16 rgSchEmtcGetSiWinPerd ARGS((
+S16 rgSchEmtcGetSiWinPerd ARGS((
RgSchCellCb *cell,
-U16 *siWinSize,
-U16 *minPeriod
+uint16_t *siWinSize,
+uint16_t *minPeriod
));
extern S16 rgSCHEmtcUtlCalMcsAndNPrb
(
RgSchCellCb *cell,
- U8 cfgType,
+ uint8_t cfgType,
MsgLen msgLen,
- U8 siId
+ uint8_t siId
);
-EXTERN S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS(
+S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS(
(
-U32 bo
+uint32_t bo
));
-EXTERN Void rgSCHEmtcWarningSiCfg ARGS(
+Void rgSCHEmtcWarningSiCfg ARGS(
(
RgSchCellCb *cell,
RgrWarningSiCfgReqInfo *warningSiCfgReqInfo,
-U16 idx
+uint16_t idx
));
#endif
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHGomHndlCfg
-(
-Pst *pst,
-RgSchCb *instCb,
-RgrCfgTransId transId,
-RgrCfgReqInfo *cfgReqInfo
-)
-#else
-PUBLIC S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo)
-Pst *pst;
-RgSchCb *instCb;
-RgrCfgTransId transId;
-RgrCfgReqInfo *cfgReqInfo;
-#endif
+S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo)
{
S16 ret;
SpId spId = 0;
CmLteCellId cellId;
RgSchCellCb *cell = NULLP;
- U8 cfmStatus = RGR_CFG_CFM_NOK;
-#ifdef DEBUGP
- Inst inst = (instCb->rgSchInit.inst );
-#endif
+ uint8_t cfmStatus = RGR_CFG_CFM_NOK;
- TRC2(rgSCHGomHndlCfg);
/* Apply the configuration for Cell Configuration or Delete */
if (cfgReqInfo->action != RGR_RECONFIG)
{
ret = rgSCHGomCfgReq (pst->region, pst->pool, instCb,
transId, cfgReqInfo);
- RETVALUE(ret);
+ return (ret);
}
/* Fetch the cell Id for the recieved request */
if((rgSCHGomGetCellIdFrmCfgReq(cfgReqInfo, &cellId)) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Action.Config Type Error");
+ DU_LOG("\nERROR --> SCH : Action.Config Type Error");
- SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Extract the cell and Enquee Config Request */
if(NULLP != instCb->rgrSap[spId].cell)
{
if(cellId != instCb->rgrSap[spId].cell->cellId)
{
- RLOG_ARG2(L_ERROR,DBG_CELLID,cellId, "Cell with Id %d already exists "
+ DU_LOG("\nERROR --> SCH : Cell with Id %d already exists "
"on sap %d", instCb->rgrSap[spId].cell->cellId, spId);
- SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
cell = instCb->rgrSap[spId].cell;
ret = rgSCHGomEnqCfgReq(pst->region, pst->pool, cell, transId, cfgReqInfo);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "rgSCHGomHndlCfg: Enqueuing CfgReq "
+ DU_LOG("\nERROR --> SCH : rgSCHGomHndlCfg: Enqueuing CfgReq "
"Failed ");
- SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
- SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}/* rgSCHGomHndlCfg */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomCfgReq
-(
-Region reg,
-Pool pool,
-RgSchCb *instCb,
-RgrCfgTransId transId,
-RgrCfgReqInfo *cfgReqInfo
-)
-#else
-PRIVATE S16 rgSCHGomCfgReq(reg, pool, instCb, transId, cfgReqInfo)
-Region reg;
-Pool pool;
-RgSchCb *instCb;
-RgrCfgTransId transId;
-RgrCfgReqInfo *cfgReqInfo;
-#endif
+static S16 rgSCHGomCfgReq(Region reg,Pool pool,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo)
{
- SpId spId = 0;
- U8 cfmStatus = RGR_CFG_CFM_OK;
+ SpId spId = 0;
+ uint8_t cfmStatus = RGR_CFG_CFM_OK;
S16 ret;
RgSchErrInfo errInfo;
-#ifdef DEBUGP
- Inst inst = (instCb->rgSchInit.inst );
-#endif
- TRC2(rgSCHGomCfgReq);
#ifdef EMTC_ENABLE
-printf("\n AT MAC rgSCHGomCfgReq \n");
+printf("\nDEBUG --> SCH: AT MAC rgSCHGomCfgReq \n");
#endif
/* Process Config/Reconfig/Delete request from RRM */
#endif /* LTE_ADV */
default:
{
- RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "Invalid configuration "
+ DU_LOG("\nERROR --> SCH : Invalid configuration "
"action %d", cfgReqInfo->action);
ret = RFAILED;
}
cfmStatus = RGR_CFG_CFM_NOK;
}
- SPutSBuf(reg, pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
#ifdef EMTC_ENABLE
-printf("\n AT MAC sending RGR cfg cfm \n");
+printf("\nDEBUG --> SCH: AT MAC sending RGR cfg cfm \n");
#endif
/* Send back confirmation status to RRM */
schSendCfgCfm(reg, pool, transId, cfmStatus);
#ifdef EMTC_ENABLE
-printf("\n AT MAC RGR cfg cfm sent\n");
+printf("\nDEBUG --> SCH: AT MAC RGR cfg cfm sent\n");
#endif
- RETVALUE(ret);
+ return (ret);
} /* rgSCHGomCfgReq */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomEnqCfgReq
-(
-Region reg,
-Pool pool,
-RgSchCellCb *cell,
-RgrCfgTransId transId,
-RgrCfgReqInfo *rgrCfgReq
-)
-#else
-PRIVATE S16 rgSCHGomEnqCfgReq(reg, pool, cell, transId, rgrCfgReq)
-Region reg;
-Pool pool;
-RgSchCellCb *cell;
-RgrCfgTransId transId;
-RgrCfgReqInfo *rgrCfgReq;
-#endif
+static S16 rgSCHGomEnqCfgReq(Region reg,Pool pool,RgSchCellCb *cell,RgrCfgTransId transId,RgrCfgReqInfo *rgrCfgReq)
{
S16 ret;
- U32 sfDiff;
+ uint32_t sfDiff;
RgSchCfgElem *rgrCfgElem = NULLP;
CmLteTimingInfo actvTime;
Inst inst = cell->instIdx;
- TRC2(rgSCHGomEnqCfgReq);
-
/* Allocate memory for config Element */
ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem));
- if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP))
+ if ((ret != ROK) || ((uint8_t *)rgrCfgElem == NULLP))
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Initialize the configuration element */
- cmMemcpy((U8*)rgrCfgElem->rgrCfg.transId.trans,(U8*)transId.trans,
+ memcpy(rgrCfgElem->rgrCfg.transId.trans,transId.trans,
sizeof(transId.trans));
rgrCfgElem->rgrCfg.reg = reg;
rgrCfgElem->rgrCfg.pool = pool;
/* Check if the activation time is valid */
if (actvTime.sfn >= RGSCH_MAX_SFN
- || actvTime.subframe >= RGSCH_NUM_SUB_FRAMES_5G)
+ || actvTime.slot >= RGSCH_NUM_SUB_FRAMES_5G)
{
- RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "Invalid activation time for RGR "
- "config request: activation sfn %d activation subframe %d current "
- "sfn %d current subframe %d", actvTime.sfn, actvTime.subframe,
- cell->crntTime.sfn, cell->crntTime.subframe);
+ DU_LOG("\nERROR --> SCH : Invalid activation time for RGR "
+ "config request: activation sfn %d activation slot %d current "
+ "sfn %d current slot %d", actvTime.sfn, actvTime.slot,
+ cell->crntTime.sfn, cell->crntTime.slot);
/* ccpu00117052 - MOD - Passing double pointer
for proper NULLP assignment*/
rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
- RETVALUE(RFAILED);
+ return RFAILED;
}
sfDiff = RGSCH_CALC_SF_DIFF(actvTime, cell->crntTime);
if (sfDiff > (RGR_ACTV_WIN_SIZE * RGSCH_NUM_SUB_FRAMES_5G))
{
- RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId,"Invalid activation time for RGR"
- " config request: activation sfn %d activation subframe %d "
- "current sfn %d current subframe %d", actvTime.sfn,
- actvTime.subframe, cell->crntTime.sfn, cell->crntTime.subframe);
+ DU_LOG("\nERROR --> SCH : Invalid activation time for RGR"
+ " config request: activation sfn %d activation slot %d "
+ "current sfn %d current slot %d", actvTime.sfn,
+ actvTime.slot, cell->crntTime.sfn, cell->crntTime.slot);
/* ccpu00117052 - MOD - Passing double pointer
for proper NULLP assignment*/
rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (sfDiff)
rgrCfgElem->actvTime = actvTime;
rgSCHDbmInsPndngRgrCfgElem(cell, rgrCfgElem);
/* Cfm to be sent only after applying request */
- RETVALUE(ROK);
+ return ROK;
}
}
/* Add to current cfgReq list */
rgSCHDbmInsCrntRgrCfgElem(cell, rgrCfgElem);
/* Cfm to be sent only after applying request */
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHGomEnqCfgReq */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHGomTtiHndlr
-(
-RgSchCellCb *cell,
-SpId spId
-)
-#else
-PUBLIC S16 rgSCHGomTtiHndlr(cell, spId)
-RgSchCellCb *cell;
-SpId spId;
-#endif
+S16 rgSCHGomTtiHndlr(RgSchCellCb *cell,SpId spId)
{
RgSchCfgElem *cfgElem;
Inst inst= cell->instIdx;
- TRC2(rgSCHGomTtiHndlr);
/* Dequeue from current config list */
while ((cfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP)
rgSCHUtlFreeSBuf(inst, (Data **)&cfgElem, sizeof(*cfgElem));
}
- RETVALUE(ROK);
+ return ROK;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomHndlCfgReq
-(
-RgSchCb *instCb,
-SpId spId,
-RgrCfg *cfg,
-RgSchErrInfo *errInfo
-)
-#else
-PRIVATE S16 rgSCHGomHndlCfgReq(instCb, spId, cfg, errInfo)
-RgSchCb *instCb;
-SpId spId;
-RgrCfg *cfg;
-RgSchErrInfo *errInfo;
-#endif
+static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo *errInfo)
{
S16 ret;
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst );
RgSchUeCb *ue;
- TRC2(rgSCHGomHndlCfgReq);
-
errInfo->errType = RGSCHERR_GOM_CFG_REQ;
/* Validate and process the configuration request */
ret = rgSCHCfgVldtRgrCellCfg(inst, &cfg->u.cellCfg, cell, errInfo);
if (ret != ROK)
{
- RLOG1(L_ERROR,"Rgr Cell configuration "
+ DU_LOG("\nERROR --> SCH : Rgr Cell configuration "
"validation FAILED: Cell %d", cfg->u.cellCfg.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrCellCfg(instCb, spId, &cfg->u.cellCfg, errInfo);
break;
ret = rgSCHCfgVldtRgrUeCfg(inst, &cfg->u.ueCfg, &cell, errInfo);
if (ret != ROK)
{
- RLOG1(L_ERROR,"Ue configuration validation"
+ DU_LOG("\nERROR --> SCH : Ue configuration validation"
" FAILED: CRNTI:%d", cfg->u.ueCfg.crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrUeCfg(cell, &cfg->u.ueCfg, errInfo);
break;
ret = rgSCHCfgVldtRgrLcCfg(inst, &cfg->u.lchCfg, &cell, &ue, errInfo);
if (ret != ROK)
{
- RLOG1(L_ERROR,"LC configuration validation "
+ DU_LOG("\nERROR --> SCH : LC configuration validation "
"FAILED: LCID:%d", cfg->u.lchCfg.lcId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrLchCfg(cell, ue, &cfg->u.lchCfg, errInfo);
break;
ret = rgSCHCfgVldtRgrLcgCfg(inst, &cfg->u.lcgCfg, &cell, &ue, errInfo);
if (ret != ROK)
{
- RLOG1(L_ERROR,"LCG configuration validation "
+ DU_LOG("\nERROR --> SCH : LCG configuration validation "
"FAILED: LCGID:%d", cfg->u.lcgCfg.ulInfo.lcgId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrLcgCfg(cell, ue, &cfg->u.lcgCfg, errInfo);
break;
ret = rgSCHCfgVldtRgrSchedEnbCfg(inst, &cfg->u.schedEnbCfg, errInfo);
if (ret != ROK)
{
- RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCH ENB configuration validation "
- "FAILED: \n" ));
- RETVALUE(RFAILED);
+ DU_LOG("\nERROR --> SCH : SCH ENB configuration validation FAILED: \n");
+ return RFAILED;
}
ret = rgSCHCfgRgrSchedEnbCfg(inst, spId, &cfg->u.schedEnbCfg, errInfo);
break;
default:
{
#if(ERRCLASS & ERRCLS_INT_PAR)
- RLOG1(L_ERROR,"Should never come here: "
+ DU_LOG("\nERROR --> SCH : Should never come here: "
"cfgType %d", cfg->cfgType);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- RETVALUE(ret);
+ return (ret);
} /* rgSCHGomHndlCfgReq */
#ifdef LTE_ADV
* @param[in] RgSchCb *instCb
* @param[in] SpId spId
* @param[in] RgrSCellActDeactEvnt *sCellActDeactEvnt
- * @param[in] U8 action
+ * @param[in] uint8_t action
* @param[out] RgSchErrInfo *errInfo
* @return S16
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomHndlSCellActDeactReq
-(
-RgSchCb *instCb,
-SpId spId,
-RgrSCellActDeactEvnt *sCellActDeactEvnt,
-RgSchErrInfo *errInfo,
-U8 action
-)
-#else
-PRIVATE S16 rgSCHGomHndlSCellActDeactReq(instCb, spId, sCellActDeactEvnt, errInfo, action)
-RgSchCb *instCb;
-SpId spId;
-RgrSCellActDeactEvnt *sCellActDeactEvnt;
-RgSchErrInfo *errInfo;
-U8 action;
-#endif
+static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb *instCb,SpId spId,RgrSCellActDeactEvnt *sCellActDeactEvnt,RgSchErrInf *errInfo,uint8_t action)
{
RgSchUeCb *ue = NULLP;
- U16 idx = 0;
- U16 sCellIdx = 0;
+ uint16_t idx = 0;
+ uint16_t sCellIdx = 0;
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst);
- TRC2(rgSCHGomHndlSCellActDeactReq);
- RGSCHDBGPRM(inst,(rgSchPBuf(inst), "Processing RGR SCell Actication request:"
+ DU_LOG(("\nDEBUG --> SCH : Processing RGR SCell Actication request:"
"%d\n", sCellActDeactEvnt->crnti));
errInfo->errType = RGSCHERR_GOM_SCELL_REQ;
/* Fetch the Ue */
if ((ue = rgSCHDbmGetUeCb(cell, sCellActDeactEvnt->crnti)) == NULLP)
{
- RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UE: does not exist\n",
+ DU_LOG(("\nERROR --> SCH : [%d]UE: does not exist\n",
sCellActDeactEvnt->crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(idx = 0; idx < sCellActDeactEvnt->numOfSCells; idx++)
if (ROK != (rgSCHSCellTrigActDeact(cell, ue, sCellIdx, action)))
{
- RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCell Actication failed"
+ DU_LOG("\nERROR --> SCH : SCell Actication failed"
"for UE [%d] with SCellIdx [%d]\n",
- sCellActDeactEvnt->crnti, idx));
- RETVALUE(RFAILED);
+ sCellActDeactEvnt->crnti, idx);
+ return RFAILED;
}
- }
- RGSCHDBGINFO(inst,(rgSchPBuf(inst), "RGR Reconfiguration processed\n"));
- RETVALUE(ROK);
+ DU_LOG("\nINFO --> SCH : RGR Reconfiguration processed\n");
+ return ROK;
} /* rgSCHGomHndlSCellActDeactReq */
#endif /* LTE_ADV */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomHndlRecfgReq
-(
-RgSchCb *instCb,
-SpId spId,
-RgrRecfg *recfg,
-RgSchErrInfo *errInfo
-)
-#else
-PRIVATE S16 rgSCHGomHndlRecfgReq(instCb, spId, recfg, errInfo)
-RgSchCb *instCb;
-SpId spId;
-RgrRecfg *recfg;
-RgSchErrInfo *errInfo;
-#endif
+static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSchErrInfo *errInfo)
{
RgSchUeCb *ue = NULLP;
RgSchDlLcCb *dlLc = NULLP; /* PURIFY_FIX:UMR */
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst );
- TRC2(rgSCHGomHndlRecfgReq);
-
errInfo->errType = RGSCHERR_GOM_RECFG_REQ;
/* Validate and process the re-configuration request */
errInfo);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,recfg->u.cellRecfg.cellId,"Rgr Cell Recfg Validation "
+ DU_LOG("\nERROR --> SCH : Rgr Cell Recfg Validation "
"FAILED");
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrCellRecfg(cell, &recfg->u.cellRecfg, errInfo);
break;
ret = rgSCHCfgVldtRgrUeRecfg(inst, &recfg->u.ueRecfg, &cell, &ue, errInfo);
if ( ret != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.ueRecfg.cellId,"Ue Recfg Validation FAILED"
+ DU_LOG("\nERROR --> SCH : Ue Recfg Validation FAILED"
"OLD CRNTI:%d",recfg->u.ueRecfg.oldCrnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrUeRecfg(cell, ue, &recfg->u.ueRecfg, errInfo);
break;
&dlLc, errInfo);
if (ret != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lchRecfg.cellId,"Lc Recfg Validation FAILED"
+ DU_LOG("\nERROR --> SCH : Lc Recfg Validation FAILED"
"LCID:%d",recfg->u.lchRecfg.lcId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrLchRecfg(cell, ue, dlLc, &recfg->u.lchRecfg, errInfo);
break;
errInfo);
if (ret != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lcgRecfg.cellId, "Lcg Recfg Validation FAILED"
+ DU_LOG("\nERROR --> SCH : Lcg Recfg Validation FAILED"
"LCGID:%d",recfg->u.lcgRecfg.ulRecfg.lcgId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrLcgRecfg(cell, ue, &recfg->u.lcgRecfg, errInfo);
break;
default:
{
#if(ERRCLASS & ERRCLS_INT_PAR)
- RLOG1(L_ERROR,"Should never come here: recfgType %d", recfg->recfgType);
+ DU_LOG("\nERROR --> SCH : Should never come here: recfgType %d", recfg->recfgType);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- RETVALUE(ret);
+ return (ret);
} /* rgSCHGomHndlRecfgReq */
/**
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomHndlResetReq
-(
-RgSchCb *instCb,
-SpId spId,
-RgrRst *reset,
-RgSchErrInfo *errInfo
-)
-#else
-PRIVATE S16 rgSCHGomHndlResetReq(instCb, spId, reset, errInfo)
-RgSchCb *instCb;
-SpId spId;
-RgrRst *reset;
-RgSchErrInfo *errInfo;
-#endif
+static S16 rgSCHGomHndlResetReq(RgSchCb *instCb,SpId spId,RgrRst *reset,RgSchErrInfo *errInfo)
{
S16 ret;
RgSchCellCb *cell= instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst );
RgSchUeCb *ue = NULLP;
- TRC2(rgSCHGomHndlResetReq);
-
-
errInfo->errType = RGSCHERR_GOM_RESET_REQ;
/* Validate and process the UE reset request */
ret = rgSCHCfgVldtRgrUeReset(inst, reset, cell, &ue, errInfo);
if (ret != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset Validation FAILED"
+ DU_LOG("\nERROR --> SCH : Rgr UE Reset Validation FAILED"
"CRNTI:%d",reset->crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgSCHCfgRgrUeReset(cell, ue, reset, errInfo);
if (ret != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset FAILED"
+ DU_LOG("\nERROR --> SCH : Rgr UE Reset FAILED"
"CRNTI:%d",reset->crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ret);
+ return (ret);
} /* rgSCHGomHndlResetReq */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomHndlDelReq
-(
-RgSchCb *instCb,
-SpId spId,
-RgrDel *del,
-RgSchErrInfo *errInfo
-)
-#else
-PRIVATE S16 rgSCHGomHndlDelReq(instCb, spId, del, errInfo)
-RgSchCb *instCb;
-SpId spId;
-RgrDel *del;
-RgSchErrInfo *errInfo;
-#endif
+static S16 rgSCHGomHndlDelReq(RgSchCb *instCb,SpId spId,RgrDel *del,RgSchErrInfo *errInfo)
{
S16 ret;
-#ifdef DEBUGP
- Inst inst = (instCb->rgSchInit.inst);
-#endif
- VOLATILE U32 startTime=0;
+ volatile uint32_t startTime=0;
- TRC2(rgSCHGomHndlDelReq);
-
errInfo->errType = RGSCHERR_GOM_DEL_REQ;
if(instCb->rgrSap[spId].cell == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Cell doesnt exist");
- RETVALUE(RFAILED);
+ DU_LOG("\nERROR --> SCH : Cell doesnt exist");
+ return RFAILED;
}
/* Process the delete request */
if(ret == ROK)
{
/* TODO::Needs to be revisited after tti flow CaDev Start */
- U8 idx = (U8)((instCb->rgrSap[spId].cell->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
+ uint8_t idx = (uint8_t)((instCb->rgrSap[spId].cell->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
instCb->cells[idx] = NULLP;
/* CaDev End */
instCb->rgrSap[spId].cell = NULLP;
default:
{
#if(ERRCLASS & ERRCLS_INT_PAR)
- RLOG1(L_ERROR,"Should never come here: delType %d", del->delType);
+ DU_LOG("\nERROR --> SCH : Should never come here: delType %d", del->delType);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- RETVALUE(ret);
+ return (ret);
} /* rgSCHGomHndlDelReq */
* File : rg_sch_gom.c
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq
-(
-RgrCfgReqInfo *rgrCfgReq,
-CmLteCellId *cellId
-)
-#else
-PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq(rgrCfgReq, cellId)
-RgrCfgReqInfo *rgrCfgReq;
-CmLteCellId *cellId;
-#endif
+static S16 rgSCHGomGetCellIdFrmCfgReq(RgrCfgReqInfo *rgrCfgReq,CmLteCellId *cellId)
{
- TRC2(rgSCHGomGetCellIdFrmCfgReq);
-
-
/* Extract CellId depending on the action and Config Type in the Request
* As of now this function is called for only re configuration so removed
* othe CASES below if needed we can add them*/
}
else
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
}
default:
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
} /* End of Switch */
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHGomGetCellIdFrmCfgReq */
#ifdef RGR_SI_SCH
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHGomHndlSiCfg
-(
-Region reg,
-Pool pool,
-RgSchCb *instCb,
-SpId spId,
-RgrCfgTransId transId,
-RgrSiCfgReqInfo *cfgReqInfo
-)
-#else
-PUBLIC S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo)
-Region reg;
-Pool pool;
-RgSchCb *instCb;
-SpId spId;
-RgrCfgTransId transId;
-RgrSiCfgReqInfo *cfgReqInfo;
-#endif
+S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo *cfgReqInfo)
{
S16 ret;
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst );
- RgSchErrInfo errInfo;
- U8 cfmStatus = RGR_CFG_CFM_NOK;
+ RgSchErrInfo errInfo;
+ uint8_t cfmStatus = RGR_CFG_CFM_NOK;
MsgLen msgLen = 0, pduLen;
S32 tbSz = 0;
- U8 nPrb = 0;
- U8 mcs = 0;
-
- TRC2(rgSCHGomHndlSiCfg);
+ uint8_t nPrb = 0;
+ uint8_t mcs = 0;
/* check if cell does not exists */
- if (((U8 *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId))
+ if (((uint8_t *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Cell Control block does not exist"
- );
+ DU_LOG("\nERROR --> SCH : Cell Control block does not exist");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/*Validate the received SI configuration */
ret = rgSCHCfgVldtRgrSiCfg(inst, cfgReqInfo, cell, &errInfo);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration "
+ DU_LOG("\nERROR --> SCH : Rgr SI configuration "
"validation FAILED");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/*ccpu00140789: Stopping SI scheduling*/
if(RGR_SI_STOP == cfgReqInfo->cfgType)
RGSCH_FREE_MSG(cell->siCb.newSiInfo.siInfo[cfgReqInfo->siId-1].si);
cell->siCb.newSiInfo.siInfo[cfgReqInfo->siId-1].si = NULLP;
}
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
cfmStatus = RGR_CFG_CFM_OK;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
- RETVALUE(ROK);
+ return ROK;
}
else
{
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
/* need to add padding bytes */
nmPadBytes = (tbSz - (msgLen*8))/8;
- if ( SGetSBuf(reg,pool,&padding,nmPadBytes) != ROK)
+ SCH_ALLOC(padding,nmPadBytes);
+ if(padding == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration "
- "SGetSBuf failed for padding failed");
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ DU_LOG("\nERROR --> SCH : Rgr SI configuration "
+ " failed to allocate memory for padding");
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- cmMemset((U8*)padding,(U8)0,nmPadBytes);
+ memset(padding,0,nmPadBytes);
#ifdef MS_MBUF_CORRUPTION
MS_BUF_ADD_ALLOC_CALLER();
#endif
if ( SAddPstMsgMult((Data*)padding,nmPadBytes,cfgReqInfo->pdu) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration "
+ DU_LOG("\nERROR --> SCH : Rgr SI configuration "
"Failed to add padding bytes");
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
- SPutSBuf(reg, pool, (Data* )padding,(Size)nmPadBytes);
+ SCH_FREE(padding,(Size)nmPadBytes);
padding = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- SPutSBuf(reg, pool, (Data* )padding,(Size)nmPadBytes);
+ SCH_FREE(padding,(Size)nmPadBytes);
padding = NULLP;
}/* if (tbSz != ...*/
}/* if (RGR_SI_CFG_TYPE_SI...*/
ret = rgSCHUtlCalMcsAndNPrb(cell, cfgReqInfo->cfgType, pduLen,0);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB"
+ DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB"
"value");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1,
ret = rgSCHUtlCalMcsAndNPrb(cell, cfgReqInfo->cfgType, pduLen,0);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB"
+ DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB"
"value");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1,
cell->siCb.newSiInfo.sib1Info.sib1,
cfgReqInfo->siId);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB"
+ DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB"
"value");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Si recfg, where numSi changes */
if (cell->siCb.siBitMask & RGSCH_SI_SICFG_UPD)
}
else /* Initial Si cfg or si recfg where numSi did not change */
{
- U8 bitMask;
+ uint8_t bitMask;
/* Initial Si cfg */
if (cell->siCb.crntSiInfo.siInfo[cfgReqInfo->siId-1].si == NULLP)
{
cfgReqInfo->siId);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB"
+ DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB"
"value");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* No need to wait for Modification period boundary */
cell->siCb.siArray[cfgReqInfo->siId-1].si = cfgReqInfo->pdu;
cell->siCb.siArray[cfgReqInfo->siId-1].isWarningSi = FALSE;
break;
default:
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Invalid cfgType "
+ DU_LOG("\nERROR --> SCH : Invalid cfgType "
"parameter value");
RGSCH_FREE_MSG(cfgReqInfo->pdu);
- SPutSBuf(reg, pool, (Data *)cfgReqInfo,
+ SCH_FREE(cfgReqInfo,
(Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
+ SCH_FREE(cfgReqInfo, (Size)sizeof(*cfgReqInfo));
cfgReqInfo = NULLP;
cfmStatus = RGR_CFG_CFM_OK;
rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHGomHndlSiCfg */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHGomHndlWarningSiCfg
+S16 rgSCHGomHndlWarningSiCfg
(
Region reg,
Pool pool,
RgrCfgTransId transId,
RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
)
-#else
-PUBLIC S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId,
-warningSiCfgReqInfo)
-Region reg;
-Pool pool;
-RgSchCb *instCb;
-SpId spId;
-RgrCfgTransId transId;
-RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
-#endif
{
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
- U8 cfmStatus = RGR_CFG_CFM_NOK;
- U16 idx;
- U8 siId = warningSiCfgReqInfo->siId;
- U8 j, mcs=0, nPrb=0;
- RgSchWarningSiSeg *warningSiMsg;
- RgSchWarningSiPdu *pduNode;
- CmLList *node;
- MsgLen msgLen = 0;
- Bool freeNodeFound = FALSE;
- U16 siWinSize = 0;
- U16 minPeriod = 0;
+ uint8_t cfmStatus = RGR_CFG_CFM_NOK;
+ uint16_t idx;
+ uint8_t siId = warningSiCfgReqInfo->siId;
+ uint8_t j, mcs=0, nPrb=0;
+ RgSchWarningSiSeg *warningSiMsg;
+ RgSchWarningSiPdu *pduNode;
+ CmLList *node;
+ MsgLen msgLen = 0;
+ Bool freeNodeFound = FALSE;
+ uint16_t siWinSize = 0;
+ uint16_t minPeriod = 0;
#ifdef EMTC_ENABLE
- U8 isEmtc = warningSiCfgReqInfo->emtcEnable;
+ uint8_t isEmtc = warningSiCfgReqInfo->emtcEnable;
#endif
- TRC2(rgSCHGomHndlWarningSiCfg);
-
#ifdef EMTC_ENABLE
if(TRUE == isEmtc)
{
minPeriod = cell->siCfg.minPeriodicity;
}
/* check if cell does not exists */
- if (((U8 *)cell == NULLP) ||
+ if (((uint8_t *)cell == NULLP) ||
(cell->cellId != warningSiCfgReqInfo->cellId) ||
(warningSiCfgReqInfo->siId >
((minPeriod * 10)/siWinSize)))
{
- RLOG_ARG2(L_ERROR,DBG_CELLID,warningSiCfgReqInfo->cellId,"Warning SI Cfg Failed for siId = %d"
+ DU_LOG("\nERROR --> SCH : Warning SI Cfg Failed for siId = %d"
"warning cellID:%d",warningSiCfgReqInfo->siId,warningSiCfgReqInfo->cellId);
rgSCHUtlFreeWarningSiSeg(reg, pool, &warningSiCfgReqInfo->siPduLst);
- SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo,
+ SCH_FREE(warningSiCfgReqInfo,
sizeof(RgrWarningSiCfgReqInfo));
warningSiCfgReqInfo = NULLP;
rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Search for free index in WarningSi */
#endif
{
- RGSCHLOGERROR(cell->instIdx,ERRCLS_INT_PAR,ERG011,
- (ErrVal)msgLen,
- "rgSCHGomHndlWarningSiCfg():msgLen does not match\
+ DU_LOG("\nERROR --> SCH : rgSCHGomHndlWarningSiCfg():msgLen does not match\
any valid TB Size.");
- RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Warning SI Cfg Failed"
+ DU_LOG("\nERROR --> SCH : Warning SI Cfg Failed"
"for siId = %d", warningSiCfgReqInfo->siId);
rgSCHUtlFreeWarningSiSeg(reg, pool,
&warningSiCfgReqInfo->siPduLst);
- SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo,
+ SCH_FREE(warningSiCfgReqInfo,
sizeof(RgrWarningSiCfgReqInfo));
warningSiCfgReqInfo = NULLP;
rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId,
siId, transId,cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
{
node = warningSiCfgReqInfo->siPduLst.first;
cmLListDelFrm(&(warningSiCfgReqInfo->siPduLst), node);
- SPutSBuf(reg, pool, (Data *)node,sizeof(CmLList));
+ SCH_FREE(node,sizeof(CmLList));
node = NULLP;
}
if (freeNodeFound == FALSE)
{
- RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,"No SI Index is free");
+ DU_LOG("\nDEBUG --> SCH : No SI Index is free");
rgSCHUtlFreeWarningSiSeg(reg, pool, &warningSiCfgReqInfo->siPduLst);
- SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo,
+ SCH_FREE(warningSiCfgReqInfo,
sizeof(RgrWarningSiCfgReqInfo));
warningSiCfgReqInfo = NULLP;
rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId,
cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo,
+ SCH_FREE(warningSiCfgReqInfo,
sizeof(RgrWarningSiCfgReqInfo));
warningSiCfgReqInfo = NULLP;
- RETVALUE(ROK);
+ return ROK;
}
\f
* @param[in] SpId siId
* @return void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHGomHndlWarningSiStopReq
-(
-Region reg,
-Pool pool,
-RgSchCb *instCb,
-U8 siId,
-RgrCfgTransId transId,
-SpId spId
-)
-#else
-PUBLIC Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId)
-Region reg;
-Pool pool;
-RgSchCb *instCb;
-U8 siId;
-RgrCfgTransId transId;
-SpId spId;
-#endif
+Void rgSCHGomHndlWarningSiStopReq(Region reg,Pool pool,RgSchCb *instCb,uint8_t siId,RgrCfgTransId transId,SpId spId)
{
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
- U16 idx;
+ uint16_t idx;
CmLList *node;
RgSchWarningSiPdu *warningSiPdu;
Buffer *pdu;
- TRC3(rgSCHGomHndlWarningSiStopReq)
-
for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++)
{
if(cell->siCb.warningSi[idx].siId == siId)
{
- if ((cmMemcmp ((U8 *)&cell->siCb.warningSi[idx].warningSiMsg.transId,
- (U8 *)&transId, sizeof(RgrCfgTransId))) == 0)
+ if ((cmMemcmp ((uint8_t *)&cell->siCb.warningSi[idx].warningSiMsg.transId,
+ (uint8_t *)&transId, sizeof(RgrCfgTransId))) == 0)
{
/* ccpu00136659: CMAS ETWS design changes */
CM_LLIST_FIRST_NODE(&cell->siCb.warningSi[idx].warningSiMsg.segLstCp, node);
}
}
}
- RETVOID;
+ return;
}
#endif/*RGR_SI_SCH */
* @return S16
*
**/
-#ifdef ANSI
-PUBLIC S16 rgSchUpdtRNTPInfo
-(
- RgSchCellCb *cell,
- RgSchDlSf *sf,
- RgrLoadInfReqInfo *loadInfReq
- )
-#else
-PRIVATE Void rgSchUpdtRNTPInfo(cell, sf)
- RgSchCellCb *cell;
- RgSchDlSf *sf;
- RgrLoadInfReqInfo *loadInfReq;
-
-#endif
+S16 rgSchUpdtRNTPInfo(RgSchCellCb *cell,RgSchDlSf *sf,RgrLoadInfReqInfo *loadInfReq)
{
/* Initialise the variables */
RgSchSFRPoolInfo *sfrCCPool;
CmLList *n;
S16 ret = RFAILED;
- TRC2(rgSchUpdtRNTPInfo);
-
l = &sf->sfrTotalPoolInfo.ccPool;
/*Get the first node from the CC Pool*/
{
sfrCCPool->pwrHiCCRange.endRb = loadInfReq->rgrCcPHighEndRb;
sfrCCPool->pwrHiCCRange.startRb = loadInfReq->rgrCcPHighStartRb;
- RETVALUE(ROK);
+ return ROK;
}
else
{
n = cmLListNext(l);
}
}
- RETVALUE(ret);
+ return (ret);
}
/**
* @brief Handler to handle LOAD INF request from RRM to MAC.
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHGomHndlLoadInf
-(
- Region reg,
- Pool pool,
- RgSchCb *instCb,
- SpId spId,
- RgrCfgTransId transId,
- RgrLoadInfReqInfo *loadInfReq
- )
-#else
-PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
- Region reg;
- Pool pool;
- RgSchCb *instCb;
- SpId spId;
- RgrCfgTransId transId;
- RgrLoadInfReqInfo *loadInfReq;
-#endif
+S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrLoadInfReqInfo *loadInfReq)
{
S16 ret;
RgSchCellCb *cell = instCb->rgrSap[spId].cell;
Inst inst = (instCb->rgSchInit.inst );
RgSchErrInfo errInfo;
- U16 i;
-
- TRC2(rgSCHGomHndlLoadInf);
-
+ uint16_t i;
/* check if cell does not exists */
- if (((U8 *)cell == NULLP) || (cell->cellId != loadInfReq->cellId))
+ if (((uint8_t *)cell == NULLP) || (cell->cellId != loadInfReq->cellId))
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,loadInfReq->cellId,"Cell Control block does not exist"
+ DU_LOG("\nERROR --> SCH : Cell Control block does not exist"
"for load cellId:%d",loadInfReq->cellId);
- SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
- RETVALUE(RFAILED);
+ SCH_FREE(loadInfReq, (Size)sizeof(*loadInfReq));
+ return RFAILED;
}
if (cell->lteAdvCb.dsfrCfg.status == RGR_DISABLE)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHGomHndlLoadInf(): DSFR Feature not enabled");
- SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
- RETVALUE(RFAILED);
+ DU_LOG("\nERROR --> SCH : rgSCHGomHndlLoadInf(): DSFR Feature not enabled");
+ SCH_FREE(loadInfReq, (Size)sizeof(*loadInfReq));
+ return RFAILED;
}
/* Validate the received LOAD INF Configuration */
ret = rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, &errInfo);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Rgr LOAD INF Configuration "
+ DU_LOG("\nERROR --> SCH : Rgr LOAD INF Configuration "
"validation FAILED");
- SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
- RETVALUE(RFAILED);
+ SCH_FREE(loadInfReq, (Size)sizeof(*loadInfReq));
+ return RFAILED;
}
/* Update the RNTP info rcvd in the respective cell centre pool so that Phigh can be
sent for the UEs scheduled in that particular RB range*/
- for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++)
+ for(i = 0; i < RGSCH_NUM_DL_slotS; i++)
{
if((rgSchUpdtRNTPInfo(cell, cell->subFrms[i], loadInfReq) != ROK))
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
+ SCH_FREE(loadInfReq, (Size)sizeof(*loadInfReq));
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHGomHndlLoadInf */
/* LTE_ADV_FLAG_REMOVED_END */
\f
Code Review / o-du / l2.git / blobdiff