X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=39fc8700f5b372349f2601e620d6e392d2c3f1ca;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=4ce1a88544f253a1bb8fdb2cc57ae86d6b77758b;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c
index 4ce1a8854..39fc8700f 100755
--- 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);
+TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti);
 #endif
 /** 
  * @file gp_dbm_dl.c
@@ -94,23 +94,15 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti);
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmDlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlInit(RlcCb *gCb)
 {
 
    /* 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)))
    {   
@@ -120,10 +112,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)))
    {
@@ -136,10 +128,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))
    {
@@ -151,10 +143,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))
    {
@@ -177,15 +169,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDlDeInit(RlcCb *gCb)
 {
 
 
@@ -205,7 +189,7 @@ RlcCb *gCb;
    
 #endif /* LTE_L2_MEAS */
 
-   RETVOID;
+   return;
 } /* rlcDbmDlDeInit */
 
 
@@ -335,21 +319,9 @@ CmLteLcId lcId, RlcDlRbCb **rbCb)
  * @return  Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlRb
-(
-RlcCb       *gCb,
-RlcDlRbCb   **rbCbLst,
-U8         numRbCb 
-)
-#else
-Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcDlRbCb   **rbCbLst;
-U8         numRbCb;   
-#endif
+Void rlcDbmDelAllDlRb(RlcCb *gCb,RlcDlRbCb **rbCbLst,uint8_t numRbCb)
 {
-   U32 idx;
+   uint32_t idx;
 
 
    for (idx = 0; idx < numRbCb; idx++)
@@ -359,18 +331,18 @@ U8         numRbCb;
 #ifdef LTE_L2_MEAS
          RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, (rbCbLst[idx]));
 #endif
-         if( CM_LTE_MODE_UM == rbCbLst[idx]->mode)
+         if( RLC_MODE_UM == rbCbLst[idx]->mode)
          {
             rlcUmmFreeDlRbCb(gCb,rbCbLst[idx]);
 
             RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
          }
-         else if( CM_LTE_MODE_AM == rbCbLst[idx]->mode)
+         else if( RLC_MODE_AM == rbCbLst[idx]->mode)
          {
             rlcAmmFreeDlRbCb(gCb,rbCbLst[idx]);
          }
          /* ccpu00136940 */
-         else if(CM_LTE_MODE_TM == rbCbLst[idx]->mode)
+         else if(RLC_MODE_TM == rbCbLst[idx]->mode)
          {
             cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCbLst[idx]->m.tm.sduQ));
             RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
@@ -380,7 +352,7 @@ U8         numRbCb;
 
    }
 
-   RETVOID;
+   return;
 } /* rlcDbmDelAllDlRb */
 
 
@@ -401,21 +373,7 @@ U8         numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlUeCb
-(
-RlcCb          *gCb,
-CmLteRnti     ueId,  
-CmLteCellId   cellId,
-RlcDlUeCb      **ueCb 
-)
-#else
-S16 rlcDbmCreateDlUeCb(gCb,ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;
-CmLteCellId   cellId;
-RlcDlUeCb      **ueCb;
-#endif
+S16 rlcDbmCreateDlUeCb(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcDlUeCb **ueCb)
 {
    RlcDlUeCb *tUeCb;        
 
@@ -437,8 +395,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",
@@ -494,19 +452,7 @@ uint8_t rlcDbmFetchDlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcDl
  * @return Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelDlUeCb
-(
-RlcCb       *gCb,
-RlcDlUeCb   *ueCb,   
-Bool       abortFlag 
-)
-#else
-Void rlcDbmDelDlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcDlUeCb   *ueCb; 
-Bool       abortFlag;
-#endif
+Void rlcDbmDelDlUeCb(RlcCb *gCb,RlcDlUeCb *ueCb,Bool abortFlag)
 {
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -536,7 +482,7 @@ Bool       abortFlag;
    /* Deallocate ueCb */
    RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb));
 
-   RETVOID;
+   return;
 } /* kwDbmDelUeCb */
 
 
@@ -551,15 +497,7 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlUe
-(
-RlcCb  *gCb
-)
-#else
-Void rlcDbmDelAllDlUe(gCb)
-RlcCb  *gCb;
-#endif
+Void rlcDbmDelAllDlUe(RlcCb  *gCb)
 {
    RlcDlUeCb *ueCb = NULLP; 
 
@@ -574,24 +512,14 @@ RlcCb  *gCb;
       ueCb = NULLP;
    }
 
-   RETVOID;
+   return;
 } /* kwDbmDelAllUe */
 
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-Void rlcDbmDelAllDlL2MeasTbFrmUe
-(
-RlcCb      *gCb,
-RlcDlUeCb  *ueCb
-)
-#else
-Void rlcDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb)
-RlcCb      *gCb;
-RlcDlUeCb  *ueCb;
-#endif
+Void rlcDbmDelAllDlL2MeasTbFrmUe(RlcCb *gCb,RlcDlUeCb  *ueCb)
 {
-   U8           tbIdx;
+   uint8_t       tbIdx;
    RlcL2MeasTb   *l2MeasTb = NULLP;
    for(tbIdx = 0; tbIdx < RLC_MAX_TB_PER_UE; tbIdx++)
    { 
@@ -602,7 +530,7 @@ RlcDlUeCb  *ueCb;
           ueCb->l2MeasTbCb[tbIdx] = NULLP;
        }       
    }  
-   RETVOID;   
+   return;   
 }/* End of kwDbmDelL2MeasTb */
 #endif /* LTE_L2_MEAS */
 
@@ -621,19 +549,7 @@ RlcDlUeCb  *ueCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlCellCb
-(
-RlcCb          *gCb,
-CmLteCellId   cellId, 
-RlcDlCellCb    **cellCb 
-)
-#else
-S16 rlcDbmCreateDlCellCb(gCb,cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;   
-RlcDlCellCb    **cellCb;
-#endif
+S16 rlcDbmCreateDlCellCb(RlcCb *gCb,CmLteCellId cellId,RlcDlCellCb **cellCb)
 {
    RlcDlCellCb *tCellCb; 
    
@@ -652,8 +568,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;
@@ -684,7 +600,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))
@@ -709,17 +625,7 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId  cellId, RlcDlCellCb **cellC
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelDlCellCb
-(
-RlcCb         *gCb,
-RlcDlCellCb   *cellCb  
-)
-#else
-Void rlcDbmDelDlCellCb(gCb,cellCb)
-RlcCb         *gCb;
-RlcDlCellCb   *cellCb;
-#endif
+Void rlcDbmDelDlCellCb(RlcCb *gCb,RlcDlCellCb *cellCb)
 {
 
    /* Delete all rbCbs in cellCb */
@@ -734,7 +640,7 @@ RlcDlCellCb   *cellCb;
    /* Deallocate cellCb */
    RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb));
 
-   RETVOID;
+   return;
 } /* kwDbmDelCellCb */
 
 
@@ -748,15 +654,7 @@ RlcDlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllDlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllDlCell(RlcCb *gCb)
 {
    RlcDlCellCb *cellCb = NULLP;
 
@@ -770,7 +668,7 @@ RlcCb *gCb;
       cellCb = NULLP;
    }
 
-   RETVOID;
+   return;
 } /* rlcDbmDelAllDlCell */
 
 
@@ -785,15 +683,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-S16 rlcDbmDlShutdown
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlShutdown(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlShutdown(RlcCb *gCb)
 {
 
    rlcDbmDelAllDlCell(gCb);