X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=51742fbe216aa27c9285742fa3e6befb2ccdf576;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=29435118d9fdd183360a59be3c85fa810b618001;hpb=18376996c17ece8306c1fe9539a00010bea607d5;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 29435118d..51742fbe2 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -33,21 +33,9 @@ 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 "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 "crg.h" /* CRG Interface defines */ #include "rgu.h" /* RGU Interface defines */ @@ -57,18 +45,9 @@ static int RLOG_MODULE_ID=4096; #include "rgr.h" /* LRG Interface defines */ #include "rg.h" /* MAC defines */ #include "rg_err.h" /* MAC error defines */ -#include "du_log.h" +#include "mac_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 "crg.x" /* CRG Interface includes */ #include "rgu.x" /* RGU Interface includes */ #include "tfu.x" /* RGU Interface includes */ @@ -83,75 +62,57 @@ static int RLOG_MODULE_ID=4096; #endif #include "ss_rbuf.h" #include "ss_rbuf.x" -#include "lwr_mac.h" /* MAC CL defines */ +#include "mac_sch_interface.h" +#include "lwr_mac_upr_inf.h" #include "mac.h" -#include "lwr_mac_phy.h" #include "lwr_mac_fsm.h" +#include "lwr_mac_phy.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -EXTERN Void rgGetSId ARGS((SystemId *s)); +Void rgGetSId ARGS((SystemId *s)); #ifdef __cplusplus } #endif /* __cplusplus */ /* Public variable declaration */ -ClCb clGlobalCp; MacCb macCb; -int MacSchCellCfgReq(Pst *pst,MacCellCfg *macCellCfg); - /* forward references */ -PRIVATE U16 rgLMMGenCfg ARGS(( +static uint16_t rgLMMGenCfg ARGS(( Inst inst, RgCfg *cfg )); -PRIVATE U16 rgLMMSapCfg ARGS(( +static uint16_t rgLMMSapCfg ARGS(( Inst inst, RgCfg *cfg, Elmnt sapType )); -PRIVATE Void rgLMMShutdown ARGS(( +static Void rgLMMShutdown ARGS(( Inst inst )); -PRIVATE Void rgLMMFillCfmPst ARGS(( +static Void rgLMMFillCfmPst ARGS(( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm )); -PRIVATE Void rgLMMGenCntrl ARGS(( +static Void rgLMMGenCntrl ARGS(( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst )); -PRIVATE Void rgLMMSapCntrl ARGS(( +static Void rgLMMSapCntrl ARGS(( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst )); -extern int packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); - -packMacCellCfgConfirm packMacCellCfmOpts[] = -{ - packMacCellCfgCfm, /* packing for loosely coupled */ - duHandleMacCellCfgCfm, /* packing for tightly coupled */ - packMacCellCfgCfm, /* packing for light weight loosly coupled */ -}; - -SchCellCfgFunc SchCellCfgOpts[] = -{ - packSchCellCfg, /* packing for loosely coupled */ - SchHdlCellCfgReq, /* packing for tightly coupled */ - packSchCellCfg /* packing for light weight loosly coupled */ -}; - /** * @brief Task Initiation callback function. @@ -172,30 +133,21 @@ SchCellCfgFunc SchCellCfgOpts[] = * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 rgActvInit +S16 rgActvInit ( Ent entity, /* entity */ Inst inst, /* instance */ Region region, /* region */ Reason reason /* reason */ ) -#else -PUBLIC S16 rgActvInit(entity, inst, region, reason) -Ent entity; /* entity */ -Inst inst; /* instance */ -Region region; /* region */ -Reason reason; /* reason */ -#endif { Inst macInst ; - TRC2(rgActvInit); RG_IS_INST_VALID(inst); macInst = inst - RG_INST_START; /* Initialize the MAC TskInit structure to zero */ - cmMemset ((U8 *)&rgCb[macInst], 0, sizeof(RgCb)); + memset (&rgCb[macInst], 0, sizeof(RgCb)); /* Initialize the MAC TskInit with received values */ rgCb[macInst].rgInit.ent = entity; @@ -211,7 +163,7 @@ Reason reason; /* reason */ #ifdef DEBUGP #ifdef RG_DEBUG /* disabling debugs by default */ - rgCb[macInst].rgInit.dbgMask = 0xffffffff; + rgCb[macInst].rgInit.dbgMask = 0xffffffff; #endif #endif /* DEBUGP */ #ifdef SS_DIAG @@ -233,27 +185,13 @@ Reason reason; /* reason */ SAttachSRngBuf(SS_RNG_BUF_ULMAC_TO_ULRLC, SS_RBUF_ENT_ULRLC,SS_RNG_RX); #endif - /* Initializing CL control block */ - clGlobalCp.region = region; - clGlobalCp.pool = 0; - clGlobalCp.clCfgDone = FALSE; - clGlobalCp.numOfCells = 0; - clGlobalCp.phyState = PHY_STATE_IDLE; - - if( cmHashListInit(&clGlobalCp.cellCbLst, MAX_NUM_CELL_SUPP, 0x0, FALSE, - CM_HASH_KEYTYPE_DEF, clGlobalCp.region, clGlobalCp.pool ) != ROK ) - { - printf("\n Cellcb hash list initialization failed for MAC CL"); - RETVALUE(RFAILED); - } - /* Initialize Scheduler as well */ - schActvInit(ENTRG, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP); + schActvInit(ENTMAC, SCH_INST_START, DFLT_REGION, PWR_UP); /* Initialize lower mac */ - lwrMacInit(); + lwrMacLayerInit(region, 0); - RETVALUE(ROK); + return ROK; } /* rgActvInit */ @@ -275,30 +213,21 @@ Reason reason; /* reason */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 RgMiLrgCfgReq +S16 RgMiLrgCfgReq ( Pst *pst, /* post structure */ RgMngmt *cfg /* config structure */ ) -#else -PUBLIC S16 RgMiLrgCfgReq(pst, cfg) -Pst *pst; /* post structure */ -RgMngmt *cfg; /* config structure */ -#endif { - U16 ret = LCM_PRIM_OK; - U16 reason = LCM_REASON_NOT_APPL; + uint16_t ret = LCM_PRIM_OK; + uint16_t reason = LCM_REASON_NOT_APPL; RgMngmt cfm; Pst cfmPst; Inst inst; - TRC2(RgMiLrgCfgReq) - - 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", pst->srcEnt, pst->srcInst); RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -306,7 +235,7 @@ RgMngmt *cfg; /* config structure */ /* Fill the post structure for sending the confirmation */ rgLMMFillCfmPst(pst, &cfmPst, cfg); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = cfg->hdr.transId; @@ -317,19 +246,23 @@ RgMngmt *cfg; /* config structure */ switch(cfg->hdr.elmId.elmnt) { case STGEN: - reason = rgLMMGenCfg(inst,&cfg->t.cfg); - break; +#ifdef INTEL_WLS_MEM + /* Start WLS message receiver thread */ + LwrMacStartWlsRcvr(); +#endif + reason = rgLMMGenCfg(inst,&cfg->t.cfg); + break; case STRGUSAP: case STCRGSAP: case STTFUSAP: - reason = rgLMMSapCfg(inst,&cfg->t.cfg, cfg->hdr.elmId.elmnt); - break; + reason = rgLMMSapCfg(inst,&cfg->t.cfg, cfg->hdr.elmId.elmnt); + break; default: - ret = LCM_PRIM_NOK; - reason = LCM_REASON_INVALID_ELMNT; - RLOG1(L_ERROR, "Invalid Elmnt=%d", - cfg->hdr.elmId.elmnt); - break; + ret = LCM_PRIM_NOK; + reason = LCM_REASON_INVALID_ELMNT; + DU_LOG("\nERROR --> MAC : Invalid Elmnt=%d", + cfg->hdr.elmId.elmnt); + break; } if (reason != LCM_REASON_NOT_APPL) @@ -341,8 +274,8 @@ RgMngmt *cfg; /* config structure */ cfm.cfm.reason = reason; RgMiLrgCfgCfm(&cfmPst, &cfm); - - RETVALUE(ROK); + + return ROK; }/*-- RgMiLrgCfgReq --*/ @@ -365,31 +298,22 @@ RgMngmt *cfg; /* config structure */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 RgMiLrgStsReq +S16 RgMiLrgStsReq ( Pst *pst, /* post structure */ RgMngmt *sts /* statistics structure */ ) -#else -PUBLIC S16 RgMiLrgStsReq(pst, sts) -Pst *pst; /* post structure */ -RgMngmt *sts; /* statistics structure */ -#endif { Pst cfmPst; RgMngmt cfm; Inst inst; - TRC2(RgMiLrgStsReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; /* Fill the post structure for sending the confirmation */ rgLMMFillCfmPst(pst, &cfmPst, sts); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = sts->hdr.transId; @@ -406,15 +330,15 @@ 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"); - RETVALUE(ROK); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); + return ROK; } switch(sts->hdr.elmId.elmnt) { case STGEN: { - cmMemcpy((U8 *)&(cfm.t.sts.s.genSts), (U8 *)&rgCb[inst].genSts, + memcpy(&(cfm.t.sts.s.genSts), &rgCb[inst].genSts, sizeof(RgGenSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) @@ -425,7 +349,7 @@ RgMngmt *sts; /* statistics structure */ #ifdef MAC_SCH_STATS { RgGenSts *genSts = &(cfm.t.sts.s.genSts); - U8 cqi = 0; + uint8_t cqi = 0; for(cqi=0; cqi <= 14; cqi++) { /* Filling DL ACK/NACK stats */ @@ -475,50 +399,50 @@ RgMngmt *sts; /* statistics structure */ /* Reset statistics */ if(sts->t.sts.action == ZEROSTS) { - cmMemset((U8 *)&hqRetxStats, 0, \ + memset(&hqRetxStats, 0, \ sizeof(RgSchHqRetxStats)); - cmMemset((U8 *)&hqFailStats, 0, \ + memset(&hqFailStats, 0, \ sizeof(RgSchNackAckStats)); } } #endif /* MAC_SCH_STATS*/ - } - break; + } + break; case STRGUSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.rguSts), (U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, + memcpy(&(cfm.t.sts.s.rguSts), &rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts)); - break; + break; case STCRGSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.crgSts), (U8 *)&rgCb[inst].crgSap.sapSts, + memcpy(&(cfm.t.sts.s.crgSts), &rgCb[inst].crgSap.sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts)); - break; + break; case STTFUSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.tfuSts), (U8 *)&rgCb[inst].tfuSap.sapSts, + memcpy(&(cfm.t.sts.s.tfuSts), &rgCb[inst].tfuSap.sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts)); - break; + break; default: - cfm.cfm.status = LCM_PRIM_NOK; - cfm.cfm.reason = LCM_REASON_INVALID_ELMNT; - RLOG1(L_ERROR, "Invalid Elmnt = %d",sts->hdr.elmId.elmnt); - break; + cfm.cfm.status = LCM_PRIM_NOK; + cfm.cfm.reason = LCM_REASON_INVALID_ELMNT; + DU_LOG("\nERROR --> MAC : Invalid Elmnt = %d",sts->hdr.elmId.elmnt); + break; } RgMiLrgStsCfm(&cfmPst,&cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStsReq --*/ @@ -540,24 +464,16 @@ RgMngmt *sts; /* statistics structure */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 RgMiLrgStaReq +S16 RgMiLrgStaReq ( Pst *pst, /* post structure */ RgMngmt *sta /* status structure */ ) -#else -PUBLIC S16 RgMiLrgStaReq(pst, sta) -Pst *pst; /* post structure */ -RgMngmt *sta; /* status structure */ -#endif { Pst cfmPst; RgMngmt cfm; Inst inst ; - TRC2(RgMiLrgStaReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -568,10 +484,10 @@ RgMngmt *sta; /* status structure */ if (sta->t.ssta.s.sysId.ptNmb != NULLP) { - SPutSBuf(pst->region, pst->pool, (Data *)sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); + MAC_FREE(sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); } - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt; #ifdef LMINT3 @@ -581,35 +497,33 @@ RgMngmt *sta; /* status structure */ if(rgCb[inst].rgInit.cfgDone != TRUE) { SGetDateTime(&cfm.t.ssta.dt); - if (SGetSBuf(cfmPst.region, cfmPst.pool, - (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE) - != ROK) + MAC_ALLOC(cfm.t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); + if(cfm.t.ssta.s.sysId.ptNmb == NULLP) { - RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); - RETVALUE(ROK); + DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation"); + return ROK; } - cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); + memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); cfm.cfm.status = LCM_PRIM_NOK; 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"); - RETVALUE(ROK); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); + return ROK; } switch(sta->hdr.elmId.elmnt) { case STGEN: SGetDateTime(&cfm.t.ssta.dt); - if (SGetSBuf(cfmPst.region, cfmPst.pool, - (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE) - != ROK) + MAC_ALLOC(cfm.t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); + if(cfm.t.ssta.s.sysId.ptNmb == NULLP) { - RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); - RETVALUE(ROK); + DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation"); + return ROK; } - cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); + memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; @@ -619,8 +533,8 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.rguSapSta), - (U8 *)&rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta, + memcpy(&(cfm.t.ssta.s.rguSapSta), + &rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; @@ -628,7 +542,7 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.crgSapSta), (U8 *)&rgCb[inst].crgSap.sapSta, + memcpy(&(cfm.t.ssta.s.crgSapSta), &rgCb[inst].crgSap.sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; @@ -636,18 +550,18 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.tfuSapSta), (U8 *)&rgCb[inst].tfuSap.sapSta, + memcpy(&(cfm.t.ssta.s.tfuSapSta), &rgCb[inst].tfuSap.sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; default: - 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); - break; + cfm.cfm.status = LCM_PRIM_NOK; + cfm.cfm.reason = LCM_REASON_INVALID_ELMNT; + RgMiLrgStaCfm(&cfmPst, &cfm); + DU_LOG("\nERROR --> MAC : Invalid elmnt=%d",sta->hdr.elmId.elmnt); + break; } - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStaReq --*/ @@ -671,25 +585,16 @@ RgMngmt *sta; /* status structure */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 RgMiLrgCntrlReq +S16 RgMiLrgCntrlReq ( Pst *pst, /* post structure */ RgMngmt *cntrl /* control structure */ ) -#else -PUBLIC S16 RgMiLrgCntrlReq(pst, cntrl) -Pst *pst; /* post structure */ -RgMngmt *cntrl; /* control structure */ -#endif { S16 ret = ROK; /* return value */ Pst cfmPst; RgMngmt cfm; Inst inst; - - TRC2(RgMiLrgCntrlReq) - /* Fill the post structure for sending the confirmation */ RG_IS_INST_VALID(pst->dstInst); @@ -697,7 +602,7 @@ RgMngmt *cntrl; /* control structure */ rgLMMFillCfmPst(pst, &cfmPst, cntrl); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = cntrl->hdr.transId; #endif @@ -712,29 +617,29 @@ 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"); - RETVALUE(ROK); + DU_LOG("\nERROR --> MAC : Gen Cfg not done"); + return ROK; } - + /* General Config done, process the Control request */ switch(cntrl->hdr.elmId.elmnt) { case STGEN: - rgLMMGenCntrl(cntrl, &cfm, &cfmPst); - break; + rgLMMGenCntrl(cntrl, &cfm, &cfmPst); + break; case STTFUSAP: case STRGUSAP: case STCRGSAP: - rgLMMSapCntrl(cntrl, &cfm, &cfmPst); - break; + rgLMMSapCntrl(cntrl, &cfm, &cfmPst); + break; default: - 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); - break; + cfm.cfm.status = LCM_PRIM_NOK; + cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL; + RgMiLrgCntrlCfm(&cfmPst, &cfm); + DU_LOG("\nERROR --> MAC : invalid elmnt=%d",cntrl->hdr.elmId.elmnt); + break; } - RETVALUE(ret); + return (ret); }/*-- RgMiLrgCntrlReq --*/ @@ -752,108 +657,100 @@ RgMngmt *cntrl; /* control structure */ * * @param[in] Inst inst * @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 ANSI -PRIVATE U16 rgLMMSapCfg +static uint16_t rgLMMSapCfg ( Inst inst, RgCfg *cfg, /* Configuaration information */ Elmnt sapType /* Sap Type */ ) -#else -PRIVATE U16 rgLMMSapCfg(inst,cfg,sapType) -Inst inst; -RgCfg *cfg; /* Configuaration information */ -Elmnt sapType; /* Sap Type */ -#endif { - U16 ret = LCM_REASON_NOT_APPL; + uint16_t ret = LCM_REASON_NOT_APPL; RgLowSapCfgInfo *lowSapCfg = NULLP; RgUpSapCfgInfo *upSapCfg = NULLP; - RgUpSapCb *upSapCb = NULLP; + RgUpSapCb *upSapCb = NULLP; - TRC2(rgLMMSapCfg) - /* Check if Gen Config has been done */ + /* Check if Gen Config has been done */ if(rgCb[inst].rgInit.cfgDone != TRUE) - RETVALUE(LCM_REASON_GENCFG_NOT_DONE); + return (LCM_REASON_GENCFG_NOT_DONE); switch(sapType) { case STRGUSAP: - if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) && - (cfg->s.rguSap.selector != RGU_SEL_TC) && - (cfg->s.rguSap.selector != RGU_SEL_LC)) - { - ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for RGU"); - break; - } - upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]); - if(upSapCb->sapSta.sapState == LRG_NOT_CFG) - { - upSapCb->sapSta.sapState = LRG_UNBND; - } - upSapCfg = &(upSapCb->sapCfg); - upSapCfg->sapPst.dstEnt = cfg->s.rguSap.ent; - upSapCfg->sapPst.dstInst = cfg->s.rguSap.inst; - upSapCfg->sapPst.dstProcId = cfg->s.rguSap.procId; - upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent; - upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst; - upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId; - upSapCfg->sapPst.region = cfg->s.rguSap.mem.region; - upSapCfg->sapPst.pool = cfg->s.rguSap.mem.pool; - upSapCfg->sapPst.selector = cfg->s.rguSap.selector; - upSapCfg->sapPst.route = cfg->s.rguSap.route; - upSapCfg->sapPst.intfVer = 0; - upSapCfg->sapPst.prior = cfg->s.rguSap.prior; - upSapCfg->suId = cfg->s.rguSap.suId; - upSapCfg->spId = cfg->s.rguSap.spId; - /*T2K uses 2 saps, T3K uses 1 sap. change the rgRguDlSap to 1 only if - * there is cfg request with sap is 1*/ - break; + if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) && + (cfg->s.rguSap.selector != ODU_SELECTOR_TC) && + (cfg->s.rguSap.selector != ODU_SELECTOR_LC)) + { + ret = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU"); + break; + } + upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]); + if(upSapCb->sapSta.sapState == LRG_NOT_CFG) + { + upSapCb->sapSta.sapState = LRG_UNBND; + } + upSapCfg = &(upSapCb->sapCfg); + upSapCfg->sapPst.dstEnt = cfg->s.rguSap.ent; + upSapCfg->sapPst.dstInst = cfg->s.rguSap.inst; + upSapCfg->sapPst.dstProcId = cfg->s.rguSap.procId; + upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent; + upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst; + upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId; + upSapCfg->sapPst.region = cfg->s.rguSap.mem.region; + upSapCfg->sapPst.pool = cfg->s.rguSap.mem.pool; + upSapCfg->sapPst.selector = cfg->s.rguSap.selector; + upSapCfg->sapPst.route = cfg->s.rguSap.route; + upSapCfg->sapPst.intfVer = 0; + upSapCfg->sapPst.prior = cfg->s.rguSap.prior; + upSapCfg->suId = cfg->s.rguSap.suId; + upSapCfg->spId = cfg->s.rguSap.spId; + /*T2K uses 2 saps, T3K uses 1 sap. change the rgRguDlSap to 1 only if + * there is cfg request with sap is 1*/ + break; case STCRGSAP: - if ((cfg->s.crgSap.selector != CRG_SEL_TC) && - (cfg->s.crgSap.selector != CRG_SEL_LC)) - { - ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for CRG"); - break; - } - if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG) - { - rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND; - } - upSapCfg = &rgCb[inst].crgSap.sapCfg; - - upSapCfg->sapPst.dstEnt = cfg->s.crgSap.ent; - upSapCfg->sapPst.dstInst = cfg->s.crgSap.inst; - upSapCfg->sapPst.dstProcId = cfg->s.crgSap.procId; - upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent; - upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst; - upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId; - upSapCfg->sapPst.region = cfg->s.crgSap.mem.region; - upSapCfg->sapPst.pool = cfg->s.crgSap.mem.pool; - upSapCfg->sapPst.selector = cfg->s.crgSap.selector; - upSapCfg->sapPst.route = cfg->s.crgSap.route; - upSapCfg->sapPst.intfVer = 0; - upSapCfg->sapPst.prior = cfg->s.crgSap.prior; - upSapCfg->suId = cfg->s.crgSap.suId; - upSapCfg->spId = cfg->s.crgSap.spId; - break; + if ((cfg->s.crgSap.selector != ODU_SELECTOR_TC) && + (cfg->s.crgSap.selector != ODU_SELECTOR_LC)) + { + ret = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : unsupported Selector value for CRG"); + break; + } + if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG) + { + rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND; + } + upSapCfg = &rgCb[inst].crgSap.sapCfg; + + upSapCfg->sapPst.dstEnt = cfg->s.crgSap.ent; + upSapCfg->sapPst.dstInst = cfg->s.crgSap.inst; + upSapCfg->sapPst.dstProcId = cfg->s.crgSap.procId; + upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent; + upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst; + upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId; + upSapCfg->sapPst.region = cfg->s.crgSap.mem.region; + upSapCfg->sapPst.pool = cfg->s.crgSap.mem.pool; + upSapCfg->sapPst.selector = cfg->s.crgSap.selector; + upSapCfg->sapPst.route = cfg->s.crgSap.route; + upSapCfg->sapPst.intfVer = 0; + upSapCfg->sapPst.prior = cfg->s.crgSap.prior; + upSapCfg->suId = cfg->s.crgSap.suId; + upSapCfg->spId = cfg->s.crgSap.spId; + break; case STTFUSAP: #ifndef CL_MAC_LWLC - if ((cfg->s.tfuSap.selector != TFU_SEL_TC) && - (cfg->s.tfuSap.selector != TFU_SEL_LC)) - { - ret = LCM_REASON_INVALID_PAR_VAL; - RLOG0(L_ERROR, "unsupported Selector value for TFU"); - break; - } + if ((cfg->s.tfuSap.selector != ODU_SELECTOR_TC) && + (cfg->s.tfuSap.selector != ODU_SELECTOR_LC)) + { + ret = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : unsupported Selector value for TFU"); + break; + } #endif if (rgCb[inst].tfuSap.sapSta.sapState == LRG_NOT_CFG) { @@ -875,14 +772,14 @@ Elmnt sapType; /* Sap Type */ lowSapCfg->sapPst.prior = cfg->s.tfuSap.prior; lowSapCfg->suId = cfg->s.tfuSap.suId; lowSapCfg->spId = cfg->s.tfuSap.spId; - cmMemcpy((U8 *)&lowSapCfg->bndTmr, (U8 *)&cfg->s.tfuSap.bndTmr, + memcpy(&lowSapCfg->bndTmr, &cfg->s.tfuSap.bndTmr, sizeof(TmrCfg)); break; default: - /* would never reach here */ - break; + /* would never reach here */ + break; } - RETVALUE(ret); + return (ret); } @@ -900,40 +797,33 @@ Elmnt sapType; /* Sap Type */ * * @param[in] Inst inst * @param[in] RgCfg *cfg, the Configuaration information - * @return U16 + * @return uint16_t * -# LCM_REASON_NOT_APPL * -# LCM_REASON_INVALID_MSGTYPE * -# LCM_REASON_MEM_NOAVAIL **/ -#ifdef ANSI -PRIVATE U16 rgLMMGenCfg +static uint16_t rgLMMGenCfg ( Inst inst, RgCfg *cfg /* Configuaration information */ ) -#else -PRIVATE U16 rgLMMGenCfg(inst,cfg) -Inst inst; -RgCfg *cfg; /* Configuaration information */ -#endif { - U16 ret = LCM_REASON_NOT_APPL; + uint16_t ret = LCM_REASON_NOT_APPL; - TRC2(rgLMMGenCfg) /* Check if General Configuration is done already */ if (rgCb[inst].rgInit.cfgDone == TRUE) { - RETVALUE(LCM_REASON_INVALID_MSGTYPE); + return (LCM_REASON_INVALID_MSGTYPE); } - if ((cfg->s.genCfg.lmPst.selector != LRG_SEL_TC) && - (cfg->s.genCfg.lmPst.selector != LRG_SEL_LC)) + 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"); - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU"); + return (LCM_REASON_INVALID_PAR_VAL); } /* Update the Pst structure for LM interface */ - cmMemcpy((U8 *)&rgCb[inst].rgInit.lmPst, (U8 *)&cfg->s.genCfg.lmPst, + memcpy(&rgCb[inst].rgInit.lmPst, &cfg->s.genCfg.lmPst, sizeof(Pst)); rgCb[inst].rgInit.lmPst.srcProcId = rgCb[inst].rgInit.procId; @@ -945,61 +835,58 @@ RgCfg *cfg; /* Configuaration information */ rgCb[inst].rgInit.pool = cfg->s.genCfg.mem.pool; rgCb[inst].genCfg.tmrRes = cfg->s.genCfg.tmrRes; + macCb.tmrRes = cfg->s.genCfg.tmrRes; macCb.macInst = rgCb[inst].rgInit.inst; + macCb.procId = rgCb[inst].rgInit.procId; /* Initialize SAP States */ rgCb[inst].crgSap.sapSta.sapState = LRG_NOT_CFG; if(cfg->s.genCfg.numRguSaps == 0) { - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Invalid numRguSap.\n")); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> MAC : rgGenCfg(): Invalid numRguSap.\n"); + return RFAILED; } /* allocate RGR saps */ - if (SGetSBuf(rgCb[inst].rgInit.region, - rgCb[inst].rgInit.pool, - (Data **)&rgCb[inst].rguSap, - (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK) + MAC_ALLOC(rgCb[inst].rguSap, sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps); + if(rgCb[inst].rguSap == NULLP) { - RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n")); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> MAC : rgGenCfg(): Failed to allocate mem for RGU SAP's.\n"); + return RFAILED; } rgCb[inst].numRguSaps = cfg->s.genCfg.numRguSaps; for (int idx = 0; idx < rgCb[inst].numRguSaps; idx++) { rgCb[inst].rguSap[idx].sapSta.sapState = LRG_NOT_CFG; - cmMemset((U8 *)&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb)); } rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG; /* Initialize the timer blocks */ - cmInitTimers(rgCb[inst].tmrBlk, RG_MAX_TIMER); + cmInitTimers(macCb.tmrBlk, MAX_NUM_TIMER); /* Initialzie the timer queue */ - cmMemset((U8 *)&rgCb[inst].tmrTq, 0, sizeof(CmTqType)*RG_TQ_SIZE); + memset(&macCb.tmrTq, 0, sizeof(CmTqType) * MAC_TQ_SIZE); /* Initialize the timer control point */ - cmMemset((U8 *)&rgCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); - rgCb[inst].tmrTqCp.tmrLen = RG_TQ_SIZE; -#if 0 + memset(&macCb.tmrTqCp, 0, sizeof(CmTqCp)); + macCb.tmrTqCp.tmrLen = MAC_TQ_SIZE; + /* Timer Registration request to SSI */ - if (SRegTmrMt(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst, - (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr) != ROK) + if(ODU_REG_TMR_MT(ENTMAC, macCb.macInst, macCb.tmrRes, macActvTmr) != ROK) { - - RLOG0(L_ERROR, "Failed to register timer"); - SPutSBuf(rgCb[inst].rgInit.region, - rgCb[inst].rgInit.pool, - (Data *)rgCb[inst].rguSap, - (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)); + DU_LOG("\nERROR --> MAC : Failed to register timer"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + MAC_FREE(rgCb[inst].rguSap, + (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)); + + return (LCM_REASON_MEM_NOAVAIL); } -#endif + /* Set Config done in TskInit */ rgCb[inst].rgInit.cfgDone = TRUE; - RETVALUE(ret); + return (ret); } @@ -1019,34 +906,25 @@ RgCfg *cfg; /* Configuaration information */ * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgLMMShutdown -( -Inst inst -) -#else -PRIVATE Void rgLMMShutdown(inst) -Inst inst; -#endif +static Void rgLMMShutdown(Inst inst) { RgCellCb *cell = rgCb[inst].cell; - U8 idx; + uint8_t idx; - TRC2(rgLMMShutdown) - /* Unbind the TFU Sap */ + /* Unbind the TFU Sap */ if(rgCb[inst].tfuSap.sapSta.sapState == LRG_WAIT_BNDCFM) { - rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, LRG_UNBND); + //rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, LRG_UNBND); if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) { rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); - } + } rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND; } if(rgCb[inst].tfuSap.sapSta.sapState == LRG_BND) { - rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, LRG_UNBND); + //rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, LRG_UNBND); rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND; } @@ -1055,32 +933,29 @@ Inst inst; { for(idx=0;idx < RG_NUM_SUB_FRAMES; idx++) { - rgTOMRlsSf(inst,&cell->subFrms[idx]); + rgTOMRlsSf(inst,&cell->subFrms[idx]); } rgCFGFreeCellCb(cell); } /* Deleting the RGU SAPs */ - SPutSBuf(rgCb[inst].rgInit.region, - rgCb[inst].rgInit.pool, - (Data *)rgCb[inst].rguSap, - (sizeof(RgUpSapCb) * rgCb[inst].numRguSaps)); - rgCb[inst].rguSap = NULLP; + MAC_FREE(rgCb[inst].rguSap, + (sizeof(RgUpSapCb) * rgCb[inst].numRguSaps)); rgCb[inst].inactiveCell = NULLP; rgCb[inst].cell = NULLP; /* De-register the Timer Service */ (Void) SDeregTmrMt(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst, - (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr); + (S16)rgCb[inst].genCfg.tmrRes, macActvTmr); /* call back the task initialization function to intialize * the global RgCb Struct */ rgActvInit(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst, rgCb[inst].rgInit.region, - rgCb[inst].rgInit.reason); + rgCb[inst].rgInit.reason); - RETVOID; + return; } @@ -1099,26 +974,18 @@ Inst inst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgLMMGenCntrl +static Void rgLMMGenCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -PRIVATE Void rgLMMGenCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif { Inst inst = (cfmPst->srcInst - RG_INST_START); - TRC2(rgLMMGenCntrl) cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; - + switch(cntrl->t.cntrl.action) { @@ -1131,8 +998,8 @@ Pst *cfmPst; rgCb[inst].rgInit.trc = TRUE; rgCb[inst].trcLen = cntrl->t.cntrl.s.trcLen; /*Store the response and TransId for sending the Traces */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.trcResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.trcResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.trcResp.transId = cntrl->hdr.transId; break; @@ -1140,72 +1007,72 @@ Pst *cfmPst; /* Enable Unsolicited Status (alarms) */ rgCb[inst].rgInit.usta = TRUE; /*Store the response and TransId for sending the Alarms */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.ustaResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.ustaResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId; break; case SADBG: /* Enable Debug Printing */ #ifdef DEBUGP - rgCb[inst].rgInit.dbgMask |= cntrl->t.cntrl.s.rgDbgCntrl.dbgMask; + rgCb[inst].rgInit.dbgMask |= cntrl->t.cntrl.s.rgDbgCntrl.dbgMask; #endif - break; + break; #ifdef SS_DIAG - case SALOG: - rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask; - break; + case SALOG: + rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask; + break; #endif - 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); - break; - } - break; + default: + cfm->cfm.status = LCM_PRIM_NOK; + cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction); + break; + } + break; case ADISIMM: - /* Action is Diable immidiately */ - switch(cntrl->t.cntrl.subAction) - { - case SATRC: - /* Disable Traces */ - rgCb[inst].rgInit.trc = FALSE; - break; - case SAUSTA: - /* Disable Unsolicited Status (alarms) */ - rgCb[inst].rgInit.usta = FALSE; - break; - case SADBG: - /* Disable Debug Printing */ + /* Action is Diable immidiately */ + switch(cntrl->t.cntrl.subAction) + { + case SATRC: + /* Disable Traces */ + rgCb[inst].rgInit.trc = FALSE; + break; + case SAUSTA: + /* Disable Unsolicited Status (alarms) */ + rgCb[inst].rgInit.usta = FALSE; + break; + case SADBG: + /* Disable Debug Printing */ #ifdef DEBUGP - rgCb[inst].rgInit.dbgMask &=~cntrl->t.cntrl.s.rgDbgCntrl.dbgMask; + rgCb[inst].rgInit.dbgMask &=~cntrl->t.cntrl.s.rgDbgCntrl.dbgMask; #endif - break; + break; #ifdef SS_DIAG - case SALOG: - rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask; - break; + case SALOG: + rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask; + break; #endif - 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); - break; - } - break; + default: + cfm->cfm.status = LCM_PRIM_NOK; + cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction); + break; + } + break; case ASHUTDOWN: - /* Free all the memory dynamically allocated by MAC */ - rgLMMShutdown(inst); - break; + /* Free all the memory dynamically allocated by MAC */ + rgLMMShutdown(inst); + break; 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); - break; + cfm->cfm.status = LCM_PRIM_NOK; + cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; + DU_LOG("\nERROR --> MAC : invalid action=%d",cntrl->t.cntrl.action); + break; } RgMiLrgCntrlCfm(cfmPst, cfm); - RETVOID; + return; } @@ -1224,22 +1091,14 @@ Pst *cfmPst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgLMMSapCntrl +static Void rgLMMSapCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) -#else -PRIVATE Void rgLMMSapCntrl(cntrl, cfm, cfmPst) -RgMngmt *cntrl; -RgMngmt *cfm; -Pst *cfmPst; -#endif { Inst inst = cfmPst->srcInst - RG_INST_START; - TRC2(rgLMMSapCntrl) /* Only TFU Sap can be controlled by LM */ switch(cntrl->hdr.elmId.elmnt) @@ -1267,8 +1126,8 @@ Pst *cfmPst; rgCb[inst].tfuSap.numBndRetries++; /* Store the response and TransId for sending * the Control confirm */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.bndCfmResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.bndCfmResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.bndCfmResp.transId = cntrl->hdr.transId; /* Sending Status Indication to Layer Manager */ @@ -1276,8 +1135,8 @@ Pst *cfmPst; cfm->cfm.reason = LCM_REASON_NOT_APPL; RgMiLrgCntrlCfm(cfmPst, cfm); - rgLIMTfuBndReq(inst,rgCb[inst].tfuSap.sapCfg.suId, - rgCb[inst].tfuSap.sapCfg.spId); + //rgLIMTfuBndReq(inst,rgCb[inst].tfuSap.sapCfg.suId, + //rgCb[inst].tfuSap.sapCfg.spId); RETVOID; } break; @@ -1293,7 +1152,7 @@ Pst *cfmPst; } else { - rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, TFU_UBNDREQ_MNGMT); + //rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, TFU_UBNDREQ_MNGMT); if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) { rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); @@ -1309,13 +1168,13 @@ Pst *cfmPst; if ((rgCb[inst].tfuSap.sapSta.sapState == LRG_WAIT_BNDCFM) || (rgCb[inst].tfuSap.sapSta.sapState == LRG_BND)) { - rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, TFU_UBNDREQ_MNGMT); + //rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, TFU_UBNDREQ_MNGMT); if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) { rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); } } - cmMemset((U8 *)&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb)); + memset(&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb)); rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1323,8 +1182,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; @@ -1332,7 +1191,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb)); rgCb[inst].rguSap[cntrl->t.cntrl.instId].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1340,8 +1199,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; @@ -1349,7 +1208,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb)); rgCb[inst].crgSap.sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1357,7 +1216,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; } @@ -1367,7 +1226,7 @@ Pst *cfmPst; RETVOID; } RgMiLrgCntrlCfm(cfmPst, cfm); - RETVOID; + return; } @@ -1387,22 +1246,14 @@ Pst *cfmPst; * File : rg_lmm.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgLMMFillCfmPst +static Void rgLMMFillCfmPst ( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm ) -#else -PRIVATE Void rgLMMFillCfmPst(reqPst, cfmPst, cfm) -Pst *reqPst; -Pst *cfmPst; -RgMngmt *cfm; -#endif { Inst inst; - TRC2(rgLMMFillCfmPst) inst = (reqPst->dstInst - RG_INST_START); cfmPst->srcEnt = rgCb[inst].rgInit.ent; @@ -1418,7 +1269,7 @@ RgMngmt *cfm; cfmPst->region = cfm->hdr.response.mem.region; cfmPst->pool = cfm->hdr.response.mem.pool; - RETVOID; + return; } @@ -1435,35 +1286,26 @@ RgMngmt *cfm; * * @param[in] Inst inst * @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 rgLMMStartTmr +S16 rgLMMStartTmr ( Inst inst, S16 tmrEvnt, /* Timer Event */ -U32 tmrVal, /* Wait Time */ +uint32_t tmrVal, /* Wait Time */ PTR cb /* Entry for which Timer Expired */ ) -#else -PUBLIC S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb) -Inst inst; -S16 tmrEvnt; /* Timer Event */ -U32 tmrVal; /* Wait Time */ -PTR cb; /* Entry for which Timer Expired */ -#endif { CmTmrArg arg; - TRC2(rgLMMStartTmr) - UNUSED(tmrEvnt); + UNUSED(tmrEvnt); /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgCb[inst].tmrTqCp; arg.tq = rgCb[inst].tmrTq; @@ -1475,7 +1317,7 @@ PTR cb; /* Entry for which Timer Expired */ arg.wait = tmrVal; cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -1499,25 +1341,17 @@ PTR cb; /* Entry for which Timer Expired */ * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgLMMStopTmr +S16 rgLMMStopTmr ( Inst inst, /* Scheduler instance */ S16 tmrEvnt, /* Timer Event */ PTR cb /* Entry for which Timer Expired */ ) -#else -PUBLIC S16 rgLMMStopTmr(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(rgLMMStopTmr) ret = RFAILED; @@ -1527,7 +1361,7 @@ PTR cb; /* Entry for which Timer Expired */ if(rgCb[inst].tmrBlk[i].tmrEvnt == tmrEvnt) { /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgCb[inst].tmrTqCp; arg.tq = rgCb[inst].tmrTq; @@ -1546,7 +1380,7 @@ PTR cb; /* Entry for which Timer Expired */ } - RETVALUE(ret); + return (ret); } @@ -1566,25 +1400,16 @@ PTR cb; /* Entry for which Timer Expired */ * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 rgLMMTmrExpiry +S16 rgLMMTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) -#else -PUBLIC S16 rgLMMTmrExpiry(cb,tmrEvnt) -PTR cb; /* Pointer to timer control block */ -S16 tmrEvnt; /* Timer Event */ -#endif { S16 ret = ROK; RgLowSapCb *tfuSap = (RgLowSapCb *)cb; Inst inst = tfuSap->sapCfg.sapPst.srcInst - RG_INST_START; - TRC2(rgLMMTmrExpiry) - - switch(tmrEvnt) { case RG_BNDREQ_TMR: @@ -1604,16 +1429,16 @@ S16 tmrEvnt; /* Timer Event */ } /* Send bind request */ - rgLIMTfuBndReq(inst,rgCb[inst].tfuSap.sapCfg.suId, - rgCb[inst].tfuSap.sapCfg.spId); + //rgLIMTfuBndReq(inst,rgCb[inst].tfuSap.sapCfg.suId, + //rgCb[inst].tfuSap.sapCfg.spId); } break; default: - RLOG1(L_ERROR, "Invalid tmrEvnt=%d",tmrEvnt); + DU_LOG("\nERROR --> MAC : Invalid tmrEvnt=%d",tmrEvnt); ret = RFAILED; break; } - RETVALUE(ret); + return (ret); } @@ -1629,41 +1454,29 @@ S16 tmrEvnt; /* Timer Event */ * status indication to the Layer Manager. * * @param[in] Inst inst - * @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 rgLMMStaInd +S16 rgLMMStaInd ( Inst inst, -U16 category, -U16 event, -U16 cause, +uint16_t category, +uint16_t event, +uint16_t cause, RgUstaDgn *dgn ) -#else -PUBLIC S16 rgLMMStaInd(inst,category, event, cause, dgn) -Inst inst; -U16 category; -U16 event; -U16 cause; -RgUstaDgn *dgn; -#endif { RgMngmt usta; - - TRC2(rgLMMStaInd) - if(rgCb[inst].rgInit.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; @@ -1671,7 +1484,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)); } rgCb[inst].rgInit.lmPst.selector = rgCb[inst].genCfg.ustaResp.response.selector; @@ -1681,7 +1494,7 @@ RgUstaDgn *dgn; rgCb[inst].rgInit.lmPst.pool = rgCb[inst].genCfg.ustaResp.response.mem.pool; usta.hdr.transId = rgCb[inst].genCfg.ustaResp.transId; - RETVALUE(RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta)); + return (RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta)); } @@ -1697,22 +1510,15 @@ RgUstaDgn *dgn; * * @param[in] Inst inst * @param[in] Buffer *srcMbuf, the Message Buffer . - * @param[in] U8 event, the trace event. + * @param[in] uint8_t event, the trace event. * @return Void **/ -#ifdef ANSI -PUBLIC Void rgLMMTrcInd +Void rgLMMTrcInd ( Inst inst, Buffer *srcMbuf, /* Message Buffer */ -U8 event /* event */ +uint8_t event /* event */ ) -#else -PUBLIC Void rgLMMTrcInd(inst,srcMbuf,event) -Inst inst; -Buffer *srcMbuf; /* Message Buffer */ -U8 event; /* event */ -#endif { Buffer *dstMbuf = NULLP; MsgLen bufLen = 0; @@ -1721,16 +1527,15 @@ U8 event; /* event */ RgMngmt trc; Pst pst; - TRC2(rgLMMTrcInd) if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP)) { - RLOG0(L_ERROR, "Trace Disabled."); - RETVOID; + DU_LOG("\nERROR --> MAC : Trace Disabled."); + return; } - cmMemset((U8 *)&trc, 0, sizeof(RgMngmt)); + memset(&trc, 0, sizeof(RgMngmt)); pst = rgCb[inst].rgInit.lmPst; pst.selector = rgCb[inst].genCfg.trcResp.response.selector; @@ -1742,20 +1547,20 @@ U8 event; /* event */ trc.hdr.transId = rgCb[inst].genCfg.trcResp.transId; SGetDateTime(&trc.t.trc.dt); - + /* Check if the whole buffer is to be sent in Trace indication */ if(rgCb[inst].trcLen == LRG_FULL_TRACE) { if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf) - != ROK) + != ROK) { - RLOG0(L_ERROR, "SCpyMsgMsg Failed."); - RETVOID; + DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed."); + return; } trc.cfm.status = LCM_PRIM_OK; trc.cfm.reason = LCM_REASON_NOT_APPL; trc.t.trc.evnt = event; - + /* Send Trace Indication to Layer manager */ RgMiLrgTrcInd(&pst, &trc, dstMbuf); } @@ -1765,71 +1570,71 @@ U8 event; /* event */ /* Get the length of the recvd message buffer */ if (SFndLenMsg(srcMbuf, &bufLen) != ROK) { - RLOG0(L_ERROR, "SFndLenMsg Failed."); - RETVOID; + DU_LOG("\nERROR --> MAC : SFndLenMsg Failed."); + return; } /* Check if the recvd buffer size is less than request trace len */ if(bufLen < rgCb[inst].trcLen) { - /* Copy the whole of the recvd buffer in trace indication */ - - if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf) - != ROK) - { - RLOG0(L_ERROR, "SCpyMsgMsg Failed."); - RETVOID; - } - - trc.cfm.status = LCM_PRIM_OK; - trc.cfm.reason = LCM_REASON_NOT_APPL; - trc.t.trc.evnt = event; + /* Copy the whole of the recvd buffer in trace indication */ + + if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf) + != ROK) + { + DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed."); + return; + } - /* Send Trace Indication to Layer manager */ - RgMiLrgTrcInd(&pst, &trc, dstMbuf); + trc.cfm.status = LCM_PRIM_OK; + trc.cfm.reason = LCM_REASON_NOT_APPL; + trc.t.trc.evnt = event; + + /* Send Trace Indication to Layer manager */ + RgMiLrgTrcInd(&pst, &trc, dstMbuf); } /* if the recvd buffer size is greater than request trace len */ if(bufLen >= rgCb[inst].trcLen) { - /* Get a temporary buffer to store the msg */ - if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK) - { - RLOG0(L_ERROR, "rgAllocSBuf Failed."); - RETVOID; - } - - /* Copy trcLen nos of bytes from the recvd message */ - if (SCpyMsgFix(srcMbuf,0,rgCb[inst].trcLen,tempBuf,&tempCnt) != ROK) - { - RLOG0(L_ERROR, "SCpyMsgFix Failed."); - RETVOID; - } - - if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK) - { - RLOG0(L_ERROR, "dstMbuf Allocation Failed"); - RETVOID; - } - /* Copy the tempBuf data to dst mBuf */ - if (SCpyFixMsg(tempBuf,dstMbuf,0,rgCb[inst].trcLen,&tempCnt) != ROK) - { - RLOG0(L_ERROR, "SCpyFixMsg Failed."); - RETVOID; - } - - /*ccpu00117052 - MOD - Passing double pointer for proper NULLP - assignment */ - /* Free the memory allocated for tempBuf */ - rgFreeSBuf(inst,&tempBuf, rgCb[inst].trcLen); - - trc.cfm.status = LCM_PRIM_OK; - trc.cfm.reason = LCM_REASON_NOT_APPL; - trc.t.trc.evnt = event; - - /* Send Trace Indication to Layer manager */ - RgMiLrgTrcInd(&pst, &trc, dstMbuf); + /* Get a temporary buffer to store the msg */ + if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK) + { + 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) + { + DU_LOG("\nERROR --> MAC : SCpyMsgFix Failed."); + return; + } + + if (ODU_GET_MSG_BUF(pst.region, pst.pool, &dstMbuf) != ROK) + { + 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) + { + DU_LOG("\nERROR --> MAC : SCpyFixMsg Failed."); + return; + } + + /*ccpu00117052 - MOD - Passing double pointer for proper NULLP + assignment */ + /* Free the memory allocated for tempBuf */ + rgFreeSBuf(inst,&tempBuf, rgCb[inst].trcLen); + + trc.cfm.status = LCM_PRIM_OK; + trc.cfm.reason = LCM_REASON_NOT_APPL; + trc.t.trc.evnt = event; + + /* Send Trace Indication to Layer manager */ + RgMiLrgTrcInd(&pst, &trc, dstMbuf); } } - RETVOID; + return; } @@ -1849,50 +1654,42 @@ U8 event; /* 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 rgLMMBndCfm +S16 rgLMMBndCfm ( Pst *pst, /* Post Structure */ SuId suId, /* Service user ID */ -U8 status /* Status */ +uint8_t status /* Status */ ) -#else -PUBLIC S16 rgLMMBndCfm(pst,suId,status) -Pst *pst; /* Post Structure */ -SuId suId; /* Service user ID */ -U8 status; /* Status */ -#endif { Inst inst = pst->dstInst - RG_INST_START; S16 ret = ROK; RgMngmt cntrlCfm; Pst cfmPst; - TRC3(rgLMMBndCfm) UNUSED(pst); /* Check if the suId is valid */ if(rgCb[inst].tfuSap.sapCfg.suId != suId) { - RLOG0(L_ERROR, "Invalid SuId"); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> MAC : Invalid SuId"); + return RFAILED; } /* check the Sap State */ switch(rgCb[inst].tfuSap.sapSta.sapState) { case LRG_WAIT_BNDCFM: - break; + break; case LRG_BND: - /* SAP is already bound */ - RETVALUE(ROK); + /* SAP is already bound */ + return ROK; default: - RETVALUE(RFAILED); + return RFAILED; } cfmPst = rgCb[inst].rgInit.lmPst; @@ -1902,33 +1699,33 @@ U8 status; /* Status */ cfmPst.region = rgCb[inst].genCfg.bndCfmResp.response.mem.region; cfmPst.pool = rgCb[inst].genCfg.bndCfmResp.response.mem.pool; - cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt)); + memset(&cntrlCfm, 0, sizeof(RgMngmt)); switch(status) { case CM_BND_OK: /* status is OK */ - /* Change SAP state to Bound */ - rgCb[inst].tfuSap.sapSta.sapState = LRG_BND; - if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) - { - ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); - } - /* Send Control Confirm with status as OK to Layer Manager */ - cntrlCfm.cfm.status = LCM_PRIM_OK; - cntrlCfm.cfm.reason = LCM_REASON_NOT_APPL; - break; + /* Change SAP state to Bound */ + rgCb[inst].tfuSap.sapSta.sapState = LRG_BND; + if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) + { + ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); + } + /* Send Control Confirm with status as OK to Layer Manager */ + cntrlCfm.cfm.status = LCM_PRIM_OK; + cntrlCfm.cfm.reason = LCM_REASON_NOT_APPL; + break; default: - /* Change SAP state to UnBound */ - rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND; - if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) - { - ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); - } - /* Send Control Confirm with status as NOK to Layer Manager */ - cntrlCfm.cfm.status = LCM_PRIM_NOK; - cntrlCfm.cfm.reason = LCM_REASON_NEG_CFM; - break; + /* Change SAP state to UnBound */ + rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND; + if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE) + { + ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); + } + /* Send Control Confirm with status as NOK to Layer Manager */ + cntrlCfm.cfm.status = LCM_PRIM_NOK; + cntrlCfm.cfm.reason = LCM_REASON_NEG_CFM; + break; } rgCb[inst].tfuSap.numBndRetries = 0; cntrlCfm.hdr.elmId.elmnt = STTFUSAP; @@ -1936,382 +1733,10 @@ U8 status; /* Status */ ret = RgMiLrgCntrlCfm(&cfmPst, &cntrlCfm); - RETVALUE(ret); -} - - -/** - * @brief LTE MAC timer call back function registered with SSI. - * - * @details - * - * Function : rgActvTmr - * - * This function is invoked by SSI for every timer activation - * period expiry. - * - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC S16 rgActvTmr -( - Ent ent, - Inst inst -) -#else -PUBLIC S16 rgActvTmr(ent, inst) -Ent ent; -Inst inst; -#endif -{ - Inst macInst = (inst - RG_INST_START); - TRC3(rgActvTmr) - - /* Check if any MAC timer has expired */ - cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry); - - RETVALUE(ROK); - -} /* end of rgActvTmr */ - -/** - * @brief Layer Manager Configuration request handler for Scheduler - * - * @details - * - * Function : MacSchGenCfgReq - * - * This function receives general configurations for Scheduler - * from DU APP and forwards to Scheduler. - * - * @param[in] Pst *pst, the post structure - * @param[in] RgMngmt *cfg, the configuration parameter's structure - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC int MacSchGenCfgReq -( -Pst *pst, /* post structure */ -RgMngmt *cfg /* config structure */ -) -#else -PUBLIC int MacSchGenCfgReq(pst, cfg) -Pst *pst; /* post structure */ -RgMngmt *cfg; /* config structure */ -#endif -{ - printf("\nReceived Scheduler gen config at MAC"); - pst->dstInst = DEFAULT_CELLS + 1; - HandleSchGenCfgReq(pst, cfg); - - return ROK; -} - -/** - * @brief Layer Manager Configuration response from Scheduler - * - * @details - * - * Function : SchSendCfgCfm - * - * This function sends general configurations response from - * Scheduler to DU APP. - * - * @param[in] Pst *pst, the post structure - * @param[in] RgMngmt *cfm, the configuration confirm structure - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC S16 SchSendCfgCfm -( -Pst *pst, /* post structure */ -RgMngmt *cfm /* config confirm structure */ -) -#else -PUBLIC S16 SchSendCfgCfm(pst, cfm) -Pst *pst; /* post structure */ -RgMngmt *cfm; /* config confirm structure */ -#endif -{ - printf("\nSending Scheduler config confirm to DU APP"); - pst->dstEnt = ENTDUAPP; - pst->dstInst = 0; - pst->srcInst = 0; - pst->selector = MAC_SCH_LC_SELECTOR; - RgMiLrgSchCfgCfm(pst, cfm); - - RETVALUE(ROK); -} - - -/*********************************************************** - * - * Func : macCellCfgFillCfmPst - * - * - * Desc : Fills the Confirmation Post Structure cfmPst - * - * Ret : Void - * - * Notes: - * - * File : rg_lmm.c - * - **********************************************************/ -Void macCellCfgFillCfmPst -( -Pst *reqPst, -Pst *cfmPst -) -{ - Inst inst; - inst = reqPst->dstInst; - - cfmPst->srcEnt = rgCb[inst].rgInit.ent; - cfmPst->srcInst = rgCb[inst].rgInit.inst; - cfmPst->srcProcId = rgCb[inst].rgInit.procId; - - cfmPst->dstEnt = ENTDUAPP; - cfmPst->dstInst = 0; - cfmPst->dstProcId = cfmPst->srcProcId; - - cfmPst->selector = LRG_SEL_LC; - cfmPst->prior = reqPst->prior; - cfmPst->route = reqPst->route; - cfmPst->region = reqPst->region; - cfmPst->pool = reqPst->pool; - cfmPst->event = EVENT_MAC_CELL_CONFIG_CFM; - - RETVOID; -} - -/** - * @brief Layer Manager Configuration request handler. - * - * @details - * - * Function : MacHdlCellCfgReq - * - * This function handles the gNB and cell configuration - * request received from DU APP. - * This API unapcks and forwards the config towards SCH - * - * @param[in] Pst *pst - * @param[in] MacCellCfg *macCellCfg - * @return S16 - * -# ROK - **/ -int MacHdlCellCfgReq -( - Pst *pst, - MacCellCfg *macCellCfg -) -{ - Pst cfmPst; - uint16_t ret = ROK; - RgCellCb *cellCb; - MacCellCb *macCellCb; - Inst inst = pst->dstInst; - - cmMemset((U8 *)&cfmPst, 0, sizeof(Pst)); - MAC_ALLOC(cellCb,sizeof(RgCellCb)); - - if(cellCb == NULLP) - { - DU_LOG("\nMAC : cellCb is NULL at handling of macCellCfg\n"); - return RFAILED; - } - - memcpy(&cellCb->macCellCfg,macCellCfg,sizeof(MacCellCfg)); - rgCb[inst].cell = cellCb; - - MAC_ALLOC(macCellCb,sizeof(MacCellCb)); - if(macCellCb == NULLP) - { - DU_LOG("\nMAC : macCellCb is NULL at handling of macCellCfg\n"); - return RFAILED; - } - macCb.macCell = macCellCb; - macCb.macCell->cellId = macCellCfg->cellId; - /* Send cell cfg to scheduler */ - ret = MacSchCellCfgReq(pst, macCellCfg); - if(ret != ROK) - { - MacCellCfgCfm macCellCfgCfm; - macCellCfgCfm.rsp = RSP_NOK; - macCellCfgCfm.transId = macCellCfg->transId; - macCellCfgFillCfmPst(pst,&cfmPst); - ret = (*packMacCellCfmOpts[cfmPst.selector])(&cfmPst,&macCellCfgCfm); - } -#ifdef INTEL_WLS - LwrMacEnqueueWlsBlock(); -#endif - return ret; -} /* end of MacHdlCellCfgReq */ - -/** - * @brief Layer Manager Configuration request handler. - * - * @details - * - * Function : MacSchCellCfgReq - * - * This function sends cell configuration to SCH - * - * @param[in] Pst *pst - * @param[in] MacCellCfg *macCellCfg - * @return S16 - * -# ROK - **/ -int MacSchCellCfgReq -( - Pst *pst, - MacCellCfg *macCellCfg -) -{ - SchCellCfg schCellCfg; - Pst cfgPst; - int ret; - - cmMemset((U8 *)&cfgPst, 0, sizeof(Pst)); - schCellCfg.cellId = macCellCfg->cellId; - schCellCfg.phyCellId = macCellCfg->phyCellId; - schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw; - schCellCfg.dupMode = macCellCfg->dupType; - - /* fill ssb scheduler parameters */ - schCellCfg.ssbSchCfg.ssbPbchPwr = macCellCfg->ssbCfg.ssbPbchPwr; - schCellCfg.ssbSchCfg.scsCommon = macCellCfg->ssbCfg.scsCmn; - schCellCfg.ssbSchCfg.ssbOffsetPointA = macCellCfg->ssbCfg.ssbOffsetPointA; - schCellCfg.ssbSchCfg.ssbPeriod = macCellCfg->ssbCfg.ssbPeriod; - schCellCfg.ssbSchCfg.ssbSubcOffset = macCellCfg->ssbCfg.ssbScOffset; - for(uint8_t idx=0; idxssbCfg.ssbMask[idx]; - } - - /* fill SIB1 scheduler parameters */ - schCellCfg.sib1SchCfg.sib1PduLen = macCellCfg->sib1Cfg.sib1PduLen; - schCellCfg.sib1SchCfg.sib1NewTxPeriod = macCellCfg->sib1Cfg.sib1NewTxPeriod; - schCellCfg.sib1SchCfg.sib1RepetitionPeriod = macCellCfg->sib1Cfg.sib1RepetitionPeriod; - schCellCfg.sib1SchCfg.coresetZeroIndex = macCellCfg->sib1Cfg.coresetZeroIndex; - schCellCfg.sib1SchCfg.searchSpaceZeroIndex = macCellCfg->sib1Cfg.searchSpaceZeroIndex; - schCellCfg.sib1SchCfg.sib1Mcs = macCellCfg->sib1Cfg.sib1Mcs; - - /* fill RACH config params */ - schCellCfg.schRachCfg.prachCfgIdx = macCellCfg->prachCfg.prachCfgIdx; - schCellCfg.schRachCfg.prachSubcSpacing = \ - macCellCfg->prachCfg.prachSubcSpacing; - schCellCfg.schRachCfg.msg1FreqStart = macCellCfg->prachCfg.msg1FreqStart; - schCellCfg.schRachCfg.msg1Fdm = macCellCfg->prachCfg.msg1Fdm; - schCellCfg.schRachCfg.rootSeqIdx = macCellCfg->prachCfg.fdm[0].rootSeqIdx; - schCellCfg.schRachCfg.numRootSeq = macCellCfg->prachCfg.fdm[0].numRootSeq; - schCellCfg.schRachCfg.k1 = macCellCfg->prachCfg.fdm[0].k1; - schCellCfg.schRachCfg.ssbPerRach = macCellCfg->prachCfg.ssbPerRach; - schCellCfg.schRachCfg.prachMultCarrBand = \ - macCellCfg->prachCfg.prachMultCarrBand; - schCellCfg.schRachCfg.raContResTmr = macCellCfg->prachCfg.raContResTmr; - schCellCfg.schRachCfg.rsrpThreshSsb = macCellCfg->prachCfg.rsrpThreshSsb; - schCellCfg.schRachCfg.raRspWindow = macCellCfg->prachCfg.raRspWindow; - - /* fill initial DL BWP */ - schCellCfg.schInitialBwp.bwp.firstPrb = macCellCfg->initialBwp.bwp.firstPrb; - schCellCfg.schInitialBwp.bwp.numPrb = macCellCfg->initialBwp.bwp.numPrb; - schCellCfg.schInitialBwp.bwp.scs = macCellCfg->initialBwp.bwp.scs; - schCellCfg.schInitialBwp.bwp.cyclicPrefix = macCellCfg->initialBwp.bwp.cyclicPrefix; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.searchSpaceId = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.searchSpaceId; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.coresetId = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.coresetId; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.monitoringSlot = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.monitoringSlot; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.duration = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.duration; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.monitoringSymbol = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.monitoringSymbol; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel1 = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel1; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel2 = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel2; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel4 = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel4; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel8 = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel8; - schCellCfg.schInitialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel16 = macCellCfg->initialBwp.pdcchCommon.raSearchSpace.candidate.aggLevel16; - - cfgPst.srcProcId = pst->dstProcId; - cfgPst.dstProcId = pst->srcProcId; - cfgPst.srcEnt = ENTRG; - cfgPst.srcInst = 0; - cfgPst.dstEnt = ENTRG; - cfgPst.dstInst = 1; - cfgPst.selector = MAC_SCH_TC_SELECTOR; - cfgPst.event = EVENT_SCH_CELL_CFG; - - ret = (*SchCellCfgOpts[cfgPst.selector])(&cfgPst, &schCellCfg); - return ret; -} /* end of MacSchCellCfgReq */ - - -/******************************************************************* - * - * @brief Sends Cell config confirm to DU APP - * - * @details - * - * Function : MacSendCellCfgCfm - * - * Functionality: - * Sends Cell config confirm to DU APP - * - * @params[in] Response status - * @return void - * - * ****************************************************************/ -void MacSendCellCfgCfm(uint8_t response) -{ - Pst pst; - RgCellCb *cellCb; - MacCellCfgCfm macCellCfgCfm; - - cmMemset((U8 *)&pst, 0, sizeof(Pst)); - cellCb = rgCb[macCb.macInst].cell; - - macCellCfgCfm.transId = cellCb->macCellCfg.transId; - macCellCfgCfm.rsp = response; - - memcpy((void *)&pst, (void *)&rgCb[macCb.macInst].rgInit.lmPst, sizeof(Pst)); - pst.event = EVENT_MAC_CELL_CONFIG_CFM; - (*packMacCellCfmOpts[pst.selector])(&pst,&macCellCfgCfm); -} - - -/** - * @brief Layer Manager Configuration response handler. - * - * @details - * - * Function : MacProcSchCellCfgCfm - * - * This function processes cell configuration to SCH - * - * @param[in] Pst *pst - * @param[in] SchCellCfgCfm *schCellCfgCfm - * @return int - * -# ROK - **/ -int MacProcSchCellCfgCfm -( - Pst *pst, - SchCellCfgCfm *schCellCfgCfm -) -{ - if(schCellCfgCfm->rsp == RSP_OK) - { - sendToLowerMac(CONFIG_REQUEST, 0, (void *)NULL); - } - else - { - MacSendCellCfgCfm(RSP_NOK); - } - return ROK; + return (ret); } /********************************************************************** - - End of file -**********************************************************************/ + + End of file + **********************************************************************/