U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrmac / rg_dhm.c

diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c
index e8cdacf..87b9d1c 100755 (executable)
--- a/src/5gnrmac/rg_dhm.c
+++ b/src/5gnrmac/rg_dhm.c
@@ -84,7 +84,7 @@ PRIVATE Void rgDHMBldTfuDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgDlHqProcC
 S16 rgDHMFreeHqProcTB
 (
 RgDlHqProcCb         *hqP,
-U8                   tbIndex
+uint8_t              tbIndex
 );
 
 #endif
@@ -116,16 +116,16 @@ S16 rgDHMHqEntInit
 (
 Inst               inst,
 RgDlHqEnt          *hqE,
-U8                 maxHqProcs
+uint8_t            maxHqProcs
 )
 #else
 S16 rgDHMHqEntInit(inst,hqE, maxHqProcs)
 Inst               inst,
 RgDlHqEnt          *hqE;
-U8                 maxHqProcs;
+uint8_t            maxHqProcs;
 #endif
 {
-   U8 idx1,idx2;
+   uint8_t idx1,idx2;
 #ifdef L2_OPTMZ
    Buffer  *hdrDBuf = NULLP;
    Buffer  *ceDBuf = NULLP;
@@ -207,7 +207,7 @@ RgCellCb *cell;
 RgDlHqEnt          *hqE;
 #endif
 {
-   U8       i = 0;
+   uint8_t       i = 0;
 
    if(hqE->procs[0])
    {
@@ -222,7 +222,7 @@ RgDlHqEnt          *hqE;
 #endif
       }
    }
-   RETVOID;
+   return;
 } /* rgDHMUeReset*/
 
 /**
@@ -267,7 +267,7 @@ Inst inst;
    {
       RG_FREE_MSG(*mBuf);
    }
-   RETVOID;
+   return;
 }
 /**
  * @brief This function is called to release the 
@@ -298,8 +298,8 @@ Inst inst;
 #endif
 {
    RgCb *rgCbP = &rgCb[inst];
-   U8 start = rgCbP->bufCnt;
-   U8 end = 0;
+   uint8_t start = rgCbP->bufCnt;
+   uint8_t end = 0;
 
    if (rgCbP->bufCnt < RG_MAX_FREE_BUFS_PERTTI)
    {
@@ -315,7 +315,7 @@ Inst inst;
       SPutMsg(rgCbP->bufToFree[start]);
    }
    rgCbP->bufCnt = end;
-   RETVOID;
+   return;
 } /* rgDHMFreeTbBufs */
 
 #ifdef ANSI
@@ -329,8 +329,8 @@ Inst inst;
 #endif
 {
    RgCb *rgCbP = &rgCb[inst];
-   U8 start = rgCbP->bufCnt;
-   U8 end = 0;
+   uint8_t start = rgCbP->bufCnt;
+   uint8_t end = 0;
 
    while (start != end)
    {
@@ -338,7 +338,7 @@ Inst inst;
       SPutMsg(rgCbP->bufToFree[start]);
    }
    rgCbP->bufCnt = end;
-   RETVOID;
+   return;
 } /* rgDHMFreeTbBufs */
 
 
@@ -363,19 +363,19 @@ S16 rgDHMRlsHqProcTB
 (
 RgCellCb             *cell,
 RgDlHqProcCb         *hqP,
-U8                   tbIndex
+uint8_t              tbIndex
 )
 #else
 S16 rgDHMRlsHqProcTB(cell, hqP, tbIndex)
 RgCellCb             *cell;
 RgDlHqProcCb         *hqP;
-U8                   tbIndex;
+uint8_t              tbIndex;
 #endif
 {
-    U8                    idx;
+    uint8_t          idx;
 #ifdef L2_OPTMZ
     RgTfuDatReqTbInfo     *tb;   /* TB to be sent to CL/PHY*/
-   // U32 lchIdx, pduIdx;
+   // uint32_t lchIdx, pduIdx;
 #endif
 
    if((tbIndex > RG_MAX_TB_PER_UE) ||
@@ -440,7 +440,7 @@ U8                   tbIndex;
  *     Invoked by: ROM
  *     
  *  @param[in]  RgUeCb        *ue
- *  @param[in]  U8            idx
+ *  @param[in]  uint8_t            idx
  *  @param[in]  RgDlHqProc    **hqP
  *  @return  S16       
  *         -#   ROK     if successful
@@ -451,13 +451,13 @@ U8                   tbIndex;
 S16 rgDHMGetHqProcFrmId
 (
 RgUeCb               *ue,
-U8                   idx,
+uint8_t              idx,
 RgDlHqProcCb         **hqP
 )
 #else
 S16 rgDHMGetHqProcFrmId(ue, idx, hqP)
 RgUeCb               *ue;
-U8                   idx;
+uint8_t              idx;
 RgDlHqProcCb         **hqP;
 #endif
 {
@@ -467,7 +467,7 @@ RgDlHqProcCb         **hqP;
    return ROK;
 } /* rgDHMGetHqProcFrmId */
 
-/*PRIVATE U32 dataAvl; */
+/*PRIVATE uint32_t dataAvl; */
 /**
  * @brief Handler for sending data to PHY
  *
@@ -505,8 +505,8 @@ RgDlHqProcCb    *hqP;
 RgErrInfo       *err;
 #endif
 {
-   U8 i;
-   Inst               inst = cellCb->macInst - RG_INST_START;
+   uint8_t i;
+   Inst    inst = cellCb->macInst - RG_INST_START;
    RgTfuDatReqPduInfo   *datReq;
    RgBldPduInfo      bldPdu;
    /*Added this variable to figure out that whether this UE data
@@ -688,16 +688,17 @@ RgDlSf            *dlSf;
 RgErrInfo      *err;
 #endif
 {
-//   U32            len;
-   U8             i;
-   U8             j;
+//   uint32_t            len;
+   uint8_t        i;
+   uint8_t        j;
    RgBldPduInfo   bldPdu;
-   U8             tbIndex;
+   uint8_t        tbIndex;
 #ifdef L2_OPTMZ
    RgTfuDatReqTbInfo     *tb;
 #endif
 
-   tbIndex = (U8)(datReq->transId & 0x03);
+
+   tbIndex = (uint8_t)(datReq->transId & 0x03);
    /* Accept all the data requests even if delayed in case nothing
     * has been sent earlier on the harq proc.
     */
@@ -711,7 +712,7 @@ RgErrInfo      *err;
          {
             j++;
          } 
-         rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1));
+         rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (uint8_t)(j+1));
       }
       return RFAILED;
    }
