U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrrlc / kw_dbm_dl.c

diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c
index f051b7c..1234002 100755 (executable)
--- a/src/5gnrrlc/kw_dbm_dl.c
+++ b/src/5gnrrlc/kw_dbm_dl.c
@@ -75,7 +75,7 @@ static int RLOG_FILE_ID=193;
 
 
 #ifdef TENB_STATS
-EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti);
+EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti);
 #endif
 /** 
  * @file gp_dbm_dl.c
@@ -104,14 +104,13 @@ S16 rlcDbmDlInit(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcDbmDlInit)
 
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), 
-                            (U16) RLC_UE_LIST_BUCKET_SIZE,
-                            (U16) 0, 
+                            (uint16_t) RLC_UE_LIST_BUCKET_SIZE,
+                            (uint16_t) 0, 
                             (Bool) FALSE, 
-                            (U16) CM_HASH_KEYTYPE_CONID,
+                            (uint16_t) CM_HASH_KEYTYPE_CONID,
                             RLC_GET_MEM_REGION(gCb), 
                             RLC_GET_MEM_POOL(gCb)))
    {   
@@ -121,10 +120,10 @@ RlcCb *gCb;
 
    /* Initialize cellCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.dlCb->cellLstCp), 
-                            (U16) RLC_CELL_LIST_BUCKET_SIZE,
-                            (U16) 0, 
+                            (uint16_t) RLC_CELL_LIST_BUCKET_SIZE,
+                            (uint16_t) 0, 
                             (Bool) FALSE, 
-                            (U16) CM_HASH_KEYTYPE_CONID,
+                            (uint16_t) CM_HASH_KEYTYPE_CONID,
                             RLC_GET_MEM_REGION(gCb), 
                             RLC_GET_MEM_POOL(gCb)))
    {
@@ -137,10 +136,10 @@ RlcCb *gCb;
 #ifdef LTE_L2_MEAS_RLC
    /* Initialize qcI Hash List */
    if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.qciHlCp), 
-                            (U16) RLC_QCI_LIST_BUCKET_SIZE,
-                            (U16) 0, 
+                            (uint16_t) RLC_QCI_LIST_BUCKET_SIZE,
+                            (uint16_t) 0, 
                             (Bool) TRUE, 
-                            (U16) CM_HASH_KEYTYPE_DEF,
+                            (uint16_t) CM_HASH_KEYTYPE_DEF,
                             rlcCb.init.region, 
                             rlcCb.init.pool))
    {
@@ -152,10 +151,10 @@ RlcCb *gCb;
    
    /* Initialize tbHlCp Hash List */
    if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.tbHlCp), 
-                            (U16) RLC_TB_LIST_BUCKET_SIZE,
-                            (U16) 0, 
+                            (uint16_t) RLC_TB_LIST_BUCKET_SIZE,
+                            (uint16_t) 0, 
                             (Bool) FALSE, 
-                            (U16) CM_HASH_KEYTYPE_DEF,
+                            (uint16_t) CM_HASH_KEYTYPE_DEF,
                             rlcCb.init.region, 
                             rlcCb.init.pool))
    {
@@ -188,7 +187,6 @@ Void rlcDbmDlDeInit(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcDbmDlDeInit);
 
 
    /* De Initialize ueCb Hash List */
@@ -207,7 +205,7 @@ RlcCb *gCb;
    
 #endif /* LTE_L2_MEAS */
 
-   RETVOID;
+   return;
 } /* rlcDbmDlDeInit */
 
 \f
@@ -342,18 +340,16 @@ Void rlcDbmDelAllDlRb
 (
 RlcCb       *gCb,
 RlcDlRbCb   **rbCbLst,
-U8         numRbCb 
+uint8_t     numRbCb 
 )
 #else
 Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
 RlcCb       *gCb;
 RlcDlRbCb   **rbCbLst;
-U8         numRbCb;   
+uint8_t     numRbCb;   
 #endif
 {
-   U32 idx;
-
-   TRC3(rlcDbmDelAllDlRb)
+   uint32_t idx;
 
 
    for (idx = 0; idx < numRbCb; idx++)
@@ -384,7 +380,7 @@ U8         numRbCb;
 
    }
 
-   RETVOID;
+   return;
 } /* rlcDbmDelAllDlRb */
 
 \f
