U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrsch / rg_sch_dbm.c

diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c
index 863d1f0..212a49d 100755 (executable)
--- a/src/5gnrsch/rg_sch_dbm.c
+++ b/src/5gnrsch/rg_sch_dbm.c
@@ -58,15 +58,15 @@ static int RLOG_MODULE_ID=4096;
 
 
 /* local defines */
-PRIVATE S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, U16 numBins));
+PRIVATE S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins));
 #ifdef LTE_TDD
-PRIVATE S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, U16 numBins));
+PRIVATE S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins));
 #endif
 PRIVATE Void rgSCHDbmInitDedLcLst ARGS((RgSchUeCb *ueCb));
 PRIVATE Void rgSCHDbmInitCmnLcLst ARGS((RgSchCellCb *cellCb));
 #ifdef LTEMAC_SPS
 PRIVATE S16 rgSCHDbmInitSpsUeCbLst ARGS((RgSchCellCb *cellCb,
-                      U16 numBins));
+                      uint16_t numBins));
 #endif
 PRIVATE Void rgSCHDbmInitRaCbLst ARGS(( RgSchCellCb *cellCb));
 #ifndef LTE_TDD
@@ -169,19 +169,19 @@ RgSchCellCb       *cellCb;
 PRIVATE S16 rgSCHDbmInitUeCbLst
 (
 RgSchCellCb    *cellCb,
-U16            numBins
+uint16_t            numBins
 )
 #else
 PRIVATE S16 rgSCHDbmInitUeCbLst(cellCb, numBins)
 RgSchCellCb    *cellCb;
-U16            numBins;
+uint16_t            numBins;
 #endif
 {
    RgSchUeCellInfo ueCellInfo;
 
    /* Fix: syed It is better to compute offset dynamically
     * rather than hardcoding it as 0 */      
-   return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, 
+   return (cmHashListInit(&cellCb->ueLst, numBins, (uint16_t)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, 
                CM_HASH_KEYTYPE_CONID,
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool));
@@ -235,17 +235,17 @@ RgSchCellCb       *cellCb;
 PRIVATE S16 rgSCHDbmInitSpsUeCbLst
 (
 RgSchCellCb       *cellCb,
-U16               numBins
+uint16_t               numBins
 )
 #else
 PRIVATE S16 rgSCHDbmInitSpsUeCbLst(cellCb, numBins)
 RgSchCellCb       *cellCb;
-U16               numBins;
+uint16_t               numBins;
 #endif
 {
    RgSchUeCb 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,
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool));
@@ -313,7 +313,7 @@ RgSchUeCb         *ueCb;
    ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]];
 
    return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, 
-      (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId)));
+      (uint8_t *)&ueCb->ueId, (uint16_t)sizeof(ueCb->ueId)));
 
 }  /* rgSCHDbmInsUeCb */
 
@@ -345,7 +345,7 @@ RgSchUeCb         *ueCb;
 #endif
 {
    return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
-      (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti)));
+      (uint8_t *)&ueCb->spsRnti, (uint16_t)sizeof(ueCb->spsRnti)));
 
 }  /* end of rgSCHDbmInsSpsUeCb */
 
@@ -378,7 +378,7 @@ CmLteRnti      ueId;
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
 
