X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch.c;h=d90d3274d1b72cb23e027543ac35c83856a33db7;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=4bbdc11b429c6817fbed05902ce06a3817322bf9;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index 4bbdc11b4..d90d3274d 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 */ @@ -118,13 +101,13 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo * -# 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 @@ -146,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)); @@ -168,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 */ @@ -190,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 @@ -210,13 +193,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 @@ -262,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) @@ -273,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) @@ -291,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 @@ -305,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-- */ /** @@ -326,13 +309,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 @@ -362,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; @@ -393,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. @@ -411,13 +394,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 @@ -445,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) @@ -465,7 +448,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) cell->sndL2Meas = TRUE; } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasSendReq*/ #endif /* LTE_L2_MEAS */ @@ -493,14 +476,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; @@ -569,7 +552,7 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) #endif ret = RgUiRgrBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgrBndReq */ /** @@ -592,14 +575,14 @@ 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; @@ -625,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 @@ -635,9 +618,9 @@ 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 */ #ifdef RGR_SI_SCH @@ -663,7 +646,7 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrSiCfgReq +S16 RgUiRgrSiCfgReq ( Pst *pst, SpId spId, @@ -671,7 +654,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; @@ -694,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) @@ -709,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 @@ -722,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 */ @@ -748,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 */ @@ -777,7 +760,7 @@ else * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiCfgReq +S16 RgUiRgrWarningSiCfgReq ( Pst *pst, SpId spId, @@ -785,7 +768,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; @@ -809,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) @@ -827,7 +810,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -843,7 +826,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -866,10 +849,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -894,7 +877,7 @@ else * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiStopReq +S16 RgUiRgrWarningSiStopReq ( Pst *pst, SpId spId, @@ -902,7 +885,7 @@ RgrCfgTransId transId, U8 siId ) #else -PUBLIC S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId) +S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId) Pst *pst; SpId spId; RgrCfgTransId transId; @@ -924,7 +907,7 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -934,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 */ @@ -968,7 +951,7 @@ U8 siId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRgrLoadInfReq +S16 RgUiRgrLoadInfReq ( Pst *pst, SpId spId, @@ -976,7 +959,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; @@ -997,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) @@ -1011,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 @@ -1023,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 */ @@ -1034,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 */ @@ -1059,13 +1042,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 @@ -1095,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 @@ -1107,7 +1090,7 @@ RgInfDedBoRpt *boRpt; #ifdef LTE_ADV if (cell != ue->cell) { - RETVALUE(RFAILED); + return RFAILED; } #endif if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, boRpt->lcId)) != NULLP) @@ -1173,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 */ @@ -1198,13 +1181,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 @@ -1222,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 */ @@ -1237,7 +1220,7 @@ RgInfCmnBoRpt *boRpt; rgSCHUtlHndlBcchPcchBoUpdt(cell, boRpt); } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchCmnBoUpdtReq */ /*Fix: start: Inform UE delete to scheduler*/ /** @@ -1256,13 +1239,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 @@ -1278,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 @@ -1288,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 @@ -1322,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*/ /** @@ -1344,13 +1327,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 @@ -1426,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) @@ -1439,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, @@ -1449,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 @@ -1496,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); @@ -1516,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; } } } @@ -1580,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); @@ -1595,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 @@ -1620,13 +1603,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 @@ -1645,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 */ @@ -1681,13 +1664,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 @@ -1720,7 +1703,7 @@ RgInfL2MeasCfm *measCfm; { RLOG_ARG0(L_ERROR,DBG_CELLID,measCfm->cellId, "Meas Cfm Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } @@ -1738,7 +1721,7 @@ RgInfL2MeasCfm *measCfm; } if ( measCb == NULLP ) { - RETVALUE( RFAILED ); + return ( RFAILED ); } @@ -1761,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++) { @@ -1784,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 */ /** @@ -1808,13 +1791,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 @@ -1831,7 +1814,7 @@ RgInfL2MeasCfm *measCfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasStopCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } #endif @@ -1855,14 +1838,14 @@ RgInfL2MeasCfm *measCfm; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuSchBndCfm +S16 RgLiTfuSchBndCfm ( Pst *pst, SuId suId, U8 status ) #else -PUBLIC S16 RgLiTfuSchBndCfm(pst, suId, status) +S16 RgLiTfuSchBndCfm(pst, suId, status) Pst *pst; SuId suId; U8 status; @@ -1878,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]); @@ -1887,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 */ /** @@ -1912,14 +1895,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; @@ -1935,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); @@ -1955,7 +1938,7 @@ TfuRaReqIndInfo *raReqInd; RGSCH_FREE_MEM(raReqInd); /*SPutSBuf (pst->region, pst->pool, (Data *)raReqInd, sizeof(TfuRaReqIndInfo)); */ - RETVALUE(ret); + return (ret); } /* RgLiTfuRaReqInd */ /** @@ -1976,14 +1959,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; @@ -1999,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) @@ -2007,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 */ /** @@ -2033,14 +2016,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; @@ -2056,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 */ @@ -2091,14 +2074,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; @@ -2114,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 @@ -2128,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 */ @@ -2151,14 +2134,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; @@ -2174,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 */ @@ -2210,14 +2193,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; @@ -2233,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 @@ -2267,14 +2250,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; @@ -2291,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 */ /** @@ -2325,14 +2308,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; @@ -2348,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 @@ -2383,14 +2366,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; @@ -2406,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 */ /** @@ -2437,14 +2420,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; @@ -2463,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 @@ -2480,7 +2463,7 @@ gettimeofday(&start6, NULL); #ifdef XEON_SPECIFIC_CHANGES gettimeofday(&end6, NULL); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuCrcInd */ /** @@ -2501,14 +2484,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; @@ -2524,19 +2507,19 @@ 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 */ /************* RGM Interface ****************/ @@ -2560,14 +2543,14 @@ TfuTimingAdvIndInfo *timingAdvInd; * -# 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; @@ -2638,7 +2621,7 @@ SpId spId; #endif ret = RgUiRgmBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgmBndReq */ /** @@ -2661,14 +2644,14 @@ 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; @@ -2694,7 +2677,7 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -2704,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 */ @@ -2730,14 +2713,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; @@ -2766,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. @@ -2789,14 +2772,14 @@ RgmPrbRprtCfg *prbRprtCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuErrInd +S16 RgLiTfuErrInd ( Pst *pst, SuId suId, TfuErrIndInfo *errInd ) #else -PUBLIC S16 RgLiTfuErrInd(pst, suId, errInd) +S16 RgLiTfuErrInd(pst, suId, errInd) Pst *pst; SuId suId; TfuErrIndInfo *errInd; @@ -2814,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 @@ -2828,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 */