@@ -423,9 +419,6 @@ RlcDlUeCb      **ueCb;
 {
    RlcDlUeCb *tUeCb;        
 
-   TRC3(rlcDbmCreateDlUeCb)
-
-
    RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -444,8 +437,8 @@ RlcDlUeCb      **ueCb;
 
    if (ROK != cmHashListInsert(&(gCb->u.dlCb->ueLstCp), 
                                (PTR)tUeCb, 
-                               (U8 *)&(tUeCb->ueId),
-                               (U16) sizeof(CmLteRnti)))
+                               (uint8_t *)&(tUeCb->ueId),
+                               (uint16_t) sizeof(CmLteRnti)))
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
             "UeId[%u] HashList Insertion Failed",
@@ -515,8 +508,6 @@ RlcDlUeCb   *ueCb;
 Bool       abortFlag;
 #endif
 {
-   TRC3(rlcDbmDelDlUeCb)
-
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
    UNUSED(abortFlag);
@@ -545,7 +536,7 @@ Bool       abortFlag;
    /* Deallocate ueCb */
    RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb));
 
-   RETVOID;
+   return;
 } /* kwDbmDelUeCb */
 
 \f
@@ -572,9 +563,6 @@ RlcCb  *gCb;
 {
    RlcDlUeCb *ueCb = NULLP; 
 
-   TRC3(rlcDbmDelAllDlUe)
-
-
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&(gCb->u.dlCb->ueLstCp), 
                                    (PTR) ueCb, 
@@ -586,7 +574,7 @@ RlcCb  *gCb;
       ueCb = NULLP;
    }
 
-   RETVOID;
+   return;
 } /* kwDbmDelAllUe */
 
 /* kw005.201 added support for L2 Measurement */         
@@ -603,7 +591,7 @@ RlcCb      *gCb;
 RlcDlUeCb  *ueCb;
 #endif
 {
-   U8           tbIdx;
+   uint8_t       tbIdx;
    RlcL2MeasTb   *l2MeasTb = NULLP;
    for(tbIdx = 0; tbIdx < RLC_MAX_TB_PER_UE; tbIdx++)
    { 
@@ -614,7 +602,7 @@ RlcDlUeCb  *ueCb;
           ueCb->l2MeasTbCb[tbIdx] = NULLP;
        }       
    }  
-   RETVOID;   
+   return;   
 }/* End of kwDbmDelL2MeasTb */
 #endif /* LTE_L2_MEAS */
 \f
@@ -649,7 +637,6 @@ RlcDlCellCb    **cellCb;
 {
    RlcDlCellCb *tCellCb; 
    
-   TRC3(rlcDbmCreateDlCellCb)
 
    RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb));
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -665,8 +652,8 @@ RlcDlCellCb    **cellCb;
 
    if(ROK != cmHashListInsert(&(gCb->u.dlCb->cellLstCp), 
                               (PTR) tCellCb,
-                              (U8 *)&(tCellCb->cellId), 
-                              (U16) sizeof(CmLteCellId)))
+                              (uint8_t *)&(tCellCb->cellId), 
+                              (uint16_t) sizeof(CmLteCellId)))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellId,"HashList Insertion Failed");
       return RFAILED;
@@ -697,7 +684,7 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId  cellId, RlcDlCellCb **cellC
    *cellCb = NULLP;
    
    if(ROK != cmHashListFind(&(gCb->u.dlCb->cellLstCp), 
-                            (U8 *)&(cellId),
+                            (uint8_t *)&(cellId),
                             sizeof(CmLteCellId), 
                             RLC_DEF_SEQ_NUM, 
                             (PTR*) cellCb))
@@ -734,8 +721,6 @@ RlcCb         *gCb;
 RlcDlCellCb   *cellCb;
 #endif
 {
-   TRC3(rlcDbmDelDlCellCb)
-
 
    /* Delete all rbCbs in cellCb */
    rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL);
@@ -749,7 +734,7 @@ RlcDlCellCb   *cellCb;
    /* Deallocate cellCb */
    RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb));
 
-   RETVOID;
+   return;
 } /* kwDbmDelCellCb */
 
 \f
@@ -775,9 +760,6 @@ RlcCb *gCb;
 {
    RlcDlCellCb *cellCb = NULLP;
 
-   TRC3(rlcDbmDelAllDlCell)
-
-
    /* Until no more cellCb is ueLstCp hash list get and delete cellCb */
    while (ROK == cmHashListGetNext(&(gCb->u.dlCb->cellLstCp), 
                                    (PTR) cellCb, 
@@ -788,7 +770,7 @@ RlcCb *gCb;
       cellCb = NULLP;
    }
 
-   RETVOID;
+   return;
 } /* rlcDbmDelAllDlCell */
 
 \f
@@ -813,7 +795,6 @@ S16 rlcDbmDlShutdown(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcDbmDlShutdown)
 
    rlcDbmDelAllDlCell(gCb);