UL data path changes at Phy stub, RLC UL UM and DU APP [Issue-ID: ODUHIGH-262]

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

diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c
index 6c0b1be..32bd820 100755 (executable)
--- a/src/5gnrrlc/kw_dbm_ul.c
+++ b/src/5gnrrlc/kw_dbm_ul.c
@@ -73,24 +73,14 @@ static int RLOG_FILE_ID=194;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmUlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmUlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmUlInit(RlcCb *gCb)
 {
-   TRC3(rlcUlDbmInit)
-
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.ulCb->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)))
    {
@@ -100,10 +90,10 @@ RlcCb *gCb;
 
    /* Initialize cellCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.ulCb->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)))
    {
@@ -113,10 +103,10 @@ RlcCb *gCb;
    }
 
    if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp), 
-                            (U16) RLC_TRANS_ID_LST_BKT_SIZE,
-                            (U16) 0, 
+                            (uint16_t) RLC_TRANS_ID_LST_BKT_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)))
    {
@@ -142,18 +132,8 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmUlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlDeInit(RlcCb *gCb)
 {
-   TRC3(rlcDbmUlDeInit);
-
 
    /* De Initialize ueCb Hash List */
    cmHashListDeinit(&(gCb->u.ulCb->ueLstCp));
@@ -169,7 +149,7 @@ RlcCb *gCb;
    cmHashListDeinit(&(rlcCb.rlcL2Cb.qciHlCp));
 #endif /* LTE_L2_MEAS */
 
-   RETVOID;
+   return;
 } /* kwDbmDeInit */
 
 
@@ -186,22 +166,13 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
 Void rlcDbmFetchUlRbCbByRbId
 (
 RlcCb         *gCb,
 CmLteRlcId   *rlcId,  
 RlcUlRbCb     **rbCb  
 )
-#else
-Void rlcDbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   *rlcId;    
-RlcUlRbCb     **rbCb;   
-#endif
 {
-   TRC3(rlcDbmFetchUlRbCbByRbId)
-
    *rbCb= NULLP;
 
    /* Check for UE CB or CELL CB */
@@ -216,7 +187,7 @@ RlcUlRbCb     **rbCb;
                rlcId->cellId, 
                rlcId->ueId,
                RLC_MAX_RB_PER_CELL);
-         RETVOID;
+         return;
       }
 
       rlcDbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
@@ -226,7 +197,7 @@ RlcUlRbCb     **rbCb;
                "CellCb not found RBID:%d UEID:%d",
                rlcId->rbId,
                rlcId->ueId);
-         RETVOID;
+         return;
       }
 
       *rbCb = cellCb->rbCb[rlcId->rbId];
@@ -242,7 +213,7 @@ RlcUlRbCb     **rbCb;
                rlcId->rbType,
                rlcId->cellId,
                rlcId->ueId);
-         RETVOID;
+         return;
       }
 
       if (rlcDbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
@@ -251,12 +222,12 @@ RlcUlRbCb     **rbCb;
                "UeId [%d]: UeCb not found RBID:%d",
                rlcId->ueId,
                rlcId->rbId);
-         RETVOID;
+         return;
       }
 
       RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
    }
-   RETVOID;
+   return;
 } /* rlcDbmFetchUlRbCbByRbId */
 
 \f
@@ -325,35 +296,25 @@ void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
  * @return  Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelAllUlRb
 (
 RlcCb       *gCb,
 RlcUlRbCb   **rbCbLst,          
-U8         numRbCb            
+uint8_t     numRbCb            
 )
