X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_gom.c;h=174867e830b2cd999b19305768fd1ce8012455e2;hb=15c1e4f846f9935150615a5e9e7f94500bd62790;hp=b70e203a121af7a15eb61822b6e10509738dfe24;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index b70e203a1..174867e83 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -57,48 +57,48 @@ static int RLOG_FILE_ID=164; #include "rg_sch.x" /* local defines */ -PRIVATE S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId, +static S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId, RgrCfg *cfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId, +static S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId, RgrRecfg *recfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset, +static S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq, +static S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq, CmLteCellId *cellId)); -PRIVATE S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb, +static S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb, RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo)); -PRIVATE S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell, +static S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell, RgrCfgTransId transId, RgrCfgReqInfo *rgrCfgReq)); -PRIVATE S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId, +static S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId, RgrDel *del,RgSchErrInfo *errInfo)); #ifdef LTE_ADV -PRIVATE S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId, - RgrSCellActDeactEvnt *sCellActDeactEvnt, RgSchErrInfo *errInfo, U8 action)); +static S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId, + RgrSCellActDeactEvnt *sCellActDeactEvnt, RgSchErrInfo *errInfo, uint8_t action)); #endif /* LTE_ADV */ #ifdef EMTC_ENABLE -EXTERN S16 rgSchEmtcGetSiWinPerd ARGS(( +S16 rgSchEmtcGetSiWinPerd ARGS(( RgSchCellCb *cell, -U16 *siWinSize, -U16 *minPeriod +uint16_t *siWinSize, +uint16_t *minPeriod )); extern S16 rgSCHEmtcUtlCalMcsAndNPrb ( RgSchCellCb *cell, - U8 cfgType, + uint8_t cfgType, MsgLen msgLen, - U8 siId + uint8_t siId ); -EXTERN S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS( +S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS( ( -U32 bo +uint32_t bo )); -EXTERN Void rgSCHEmtcWarningSiCfg ARGS( +Void rgSCHEmtcWarningSiCfg ARGS( ( RgSchCellCb *cell, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo, -U16 idx +uint16_t idx )); #endif @@ -135,27 +135,13 @@ U16 idx * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHGomHndlCfg -( -Pst *pst, -RgSchCb *instCb, -RgrCfgTransId transId, -RgrCfgReqInfo *cfgReqInfo -) -#else -S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo) -Pst *pst; -RgSchCb *instCb; -RgrCfgTransId transId; -RgrCfgReqInfo *cfgReqInfo; -#endif +S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo) { S16 ret; SpId spId = 0; CmLteCellId cellId; RgSchCellCb *cell = NULLP; - U8 cfmStatus = RGR_CFG_CFM_NOK; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; #ifdef DEBUGP Inst inst = (instCb->rgSchInit.inst ); #endif @@ -244,26 +230,10 @@ RgrCfgReqInfo *cfgReqInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomCfgReq -( -Region reg, -Pool pool, -RgSchCb *instCb, -RgrCfgTransId transId, -RgrCfgReqInfo *cfgReqInfo -) -#else -PRIVATE S16 rgSCHGomCfgReq(reg, pool, instCb, transId, cfgReqInfo) -Region reg; -Pool pool; -RgSchCb *instCb; -RgrCfgTransId transId; -RgrCfgReqInfo *cfgReqInfo; -#endif +static S16 rgSCHGomCfgReq(Region reg,Pool pool,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo) { - SpId spId = 0; - U8 cfmStatus = RGR_CFG_CFM_OK; + SpId spId = 0; + uint8_t cfmStatus = RGR_CFG_CFM_OK; S16 ret; RgSchErrInfo errInfo; #ifdef DEBUGP @@ -368,33 +338,17 @@ printf("\n AT MAC RGR cfg cfm sent\n"); * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomEnqCfgReq -( -Region reg, -Pool pool, -RgSchCellCb *cell, -RgrCfgTransId transId, -RgrCfgReqInfo *rgrCfgReq -) -#else -PRIVATE S16 rgSCHGomEnqCfgReq(reg, pool, cell, transId, rgrCfgReq) -Region reg; -Pool pool; -RgSchCellCb *cell; -RgrCfgTransId transId; -RgrCfgReqInfo *rgrCfgReq; -#endif +static S16 rgSCHGomEnqCfgReq(Region reg,Pool pool,RgSchCellCb *cell,RgrCfgTransId transId,RgrCfgReqInfo *rgrCfgReq) { S16 ret; - U32 sfDiff; + uint32_t sfDiff; RgSchCfgElem *rgrCfgElem = NULLP; CmLteTimingInfo actvTime; Inst inst = cell->instIdx; /* Allocate memory for config Element */ ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem)); - if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP)) + if ((ret != ROK) || ((uint8_t *)rgrCfgElem == NULLP)) { return RFAILED; } @@ -485,17 +439,7 @@ RgrCfgReqInfo *rgrCfgReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHGomTtiHndlr -( -RgSchCellCb *cell, -SpId spId -) -#else -S16 rgSCHGomTtiHndlr(cell, spId) -RgSchCellCb *cell; -SpId spId; -#endif +S16 rgSCHGomTtiHndlr(RgSchCellCb *cell,SpId spId) { RgSchCfgElem *cfgElem; Inst inst= cell->instIdx; @@ -551,21 +495,7 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomHndlCfgReq -( -RgSchCb *instCb, -SpId spId, -RgrCfg *cfg, -RgSchErrInfo *errInfo -) -#else -PRIVATE S16 rgSCHGomHndlCfgReq(instCb, spId, cfg, errInfo) -RgSchCb *instCb; -SpId spId; -RgrCfg *cfg; -RgSchErrInfo *errInfo; -#endif +static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo *errInfo) { S16 ret; RgSchCellCb *cell = instCb->rgrSap[spId].cell; @@ -669,33 +599,17 @@ RgSchErrInfo *errInfo; * @param[in] RgSchCb *instCb * @param[in] SpId spId * @param[in] RgrSCellActDeactEvnt *sCellActDeactEvnt - * @param[in] U8 action + * @param[in] uint8_t action * @param[out] RgSchErrInfo *errInfo * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomHndlSCellActDeactReq -( -RgSchCb *instCb, -SpId spId, -RgrSCellActDeactEvnt *sCellActDeactEvnt, -RgSchErrInfo *errInfo, -U8 action -) -#else -PRIVATE S16 rgSCHGomHndlSCellActDeactReq(instCb, spId, sCellActDeactEvnt, errInfo, action) -RgSchCb *instCb; -SpId spId; -RgrSCellActDeactEvnt *sCellActDeactEvnt; -RgSchErrInfo *errInfo; -U8 action; -#endif +static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb *instCb,SpId spId,RgrSCellActDeactEvnt *sCellActDeactEvnt,RgSchErrInf *errInfo,uint8_t action) { RgSchUeCb *ue = NULLP; - U16 idx = 0; - U16 sCellIdx = 0; + uint16_t idx = 0; + uint16_t sCellIdx = 0; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst); @@ -754,21 +668,7 @@ U8 action; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomHndlRecfgReq -( -RgSchCb *instCb, -SpId spId, -RgrRecfg *recfg, -RgSchErrInfo *errInfo -) -#else -PRIVATE S16 rgSCHGomHndlRecfgReq(instCb, spId, recfg, errInfo) -RgSchCb *instCb; -SpId spId; -RgrRecfg *recfg; -RgSchErrInfo *errInfo; -#endif +static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSchErrInfo *errInfo) { RgSchUeCb *ue = NULLP; RgSchDlLcCb *dlLc = NULLP; /* PURIFY_FIX:UMR */ @@ -866,21 +766,7 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomHndlResetReq -( -RgSchCb *instCb, -SpId spId, -RgrRst *reset, -RgSchErrInfo *errInfo -) -#else -PRIVATE S16 rgSCHGomHndlResetReq(instCb, spId, reset, errInfo) -RgSchCb *instCb; -SpId spId; -RgrRst *reset; -RgSchErrInfo *errInfo; -#endif +static S16 rgSCHGomHndlResetReq(RgSchCb *instCb,SpId spId,RgrRst *reset,RgSchErrInfo *errInfo) { S16 ret; RgSchCellCb *cell= instCb->rgrSap[spId].cell; @@ -932,28 +818,14 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHGomHndlDelReq -( -RgSchCb *instCb, -SpId spId, -RgrDel *del, -RgSchErrInfo *errInfo -) -#else -PRIVATE S16 rgSCHGomHndlDelReq(instCb, spId, del, errInfo) -RgSchCb *instCb; -SpId spId; -RgrDel *del; -RgSchErrInfo *errInfo; -#endif +static S16 rgSCHGomHndlDelReq(RgSchCb *instCb,SpId spId,RgrDel *del,RgSchErrInfo *errInfo) { S16 ret; #ifdef DEBUGP Inst inst = (instCb->rgSchInit.inst); #endif - VOLATILE U32 startTime=0; + volatile uint32_t startTime=0; errInfo->errType = RGSCHERR_GOM_DEL_REQ; @@ -972,7 +844,7 @@ RgSchErrInfo *errInfo; if(ret == ROK) { /* TODO::Needs to be revisited after tti flow CaDev Start */ - U8 idx = (U8)((instCb->rgrSap[spId].cell->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); + uint8_t idx = (uint8_t)((instCb->rgrSap[spId].cell->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); instCb->cells[idx] = NULLP; /* CaDev End */ instCb->rgrSap[spId].cell = NULLP; @@ -1038,17 +910,7 @@ RgSchErrInfo *errInfo; * File : rg_sch_gom.c * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq -( -RgrCfgReqInfo *rgrCfgReq, -CmLteCellId *cellId -) -#else -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq(rgrCfgReq, cellId) -RgrCfgReqInfo *rgrCfgReq; -CmLteCellId *cellId; -#endif +static S16 rgSCHGomGetCellIdFrmCfgReq(RgrCfgReqInfo *rgrCfgReq,CmLteCellId *cellId) { /* Extract CellId depending on the action and Config Type in the Request @@ -1116,39 +978,21 @@ CmLteCellId *cellId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHGomHndlSiCfg -( -Region reg, -Pool pool, -RgSchCb *instCb, -SpId spId, -RgrCfgTransId transId, -RgrSiCfgReqInfo *cfgReqInfo -) -#else -S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo) -Region reg; -Pool pool; -RgSchCb *instCb; -SpId spId; -RgrCfgTransId transId; -RgrSiCfgReqInfo *cfgReqInfo; -#endif +S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo *cfgReqInfo) { S16 ret; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst ); - RgSchErrInfo errInfo; - U8 cfmStatus = RGR_CFG_CFM_NOK; + RgSchErrInfo errInfo; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; MsgLen msgLen = 0, pduLen; S32 tbSz = 0; - U8 nPrb = 0; - U8 mcs = 0; + uint8_t nPrb = 0; + uint8_t mcs = 0; /* check if cell does not exists */ - if (((U8 *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId)) + if (((uint8_t *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Cell Control block does not exist" ); @@ -1335,7 +1179,7 @@ RgrSiCfgReqInfo *cfgReqInfo; } else /* Initial Si cfg or si recfg where numSi did not change */ { - U8 bitMask; + uint8_t bitMask; /* Initial Si cfg */ if (cell->siCb.crntSiInfo.siInfo[cfgReqInfo->siId-1].si == NULLP) { @@ -1418,7 +1262,6 @@ RgrSiCfgReqInfo *cfgReqInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHGomHndlWarningSiCfg ( Region reg, @@ -1428,31 +1271,21 @@ SpId spId, RgrCfgTransId transId, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo ) -#else -S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, -warningSiCfgReqInfo) -Region reg; -Pool pool; -RgSchCb *instCb; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; -#endif { RgSchCellCb *cell = instCb->rgrSap[spId].cell; - U8 cfmStatus = RGR_CFG_CFM_NOK; - U16 idx; - U8 siId = warningSiCfgReqInfo->siId; - U8 j, mcs=0, nPrb=0; - RgSchWarningSiSeg *warningSiMsg; - RgSchWarningSiPdu *pduNode; - CmLList *node; - MsgLen msgLen = 0; - Bool freeNodeFound = FALSE; - U16 siWinSize = 0; - U16 minPeriod = 0; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; + uint16_t idx; + uint8_t siId = warningSiCfgReqInfo->siId; + uint8_t j, mcs=0, nPrb=0; + RgSchWarningSiSeg *warningSiMsg; + RgSchWarningSiPdu *pduNode; + CmLList *node; + MsgLen msgLen = 0; + Bool freeNodeFound = FALSE; + uint16_t siWinSize = 0; + uint16_t minPeriod = 0; #ifdef EMTC_ENABLE - U8 isEmtc = warningSiCfgReqInfo->emtcEnable; + uint8_t isEmtc = warningSiCfgReqInfo->emtcEnable; #endif #ifdef EMTC_ENABLE @@ -1467,7 +1300,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; minPeriod = cell->siCfg.minPeriodicity; } /* check if cell does not exists */ - if (((U8 *)cell == NULLP) || + if (((uint8_t *)cell == NULLP) || (cell->cellId != warningSiCfgReqInfo->cellId) || (warningSiCfgReqInfo->siId > ((minPeriod * 10)/siWinSize))) @@ -1613,28 +1446,10 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; * @param[in] SpId siId * @return void **/ -#ifdef ANSI -Void rgSCHGomHndlWarningSiStopReq -( -Region reg, -Pool pool, -RgSchCb *instCb, -U8 siId, -RgrCfgTransId transId, -SpId spId -) -#else -Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId) -Region reg; -Pool pool; -RgSchCb *instCb; -U8 siId; -RgrCfgTransId transId; -SpId spId; -#endif +Void rgSCHGomHndlWarningSiStopReq(Region reg,Pool pool,RgSchCb *instCb,uint8_t siId,RgrCfgTransId transId,SpId spId) { RgSchCellCb *cell = instCb->rgrSap[spId].cell; - U16 idx; + uint16_t idx; CmLList *node; RgSchWarningSiPdu *warningSiPdu; Buffer *pdu; @@ -1643,8 +1458,8 @@ SpId spId; { if(cell->siCb.warningSi[idx].siId == siId) { - if ((cmMemcmp ((U8 *)&cell->siCb.warningSi[idx].warningSiMsg.transId, - (U8 *)&transId, sizeof(RgrCfgTransId))) == 0) + if ((cmMemcmp ((uint8_t *)&cell->siCb.warningSi[idx].warningSiMsg.transId, + (uint8_t *)&transId, sizeof(RgrCfgTransId))) == 0) { /* ccpu00136659: CMAS ETWS design changes */ CM_LLIST_FIRST_NODE(&cell->siCb.warningSi[idx].warningSiMsg.segLstCp, node); @@ -1664,7 +1479,7 @@ SpId spId; } } } - RETVOID; + return; } #endif/*RGR_SI_SCH */ @@ -1685,20 +1500,7 @@ SpId spId; * @return S16 * **/ -#ifdef ANSI -S16 rgSchUpdtRNTPInfo -( - RgSchCellCb *cell, - RgSchDlSf *sf, - RgrLoadInfReqInfo *loadInfReq - ) -#else -PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) - RgSchCellCb *cell; - RgSchDlSf *sf; - RgrLoadInfReqInfo *loadInfReq; - -#endif +S16 rgSchUpdtRNTPInfo(RgSchCellCb *cell,RgSchDlSf *sf,RgrLoadInfReqInfo *loadInfReq) { /* Initialise the variables */ RgSchSFRPoolInfo *sfrCCPool; @@ -1750,34 +1552,16 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHGomHndlLoadInf -( - Region reg, - Pool pool, - RgSchCb *instCb, - SpId spId, - RgrCfgTransId transId, - RgrLoadInfReqInfo *loadInfReq - ) -#else -S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) - Region reg; - Pool pool; - RgSchCb *instCb; - SpId spId; - RgrCfgTransId transId; - RgrLoadInfReqInfo *loadInfReq; -#endif +S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrLoadInfReqInfo *loadInfReq) { S16 ret; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst ); RgSchErrInfo errInfo; - U16 i; + uint16_t i; /* check if cell does not exists */ - if (((U8 *)cell == NULLP) || (cell->cellId != loadInfReq->cellId)) + if (((uint8_t *)cell == NULLP) || (cell->cellId != loadInfReq->cellId)) { RLOG_ARG1(L_ERROR,DBG_CELLID,loadInfReq->cellId,"Cell Control block does not exist" "for load cellId:%d",loadInfReq->cellId);