X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch.c;h=cee0dd6b2ad452db9074d2987f4a1c63c2f884c4;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;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..cee0dd6b2 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. @@ -239,7 +129,7 @@ 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)); @@ -261,7 +151,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 +173,7 @@ RgMngmt *cntrl; /* control structure */ break; } /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ - RETVALUE(ret); + return (ret); }/*-- RgMiLrgSchCntrlReq --*/ #ifdef LTE_L2_MEAS @@ -355,7 +245,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 +256,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 +274,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 +288,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-- */ /** @@ -455,7 +345,7 @@ 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)); node = cell->l2mList.first; @@ -486,7 +376,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. @@ -538,7 +428,7 @@ 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) @@ -558,7 +448,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) cell->sndL2Meas = TRUE; } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasSendReq*/ #endif /* LTE_L2_MEAS */ @@ -662,7 +552,7 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) #endif ret = RgUiRgrBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgrBndReq */ /** @@ -718,7 +608,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 +618,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. @@ -884,7 +677,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 +692,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 +705,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 +731,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"RgUiRgrSiCfgReq:" "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrSiCfgReq */ @@ -999,7 +792,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 +810,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1033,7 +826,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -1056,10 +849,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1114,7 +907,7 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1124,13 +917,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 */ @@ -1187,7 +980,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 +994,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 +1006,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 +1017,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 */ @@ -1285,7 +1078,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 +1090,7 @@ RgInfDedBoRpt *boRpt; #ifdef LTE_ADV if (cell != ue->cell) { - RETVALUE(RFAILED); + return RFAILED; } #endif if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, boRpt->lcId)) != NULLP) @@ -1363,10 +1156,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 */ @@ -1412,7 +1205,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 +1220,7 @@ RgInfCmnBoRpt *boRpt; rgSCHUtlHndlBcchPcchBoUpdt(cell, boRpt); } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchCmnBoUpdtReq */ /*Fix: start: Inform UE delete to scheduler*/ /** @@ -1468,7 +1261,7 @@ RgInfUeDelInd *ueDelInd; 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 +1271,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 +1305,7 @@ RgInfUeDelInd *ueDelInd; "Guard Pool:%ld", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); } - RETVALUE(ROK); + return ROK; } /* rgMacSchUeDelInd */ /*Fix: end: Inform UE delete to scheduler*/ /** @@ -1616,7 +1409,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 +1422,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 +1432,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 +1479,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 +1499,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 +1563,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 +1578,7 @@ RgInfSfDatInd *subfrmInfo; /* chk if Sch needs to dealloc datInd after unpk */ RGSCH_FREE_MEM(subfrmInfo); - RETVALUE(ret); + return (ret); } /* rgMacSchSfRecpInd */ #ifdef LTEMAC_SPS @@ -1835,16 +1628,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 */ @@ -1910,7 +1703,7 @@ RgInfL2MeasCfm *measCfm; { RLOG_ARG0(L_ERROR,DBG_CELLID,measCfm->cellId, "Meas Cfm Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } @@ -1928,7 +1721,7 @@ RgInfL2MeasCfm *measCfm; } if ( measCb == NULLP ) { - RETVALUE( RFAILED ); + return ( RFAILED ); } @@ -1951,7 +1744,7 @@ RgInfL2MeasCfm *measCfm; 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 +1767,7 @@ RgInfL2MeasCfm *measCfm; measCb->avgPrbQciUl.numQci = measCfm->u.prbCfm.numQci; measCb->cfmRcvd = TRUE; cell->sndL2Meas = TRUE; - RETVALUE(ROK); + return ROK; } /* end of RgMacSchL2MeasCfm */ /** @@ -2021,7 +1814,7 @@ RgInfL2MeasCfm *measCfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasStopCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } #endif @@ -2068,7 +1861,7 @@ U8 status; 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 +1870,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 */ /** @@ -2125,19 +1918,19 @@ TfuRaReqIndInfo *raReqInd; 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 +1938,7 @@ TfuRaReqIndInfo *raReqInd; RGSCH_FREE_MEM(raReqInd); /*SPutSBuf (pst->region, pst->pool, (Data *)raReqInd, sizeof(TfuRaReqIndInfo)); */ - RETVALUE(ret); + return (ret); } /* RgLiTfuRaReqInd */ /** @@ -2189,7 +1982,7 @@ TfuUlCqiIndInfo *ulCqiInd; 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 +1990,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 */ /** @@ -2246,18 +2039,18 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; 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 */ @@ -2304,13 +2097,13 @@ TfuHqIndInfo *harqAckInd; { 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 +2111,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 */ @@ -2364,20 +2157,20 @@ TfuSrIndInfo *srInd; { 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 */ @@ -2423,18 +2216,18 @@ TfuDlCqiIndInfo *dlCqiInd; 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 @@ -2481,19 +2274,19 @@ TfuRawCqiIndInfo *rawCqiInd; 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 */ /** @@ -2538,18 +2331,18 @@ TfuSrsIndInfo *srsInd; 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 @@ -2596,18 +2389,18 @@ TfuDoaIndInfo *doaInd; 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 */ /** @@ -2653,13 +2446,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 +2463,7 @@ gettimeofday(&start6, NULL); #ifdef XEON_SPECIFIC_CHANGES gettimeofday(&end6, NULL); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuCrcInd */ /** @@ -2714,75 +2507,21 @@ TfuTimingAdvIndInfo *timingAdvInd; 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. @@ -2882,7 +2621,7 @@ SpId spId; #endif ret = RgUiRgmBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgmBndReq */ /** @@ -2938,7 +2677,7 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -2948,9 +2687,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 */ @@ -3010,7 +2749,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. @@ -3058,13 +2797,13 @@ TfuErrIndInfo *errInd; { 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 +2811,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 */