X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrsch%2Frg_sch.c;h=13667ce7f8d08f98a076346c18c2300c7ec62a7f;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=5cf8f4653b80acaf017e851313a2d0c7a6df6882;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index 5cf8f4653..13667ce7f 100755 --- a/src/5gnrsch/rg_sch.c +++ b/src/5gnrsch/rg_sch.c @@ -37,15 +37,7 @@ static int RLOG_FILE_ID=185; static int RLOG_MODULE_ID=4096; /* 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 "rgr.h" #include "tfu.h" @@ -59,15 +51,6 @@ static int RLOG_MODULE_ID=4096; #include "rl_common.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 "tfu.x" /* TFU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -97,99 +80,6 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo #endif /* local defines */ /************** LRG Interface ****************/ -/** - * @brief Layer Manager Configuration request handler. - * - * @details - * - * Function : HandleSchGenCfgReq - * - * This function handles the configuration - * request received at scheduler instance from the Layer Manager. - * -# Based on the cfg->hdr.elmId.elmnt value it invokes one of the - * functions rgHdlGenCfg() or rgHdlSapCfg(). - * -# Invokes RgMiLrgSchCfgCfm() to send back the confirmation to the LM. - * - * @param[in] Pst *pst, the post structure - * @param[in] RgMngmt *cfg, the configuration parameter's structure - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC S16 HandleSchGenCfgReq -( -Pst *pst, /* post structure */ -RgMngmt *cfg /* config structure */ -) -#else -PUBLIC S16 HandleSchGenCfgReq(pst, cfg) -Pst *pst; /* post structure */ -RgMngmt *cfg; /* config structure */ -#endif -{ - U16 ret = LCM_PRIM_OK; - U16 reason = LCM_REASON_NOT_APPL; - RgMngmt cfm; - Pst cfmPst; -#ifdef DEBUGP - Inst inst = (pst->dstInst - SCH_INST_START); -#endif - - TRC3(HandleSchGenCfgReq) - - - if(pst->dstInst < SCH_INST_START) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Invalid inst ID"); - RLOG_ARG2(L_DEBUG,DBG_INSTID,inst, "HandleSchGenCfgReq(): " - "pst->dstInst=%d SCH_INST_START=%d", pst->dstInst,SCH_INST_START); - RETVALUE(ROK); - } - printf("\nReceived scheduler gen config"); - /* Fill the post structure for sending the confirmation */ - SchFillCfmPst(pst, &cfmPst, cfg); - - /* Initialize the cfg cfm structure - if (SGetSBuf(cfmPst.region, cfmPst.pool, (Data **)&cfm, sizeof(RgMngmt)) - != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Memory Unavailable for Confirmation"); - RETVALUE(ROK); - } */ - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); - -#ifdef LMINT3 - cfm.hdr.transId = - cfg->hdr.transId; -#endif - - cfm.hdr.elmId.elmnt = cfg->hdr.elmId.elmnt; - switch(cfg->hdr.elmId.elmnt) - { - case STSCHINST: - reason = SchInstCfg(&cfg->t.cfg,pst->dstInst ); - break; - default: - ret = LCM_PRIM_NOK; - reason = LCM_REASON_INVALID_ELMNT; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "Invalid Elmnt=%d", cfg->hdr.elmId.elmnt); - break; - } - - if (reason != LCM_REASON_NOT_APPL) - { - ret = LCM_PRIM_NOK; - } - - cfm.cfm.status = ret; - cfm.cfm.reason = reason; - - SchSendCfgCfm(&cfmPst, &cfm); - /* SPutSBuf(pst->region, pst->pool, (Data *)cfg, sizeof(RgMngmt)); */ - - RETVALUE(ROK); -}/*-- HandleSchGenCfgReq --*/ - /** * @brief Layer Manager Control request handler. @@ -211,13 +101,13 @@ RgMngmt *cfg; /* config structure */ * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMiLrgSchCntrlReq +S16 RgMiLrgSchCntrlReq ( Pst *pst, /* post structure */ RgMngmt *cntrl /* control structure */ ) #else -PUBLIC S16 RgMiLrgSchCntrlReq(pst, cntrl) +S16 RgMiLrgSchCntrlReq(pst, cntrl) Pst *pst; /* post structure */ RgMngmt *cntrl; /* control structure */ #endif @@ -227,8 +117,6 @@ RgMngmt *cntrl; /* control structure */ RgMngmt cfm; Inst inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */ - TRC3(RgMiLrgSchCntrlReq) - /* Fill the post structure for sending the confirmation */ SchFillCfmPst(pst, &cfmPst, cntrl); @@ -239,9 +127,9 @@ RgMngmt *cntrl; /* control structure */ { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Memory Unavailable for Confirmation"); SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); - RETVALUE(ROK); + return ROK; } */ - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = @@ -261,7 +149,7 @@ RgMngmt *cntrl; /* control structure */ RgMiLrgSchCntrlCfm(&cfmPst, &cfm); RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Gen Cfg not done."); /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ - RETVALUE(ROK); + return ROK; } /* General Config done, process the Control request */ @@ -283,7 +171,7 @@ RgMngmt *cntrl; /* control structure */ break; } /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ - RETVALUE(ret); + return (ret); }/*-- RgMiLrgSchCntrlReq --*/ #ifdef LTE_L2_MEAS @@ -303,13 +191,13 @@ RgMngmt *cntrl; /* control structure */ * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMiLrgSchL2MeasReq +S16 RgMiLrgSchL2MeasReq ( Pst *pst, /* post structure */ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ ) #else -PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) +S16 RgMiLrgSchL2MeasReq(pst, measInfo) Pst *pst; /* post structure */ LrgSchMeasReqInfo *measInfo; /* Meas Req Info */ #endif @@ -322,7 +210,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) #if (ERRCLASS & ERRCLS_ADD_RES) CmLList *lnk; #endif - U32 idx; + uint32_t idx; RgSchL2MeasCb *measCb = NULLP; #ifdef DEBUGP Inst inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */ @@ -331,8 +219,6 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) err.errType = 0; err.errCause = 0; - TRC3(RgMiLrgSchL2MeasReq) - /* Find the cellCb using cellId in measInfo. Iterate through all cells * in rgrsapCb in RgschCb */ @@ -355,7 +241,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_INSTID,inst, "Meas req Failed.Invalid Cell Id errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } /* Validate for Meas Types */ if ( (ret = rgSCHUtlValidateMeasReq(cell, measInfo, &err)) != ROK) @@ -366,7 +252,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.Invalid Measurement Type" "errCasue(%d) errType(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } /* Iterate through all meas requests in l2mList in cellCb */ #if (ERRCLASS & ERRCLS_ADD_RES) @@ -384,7 +270,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.Dublicate TransId" "errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -398,9 +284,9 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* -- RRgMiLrgSchL2MeasReq-- */ /** @@ -419,13 +305,13 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMiLrgSchL2MeasStopReq +S16 RgMiLrgSchL2MeasStopReq ( Pst *pst, /* post structure */ LrgSchMeasStopReqInfo *measInfo /* Meas Req Info */ ) #else -PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) +S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) Pst *pst; /* post structure */ LrgSchMeasStopReqInfo *measInfo; /* Meas Req Info */ #endif @@ -436,11 +322,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) CmLList *node = NULLP; RgSchL2MeasCb *measCb = NULLP; LrgSchMeasCfmInfo measCfm; - U8 idx; - - - TRC3(RgMiLrgSchL2MeasStopReq) - + uint8_t idx; for (idx = 0; idx < instCb->numSaps; idx++) { @@ -455,9 +337,9 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) { RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Stop req Failed.Invalid Cell Id "); - RETVALUE(RFAILED); + return RFAILED; } - cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); node = cell->l2mList.first; while(node != NULLP) { @@ -473,7 +355,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) { RgInfL2MeasStopReq measStopReq; Pst pstMac; - cmMemset((U8 *)&measStopReq, 0, sizeof(RgInfL2MeasStopReq)); + memset(&measStopReq, 0, sizeof(RgInfL2MeasStopReq)); measStopReq.transId = measInfo->hdr.transId; measStopReq.measType = measInfo->measType; /* measReq.timePrd = measInfo->timePrd; */ @@ -486,7 +368,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) RgMiLrgSchL2MeasStopCfm(&(rgSchCb[cell->instIdx].rgSchInit.lmPst), &measCfm); } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasStopReq*/ /** * @brief Layer Manager L2 Measurement request handler. @@ -504,13 +386,13 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMiLrgSchL2MeasSendReq +S16 RgMiLrgSchL2MeasSendReq ( Pst *pst, /* post structure */ LrgSchMeasSndReqInfo *measInfo /* Meas Req Info */ ) #else -PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) +S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) Pst *pst; /* post structure */ LrgSchMeasSndReqInfo *measInfo; /* Meas Req Info */ #endif @@ -518,11 +400,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) S16 ret = ROK; RgSchCellCb *cell; RgSchCb *instCb = &rgSchCb[(pst->dstInst - SCH_INST_START)]; - U8 idx; - - TRC3(RgMiLrgSchL2MeasSendReq) - - + uint8_t idx; cell = NULLP; for (idx = 0; idx < instCb->numSaps; idx++) @@ -538,14 +416,14 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) { RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Send req Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) { RgInfL2MeasSndReq measSndReq; Pst pstMac; - cmMemset((U8 *)&measSndReq, 0, sizeof(RgInfL2MeasSndReq)); + memset(&measSndReq, 0, sizeof(RgInfL2MeasSndReq)); measSndReq.transId = measInfo->hdr.transId; measSndReq.measType = measInfo->measType; measSndReq.timePrd = measInfo->timePrd; @@ -558,7 +436,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) cell->sndL2Meas = TRUE; } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasSendReq*/ #endif /* LTE_L2_MEAS */ @@ -586,14 +464,14 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrBndReq +S16 RgUiRgrBndReq ( Pst *pst, SuId suId, SpId spId ) #else -PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) +S16 RgUiRgrBndReq(pst, suId, spId) Pst *pst; SuId suId; SpId spId; @@ -604,9 +482,6 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) Inst instId = pst->dstInst-SCH_INST_START; RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRgrBndReq) - - tmpPst.prior = pst->prior; tmpPst.route = pst->route; tmpPst.selector = pst->selector; @@ -662,7 +537,7 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) #endif ret = RgUiRgrBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgrBndReq */ /** @@ -685,22 +560,20 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrUbndReq +S16 RgUiRgrUbndReq ( Pst *pst, SpId spId, Reason reason ) #else -PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) +S16 RgUiRgrUbndReq(pst, spId, reason) Pst *pst; SpId spId; Reason reason; #endif { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgrUbndReq) - /* SAP Id validation */ if (spId < rgSchCb[instId].numSaps) @@ -718,7 +591,7 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -728,108 +601,11 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP Id:RgUiRgrUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrUbndReq */ -/** - * @brief API for configuration request from RRM towards MAC. - * - * @details - * - * Function: HandleSchCfgReq - * - * This API is invoked by RRM towards MAC to configure MAC. - * These API validates the Pst, spId, suId and transfers the config request - * specific information to corresponding ownership module (GOM) API. - * - * - * @param[in] Pst *pst - * @param[in] RgrCfgTransId transId - * @param[in] RgrCfgReqInfo *cfgReqInfo - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 HandleSchCfgReq -( - Pst *pst, - RgrCfgTransId transId, - RgrCfgReqInfo *cfgReqInfo - ) -#else -PUBLIC S16 HandleSchCfgReq(pst, transId, cfgReqInfo) - Pst *pst; - RgrCfgTransId transId; - RgrCfgReqInfo *cfgReqInfo; -#endif -{ - - SpId spId = 0; - S16 ret = ROK; - U8 cfmStatus = 0x00ff; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - Inst instId = pst->dstInst-SCH_INST_START; - - TRC3(HandleSchCfgReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); - prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; - - - if (cfgReqInfo == NULLP) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer is NULL"); - schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); - } -#if 0 - if (spId < rgSchCb[instId].numSaps) - { - switch(rgSchCb[instId].rgrSap[spId].sapSta.sapState) - { - case LRG_BND: /* SAP is already bound */ - RLOG0(L_DEBUG,"SAP is already bound"); - break; - default: /* Should never reach here */ -#if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG005, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: HandleSchCfgReq failed\n"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - (Size)sizeof(*cfgReqInfo)); - schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); - } - } - else - { -#if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG006, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, - "Invalid SAP Id:HandleSchCfgReq failed\n"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, - (Size)sizeof(*cfgReqInfo)); - schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); - } -#endif - /* Handle configuration */ - ret = rgSCHGomHndlCfg(pst, &rgSchCb[instId], - transId, cfgReqInfo); - if (ret != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Configuration Request Handling Failed"); - RETVALUE(RFAILED); - } - - RETVALUE(ROK); -} /* HandleSchCfgReq */ - #ifdef RGR_SI_SCH /** * @brief API for SI configuration request from RRM towards MAC. @@ -853,7 +629,7 @@ PUBLIC S16 HandleSchCfgReq(pst, transId, cfgReqInfo) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrSiCfgReq +S16 RgUiRgrSiCfgReq ( Pst *pst, SpId spId, @@ -861,7 +637,7 @@ RgrCfgTransId transId, RgrSiCfgReqInfo *cfgReqInfo ) #else -PUBLIC S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo) +S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo) Pst *pst; SpId spId; RgrCfgTransId transId; @@ -869,13 +645,11 @@ RgrSiCfgReqInfo *cfgReqInfo; #endif { S16 ret = ROK; - U8 cfmStatus = RGR_CFG_CFM_NOK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; - TRC2(RgUiRgrSiCfgReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -884,7 +658,7 @@ RgrSiCfgReqInfo *cfgReqInfo; RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -899,7 +673,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -912,7 +686,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -938,10 +712,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"RgUiRgrSiCfgReq:" "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrSiCfgReq */ @@ -967,7 +741,7 @@ else * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiCfgReq +S16 RgUiRgrWarningSiCfgReq ( Pst *pst, SpId spId, @@ -975,7 +749,7 @@ RgrCfgTransId transId, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo ) #else -PUBLIC S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) +S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) Pst *pst; SpId spId; RgrCfgTransId transId; @@ -984,12 +758,10 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; { Inst instId = pst->dstInst-SCH_INST_START; S16 ret = ROK; - U8 cfmStatus = RGR_CFG_CFM_NOK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(RgUiRgrWarningSiCfgReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -999,7 +771,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, 0, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -1017,7 +789,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1033,7 +805,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -1056,10 +828,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1084,27 +856,23 @@ else * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiStopReq +S16 RgUiRgrWarningSiStopReq ( Pst *pst, SpId spId, RgrCfgTransId transId, -U8 siId +uint8_t siId ) #else -PUBLIC S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId) +S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId) Pst *pst; SpId spId; RgrCfgTransId transId; -U8 siId; +uint8_t siId; #endif { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgrWarningSiStopReq) - - - if (spId < rgSchCb[instId].numSaps) { if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) @@ -1114,7 +882,7 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1124,13 +892,13 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, "Invalid SAP Id:RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } rgSCHGomHndlWarningSiStopReq(pst->region, pst->pool, &rgSchCb[instId], siId, transId, spId); - RETVALUE(ROK); + return ROK; } #endif /*RGR_SI_SCH */ @@ -1158,7 +926,7 @@ U8 siId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrLoadInfReq +S16 RgUiRgrLoadInfReq ( Pst *pst, SpId spId, @@ -1166,7 +934,7 @@ PUBLIC S16 RgUiRgrLoadInfReq RgrLoadInfReqInfo *loadInfReq ) #else -PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) +S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) Pst *pst; SpId spId; RgrCfgTransId transId; @@ -1174,12 +942,10 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) #endif { S16 ret = ROK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; - TRC2(RgUiRgrLoadInfReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -1187,7 +953,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -1201,7 +967,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1213,7 +979,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -1224,10 +990,10 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrLoadInfReq */ /* LTE_ADV_FLAG_REMOVED_END */ @@ -1249,13 +1015,13 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMacSchDedBoUpdtReq +S16 RgMacSchDedBoUpdtReq ( Pst* pst, RgInfDedBoRpt *boRpt ) #else -PUBLIC S16 RgMacSchDedBoUpdtReq(pst, boRpt) +S16 RgMacSchDedBoUpdtReq(pst, boRpt) Pst* pst; RgInfDedBoRpt *boRpt; #endif @@ -1270,7 +1036,6 @@ RgInfDedBoRpt *boRpt; Inst inst = (pst->dstInst - SCH_INST_START); S16 cellSapId = boRpt->cellSapId; - TRC3(RgMacSchDedBoUpdtReq) /* RLOG_ARG2(L_DEBUG,DBG_CELLID,boRpt->cellId,"rgMacSchDedBoUpdtReq():" " boRpt->rnti = %u boRpt->lcId = %u",boRpt->rnti, boRpt->lcId); @@ -1285,7 +1050,7 @@ RgInfDedBoRpt *boRpt; /* Handle Cell fetch failure */ RGSCHLOGERROR(inst, ERRCLS_INT_PAR,ERG009,(ErrVal)boRpt->cellId, "rgMacSchDedBoUpdtReq(): Invalid cell Id"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1297,7 +1062,7 @@ RgInfDedBoRpt *boRpt; #ifdef LTE_ADV if (cell != ue->cell) { - RETVALUE(RFAILED); + return RFAILED; } #endif if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, boRpt->lcId)) != NULLP) @@ -1363,10 +1128,10 @@ RgInfDedBoRpt *boRpt; dlLc->setMaxDlPrio = boRpt->setMaxDlPrio; /* Update the scheduler */ rgSCHUtlDlDedBoUpd(cell, ue, dlLc); - RETVALUE(ROK); + return ROK; } } - RETVALUE(RFAILED); + return RFAILED; } /* end of rgMacSchDedBoUpdtReq */ @@ -1388,13 +1153,13 @@ RgInfDedBoRpt *boRpt; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMacSchCmnBoUpdtReq +S16 RgMacSchCmnBoUpdtReq ( Pst* pst, RgInfCmnBoRpt *boRpt ) #else -PUBLIC S16 RgMacSchCmnBoUpdtReq(pst, boRpt) +S16 RgMacSchCmnBoUpdtReq(pst, boRpt) Pst* pst; RgInfCmnBoRpt *boRpt; #endif @@ -1403,7 +1168,6 @@ RgInfCmnBoRpt *boRpt; Inst inst = (pst->dstInst - SCH_INST_START); S16 cellSapId = boRpt->cellSapId; - TRC3(RgMacSchCmnBoUpdtReq) /* No need to chk for cell being NULL as MAC would not have found instance if * it doesnt exist */ @@ -1412,7 +1176,7 @@ RgInfCmnBoRpt *boRpt; { RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"RgMacSchCmnBoUpdtReq():" "Invalid boRpt cell Id:%d",boRpt->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* handle status response on CCCH */ @@ -1427,7 +1191,7 @@ RgInfCmnBoRpt *boRpt; rgSCHUtlHndlBcchPcchBoUpdt(cell, boRpt); } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchCmnBoUpdtReq */ /*Fix: start: Inform UE delete to scheduler*/ /** @@ -1446,13 +1210,13 @@ RgInfCmnBoRpt *boRpt; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMacSchUeDelInd +S16 RgMacSchUeDelInd ( Pst* pst, RgInfUeDelInd *ueDelInd ) #else -PUBLIC S16 RgMacSchUeDelInd(pst, ueDelInd) +S16 RgMacSchUeDelInd(pst, ueDelInd) Pst* pst; RgInfUeDelInd *ueDelInd; #endif @@ -1463,12 +1227,10 @@ RgInfUeDelInd *ueDelInd; CmLList *tmp; RgSchRntiLnk *rntiLnk=NULL; - TRC3(RgMacSchUeDelInd) - if (rgSchCb[inst].rgrSap == NULLP || rgSchCb[inst].rgrSap[cellSapId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,ueDelInd->cellId,"rgrSap or cell is not configured"); - RETVALUE(ROK); + return ROK; } cell = rgSchCb[inst].rgrSap[cellSapId].cell; #ifndef NO_ERRCLS @@ -1478,7 +1240,7 @@ RgInfUeDelInd *ueDelInd; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgMacSchUeDelInd(): Invalid ueDelInd cell Id:%d", ueDelInd->cellId); - RETVALUE(ROK); + return ROK; } #endif @@ -1512,7 +1274,7 @@ RgInfUeDelInd *ueDelInd; "Guard Pool:%ld", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); } - RETVALUE(ROK); + return ROK; } /* rgMacSchUeDelInd */ /*Fix: end: Inform UE delete to scheduler*/ /** @@ -1534,13 +1296,13 @@ RgInfUeDelInd *ueDelInd; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgMacSchSfRecpInd +S16 RgMacSchSfRecpInd ( Pst* pst, RgInfSfDatInd *subfrmInfo ) #else -PUBLIC S16 RgMacSchSfRecpInd(pst, subfrmInfo) +S16 RgMacSchSfRecpInd(pst, subfrmInfo) Pst* pst; RgInfSfDatInd *subfrmInfo; #endif @@ -1561,18 +1323,17 @@ RgInfSfDatInd *subfrmInfo; RgSchCmnUlUeSpsInfo *ulSpsUe ; #endif /* RRM_RBC_X */ - U32 idx; + uint32_t idx; /* RRM_RBC_Y */ #ifdef LTE_L2_MEAS - U8 qci; - U16 datIndActQci = 0; - U16 combDatIndActQci = 0; /* Prev and Latest Dat Ind combined */ - U16 tempUeActQci = 0; /* UE specific Active QCIs */ - U16 diffBits = 0; - U8 lcCount; + uint8_t qci; + uint16_t datIndActQci = 0; + uint16_t combDatIndActQci = 0; /* Prev and Latest Dat Ind combined */ + uint16_t tempUeActQci = 0; /* UE specific Active QCIs */ + uint16_t diffBits = 0; + uint8_t lcCount; #endif - TRC3(RgMacSchSfRecpInd) /* No need to chk for cell being NULL as MAC wouldn't have found instance if * it doesnt exist */ @@ -1616,7 +1377,7 @@ RgInfSfDatInd *subfrmInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Received MSG3 with CRNTI:%d and also CCCH ", datInd->ceInfo.ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } ue = rgSCHDbmGetUeCb (cell, datInd->ceInfo.ces.cRnti); if (ue == NULLP) @@ -1629,7 +1390,7 @@ RgInfSfDatInd *subfrmInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Received MSG3 " "with CRNTI:%d unable to find ueCb", datInd->ceInfo.ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((ret = rgSCHUtlProcMsg3 (subfrmInfo, cell, ue, @@ -1639,7 +1400,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Processing for MSG3 failed for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -1686,7 +1447,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Processing for MSG3 failed for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* fix */ CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -1706,7 +1467,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the UE CB for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1770,7 +1531,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to handle Data" " Indication for UEID:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -1785,7 +1546,7 @@ RgInfSfDatInd *subfrmInfo; /* chk if Sch needs to dealloc datInd after unpk */ RGSCH_FREE_MEM(subfrmInfo); - RETVALUE(ret); + return (ret); } /* rgMacSchSfRecpInd */ #ifdef LTEMAC_SPS @@ -1810,13 +1571,13 @@ RgInfSfDatInd *subfrmInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgMacSchSpsRelInd +S16 RgMacSchSpsRelInd ( Pst *pst, RgInfSpsRelInfo *relInfo ) #else -PUBLIC S16 RgMacSchSpsRelInd(pst, relInfo) +S16 RgMacSchSpsRelInd(pst, relInfo) Pst *pst; RgInfSpsRelInfo *relInfo; #endif @@ -1825,7 +1586,6 @@ RgInfSpsRelInfo *relInfo; RgSchCellCb *cell; Inst inst = (pst->dstInst - SCH_INST_START); - TRC2(RgMacSchSpsRelInd); /* No need to chk for cell being NULL as MAC wouldn't have found instance if * it doesnt exist */ @@ -1835,16 +1595,16 @@ RgInfSpsRelInfo *relInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "No Ue exists with CRNTI:%d",relInfo->cRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHUtlSpsRelInd(cell, ue, relInfo->isExplRel)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "RelInd processing for CRNTI:%d failed",relInfo->cRnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchSpsRelInd */ #endif /* LTEMAC_SPS */ @@ -1871,13 +1631,13 @@ RgInfSpsRelInfo *relInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgMacSchL2MeasCfm +S16 RgMacSchL2MeasCfm ( Pst *pst, RgInfL2MeasCfm *measCfm ) #else -PUBLIC S16 RgMacSchL2MeasCfm(pst, measCfm) +S16 RgMacSchL2MeasCfm(pst, measCfm) Pst *pst; RgInfL2MeasCfm *measCfm; #endif @@ -1887,12 +1647,11 @@ RgInfL2MeasCfm *measCfm; CmLList *lnk; RgSchL2MeasCb *measCb = NULLP; RgSchCb *instCb = &rgSchCb[inst]; - U32 idx; + uint32_t idx; LrgSchMeasCfmInfo schMeasCfm; - U8 qciVal; - U8 idx1; /*LTE_L2_MEAS_PHASE2*/ - U8 qciVal1; - TRC2(RgMacSchL2MeasCfm); + uint8_t qciVal; + uint8_t idx1; /*LTE_L2_MEAS_PHASE2*/ + uint8_t qciVal1; /* Find the cellCb using cellId in measInfo. Iterate through all cells * in rgrsapCb in RgschCb */ @@ -1910,7 +1669,7 @@ RgInfL2MeasCfm *measCfm; { RLOG_ARG0(L_ERROR,DBG_CELLID,measCfm->cellId, "Meas Cfm Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } @@ -1928,7 +1687,7 @@ RgInfL2MeasCfm *measCfm; } if ( measCb == NULLP ) { - RETVALUE( RFAILED ); + return ( RFAILED ); } @@ -1945,13 +1704,13 @@ RgInfL2MeasCfm *measCfm; /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)&measCb, sizeof(RgSchL2MeasCb)); - cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); schMeasCfm.measType = measCfm->measType; schMeasCfm.cfm = measCfm->cfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } for(idx = 0; idx < measCfm->u.prbCfm.numQci; idx++) { @@ -1974,7 +1733,7 @@ RgInfL2MeasCfm *measCfm; measCb->avgPrbQciUl.numQci = measCfm->u.prbCfm.numQci; measCb->cfmRcvd = TRUE; cell->sndL2Meas = TRUE; - RETVALUE(ROK); + return ROK; } /* end of RgMacSchL2MeasCfm */ /** @@ -1998,13 +1757,13 @@ RgInfL2MeasCfm *measCfm; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgMacSchL2MeasStopCfm +S16 RgMacSchL2MeasStopCfm ( Pst *pst, RgInfL2MeasCfm *measCfm ) #else -PUBLIC S16 RgMacSchL2MeasStopCfm(pst, measCfm) +S16 RgMacSchL2MeasStopCfm(pst, measCfm) Pst *pst; RgInfL2MeasCfm *measCfm; #endif @@ -2013,15 +1772,13 @@ RgInfL2MeasCfm *measCfm; Inst inst = (pst->dstInst - SCH_INST_START); RgSchCb *instCb = &rgSchCb[inst]; - TRC2(RgMacSchL2MeasStopCfm); - - cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); schMeasCfm.measType = measCfm->measType; schMeasCfm.cfm = measCfm->cfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasStopCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } #endif @@ -2039,36 +1796,33 @@ RgInfL2MeasCfm *measCfm; * * @param[in] Pst *pst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuSchBndCfm +S16 RgLiTfuSchBndCfm ( Pst *pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgLiTfuSchBndCfm(pst, suId, status) +S16 RgLiTfuSchBndCfm(pst, suId, status) Pst *pst; SuId suId; -U8 status; +uint8_t status; #endif { S16 ret; RgSchLowSapCb *tfuSap; Inst instId = pst->dstInst - SCH_INST_START; - TRC3(RgLiTfuSchBndCfm); - - if(suId >= rgSchCb[instId].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Incorrect SuId"); - RETVALUE(RFAILED); + return RFAILED; } /* Lets validate suId first */ tfuSap = &(rgSchCb[instId].tfuSap[suId]); @@ -2077,10 +1831,10 @@ U8 status; { RLOG_ARG2(L_ERROR,DBG_INSTID,instId, "Incorrect SuId. Configured (%d)" "Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHLmmBndCfm (pst, suId, status); - RETVALUE(ret); + return (ret); } /* RgLiTfuSchBndCfm */ /** @@ -2102,14 +1856,14 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuRaReqInd +S16 RgLiTfuRaReqInd ( Pst *pst, SuId suId, TfuRaReqIndInfo *raReqInd ) #else -PUBLIC S16 RgLiTfuRaReqInd(pst, suId, raReqInd) +S16 RgLiTfuRaReqInd(pst, suId, raReqInd) Pst *pst; SuId suId; TfuRaReqIndInfo *raReqInd; @@ -2118,26 +1872,24 @@ TfuRaReqIndInfo *raReqInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuRaReqInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"SAP Validation failed SuId(%d)", suId); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(raReqInd); - RETVALUE(ret); + return (ret); } if(raReqInd == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Invalid input pointer for raReqInd Failed"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,raReqInd->cellId,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomRaReqInd(rgSchCb[inst].tfuSap[suId].cell, raReqInd); @@ -2145,7 +1897,7 @@ TfuRaReqIndInfo *raReqInd; RGSCH_FREE_MEM(raReqInd); /*SPutSBuf (pst->region, pst->pool, (Data *)raReqInd, sizeof(TfuRaReqIndInfo)); */ - RETVALUE(ret); + return (ret); } /* RgLiTfuRaReqInd */ /** @@ -2166,14 +1918,14 @@ TfuRaReqIndInfo *raReqInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuUlCqiInd +S16 RgLiTfuUlCqiInd ( Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd ) #else -PUBLIC S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd) +S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd) Pst *pst; SuId suId; TfuUlCqiIndInfo *ulCqiInd; @@ -2182,14 +1934,12 @@ TfuUlCqiIndInfo *ulCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuUlCqiInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) @@ -2197,12 +1947,12 @@ TfuUlCqiIndInfo *ulCqiInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomUlCqiInd (rgSchCb[inst].tfuSap[suId].cell, ulCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuUlCqiInd */ /** @@ -2223,14 +1973,14 @@ TfuUlCqiIndInfo *ulCqiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuPucchDeltaPwrInd +S16 RgLiTfuPucchDeltaPwrInd ( Pst *pst, SuId suId, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr ) #else -PUBLIC S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr) +S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr) Pst *pst; SuId suId; TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; @@ -2239,25 +1989,23 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuPucchDeltaPwrInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(pucchDeltaPwr); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomPucchDeltaPwrInd (rgSchCb[inst].tfuSap[suId].cell, pucchDeltaPwr); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(pucchDeltaPwr); - RETVALUE(ret); + return (ret); } /* RgLiTfuPucchDeltaPwrInd */ @@ -2281,14 +2029,14 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuHqInd +S16 RgLiTfuHqInd ( Pst *pst, SuId suId, TfuHqIndInfo *harqAckInd ) #else -PUBLIC S16 RgLiTfuHqInd(pst, suId, harqAckInd) +S16 RgLiTfuHqInd(pst, suId, harqAckInd) Pst *pst; SuId suId; TfuHqIndInfo *harqAckInd; @@ -2297,20 +2045,19 @@ TfuHqIndInfo *harqAckInd; S16 ret; Inst inst = (pst->dstInst - SCH_INST_START); - TRC3(RgLiTfuHqInd); #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); RGSCH_FREE_MEM(harqAckInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2318,7 +2065,7 @@ TfuHqIndInfo *harqAckInd; ret = rgSCHTomHarqAckInd (rgSchCb[inst].tfuSap[suId].cell, harqAckInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(harqAckInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuHqInd */ @@ -2341,14 +2088,14 @@ TfuHqIndInfo *harqAckInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuSrInd +S16 RgLiTfuSrInd ( Pst *pst, SuId suId, TfuSrIndInfo *srInd ) #else -PUBLIC S16 RgLiTfuSrInd(pst, suId, srInd) +S16 RgLiTfuSrInd(pst, suId, srInd) Pst *pst; SuId suId; TfuSrIndInfo *srInd; @@ -2357,27 +2104,25 @@ TfuSrIndInfo *srInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuSrInd); - #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"() SAP Validation failed"); RGSCH_FREE_MEM(srInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"RgLiTfuSrInd()No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHTomSrInd (rgSchCb[inst].tfuSap[suId].cell, srInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuSrInd */ @@ -2400,14 +2145,14 @@ TfuSrIndInfo *srInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuDlCqiInd +S16 RgLiTfuDlCqiInd ( Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd ) #else -PUBLIC S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd) +S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd) Pst *pst; SuId suId; TfuDlCqiIndInfo *dlCqiInd; @@ -2416,25 +2161,23 @@ TfuDlCqiIndInfo *dlCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuDlCqiInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(dlCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomDlCqiInd (rgSchCb[inst].tfuSap[suId].cell, dlCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(dlCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuDlCqiInd */ #ifdef TFU_UPGRADE @@ -2457,14 +2200,14 @@ TfuDlCqiIndInfo *dlCqiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuRawCqiInd +S16 RgLiTfuRawCqiInd ( Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd ) #else -PUBLIC S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd) +S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd) Pst *pst; SuId suId; TfuRawCqiIndInfo *rawCqiInd; @@ -2473,27 +2216,25 @@ TfuRawCqiIndInfo *rawCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuRawCqiInd); - #ifdef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(rawCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif ret = rgSCHTomRawCqiInd (rgSchCb[inst].tfuSap[suId].cell, rawCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(rawCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuRawCqiInd */ /** @@ -2515,14 +2256,14 @@ TfuRawCqiIndInfo *rawCqiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuSrsInd +S16 RgLiTfuSrsInd ( Pst *pst, SuId suId, TfuSrsIndInfo *srsInd ) #else -PUBLIC S16 RgLiTfuSrsInd(pst, suId, srsInd) +S16 RgLiTfuSrsInd(pst, suId, srsInd) Pst *pst; SuId suId; TfuSrsIndInfo *srsInd; @@ -2531,25 +2272,23 @@ TfuSrsIndInfo *srsInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuSrsInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srsInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomSrsInd (rgSchCb[inst].tfuSap[suId].cell, srsInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srsInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuSrsInd */ #endif @@ -2573,14 +2312,14 @@ TfuSrsIndInfo *srsInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuDoaInd +S16 RgLiTfuDoaInd ( Pst *pst, SuId suId, TfuDoaIndInfo *doaInd ) #else -PUBLIC S16 RgLiTfuDoaInd(pst, suId, doaInd) +S16 RgLiTfuDoaInd(pst, suId, doaInd) Pst *pst; SuId suId; TfuDoaIndInfo *doaInd; @@ -2589,25 +2328,23 @@ TfuDoaIndInfo *doaInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC2(RgLiTfuDoaInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(doaInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomDoaInd (rgSchCb[inst].tfuSap[suId].cell, doaInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(doaInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuDlCqiInd */ /** @@ -2627,14 +2364,14 @@ TfuDoaIndInfo *doaInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuCrcInd +S16 RgLiTfuCrcInd ( Pst *pst, SuId suId, TfuCrcIndInfo *crcInd ) #else -PUBLIC S16 RgLiTfuCrcInd (pst, suId, crcInd) +S16 RgLiTfuCrcInd (pst, suId, crcInd) Pst *pst; SuId suId; TfuCrcIndInfo *crcInd; @@ -2643,7 +2380,6 @@ TfuCrcIndInfo *crcInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuCrcInd); #ifdef XEON_SPECIFIC_CHANGES struct timeval start6, end6; gettimeofday(&start6, NULL); @@ -2653,13 +2389,13 @@ gettimeofday(&start6, NULL); { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); RGSCH_FREE_MEM(crcInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2670,7 +2406,7 @@ gettimeofday(&start6, NULL); #ifdef XEON_SPECIFIC_CHANGES gettimeofday(&end6, NULL); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuCrcInd */ /** @@ -2691,14 +2427,14 @@ gettimeofday(&end6, NULL); * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuTimingAdvInd +S16 RgLiTfuTimingAdvInd ( Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd ) #else -PUBLIC S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd) +S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd) Pst *pst; SuId suId; TfuTimingAdvIndInfo *timingAdvInd; @@ -2707,82 +2443,26 @@ TfuTimingAdvIndInfo *timingAdvInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuTimingAdvInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(timingAdvInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHTomTimingAdvInd(rgSchCb[inst].tfuSap[suId].cell, timingAdvInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(timingAdvInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuTimingAdvInd */ - -/** - * @brief Transmission time interval indication from PHY. - * - * @details - * - * Function : RgLiTfuSchTtiInd - * - * This API is invoked by PHY to indicate TTI indication to Scheduler for - * a cell. - * - * @param[in] Pst *pst - * @param[in] SuId suId - * @param[in] TfuTtiIndInfo *ttiInd - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgLiTfuSchTtiInd -( -Pst *pst, -SuId suId, -TfuTtiIndInfo *ttiInd -) -#else -PUBLIC S16 RgLiTfuSchTtiInd(pst, suId, ttiInd) -Pst *pst; -SuId suId; -TfuTtiIndInfo *ttiInd; -#endif -{ - S16 ret = ROK; - Inst inst = pst->dstInst-SCH_INST_START; - - TRC3(RgLiTfuSchTtiInd); - - - /* Removing the validation with every TTI - for optimization */ -#ifndef NO_ERRCLS - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); - RETVALUE(ret); - } -#endif - /* Moved check for cell outside ERRCLS*/ - - /* Now call the TOM (Tfu ownership module) primitive to process further */ - rgSCHTomTtiInd(ttiInd, inst); - - RETVALUE(ret); -} /* RgLiTfuSchTtiInd */ - /************* RGM Interface ****************/ /** * @brief API for bind request from RRM towards MAC. @@ -2804,14 +2484,14 @@ TfuTtiIndInfo *ttiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgmBndReq +S16 RgUiRgmBndReq ( Pst *pst, SuId suId, SpId spId ) #else -PUBLIC S16 RgUiRgmBndReq(pst, suId, spId) +S16 RgUiRgmBndReq(pst, suId, spId) Pst *pst; SuId suId; SpId spId; @@ -2821,9 +2501,6 @@ SpId spId; Pst tmpPst; /* Temporary Post Structure */ Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgmBndReq) - - tmpPst.prior = pst->prior; tmpPst.route = pst->route; tmpPst.selector = pst->selector; @@ -2882,7 +2559,7 @@ SpId spId; #endif ret = RgUiRgmBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgmBndReq */ /** @@ -2905,22 +2582,20 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgmUbndReq +S16 RgUiRgmUbndReq ( Pst *pst, SpId spId, Reason reason ) #else -PUBLIC S16 RgUiRgmUbndReq(pst, spId, reason) +S16 RgUiRgmUbndReq(pst, spId, reason) Pst *pst; SpId spId; Reason reason; #endif { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgmUbndReq) - /* SAP Id validation */ if (spId < rgSchCb[instId].numSaps) @@ -2938,7 +2613,7 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -2948,9 +2623,9 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP Id:RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgmUbndReq */ @@ -2974,14 +2649,14 @@ Reason reason; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgmCfgPrbRprt +S16 RgUiRgmCfgPrbRprt ( Pst *pst, SpId spId, RgmPrbRprtCfg *prbRprtCfg ) #else -PUBLIC S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg) +S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg) Pst *pst; SpId spId; RgmPrbRprtCfg *prbRprtCfg; @@ -2992,7 +2667,6 @@ RgmPrbRprtCfg *prbRprtCfg; RgSchPrbUsage *prbUsage; Inst inst = (pst->dstInst - SCH_INST_START); - TRC2(RgUiRgmCfgPrbRprt); cell = rgSchCb[inst].rgmSap[spId].cell; prbUsage = &cell->prbUsage; prbUsage->prbRprtEnabld = prbRprtCfg->bConfigType; @@ -3000,7 +2674,7 @@ RgmPrbRprtCfg *prbRprtCfg; RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, prbUsage->startTime, 1); /* clear the qciPrbRpts for all GBR QCIs */ - cmMemset((U8*)&prbUsage->qciPrbRpts[0], 0, + memset(&prbUsage->qciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgSchQciPrbUsage))); RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, @@ -3010,7 +2684,7 @@ RgmPrbRprtCfg *prbRprtCfg; /* ccpu00134393 : mem leak fix */ SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); - RETVALUE(ROK); + return ROK; } /** * @brief ERROR INDICATION from PHY for the i failed unlicensed Scell transmission. @@ -3033,17 +2707,17 @@ RgmPrbRprtCfg *prbRprtCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuErrInd +S16 RgLiTfuErrInd ( Pst *pst, SuId suId, -TfuErrIndInfo *errInd +TfuErrIndInfo *errInd ) #else -PUBLIC S16 RgLiTfuErrInd(pst, suId, errInd) +S16 RgLiTfuErrInd(pst, suId, errInd) Pst *pst; SuId suId; -TfuErrIndInfo *errInd; +TfuErrIndInfo *errInd; #endif { S16 ret = ROK; @@ -3051,20 +2725,18 @@ TfuErrIndInfo *errInd; Inst inst = (pst->dstInst - SCH_INST_START); #endif - TRC3(RgLiTfuErrInd); - #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3072,7 +2744,7 @@ TfuErrIndInfo *errInd; /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHLaaErrInd(rgSchCb[inst].tfuSap[suId].cell, errInd); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuErrInd */