X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_lmm.c;h=6e1a089cc0a6fa87b82c75a58d4d6d30eb40ebc1;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=8f257b7f2f8dedb7039f2b1e47baa22a2e9e8e50;hpb=528b3d3a09d7486a0c549820bac601db60fde18e;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 8f257b7f2..6e1a089cc 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -34,9 +34,6 @@ request primitives are defined here. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=167; /* header include files (.h) */ #include "common_def.h" @@ -51,8 +48,6 @@ static int RLOG_FILE_ID=167; #ifdef LTE_L2_MEAS #include "rg_sch_cmn.h" /* typedefs for Scheduler */ #endif -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ #include "rgr.x" /* RGR Interface includes */ @@ -93,8 +88,8 @@ void printSchCellInfo(void) * with this SAP */ if (rgSchCb[inst].tfuSap[idx].cell != NULLP) { - RLOG1(L_INFO,"CELL %d\n", idx); - RLOG1(L_INFO,"NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt); + DU_LOG("\nINFO --> SCH : CELL %d\n", idx); + DU_LOG("\nINFO --> SCH : NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt); } } } @@ -118,21 +113,13 @@ void printSchCellInfo(void) * -# LCM_REASON_NOT_APPL **/ #ifdef UNUSE_FUN -#ifdef ANSI static uint16_t rgSCHLmmSapCfg ( Inst dInst, RgCfg *cfg, /* Configuaration information */ -uint8_t sapIdx, /* SAP index */ +uint8_t sapIdx, /* SAP index */ Elmnt sapType /* SAP Type */ ) -#else -static uint16_t rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType) -Inst dInst; -RgCfg *cfg; /* Configuaration information */ -uint8_t sapIdx; /* SAP index */ -Elmnt sapType; /* SAP Type */ -#endif { uint16_t ret = LCM_REASON_NOT_APPL; RgSchLowSapCfgInfo *lowSapCfg = NULLP; @@ -149,7 +136,7 @@ Elmnt sapType; /* SAP Type */ (cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for RGR."); break; } @@ -183,7 +170,7 @@ Elmnt sapType; /* SAP Type */ (cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for TFU."); break; } @@ -223,7 +210,7 @@ Elmnt sapType; /* SAP Type */ (cfg->s.schInstCfg.rgmSap[sapIdx].selector != RGM_SEL_TC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for RGM."); break; } @@ -275,24 +262,16 @@ Elmnt sapType; /* SAP Type */ * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI -static Void rgSCHLmmShutdown -( -Inst inst -) -#else -static Void rgSCHLmmShutdown(inst) -Inst inst; -#endif +static Void rgSCHLmmShutdown(Inst inst) { Inst dInst = inst + SCH_INST_START; - uint8_t idx; + uint8_t idx; #ifdef LTE_L2_MEAS CmLList *lnk = NULLP; RgSchCb *instCb = &rgSchCb[inst]; RgSchCellCb *cell = NULLP; RgSchL2MeasCb *measCb; - uint8_t ulAllocIdx; + uint8_t ulAllocIdx; RgSchCmnUlCell *cellUl; RgSchClcBoRpt *bo = NULL; #endif @@ -434,19 +413,7 @@ Inst inst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI -Void rgSCHLmmGenCntrl -( -RgMngmt *cntrl, -RgMngmt *cfm, -Pst *cfmPst -) -#else -Void rgSCHLmmGenCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif +Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst) { Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */ @@ -502,7 +469,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl(): " "invalid subaction=%d", cntrl->t.cntrl.subAction); break; } @@ -526,7 +493,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl():" + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl():" " invalid subaction=%d", cntrl->t.cntrl.subAction); break; } @@ -538,7 +505,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl(): invalid" + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl(): invalid" " action=%d", cntrl->t.cntrl.action); break; } @@ -562,19 +529,12 @@ Pst *cfmPst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI Void rgSCHLmmSapCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -Void rgSCHLmmSapCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif { uint8_t idx; @@ -677,7 +637,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -700,7 +660,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -723,7 +683,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -754,19 +714,12 @@ Pst *cfmPst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI Void SchFillCfmPst ( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm ) -#else -Void SchFillCfmPst(reqPst, cfmPst, cfm) -Pst *reqPst; -Pst *cfmPst; -RgMngmt *cfm; -#endif { Inst inst; @@ -805,21 +758,13 @@ RgMngmt *cfm; * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmStartTmr ( -Inst inst, -S16 tmrEvnt, /* Timer Event */ -uint32_t tmrVal, /* Wait Time */ -PTR cb /* Entry for which Timer Expired */ +Inst inst, +S16 tmrEvnt, /* Timer Event */ +uint32_t tmrVal, /* Wait Time */ +PTR cb /* Entry for which Timer Expired */ ) -#else -S16 rgSCHLmmStartTmr(inst, tmrEvnt, tmrVal, cb) -Inst inst; /* scheduler instance ID */ -S16 tmrEvnt; /* Timer Event */ -uint32_t tmrVal; /* Wait Time */ -PTR cb; /* Entry for which Timer Expired */ -#endif { CmTmrArg arg; /* Inst dInst = inst + SCH_INST_START; */ @@ -862,22 +807,15 @@ PTR cb; /* Entry for which Timer Expired */ * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHLmmStopTmr ( -Inst inst, /* Scheduler instance */ -S16 tmrEvnt, /* Timer Event */ -PTR cb /* Entry for which Timer Expired */ +Inst inst, /* Scheduler instance */ +S16 tmrEvnt, /* Timer Event */ +PTR cb /* Entry for which Timer Expired */ ) -#else -S16 rgSCHLmmStopTmr(inst, tmrEvnt, cb) -Inst inst; /* Scheduler instance */ -S16 tmrEvnt; /* Timer Event */ -PTR cb; /* Entry for which Timer Expired */ -#endif { CmTmrArg arg; - uint8_t i; + uint8_t i; S16 ret; ret = RFAILED; @@ -926,23 +864,14 @@ PTR cb; /* Entry for which Timer Expired */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) -#else -S16 rgSCHLmmTmrExpiry(cb,tmrEvnt) -PTR cb; /* Pointer to timer control block */ -S16 tmrEvnt; /* Timer Event */ -#endif { S16 ret = ROK; RgSchLowSapCb *tfuSap = (RgSchLowSapCb *)cb; -#ifdef DEBUGP - Inst inst = tfuSap->cell->instIdx; -#endif switch(tmrEvnt) @@ -971,7 +900,7 @@ S16 tmrEvnt; /* Timer Event */ } break; default: - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmTmrExpiry(): Invalid" + DU_LOG("\nERROR --> SCH : rgSCHLmmTmrExpiry(): Invalid" " tmrEvnt=%d", tmrEvnt); ret = RFAILED; break; @@ -1000,19 +929,12 @@ S16 tmrEvnt; /* Timer Event */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmBndCfm ( Pst *pst, /* Post Structure */ SuId suId, /* Service user ID */ uint8_t status /* Status */ ) -#else -S16 rgSCHLmmBndCfm(pst,suId,status) -Pst *pst; /* Post Structure */ -SuId suId; /* Service user Id */ -uint8_t status; /* Status */ -#endif { S16 ret = ROK; RgMngmt cntrlCfm; @@ -1097,7 +1019,6 @@ uint8_t status; /* Status */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmStaInd ( Inst inst, @@ -1106,14 +1027,6 @@ uint16_t event, uint16_t cause, RgUstaDgn *dgn ) -#else -S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) -Inst inst; -uint16_t category; -uint16_t event; -uint16_t cause; -RgUstaDgn *dgn; -#endif { RgMngmt usta; @@ -1148,45 +1061,6 @@ RgUstaDgn *dgn; } -/** - * @brief Scheduler instance timer call back function registered with SSI. - * - * @details - * - * Function : schActvTmr - * - * This function is invoked by SSI for every timer activation - * period expiry. Note that SS_MT_TMR flag needs to be enabled for this - * as isntId is needed.As part of SRegTmr call for scheduler instance - * SS_MT_TMR flag needs to be enabled and schActvTmr needs to be given as - * callback function - * - * @return S16 - * -# ROK - **/ -#ifdef ANSI -S16 schActvTmr -( -Ent ent, -Inst inst -) -#else -S16 schActvTmr(ent, inst) -Ent ent; -Inst inst; -#endif -{ - Inst schInst = (inst - SCH_INST_START); - - /* Check if any timer in the scheduler instance has expired */ - cmPrcTmr(&rgSchCb[schInst].tmrTqCp, - rgSchCb[schInst].tmrTq, (PFV) rgSCHLmmTmrExpiry); - - return ROK; - -} /* end of schActvTmr */ - - /********************************************************************** End of file