X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=5fe6fe336c1f4773923e18c6cd0aad24cc3e851a;hb=51c7c0d7fab79f2d07e9fb4745b9abd8fde7f263;hp=b346b7442dbb34200d89314ff410fa3cdf4cbc7d;hpb=528b3d3a09d7486a0c549820bac601db60fde18e;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index b346b7442..5fe6fe336 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -33,9 +33,6 @@ The functions for the configuration, control, status and statistics request primitives are defined here. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=220; -static int RLOG_MODULE_ID=4096; /* header include files (.h) */ #include "common_def.h" @@ -137,7 +134,6 @@ Pst *cfmPst * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgActvInit ( Ent entity, /* entity */ @@ -145,13 +141,6 @@ Inst inst, /* instance */ Region region, /* region */ Reason reason /* reason */ ) -#else -S16 rgActvInit(entity, inst, region, reason) -Ent entity; /* entity */ -Inst inst; /* instance */ -Region region; /* region */ -Reason reason; /* reason */ -#endif { Inst macInst ; @@ -233,17 +222,11 @@ Reason reason; /* reason */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgCfgReq ( Pst *pst, /* post structure */ RgMngmt *cfg /* config structure */ ) -#else -S16 RgMiLrgCfgReq(pst, cfg) -Pst *pst; /* post structure */ -RgMngmt *cfg; /* config structure */ -#endif { uint16_t ret = LCM_PRIM_OK; uint16_t reason = LCM_REASON_NOT_APPL; @@ -253,8 +236,7 @@ RgMngmt *cfg; /* config structure */ - RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG,\ - "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", pst->srcEnt, pst->srcInst,0,0); + DU_LOG("\nINFO --> MAC : Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", pst->srcEnt, pst->srcInst,0,0); RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -289,7 +271,7 @@ RgMngmt *cfg; /* config structure */ default: ret = LCM_PRIM_NOK; reason = LCM_REASON_INVALID_ELMNT; - RLOG1(L_ERROR, "Invalid Elmnt=%d", + DU_LOG("\nERROR --> MAC : Invalid Elmnt=%d", cfg->hdr.elmId.elmnt); break; } @@ -327,17 +309,11 @@ RgMngmt *cfg; /* config structure */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgStsReq ( Pst *pst, /* post structure */ RgMngmt *sts /* statistics structure */ ) -#else -S16 RgMiLrgStsReq(pst, sts) -Pst *pst; /* post structure */ -RgMngmt *sts; /* statistics structure */ -#endif { Pst cfmPst; RgMngmt cfm; @@ -365,7 +341,7 @@ RgMngmt *sts; /* statistics structure */ cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; RgMiLrgStsCfm(&cfmPst,&cfm); - RLOG0(L_ERROR, "Gen Cfg not done"); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); return ROK; } @@ -473,7 +449,7 @@ RgMngmt *sts; /* statistics structure */ default: cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_INVALID_ELMNT; - RLOG1(L_ERROR, "Invalid Elmnt = %d",sts->hdr.elmId.elmnt); + DU_LOG("\nERROR --> MAC : Invalid Elmnt = %d",sts->hdr.elmId.elmnt); break; } RgMiLrgStsCfm(&cfmPst,&cfm); @@ -499,17 +475,11 @@ RgMngmt *sts; /* statistics structure */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgStaReq ( Pst *pst, /* post structure */ RgMngmt *sta /* status structure */ ) -#else -S16 RgMiLrgStaReq(pst, sta) -Pst *pst; /* post structure */ -RgMngmt *sta; /* status structure */ -#endif { Pst cfmPst; RgMngmt cfm; @@ -542,7 +512,7 @@ RgMngmt *sta; /* status structure */ (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE) != ROK) { - RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); + DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation"); return ROK; } memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); @@ -551,7 +521,7 @@ RgMngmt *sta; /* status structure */ cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt; RgMiLrgStaCfm(&cfmPst, &cfm); - RLOG0(L_ERROR, "Gen Cfg not done"); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); return ROK; } @@ -563,7 +533,7 @@ RgMngmt *sta; /* status structure */ (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE) != ROK) { - RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); + DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation"); return ROK; } memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); @@ -601,7 +571,7 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_INVALID_ELMNT; RgMiLrgStaCfm(&cfmPst, &cfm); - RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt); + DU_LOG("\nERROR --> MAC : Invalid elmnt=%d",sta->hdr.elmId.elmnt); break; } return ROK; @@ -628,17 +598,11 @@ RgMngmt *sta; /* status structure */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgCntrlReq ( Pst *pst, /* post structure */ RgMngmt *cntrl /* control structure */ ) -#else -S16 RgMiLrgCntrlReq(pst, cntrl) -Pst *pst; /* post structure */ -RgMngmt *cntrl; /* control structure */ -#endif { S16 ret = ROK; /* return value */ Pst cfmPst; @@ -666,7 +630,7 @@ RgMngmt *cntrl; /* control structure */ cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; cfm.hdr.elmId.elmnt = cntrl->hdr.elmId.elmnt; RgMiLrgCntrlCfm(&cfmPst, &cfm); - RLOG0(L_ERROR, "Gen Cfg not done"); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); return ROK; } @@ -685,7 +649,7 @@ RgMngmt *cntrl; /* control structure */ cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL; RgMiLrgCntrlCfm(&cfmPst, &cfm); - RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt); + DU_LOG("\nERROR --> MAC : invalid elmnt=%d",cntrl->hdr.elmId.elmnt); break; } return (ret); @@ -711,19 +675,12 @@ RgMngmt *cntrl; /* control structure */ * -# LCM_REASON_INVALID_SAP * -# LCM_REASON_NOT_APPL **/ -#ifdef ANSI static uint16_t rgLMMSapCfg ( Inst inst, RgCfg *cfg, /* Configuaration information */ Elmnt sapType /* Sap Type */ ) -#else -static uint16_t rgLMMSapCfg(inst,cfg,sapType) -Inst inst; -RgCfg *cfg; /* Configuaration information */ -Elmnt sapType; /* Sap Type */ -#endif { uint16_t ret = LCM_REASON_NOT_APPL; RgLowSapCfgInfo *lowSapCfg = NULLP; @@ -743,7 +700,7 @@ Elmnt sapType; /* Sap Type */ (cfg->s.rguSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for RGU"); + DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU"); break; } upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]); @@ -774,7 +731,7 @@ Elmnt sapType; /* Sap Type */ (cfg->s.crgSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for CRG"); + DU_LOG("\nERROR --> MAC : unsupported Selector value for CRG"); break; } if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG) @@ -804,7 +761,7 @@ Elmnt sapType; /* Sap Type */ (cfg->s.tfuSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for TFU"); + DU_LOG("\nERROR --> MAC : unsupported Selector value for TFU"); break; } #endif @@ -858,17 +815,11 @@ Elmnt sapType; /* Sap Type */ * -# LCM_REASON_INVALID_MSGTYPE * -# LCM_REASON_MEM_NOAVAIL **/ -#ifdef ANSI static uint16_t rgLMMGenCfg ( Inst inst, RgCfg *cfg /* Configuaration information */ ) -#else -static uint16_t rgLMMGenCfg(inst,cfg) -Inst inst; -RgCfg *cfg; /* Configuaration information */ -#endif { uint16_t ret = LCM_REASON_NOT_APPL; @@ -881,7 +832,7 @@ RgCfg *cfg; /* Configuaration information */ if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) && (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC)) { - RLOG0(L_ERROR, "unsupported Selector value for RGU"); + DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU"); return (LCM_REASON_INVALID_PAR_VAL); } /* Update the Pst structure for LM interface */ @@ -905,7 +856,7 @@ RgCfg *cfg; /* Configuaration information */ if(cfg->s.genCfg.numRguSaps == 0) { - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Invalid numRguSap.\n")); + DU_LOG("\nERROR --> MAC : rgGenCfg(): Invalid numRguSap.\n"); return RFAILED; } @@ -915,7 +866,7 @@ RgCfg *cfg; /* Configuaration information */ (Data **)&rgCb[inst].rguSap, (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK) { - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n")); + DU_LOG("\nERROR --> MAC : rgGenCfg(): Failed to allocate mem for RGU SAP's.\n"); return RFAILED; } rgCb[inst].numRguSaps = cfg->s.genCfg.numRguSaps; @@ -939,7 +890,7 @@ RgCfg *cfg; /* Configuaration information */ (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr) != ROK) { - RLOG0(L_ERROR, "Failed to register timer"); + DU_LOG("\nERROR --> MAC : Failed to register timer"); SPutSBuf(rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool, @@ -972,15 +923,7 @@ RgCfg *cfg; /* Configuaration information */ * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI -static Void rgLMMShutdown -( -Inst inst -) -#else -static Void rgLMMShutdown(inst) -Inst inst; -#endif +static Void rgLMMShutdown(Inst inst) { RgCellCb *cell = rgCb[inst].cell; uint8_t idx; @@ -1051,19 +994,12 @@ Inst inst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI static Void rgLMMGenCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -static Void rgLMMGenCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif { Inst inst = (cfmPst->srcInst - RG_INST_START); @@ -1110,7 +1046,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction); + DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction); break; } break; @@ -1141,7 +1077,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction); + DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction); break; } break; @@ -1152,7 +1088,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action); + DU_LOG("\nERROR --> MAC : invalid action=%d",cntrl->t.cntrl.action); break; } RgMiLrgCntrlCfm(cfmPst, cfm); @@ -1175,19 +1111,12 @@ Pst *cfmPst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI static Void rgLMMSapCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -static Void rgLMMSapCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif { Inst inst = cfmPst->srcInst - RG_INST_START; @@ -1273,8 +1202,8 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgLMMSapCntrl(): invalid action=%d", - cntrl->t.cntrl.action)); + DU_LOG("\nERROR --> MAC : rgLMMSapCntrl(): invalid action=%d", + cntrl->t.cntrl.action); break; } break; @@ -1290,8 +1219,8 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgLMMSapCntrl(): invalid action=%d", - cntrl->t.cntrl.action)); + DU_LOG("\nERROR --> MAC : rgLMMSapCntrl(): invalid action=%d", + cntrl->t.cntrl.action); break; } break; @@ -1307,7 +1236,7 @@ Pst *cfmPst; default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action); + DU_LOG("\nERROR --> MAC : invalid action=%d",cntrl->t.cntrl.action); break; } @@ -1337,19 +1266,12 @@ Pst *cfmPst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI static Void rgLMMFillCfmPst ( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm ) -#else -static Void rgLMMFillCfmPst(reqPst, cfmPst, cfm) -Pst *reqPst; -Pst *cfmPst; -RgMngmt *cfm; -#endif { Inst inst; inst = (reqPst->dstInst - RG_INST_START); @@ -1389,21 +1311,13 @@ RgMngmt *cfm; * @return S16 * -# ROK **/ -#ifdef ANSI - S16 rgLMMStartTmr +S16 rgLMMStartTmr ( - Inst inst, - S16 tmrEvnt, /* Timer Event */ - uint32_t tmrVal, /* Wait Time */ - PTR cb /* Entry for which Timer Expired */ - ) -#else -S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb) - Inst inst; - S16 tmrEvnt; /* Timer Event */ - uint32_t tmrVal; /* Wait Time */ - PTR cb; /* Entry for which Timer Expired */ -#endif +Inst inst, +S16 tmrEvnt, /* Timer Event */ +uint32_t tmrVal, /* Wait Time */ +PTR cb /* Entry for which Timer Expired */ +) { CmTmrArg arg; @@ -1447,19 +1361,12 @@ S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgLMMStopTmr ( Inst inst, /* Scheduler instance */ S16 tmrEvnt, /* Timer Event */ PTR cb /* Entry for which Timer Expired */ ) -#else -S16 rgLMMStopTmr(inst,tmrEvnt, cb) -Inst inst; /* Scheduler instance */ -S16 tmrEvnt; /* Timer Event */ -PTR cb; /* Entry for which Timer Expired */ -#endif { CmTmrArg arg; uint8_t i; @@ -1513,17 +1420,11 @@ PTR cb; /* Entry for which Timer Expired */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgLMMTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) -#else -S16 rgLMMTmrExpiry(cb,tmrEvnt) -PTR cb; /* Pointer to timer control block */ -S16 tmrEvnt; /* Timer Event */ -#endif { S16 ret = ROK; RgLowSapCb *tfuSap = (RgLowSapCb *)cb; @@ -1553,7 +1454,7 @@ S16 tmrEvnt; /* Timer Event */ } break; default: - RLOG1(L_ERROR, "Invalid tmrEvnt=%d",tmrEvnt); + DU_LOG("\nERROR --> MAC : Invalid tmrEvnt=%d",tmrEvnt); ret = RFAILED; break; } @@ -1580,7 +1481,6 @@ S16 tmrEvnt; /* Timer Event */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgLMMStaInd ( Inst inst, @@ -1589,18 +1489,8 @@ uint16_t event, uint16_t cause, RgUstaDgn *dgn ) -#else -S16 rgLMMStaInd(inst,category, event, cause, dgn) -Inst inst; -uint16_t category; -uint16_t event; -uint16_t cause; -RgUstaDgn *dgn; -#endif { RgMngmt usta; - - if(rgCb[inst].rgInit.usta == FALSE) { return ROK; @@ -1643,19 +1533,12 @@ RgUstaDgn *dgn; * @param[in] uint8_t event, the trace event. * @return Void **/ -#ifdef ANSI Void rgLMMTrcInd ( Inst inst, Buffer *srcMbuf, /* Message Buffer */ uint8_t event /* event */ ) -#else -Void rgLMMTrcInd(inst,srcMbuf,event) -Inst inst; -Buffer *srcMbuf; /* Message Buffer */ -uint8_t event; /* event */ -#endif { Buffer *dstMbuf = NULLP; MsgLen bufLen = 0; @@ -1668,7 +1551,7 @@ uint8_t event; /* event */ if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP)) { - RLOG0(L_ERROR, "Trace Disabled."); + DU_LOG("\nERROR --> MAC : Trace Disabled."); return; } @@ -1691,7 +1574,7 @@ uint8_t event; /* event */ if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf) != ROK) { - RLOG0(L_ERROR, "SCpyMsgMsg Failed."); + DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed."); return; } trc.cfm.status = LCM_PRIM_OK; @@ -1707,7 +1590,7 @@ uint8_t event; /* event */ /* Get the length of the recvd message buffer */ if (SFndLenMsg(srcMbuf, &bufLen) != ROK) { - RLOG0(L_ERROR, "SFndLenMsg Failed."); + DU_LOG("\nERROR --> MAC : SFndLenMsg Failed."); return; } /* Check if the recvd buffer size is less than request trace len */ @@ -1718,7 +1601,7 @@ uint8_t event; /* event */ if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf) != ROK) { - RLOG0(L_ERROR, "SCpyMsgMsg Failed."); + DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed."); return; } @@ -1735,26 +1618,26 @@ uint8_t event; /* event */ /* Get a temporary buffer to store the msg */ if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK) { - RLOG0(L_ERROR, "rgAllocSBuf Failed."); + DU_LOG("\nERROR --> MAC : rgAllocSBuf Failed."); return; } /* Copy trcLen nos of bytes from the recvd message */ if (SCpyMsgFix(srcMbuf,0,rgCb[inst].trcLen,tempBuf,&tempCnt) != ROK) { - RLOG0(L_ERROR, "SCpyMsgFix Failed."); + DU_LOG("\nERROR --> MAC : SCpyMsgFix Failed."); return; } if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK) { - RLOG0(L_ERROR, "dstMbuf Allocation Failed"); + DU_LOG("\nERROR --> MAC : dstMbuf Allocation Failed"); return; } /* Copy the tempBuf data to dst mBuf */ if (SCpyFixMsg(tempBuf,dstMbuf,0,rgCb[inst].trcLen,&tempCnt) != ROK) { - RLOG0(L_ERROR, "SCpyFixMsg Failed."); + DU_LOG("\nERROR --> MAC : SCpyFixMsg Failed."); return; } @@ -1795,19 +1678,12 @@ uint8_t event; /* event */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgLMMBndCfm ( Pst *pst, /* Post Structure */ SuId suId, /* Service user ID */ uint8_t status /* Status */ ) -#else -S16 rgLMMBndCfm(pst,suId,status) -Pst *pst; /* Post Structure */ -SuId suId; /* Service user ID */ -uint8_t status; /* Status */ -#endif { Inst inst = pst->dstInst - RG_INST_START; S16 ret = ROK; @@ -1820,7 +1696,7 @@ uint8_t status; /* Status */ /* Check if the suId is valid */ if(rgCb[inst].tfuSap.sapCfg.suId != suId) { - RLOG0(L_ERROR, "Invalid SuId"); + DU_LOG("\nERROR --> MAC : Invalid SuId"); return RFAILED; } @@ -1894,17 +1770,7 @@ uint8_t status; /* Status */ * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgActvTmr -( -Ent ent, -Inst inst -) -#else -S16 rgActvTmr(ent, inst) -Ent ent; -Inst inst; -#endif +S16 rgActvTmr(Ent ent,Inst inst) { Inst macInst = (inst - RG_INST_START);