@@ -734,7 +735,7 @@ RgErrInfo      *err;
             {
                j++;
             }
-            rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1));
+            rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (uint8_t)(j+1));
             printf("\nrgDHMHndlDedDatReq:: hqP %p \n", (Void *)hqProc);
          }
          return RFAILED;
@@ -783,7 +784,7 @@ RgErrInfo      *err;
             {
                j++;
             }
-            rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1));
+            rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (uint8_t)(j+1));
          }
          return RFAILED;
       }
@@ -912,10 +913,10 @@ RgErrInfo       *err;
 #endif
 {
    SuId            rguDlSpId;/*need to use spID instead of suID*/
-   U8              idx;
-   U8              ueIdx;
-   U8              lcIdx;
-   U8              tbIndex=0,idx1;
+   uint8_t         idx;
+   uint8_t         ueIdx;
+   uint8_t         lcIdx;
+   uint8_t         tbIndex=0,idx1;
    RgDlSf          *dlSf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
    Inst            inst = cell->macInst - RG_INST_START;
 //   Bool            isDStaReqrd = FALSE;
@@ -926,8 +927,8 @@ RgErrInfo       *err;
    RgUeCb         *ue;
    RgDlHqProcCb   *hqP;
    RgInfUeAlloc   *allocInfo;
-   U8             activeSapCnt = 0;
-   U8             staIndCnt    = 0;
+   uint8_t        activeSapCnt = 0;
+   uint8_t        staIndCnt    = 0;
 #ifdef LTE_ADV
    Bool           hqPAdded     = FALSE;
 #endif
@@ -1260,7 +1261,7 @@ RgErrInfo       *err;
  *  @return     Void
  *              None 
  **/
-//U8 crashFlag = 0;
+//uint8_t crashFlag = 0;
 #ifdef ANSI
 PRIVATE Void rgDHMBldTfuDatReq
 (
@@ -1286,10 +1287,10 @@ RgTfuDatReqPduInfo *datReq;
 #endif
 #endif
 
-   U8 i;
+   uint8_t i;
 
 #ifdef L2_OPTMZ
-   U32 lchIdx, pduIdx;
+   uint32_t lchIdx, pduIdx;
 #endif
  
    datReq->nmbOfTBs = 0;
@@ -1409,7 +1410,7 @@ RgTfuDatReqPduInfo *datReq;
          datReq->nmbOfTBs++;
       }
    }
-   RETVOID;
+   return;
 }  /* rgDHMBldTfuDatReq */
 
 
@@ -1434,16 +1435,16 @@ RgTfuDatReqPduInfo *datReq;
 S16 rgDHMFreeHqProcTB
 (
 RgDlHqProcCb         *hqP,
-U8                   tbIndex
+uint8_t              tbIndex
 )
 #else
 S16 rgDHMFreeHqProcTB(hqP, tbIndex)
 RgDlHqProcCb         *hqP;
-U8                   tbIndex;
+uint8_t              tbIndex;
 #endif
 {
    RgTfuDatReqTbInfo     *tb;   /* TB to be sent to CL/PHY*/
-   U8                    idx;
+   uint8_t               idx;
 
    if((tbIndex > RG_MAX_TB_PER_UE) ||
       (tbIndex == 0))
@@ -1499,7 +1500,7 @@ Inst               inst;
 RgDlHqEnt          *hqE;
 #endif
 {
-   U8             i;
+   uint8_t             i;
 
    if(hqE->procs)
    {
@@ -1524,7 +1525,7 @@ RgDlHqEnt          *hqE;
                             assignment */
    }
 
-   RETVOID;
+   return;
 
 }  /* rgDHMFreeUe */
 /**
@@ -1581,7 +1582,7 @@ RgInfResetHqEnt*     hqEntInfo;
 
    return ROK;
 }
-U32 gSaveVal;
+uint32_t gSaveVal;
 \f
 /**
  * @brief Function for handling RaResp request received from scheduler to MAC
@@ -1618,13 +1619,13 @@ RgInfRlsHqInfo      *rlshqUeInfo;
    RgCellCb       *cell = NULLP;
    RgUeCb         *ue;
    RgDlHqProcCb   *hqP;
-   U8             idx1,idx2;
+   uint8_t        idx1,idx2;
 #ifdef LTE_L2_MEAS
-   U8                tbId;
+   uint8_t           tbId;
    RguHarqStatusInd  hqStaInd;
    Bool              isValidTbId = FALSE;
 #endif
-   U32        startTime=0;
+   uint32_t        startTime=0;
    
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;