X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dbm.c;h=da8d94586162369099521e80fefd8f8277f8eda1;hb=9634ca974c4418c0800090e33d37ef1fe7e8cb30;hp=78d1c219f690f1763f6396e71e9f7330d70985fd;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c index 78d1c219f..da8d94586 100755 --- a/src/5gnrmac/rg_dbm.c +++ b/src/5gnrmac/rg_dbm.c @@ -53,14 +53,14 @@ #include "rg.x" /* local defines */ -PRIVATE S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, U16 numBins)); -PRIVATE Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb)); -PRIVATE Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb)); -PRIVATE Void rgDBMInitRachLst ARGS((RgCellCb *cellCb)); +static S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, uint16_t numBins)); +static Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb)); +static Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb)); +static Void rgDBMInitRachLst ARGS((RgCellCb *cellCb)); #ifdef LTEMAC_SPS -PRIVATE S16 rgDBMInitSpsUeCbLst ARGS(( +static S16 rgDBMInitSpsUeCbLst ARGS(( RgCellCb *cellCb, -U16 numBins +uint16_t numBins )); #endif @@ -133,21 +133,21 @@ RgCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDBMInitUeCbLst +static S16 rgDBMInitUeCbLst ( RgCellCb *cellCb, -U16 numBins +uint16_t numBins ) #else -PRIVATE S16 rgDBMInitUeCbLst(cellCb, numBins) +static S16 rgDBMInitUeCbLst(cellCb, numBins) RgCellCb *cellCb; -U16 numBins; +uint16_t numBins; #endif { Inst inst = cellCb->macInst - RG_INST_START; RgUeCb ue; - return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, + return (cmHashListInit(&cellCb->ueLst, numBins, (uint16_t)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); } /* rgDBMInitUeCbLst */ @@ -196,21 +196,21 @@ RgCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDBMInitSpsUeCbLst +static S16 rgDBMInitSpsUeCbLst ( RgCellCb *cellCb, -U16 numBins +uint16_t numBins ) #else -PRIVATE S16 rgDBMInitSpsUeCbLst(cellCb, numBins) +static S16 rgDBMInitSpsUeCbLst(cellCb, numBins) RgCellCb *cellCb; -U16 numBins; +uint16_t numBins; #endif { Inst inst = cellCb->macInst - RG_INST_START; RgUeCb ue; - return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, + return (cmHashListInit(&cellCb->spsUeLst, numBins, (uint16_t) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); } /* rgDBMInitSpsUeCbLst */ @@ -272,7 +272,7 @@ RgUeCb *ueCb; #endif { return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, - (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId))); + (uint8_t *)&ueCb->ueId, (uint16_t)sizeof(ueCb->ueId))); } /* rgDBMInsUeCb */ @@ -305,7 +305,7 @@ RgUeCb *ueCb; { return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, - (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); + (uint8_t *)&ueCb->spsRnti, (uint16_t)sizeof(ueCb->spsRnti))); } /* end of rgDBMInsSpsUeCb */ @@ -338,7 +338,7 @@ CmLteRnti ueId; { RgUeCb *ueCb = NULLP; - cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, + cmHashListFind(&cellCb->ueLst, (uint8_t *)&ueId, sizeof(ueId), 0, (PTR *)&ueCb); return (ueCb); } /* rgDBMGetUeCb */ @@ -371,7 +371,7 @@ CmLteRnti spsRnti; { RgUeCb *ueCb = NULLP; - cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, + cmHashListFind(&cellCb->spsUeLst, (uint8_t *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); return (ueCb); } /* rgDBMGetSpsUeCb */ @@ -534,7 +534,7 @@ RgUeCb *ueCb; #endif { #ifdef LTEMAC_SPS - U8 idx; + uint8_t idx; #endif /* Initialize Dedicated logical channels */ @@ -549,7 +549,7 @@ RgUeCb *ueCb; #endif - RETVOID; + return; } /* rgDBMInitUe */ /** @@ -565,16 +565,16 @@ RgUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitDedLcLst +static Void rgDBMInitDedLcLst ( RgUeCb *ueCb ) #else -PRIVATE Void rgDBMInitDedLcLst(ueCb) +static Void rgDBMInitDedLcLst(ueCb) RgUeCb *ueCb; #endif { - U8 idx; + uint8_t idx; for (idx = 0; idx < RG_MAX_LC_PER_UE; ++idx) { @@ -592,7 +592,7 @@ RgUeCb *ueCb; } /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInitDedLcLst */ /** @@ -611,16 +611,16 @@ RgUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitCmnLcLst +static Void rgDBMInitCmnLcLst ( RgCellCb *cellCb ) #else -PRIVATE Void rgDBMInitCmnLcLst(cellCb) +static Void rgDBMInitCmnLcLst(cellCb) RgCellCb *cellCb; #endif { - U8 idx; + uint8_t idx; cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID; cellCb->pcchInfo.lcId = RG_INVALID_LC_ID; @@ -633,7 +633,7 @@ RgCellCb *cellCb; } /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInitCmnLcLst */ /** @@ -661,7 +661,7 @@ Void rgDBMFreeCmnLcLst(cellCb) RgCellCb *cellCb; #endif { - U8 idx; + uint8_t idx; cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID; cellCb->pcchInfo.lcId = RG_INVALID_LC_ID; @@ -674,7 +674,7 @@ RgCellCb *cellCb; cellCb->numBcchDlschInfo = 0; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMFreeCmnLcLst */ /** @@ -705,7 +705,7 @@ CmLteLcId idx; ueCb->dl.lcCb[idx-1].lcId = idx; } /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInsDlDedLcCb */ /** @@ -734,7 +734,7 @@ RgDlLcCb *dlLcCb; ueCb->dl.lcCb[dlLcCb->lcId - 1].lcId = RG_INVALID_LC_ID; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMDelDlDedLcCb */ @@ -795,14 +795,14 @@ Void rgDBMInsUlDedLcCb RgUeCb *ueCb, CmLteLcId idx, LteLcgId gId, -U8 qci +uint8_t qci ) #else Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci) RgUeCb *ueCb; CmLteLcId idx; LteLcgId gId; -U8 qci; +uint8_t qci; #endif #else #ifdef ANSI @@ -836,7 +836,7 @@ LteLcgId gId; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInsUlDedLcCb */ @@ -882,7 +882,7 @@ LteLcgId gId; ueCb->ul.lcgArr[gId].lcCount = ueCb->ul.lcgArr[gId].lcCount + 1; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMUpdUlDedLcCb */ /** @@ -920,7 +920,7 @@ RgUlLcCb *ulLcCb; ueCb->ul.lcCb[ulLcCb->lcId - 1].lcId = RG_INVALID_LC_ID; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMDelUlDedLcCb */ /** @@ -988,7 +988,7 @@ RgCellCb *cellCb; CmLteLcId lcId; #endif { - U8 idx; + uint8_t idx; if(cellCb->bcchBchInfo.lcId == lcId) { @@ -1064,7 +1064,7 @@ RgCellCb *cellCb; CmLteLcId lcId; #endif { - U8 idx; + uint8_t idx; for (idx = 0; idx < RG_MAX_BCCH_DLSCH; idx++) { @@ -1133,7 +1133,7 @@ CmLteLcId idx; cellCb->bcchBchInfo.lcId = idx; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInsBcchOnBch */ /** @@ -1165,7 +1165,7 @@ CmLteLcId idx; cellCb->numBcchDlschInfo++; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInsBcchOnDlsch */ @@ -1196,7 +1196,7 @@ CmLteLcId idx; cellCb->pcchInfo.lcId = idx; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgDBMInsPcch */ /** @@ -1211,18 +1211,18 @@ CmLteLcId idx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitRachLst +static Void rgDBMInitRachLst ( RgCellCb *cellCb ) #else -PRIVATE Void rgDBMInitRachLst(cellCb) +static Void rgDBMInitRachLst(cellCb) RgCellCb *cellCb; #endif { cmLListInit(&cellCb->raInfo.ueRachLst); - RETVOID; + return; } /* rgDBMInitRachLst */ /** @@ -1252,7 +1252,7 @@ RgUeCb *ueCb; cmLListAdd2Tail(&cellCb->raInfo.ueRachLst,&ueCb->rachLstEnt); - RETVOID; + return; } /* rgDBMInsUeCbInRachLst */ /** @@ -1353,7 +1353,7 @@ RgUeCb *ueCb; { cmLListDelFrm(&cellCb->raInfo.ueRachLst, &ueCb->rachLstEnt); - RETVOID; + return; } /* rgDBMDelUeCbFromRachLst */ /**********************************************************************