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=8f06546656cccad6eb4b20091e5a1439137aa23b;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 8f0654665..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 */ @@ -70,22 +65,22 @@ Void rgSCHCmnInit ARGS((Void)); /* forward references */ extern int schActvInit(Ent entity, Inst instId, Region region, Reason reason); #ifdef UNUSE_FUN -PRIVATE U16 rgSCHLmmSapCfg ARGS(( +static uint16_t rgSCHLmmSapCfg ARGS(( Inst inst, RgCfg *cfg, - U8 sapIdx, + uint8_t sapIdx, Elmnt sapType )); #endif -PRIVATE Void rgSCHLmmShutdown ARGS(( +static Void rgSCHLmmShutdown ARGS(( Inst inst )); void printSchCellInfo(void) { - U8 idx=0; - U8 inst=0; + uint8_t idx=0; + uint8_t inst=0; for (idx = 0; idx < rgSchCb[inst].numSaps; idx++) { /* Unbind all the TFU SAP */ @@ -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); } } } @@ -112,29 +107,21 @@ void printSchCellInfo(void) * reason for success/failure of this function. * * @param[in] RgCfg *cfg, the Configuaration information - * @return U16 + * @return uint16_t * -# LCM_REASON_GENCFG_NOT_DONE * -# LCM_REASON_INVALID_SAP * -# LCM_REASON_NOT_APPL **/ #ifdef UNUSE_FUN -#ifdef ANSI -PRIVATE U16 rgSCHLmmSapCfg +static uint16_t rgSCHLmmSapCfg ( Inst dInst, RgCfg *cfg, /* Configuaration information */ -U8 sapIdx, /* SAP index */ +uint8_t sapIdx, /* SAP index */ Elmnt sapType /* SAP Type */ ) -#else -PRIVATE U16 rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType) -Inst dInst; -RgCfg *cfg; /* Configuaration information */ -U8 sapIdx; /* SAP index */ -Elmnt sapType; /* SAP Type */ -#endif { - U16 ret = LCM_REASON_NOT_APPL; + uint16_t ret = LCM_REASON_NOT_APPL; RgSchLowSapCfgInfo *lowSapCfg = NULLP; RgSchUpSapCfgInfo *upSapCfg = NULLP; Inst inst = (dInst - SCH_INST_START); @@ -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 -PRIVATE Void rgSCHLmmShutdown -( -Inst inst -) -#else -PRIVATE Void rgSCHLmmShutdown(inst) -Inst inst; -#endif +static Void rgSCHLmmShutdown(Inst inst) { Inst dInst = inst + SCH_INST_START; - U8 idx; + uint8_t idx; #ifdef LTE_L2_MEAS CmLList *lnk = NULLP; RgSchCb *instCb = &rgSchCb[inst]; RgSchCellCb *cell = NULLP; RgSchL2MeasCb *measCb; - U8 ulAllocIdx; + uint8_t ulAllocIdx; RgSchCmnUlCell *cellUl; RgSchClcBoRpt *bo = NULL; #endif @@ -359,7 +338,7 @@ Inst inst; /* Unbind all the TFU SAP */ if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM) { - rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND); + //rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND); if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE) { rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR, (PTR)&rgSchCb[inst].tfuSap[idx]); @@ -368,7 +347,7 @@ Inst inst; } if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND) { - rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND); + //rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND); rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_UNBND; } /* Free the memory held by the cell associated with this SAP */ @@ -415,7 +394,7 @@ Inst inst; /* Set Config done in TskInit */ rgSchCb[inst].rgSchInit.cfgDone = FALSE; - RETVOID; + return; } @@ -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,12 +505,12 @@ 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; } RgMiLrgSchCntrlCfm(cfmPst, cfm); - RETVOID; + return; } @@ -562,21 +529,14 @@ 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 { - U8 idx; + uint8_t idx; /* TODO Pass InstId instead of using InstId from cfmPst */ Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance Id */ @@ -585,7 +545,7 @@ Pst *cfmPst; switch(cntrl->hdr.elmId.elmnt) { case STTFUSAP: - idx = (U8)cntrl->t.cntrl.s.rgSapCntrl.suId; + idx = (uint8_t)cntrl->t.cntrl.s.rgSapCntrl.suId; if (idx > LRG_MAX_SAPS_PER_INST) { cfm->cfm.status = LCM_PRIM_NOK; @@ -626,9 +586,9 @@ Pst *cfmPst; * Request to TFU */ RgMiLrgSchCntrlCfm(cfmPst, cfm); - rgSCHUtlTfuBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg.suId, - rgSchCb[inst].tfuSap[idx].sapCfg.spId); - RETVOID; + //rgSCHUtlTfuBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg.suId, + // rgSchCb[inst].tfuSap[idx].sapCfg.spId); + return; } break; case AUBND: @@ -643,8 +603,8 @@ Pst *cfmPst; } else { - rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, - TFU_UBNDREQ_MNGMT); + //rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, + // TFU_UBNDREQ_MNGMT); if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE) { rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR, @@ -661,8 +621,8 @@ Pst *cfmPst; if ((rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM) || (rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND)) { - rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, - TFU_UBNDREQ_MNGMT); + //rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, + // TFU_UBNDREQ_MNGMT); if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE) { rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR, @@ -677,13 +637,13 @@ 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; } break; case STRGRSAP: - idx = (U8)cntrl->t.cntrl.s.rgSapCntrl.spId; + idx = (uint8_t)cntrl->t.cntrl.s.rgSapCntrl.spId; if (idx > LRG_MAX_SAPS_PER_INST) { cfm->cfm.status = LCM_PRIM_NOK; @@ -700,13 +660,13 @@ 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; } break; case STRGMSAP: - idx = (U8)cntrl->t.cntrl.s.rgSapCntrl.spId; + idx = (uint8_t)cntrl->t.cntrl.s.rgSapCntrl.spId; if (idx > LRG_MAX_SAPS_PER_INST) { cfm->cfm.status = LCM_PRIM_NOK; @@ -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; } @@ -731,10 +691,10 @@ Pst *cfmPst; default: /* Would never come here. */ - RETVOID; + return; } RgMiLrgSchCntrlCfm(cfmPst, cfm); - RETVOID; + return; } @@ -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; @@ -783,7 +736,7 @@ RgMngmt *cfm; cfmPst->region = cfm->hdr.response.mem.region; cfmPst->pool = cfm->hdr.response.mem.pool; - RETVOID; + return; } @@ -800,26 +753,18 @@ RgMngmt *cfm; * code based on "tmrEvnt". * * @param[in] S16 tmrEvnt, the Timer Event - * @param[in] U32 tmrVal, the Wait Time + * @param[in] uint32_t tmrVal, the Wait Time * @param[in] PTR cb, Entry for which Timer expired * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmStartTmr ( -Inst inst, -S16 tmrEvnt, /* Timer Event */ -U32 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 */ -U32 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; - U8 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) @@ -951,27 +880,27 @@ S16 tmrEvnt; /* Timer Event */ tfuSap->numBndRetries++; if(tfuSap->numBndRetries > RGSCH_MAX_BNDRETRY) { - rgSCHLmmStaInd((U8)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), - (U16)LCM_CATEGORY_INTERFACE, (U16)LCM_EVENT_BND_FAIL, - (U16)LCM_CAUSE_TMR_EXPIRED, (RgUstaDgn *)NULLP); + rgSCHLmmStaInd((uint8_t)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), + (uint16_t)LCM_CATEGORY_INTERFACE, (uint16_t)LCM_EVENT_BND_FAIL, + (uint16_t)LCM_CAUSE_TMR_EXPIRED, (RgUstaDgn *)NULLP); } else { /* Restart the bind timer */ if (tfuSap->sapCfg.bndTmr.enb == TRUE) { - ret = rgSCHLmmStartTmr((U8)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), + ret = rgSCHLmmStartTmr((uint8_t)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), RGSCH_BNDREQ_TMR, - (U32)tfuSap->sapCfg.bndTmr.val, cb); + (uint32_t)tfuSap->sapCfg.bndTmr.val, cb); } /* Send bind request */ - rgSCHUtlTfuBndReq((U8)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), - tfuSap->sapCfg.suId, tfuSap->sapCfg.spId); + //rgSCHUtlTfuBndReq((uint8_t)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), + //tfuSap->sapCfg.suId, tfuSap->sapCfg.spId); } break; default: - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmTmrExpiry(): Invalid" + DU_LOG("\nERROR --> SCH : rgSCHLmmTmrExpiry(): Invalid" " tmrEvnt=%d", tmrEvnt); ret = RFAILED; break; @@ -996,23 +925,16 @@ S16 tmrEvnt; /* Timer Event */ * * @param[in] Pst *pst, Post Structure * @param[in] SuId suId, Service user ID - * @param[in] U8 status, Status + * @param[in] uint8_t status, Status * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmBndCfm ( Pst *pst, /* Post Structure */ SuId suId, /* Service user ID */ -U8 status /* Status */ +uint8_t status /* Status */ ) -#else -S16 rgSCHLmmBndCfm(pst,suId,status) -Pst *pst; /* Post Structure */ -SuId suId; /* Service user Id */ -U8 status; /* Status */ -#endif { S16 ret = ROK; RgMngmt cntrlCfm; @@ -1054,7 +976,7 @@ U8 status; /* Status */ cntrlCfm.cfm.status = LCM_PRIM_OK; cntrlCfm.cfm.reason = LCM_REASON_NOT_APPL; /* Sending Status Indication to Layer Manager */ - rgSCHLmmStaInd((U8)(rgSchCb[inst].tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), + rgSCHLmmStaInd((uint8_t)(rgSchCb[inst].tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START), LCM_CATEGORY_INTERFACE, LCM_EVENT_BND_OK, LCM_CAUSE_LYR_SPECIFIC, (RgUstaDgn *)NULLP); break; @@ -1090,30 +1012,21 @@ U8 status; /* Status */ * This API is used by the other modules of MAC to send a unsolicited * status indication to the Layer Manager. * - * @param[in] U16 category, the Alarm category - * @param[in] U16 event, the Alarm event - * @param[in] U16 cause, the cause of the Alarm + * @param[in] uint16_t category, the Alarm category + * @param[in] uint16_t event, the Alarm event + * @param[in] uint16_t cause, the cause of the Alarm * @param[in] RgUstaDgn *dgn, Alarm Diagonostics * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHLmmStaInd ( Inst inst, -U16 category, -U16 event, -U16 cause, +uint16_t category, +uint16_t event, +uint16_t cause, RgUstaDgn *dgn ) -#else -S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) -Inst inst; -U16 category; -U16 event; -U16 cause; -RgUstaDgn *dgn; -#endif { RgMngmt usta; @@ -1121,7 +1034,6 @@ RgUstaDgn *dgn; { return ROK; } - memset(&usta, 0, sizeof(RgMngmt)); SGetDateTime(&usta.t.usta.cmAlarm.dt); @@ -1149,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