-   cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
+   cmHashListFind(&cellCb->ueLst, (uint8_t *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCellInfo);
 
    return (!ueCellInfo?NULLP:ueCellInfo->ue);
@@ -412,7 +412,7 @@ CmLteRnti         spsRnti;
 {
    RgSchUeCb *ueCb = NULLP; 
 
-   cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
+   cmHashListFind(&cellCb->spsUeLst, (uint8_t *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
    return (ueCb);
 }  /* rgSCHDbmGetSpsUeCb */
@@ -518,7 +518,7 @@ RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
-   U8 lcCnt = 0;
+   uint8_t lcCnt = 0;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 
    ueUl->hqEnt.numBusyHqProcs = 0;
@@ -675,7 +675,7 @@ PRIVATE Void rgSCHDbmInitDedLcLst(ueCb)
 RgSchUeCb       *ueCb;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    
    for (idx = 0; idx < RGSCH_MAX_LC_PER_UE; ++idx)
    {
@@ -685,7 +685,7 @@ RgSchUeCb       *ueCb;
    }
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
   
 
 } /* rgSCHDbmInitDedLcLst */
@@ -715,7 +715,7 @@ PRIVATE Void rgSCHDbmInitCmnLcLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    
    for (idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++)
    {
@@ -723,7 +723,7 @@ RgSchCellCb       *cellCb;
    }
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 } /* rgSCHDbmInitCmnLcLst */
 
@@ -799,7 +799,7 @@ RgSchDlLcCb       *dlLcCb;
    ueCb->dl.lcCb[dlLcCb->lcId - 1] = NULLP;
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgSCHDbmDelDlDedLcCb */
 
@@ -857,7 +857,7 @@ RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(ueCb)
 RgSchUeCb         *ueCb; 
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    
    for(idx = 0; idx < RGSCH_DEDLC_MAX_LCID; idx++)
    {
@@ -893,7 +893,7 @@ RgSchUeCb         *ueCb;
 RgSchDlLcCb       *lcCb;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    if (!lcCb)
    {
@@ -935,7 +935,7 @@ RgSchCellCb       *cellCb;
 CmLteLcId         lcId;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    for(idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++)
    {
@@ -1095,7 +1095,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
    cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].boLst = cmnDlLcCb->boLst;
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgSCHDbmInsBcchOnBch */
 
@@ -1137,7 +1137,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
    }
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgSCHDbmInsBcchOnDlsch */
 
@@ -1170,7 +1170,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
    cellCb->cmnLcCb[RGSCH_PCCH_IDX].boLst = cmnDlLcCb->boLst;
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgSCHDbmInsPcch */
 
@@ -1197,7 +1197,7 @@ RgSchClcDlLcCb       *cmnDlLcCb;
 {
 
    cmLListInit(&cmnDlLcCb->boLst);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInitCmnLcBoLst */
 
 /**
@@ -1228,7 +1228,7 @@ RgSchClcBoRpt     *cmnBoRpt;
    cmnBoRpt->boLstEnt.prev = NULLP;
    cmnBoRpt->boLstEnt.node = (PTR)cmnBoRpt;
    cmLListAdd2Tail(&cmnDlLcCb->boLst, &cmnBoRpt->boLstEnt);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInsCmnLcBoRpt */
 
 
@@ -1255,7 +1255,7 @@ RgSchCellCb       *cellCb;
 {
 
    cmLListInit(&cellCb->raInfo.raCbLst);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInitRaCbLst */
 
 
@@ -1319,7 +1319,7 @@ PRIVATE Void rgSCHDbmInitRaReqLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    /* ccpu00133557- Memory Leak Fix- initializing for the all nodes 
     * in RAREQ list*/
@@ -1327,7 +1327,7 @@ RgSchCellCb       *cellCb;
    {
       cmLListInit(&cellCb->raInfo.raReqLst[idx]);
    }
-   RETVOID;
+   return;
 }  /* rgSCHDbmInitRaReqLst */
 #endif
 
@@ -1354,7 +1354,7 @@ RgSchCellCb       *cellCb;
 {
 
    cmLListInit(&cellCb->rgCfgInfo.crntRgrCfgLst);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInitCrntRgrCfgLst */
 
 /**
@@ -1380,7 +1380,7 @@ RgSchCellCb       *cellCb;
 {
 
    cmLListInit(&cellCb->rgCfgInfo.pndngRgrCfgLst);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInitPndngRgrCfgLst */
 
 /**
@@ -1410,7 +1410,7 @@ RgSchCfgElem      *cfgElem;
    cfgElem->cfgReqLstEnt.next = NULLP;
    cfgElem->cfgReqLstEnt.prev = NULLP;
    cmLListAdd2Tail(&cellCb->rgCfgInfo.crntRgrCfgLst, &cfgElem->cfgReqLstEnt);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInsCrntRgrCfgElem */
 
 /**
@@ -1442,7 +1442,7 @@ RgSchCfgElem      *cfgElem;
    cfgElem->cfgReqLstEnt.prev = NULLP;
    cfgElem->cfgReqLstEnt.node = (PTR)cfgElem;
    cmLListAdd2Tail(&cellCb->rgCfgInfo.pndngRgrCfgLst, &cfgElem->cfgReqLstEnt);
-   RETVOID;
+   return;
 }  /* rgSCHDbmInsPndngRgrCfgElem */
 
 /**
@@ -1634,17 +1634,17 @@ RgSchCfgElem      *cfgElem;
 S16 rgSCHDbmRntiDbInit
 (
 RgSchCellCb       *cellCb,
-U16            rntiStart,
-U16            maxRntis
+uint16_t            rntiStart,
+uint16_t            maxRntis
 )
 #else
 S16 rgSCHDbmRntiDbInit(cellCb, rntiStart, maxRntis)
 RgSchCellCb       *cellCb;
-U16            rntiStart;
-U16            maxRntis;
+uint16_t            rntiStart;
+uint16_t            maxRntis;
 #endif
 {
-   U16 rnti;
+   uint16_t rnti;
    RgSchRntiLnk   *rntiPool;
 
    /* Fix for Change Request ccpu00099150 */
@@ -1669,7 +1669,7 @@ U16            maxRntis;
    }
    else
    {
-      U16 idx;
+      uint16_t idx;
       rntiPool[0].rnti = rnti++;
       rntiPool[0].prv = NULLP;
       rntiPool[0].nxt = &rntiPool[1];
@@ -1719,7 +1719,7 @@ RgSchCellCb       *cellCb;
    cmLListInit(&cellCb->rntiDb.rntiGuardPool);
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 } /* rgSCHDbmRntiDbDeInit */
 
@@ -1802,7 +1802,7 @@ RgSchRntiLnk      *rntiLnk;
 #ifdef EMTC_ENABLE
       if(ROK==rgSCHDbmPutEmtcRnti(cellCb,rntiLnk))
 {      
-RETVOID;
+return;
 }
 #endif
    rntiLnk->nxt = NULLP;
@@ -1821,7 +1821,7 @@ RETVOID;
    cellCb->rntiDb.count++;
 
    /* Stack Crash problems for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 } /* rgSCHDbmRlsRnti */
 
@@ -1844,19 +1844,19 @@ RETVOID;
 PRIVATE S16 rgSCHDbmInitUeTfuPendLst
 (
 RgSchCellCb    *cellCb,
-U16            numBins
+uint16_t            numBins
 )
 #else
 PRIVATE S16 rgSCHDbmInitUeTfuPendLst(cellCb, numBins)
 RgSchCellCb    *cellCb;
-U16            numBins;
+uint16_t            numBins;
 #endif
 {
    RgSchUePucchRecpInfo pucchInfo;
 
    /* Fix: syed It is better to compute offset dynamically
     * rather than hardcoding it as 0 */      
-   if(cmHashListInit(&cellCb->ueTfuPendLst, numBins, (U16)((PTR)&(pucchInfo.hashLstEnt) - (PTR)&pucchInfo), FALSE, 
+   if(cmHashListInit(&cellCb->ueTfuPendLst, numBins, (uint16_t)((PTR)&(pucchInfo.hashLstEnt) - (PTR)&pucchInfo), FALSE, 
                CM_HASH_KEYTYPE_CONID,
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool) != ROK)