-#else
-Void rlcDbmDelAllUlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcUlRbCb   **rbCbLst;        
-U8         numRbCb;         
-#endif
 {
-   U32 idx; /* Index */
-
-   TRC3(rlcDbmDelAllUlRb)
-
+   uint32_t idx; /* Index */
 
    for (idx = 0; idx < numRbCb; idx++)
    {
       if (rbCbLst[idx] != NULLP)
       {
          /* Free the Buffers of RbCb */
-         if( CM_LTE_MODE_UM == rbCbLst[idx]->mode ) 
+         if( RLC_MODE_UM == rbCbLst[idx]->mode ) 
          {
             rlcUmmFreeUlRbCb(gCb,rbCbLst[idx]);
          }
-         else if(CM_LTE_MODE_AM == rbCbLst[idx]->mode) 
+         else if(RLC_MODE_AM == rbCbLst[idx]->mode) 
          {
             rlcAmmFreeUlRbCb(gCb,rbCbLst[idx]);
          }
@@ -362,7 +323,7 @@ U8         numRbCb;
       }
    }
 
-   RETVOID;
+   return;
 } /* kwDbmDelAllRb */
 
 \f
@@ -383,7 +344,6 @@ U8         numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlUeCb
 (
 RlcCb          *gCb,
@@ -391,24 +351,15 @@ CmLteRnti     ueId,
 CmLteCellId   cellId,    
 RlcUlUeCb      *ueCb    
 )
-#else
-S16 rlcDbmAddUlUeCb(gCb, ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;    
-CmLteCellId   cellId; 
-RlcUlUeCb      *ueCb;
-#endif
 {
-   TRC3(rlcDbmAddUlUeCb)
-
 
    ueCb->ueId = ueId;
    ueCb->cellId = cellId;
 
    if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp), 
                               (PTR)ueCb, 
-                              (U8 *)&(ueCb->ueId),
-                              (U16) sizeof(CmLteRnti)))
+                              (uint8_t *)&(ueCb->ueId),
+                              (uint16_t) sizeof(CmLteRnti)))
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
             "UeId[%u] HashList Insertion Failed",
@@ -437,20 +388,12 @@ RlcUlUeCb      *ueCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlTransaction 
 (
 RlcCb        *gCb,
 RlcUlCfgTmpData   *cfg
 )
-#else
-S16 rlcDbmAddUlTransaction(gCb, cfg)
-RlcCb        *gCb;
-RlcUlCfgTmpData   *cfg;
-#endif
 {
-   TRC3(rlcDbmAddUlTransaction)
-
 #ifndef ALIGN_64BIT
    RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
 #else
@@ -459,8 +402,8 @@ RlcUlCfgTmpData   *cfg;
 
    return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), 
                              (PTR)cfg, 
-                             (U8 *)&(cfg->transId), 
-                             (U16) sizeof(cfg->transId)));
+                             (uint8_t *)&(cfg->transId), 
+                             (uint16_t) sizeof(cfg->transId)));
 } 
 
 \f
@@ -480,24 +423,16 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmFindUlTransaction
 (
 RlcCb             *gCb,
-U32              transId,
+uint32_t          transId,
 RlcUlCfgTmpData   **cfg
 )
-#else
-S16 rlcDbmFindUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-U32              transId;
-RlcUlCfgTmpData   **cfg;
-#endif
 {
-   TRC3(rlcDbmFindUlTransaction)
 
    if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
-                            (U8 *) &transId, 
+                            (uint8_t *) &transId, 
                             sizeof (transId), 
                             RLC_DEF_SEQ_NUM,(PTR *) cfg))
    {
@@ -524,20 +459,12 @@ RlcUlCfgTmpData   **cfg;
  *      -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmDelUlTransaction
 (
 RlcCb             *gCb,
 RlcUlCfgTmpData   *cfg       
 )
-#else
-S16 rlcDbmDelUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfg;     
-#endif
 {
-   TRC3(rlcDbmDelUlTransaction)
-
 
    if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) 
    {
@@ -562,20 +489,10 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmDelAllUlTransactions
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDelAllUlTransactions(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDelAllUlTransactions(RlcCb *gCb)
 {
    RlcUlCfgTmpData *cfg = NULL;
 
-   TRC3(kwDbmDelAllUlTransctions)
-
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->transIdLstCp), 
                                    (PTR) cfg, 
@@ -633,22 +550,13 @@ uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcUl
  * @return Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelUlUeCb
 (
 RlcCb       *gCb,
 RlcUlUeCb   *ueCb,       
 Bool       abortFlag   
 )
-#else
-Void rlcDbmDelUlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcUlUeCb   *ueCb;      
-Bool       abortFlag; 
-#endif
 {
-   TRC3(rlcDbmDelUlUeCb)
-
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
    UNUSED(abortFlag);
@@ -675,7 +583,7 @@ Bool       abortFlag;
    /* Deallocate ueCb */
    RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb));
 
-   RETVOID;
+   return;
 }
 \f
 /**
@@ -689,21 +597,10 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlUe
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlUe(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlUe(RlcCb *gCb)
 {
    RlcUlUeCb *ueCb = NULLP;  /* UE Control Block */
 
-   TRC3(rlcDbmDelAllUlUe)
-
-
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->ueLstCp), 
                                    (PTR) ueCb, 
