X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_lmm.c;h=dbb5cd62fe1379bc9a8a46fb2d6e9cabb1758456;hb=2bd852089c3226f721d83b30f816b90f803237f6;hp=2d90b4b2839b87565383c8f5aaa964afe2c4c8f1;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 2d90b4b28..dbb5cd62f 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -34,21 +34,9 @@ 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 "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_mblk.h" /* common memory link list library */ -#include "cm_lte.h" /* Common LTE Defines */ +#include "common_def.h" #include "rg_env.h" /* MAC Environment Defines */ #include "rgr.h" /* RGR Interface defines */ #include "tfu.h" /* RGU Interface defines */ @@ -60,19 +48,8 @@ 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" - +#include "sch_utils.h" /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ -#include "cm5.x" /* system services */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_mblk.x" /* common memory link list library */ -#include "cm_lte.x" /* Common LTE Defines */ #include "rgr.x" /* RGR Interface includes */ #include "rgm.x" /* RGM Interface includes */ #include "tfu.x" /* RGU Interface includes */ @@ -83,27 +60,27 @@ static int RLOG_FILE_ID=167; #include "rg_sch_cmn.x" /* typedefs for Scheduler */ #endif #ifndef LTE_L2_MEAS -PUBLIC Void rgSCHCmnInit ARGS((Void)); +Void rgSCHCmnInit ARGS((Void)); #endif /* 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 )); -PUBLIC void printSchCellInfo(void) +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 */ @@ -111,8 +88,8 @@ PUBLIC 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); } } } @@ -124,52 +101,42 @@ PUBLIC void printSchCellInfo(void) * * Function : rgSCHLmmSapCfg * - * This function in called by HandleSchGenCfgReq(). It handles the + * This function in called by SchProcGenCfgReq(). It handles the * interface SAP configuration of the scheduler instance. It * initializes the sapState to LRG_UNBND. Returns * 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); - TRC2(rgSCHLmmSapCfg) - /* Check if Gen Config has been done */ switch(sapType) { case STRGRSAP: #ifndef CL_MAC_LWLC - if ((cfg->s.schInstCfg.rgrSap[sapIdx].selector != RGR_SEL_TC) && - (cfg->s.schInstCfg.rgrSap[sapIdx].selector != RGR_SEL_LC)) + if ((cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_TC) && + (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; } @@ -199,11 +166,11 @@ Elmnt sapType; /* SAP Type */ break; case STTFUSAP: #ifndef CL_MAC_LWLC - if ((cfg->s.schInstCfg.tfuSap[sapIdx].selector != TFU_SEL_TC) && - (cfg->s.schInstCfg.tfuSap[sapIdx].selector != TFU_SEL_LC)) + if ((cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_TC) && + (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; } @@ -232,8 +199,8 @@ Elmnt sapType; /* SAP Type */ lowSapCfg->sapPst.prior = cfg->s.schInstCfg.tfuSap[sapIdx].prior; lowSapCfg->suId = cfg->s.schInstCfg.tfuSap[sapIdx].suId; lowSapCfg->spId = cfg->s.schInstCfg.tfuSap[sapIdx].spId; - cmMemcpy((U8 *)&lowSapCfg->bndTmr, - (U8 *)&cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr, + memcpy(&lowSapCfg->bndTmr, + &cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr, sizeof(TmrCfg)); break; case STRGMSAP: @@ -243,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,7 +242,7 @@ Elmnt sapType; /* SAP Type */ /* would never reach here */ break; } - RETVALUE(ret); + return (ret); } #endif @@ -295,30 +262,20 @@ 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 - TRC2(rgSCHLmmShutdown) - #ifdef LTE_L2_MEAS for (idx = 0; idx < instCb->numSaps; idx++) { @@ -381,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]); @@ -390,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 */ @@ -400,29 +357,21 @@ Inst inst; } /* Free the memory held by the scheduler instance */ /* Deallocate RGR saps */ - SPutSBuf(rgSchCb[inst].rgSchInit.region, - rgSchCb[inst].rgSchInit.pool, - (Data *)rgSchCb[inst].rgrSap, + SCH_FREE(rgSchCb[inst].rgrSap, (sizeof(RgSchUpSapCb) * rgSchCb[inst].numSaps)); rgSchCb[inst].rgrSap = NULLP; /* Deallocate RGM saps */ - SPutSBuf(rgSchCb[inst].rgSchInit.region, - rgSchCb[inst].rgSchInit.pool, - (Data *)rgSchCb[inst].rgmSap, + SCH_FREE(rgSchCb[inst].rgmSap, (sizeof(RgSchUpSapCb) * rgSchCb[inst].numSaps)); rgSchCb[inst].rgmSap = NULLP; /* Deallocate TFU saps */ - SPutSBuf(rgSchCb[inst].rgSchInit.region, - rgSchCb[inst].rgSchInit.pool, - (Data *)rgSchCb[inst].tfuSap, + SCH_FREE(rgSchCb[inst].tfuSap, (sizeof(RgSchLowSapCb) * rgSchCb[inst].numSaps)); rgSchCb[inst].tfuSap = NULLP; /* Deallocate bndCfmResponses */ - SPutSBuf(rgSchCb[inst].rgSchInit.region, - rgSchCb[inst].rgSchInit.pool, - (Data *)rgSchCb[inst].genCfg.bndCfmResp, + SCH_FREE(rgSchCb[inst].genCfg.bndCfmResp, (sizeof(RgSchLmResponse) * rgSchCb[inst].numSaps)); rgSchCb[inst].genCfg.bndCfmResp = NULLP; /* De-register the Timer Service */ @@ -437,7 +386,7 @@ Inst inst; /* Set Config done in TskInit */ rgSchCb[inst].rgSchInit.cfgDone = FALSE; - RETVOID; + return; } @@ -456,22 +405,9 @@ Inst inst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI -PUBLIC Void rgSCHLmmGenCntrl -( -RgMngmt *cntrl, -RgMngmt *cfm, -Pst *cfmPst -) -#else -PUBLIC 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 */ - TRC2(rgSCHLmmGenCntrl) cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -487,8 +423,8 @@ Pst *cfmPst; /* Enable Unsolicited Status (alarms) */ rgSchCb[inst].rgSchInit.usta = TRUE; /*Store the response and TransId for sending the Alarms */ - cmMemcpy((U8 *)&rgSchCb[inst].genCfg.ustaResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgSchCb[inst].genCfg.ustaResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgSchCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId; break; case SADBG: @@ -516,8 +452,8 @@ Pst *cfmPst; * L2 * statistics * */ - cmMemset((U8 *)&hqRetxStats, 0, sizeof(RgSchHqRetxStats)); - cmMemset((U8 *)&hqFailStats, 0, sizeof(RgSchNackAckStats)); + memset(&hqRetxStats, 0, sizeof(RgSchHqRetxStats)); + memset(&hqFailStats, 0, sizeof(RgSchNackAckStats)); #endif break; } @@ -525,7 +461,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; } @@ -549,7 +485,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; } @@ -561,12 +497,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; } @@ -585,31 +521,23 @@ Pst *cfmPst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI -PUBLIC Void rgSCHLmmSapCntrl +Void rgSCHLmmSapCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -PUBLIC 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 */ - TRC2(rgSCHLmmSapCntrl) /* Only TFU SAP can be controlled by LM */ 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; @@ -638,8 +566,8 @@ Pst *cfmPst; rgSchCb[inst].tfuSap[idx].numBndRetries++; /* Store the response and TransId for sending * the Control confirm */ - cmMemcpy((U8 *)&rgSchCb[inst].genCfg.bndCfmResp[idx].response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgSchCb[inst].genCfg.bndCfmResp[idx].response, + &cntrl->hdr.response, sizeof(Resp)); rgSchCb[inst].genCfg.bndCfmResp[idx].transId = cntrl->hdr.transId; @@ -650,9 +578,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: @@ -667,8 +595,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, @@ -685,15 +613,15 @@ 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, (PTR)&rgSchCb[inst].tfuSap[idx]); } } - cmMemset((U8 *)&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb)); + memset(&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb)); rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -701,13 +629,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; @@ -716,7 +644,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb)); + memset(&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb)); rgSchCb[inst].rgrSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -724,13 +652,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; @@ -739,7 +667,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb)); + memset(&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb)); rgSchCb[inst].rgmSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -747,7 +675,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; } @@ -755,10 +683,10 @@ Pst *cfmPst; default: /* Would never come here. */ - RETVOID; + return; } RgMiLrgSchCntrlCfm(cfmPst, cfm); - RETVOID; + return; } @@ -778,30 +706,21 @@ Pst *cfmPst; * File : rg_sch_lmm.c * **********************************************************/ -#ifdef ANSI -PUBLIC Void SchFillCfmPst +Void SchFillCfmPst ( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm ) -#else -PUBLIC Void SchFillCfmPst(reqPst, cfmPst, cfm) -Pst *reqPst; -Pst *cfmPst; -RgMngmt *cfm; -#endif { Inst inst; - TRC2(SchFillCfmPst) - inst = (reqPst->dstInst - SCH_INST_START); - cfmPst->srcEnt = ENTRG; + cfmPst->srcEnt = ENTMAC; cfmPst->srcInst = (Inst) 1; cfmPst->srcProcId = rgSchCb[inst].rgSchInit.procId; - cfmPst->dstEnt = ENTRG; + cfmPst->dstEnt = ENTMAC; cfmPst->dstInst = (Inst) 0; cfmPst->dstProcId = reqPst->srcProcId; @@ -809,7 +728,7 @@ RgMngmt *cfm; cfmPst->region = cfm->hdr.response.mem.region; cfmPst->pool = cfm->hdr.response.mem.pool; - RETVOID; + return; } @@ -826,36 +745,26 @@ 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 -PUBLIC S16 rgSCHLmmStartTmr +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 -PUBLIC 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; */ - TRC2(rgSCHLmmStartTmr) - UNUSED(tmrEvnt); /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgSchCb[inst].tmrTqCp; arg.tq = rgSchCb[inst].tmrTq; @@ -867,7 +776,7 @@ PTR cb; /* Entry for which Timer Expired */ arg.wait = tmrVal; cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -890,26 +799,17 @@ PTR cb; /* Entry for which Timer Expired */ * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgSCHLmmStopTmr +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 -PUBLIC 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; - TRC2(rgSCHLmmStopTmr) - ret = RFAILED; for(i=0;itmrBlk.tmrEvnt == tmrEvnt) { /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgSchCb[inst].tmrTqCp; arg.tq = rgSchCb[inst].tmrTq; @@ -936,7 +836,7 @@ PTR cb; /* Entry for which Timer Expired */ } - RETVALUE(ret); + return (ret); } @@ -956,24 +856,14 @@ PTR cb; /* Entry for which Timer Expired */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 rgSCHLmmTmrExpiry +S16 rgSCHLmmTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) -#else -PUBLIC 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 - TRC2(rgSCHLmmTmrExpiry) switch(tmrEvnt) @@ -982,32 +872,32 @@ 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; } - RETVALUE(ret); + return (ret); } @@ -1027,31 +917,22 @@ 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 -PUBLIC S16 rgSCHLmmBndCfm +S16 rgSCHLmmBndCfm ( Pst *pst, /* Post Structure */ SuId suId, /* Service user ID */ -U8 status /* Status */ +uint8_t status /* Status */ ) -#else -PUBLIC S16 rgSCHLmmBndCfm(pst,suId,status) -Pst *pst; /* Post Structure */ -SuId suId; /* Service user Id */ -U8 status; /* Status */ -#endif { S16 ret = ROK; RgMngmt cntrlCfm; Pst cfmPst; Inst inst = (pst->dstInst - SCH_INST_START); /* scheduler instance */ - TRC2(rgSCHLmmBndCfm) - /* check the SAP State */ switch(rgSchCb[inst].tfuSap[suId].sapSta.sapState) @@ -1060,9 +941,9 @@ U8 status; /* Status */ break; case LRG_BND: /* SAP is already bound */ - RETVALUE(ROK); + return ROK; default: - RETVALUE(RFAILED); + return RFAILED; } cfmPst = rgSchCb[inst].rgSchInit.lmPst; @@ -1072,7 +953,7 @@ U8 status; /* Status */ cfmPst.region = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.region; cfmPst.pool = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.pool; - cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt)); + memset(&cntrlCfm, 0, sizeof(RgMngmt)); switch(status) { @@ -1087,7 +968,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; @@ -1110,7 +991,7 @@ U8 status; /* Status */ ret = RgMiLrgSchCntrlCfm(&cfmPst, &cntrlCfm); - RETVALUE(ret); + return (ret); } /** @@ -1123,41 +1004,29 @@ 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 -PUBLIC S16 rgSCHLmmStaInd +S16 rgSCHLmmStaInd ( Inst inst, -U16 category, -U16 event, -U16 cause, +uint16_t category, +uint16_t event, +uint16_t cause, RgUstaDgn *dgn ) -#else -PUBLIC S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) -Inst inst; -U16 category; -U16 event; -U16 cause; -RgUstaDgn *dgn; -#endif { RgMngmt usta; - TRC2(rgSCHLmmStaInd) - if(rgSchCb[inst].rgSchInit.usta == FALSE) { - RETVALUE(ROK); + return ROK; } - - cmMemset((U8 *)&usta, 0, sizeof(RgMngmt)); + memset(&usta, 0, sizeof(RgMngmt)); SGetDateTime(&usta.t.usta.cmAlarm.dt); usta.t.usta.cmAlarm.category = category; @@ -1165,7 +1034,7 @@ RgUstaDgn *dgn; usta.t.usta.cmAlarm.cause = cause; if (dgn != NULLP) { - cmMemcpy((U8 *)&usta.t.usta.dgn, (U8 *)dgn, sizeof(RgUstaDgn)); + memcpy(&usta.t.usta.dgn, dgn, sizeof(RgUstaDgn)); } rgSchCb[inst].rgSchInit.lmPst.selector = @@ -1180,50 +1049,10 @@ RgUstaDgn *dgn; rgSchCb[inst].genCfg.ustaResp.response.mem.pool; usta.hdr.transId = rgSchCb[inst].genCfg.ustaResp.transId; - RETVALUE(RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta)); + return (RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta)); } -/** - * @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 -PUBLIC S16 schActvTmr -( -Ent ent, -Inst inst -) -#else -PUBLIC S16 schActvTmr(ent, inst) -Ent ent; -Inst inst; -#endif -{ - Inst schInst = (inst - SCH_INST_START); - TRC2(schActvTmr) - - /* Check if any timer in the scheduler instance has expired */ - cmPrcTmr(&rgSchCb[schInst].tmrTqCp, - rgSchCb[schInst].tmrTq, (PFV) rgSCHLmmTmrExpiry); - - RETVALUE(ROK); - -} /* end of schActvTmr */ - - /********************************************************************** End of file