@@ -714,7 +611,7 @@ RlcCb *gCb;
       ueCb = NULLP;
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -733,33 +630,22 @@ RlcCb *gCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
 S16 rlcDbmAddUlCellCb
 (
 RlcCb          *gCb,
 CmLteCellId   cellId,    
 RlcUlCellCb    *cellCb  
 )
-#else
-S16 rlcDbmAddUlCellCb(gCb, cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;    
-RlcUlCellCb    *cellCb;  
-#endif
 {
    RlcUlCellCb *tCellCb; 
 
-   TRC3(rlcDbmAddUlCellCb)
-
-
-
    tCellCb = cellCb;
    tCellCb->cellId = cellId;
 
    if(ROK != cmHashListInsert(&(gCb->u.ulCb->cellLstCp), 
                               (PTR) tCellCb,
-                              (U8 *)&(tCellCb->cellId), 
-                              (U16) sizeof(CmLteCellId)))
+                              (uint8_t *)&(tCellCb->cellId), 
+                              (uint16_t) sizeof(CmLteCellId)))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId,
             "HashList Insertion Failed");
@@ -812,20 +698,8 @@ void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelUlCellCb
-(
-RlcCb         *gCb,
-RlcUlCellCb   *cellCb     
-)
-#else
-Void rlcDbmDelUlCellCb(gCb, cellCb)
-RlcCb         *gCb;
-RlcUlCellCb   *cellCb;     
-#endif
+Void rlcDbmDelUlCellCb(RlcCb *gCb,RlcUlCellCb *cellCb)
 {
-   TRC3(rlcDbmDelUlCellCb)
-
 
    /* Delete all rbCbs in cellCb */
    rlcDbmDelAllUlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL);
@@ -839,7 +713,7 @@ RlcUlCellCb   *cellCb;
    /* Deallocate cellCb */
    RLC_FREE(gCb, cellCb, sizeof(RlcUlCellCb));
 
-   RETVOID;
+   return;
 } /* kwDbmDelCellCb */
 
 \f
@@ -853,21 +727,10 @@ RlcUlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlCell(RlcCb *gCb)
 {
    RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
 
-   TRC3(rlcDbmDelAllUlCell)
-
-
    /* Until no more cellCb is ueLstCp hash list get and delete cellCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->cellLstCp), 
                                    (PTR) cellCb, 
@@ -878,7 +741,7 @@ RlcCb *gCb;
       cellCb = NULLP;
    }
 
-   RETVOID;
+   return;
 } 
 
 \f
@@ -892,17 +755,8 @@ RlcCb *gCb;
  * @param[in] gCb      RLC Instance Control Block
  *
 */
-#ifdef ANSI
-Void rlcDbmUlShutdown
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlShutdown(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlShutdown(RlcCb *gCb)
 {
-   TRC3(rlcDbmUlShutdown)
 
    rlcDbmDelAllUlCell(gCb);
 
@@ -910,7 +764,7 @@ RlcCb *gCb;
 
    rlcDbmUlDeInit(gCb);
 
-   RETVOID;
+   return;
 }