X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_cfg_ul.c;h=9372c21ba48aa81ba8020f680c05fb13dc064bdc;hb=762bc0a2a50222d74b01d9a88071bfaf5d90979b;hp=aaec229f3cd1b85d25d78340bbef1dfba958db68;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c
index aaec229f3..9372c21ba 100755
--- a/src/5gnrrlc/kw_cfg_ul.c
+++ b/src/5gnrrlc/kw_cfg_ul.c
@@ -79,11 +79,11 @@ S16 rlcValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,
  *      -# RFAILED 
  *
 */
-PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
+static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId)
 {
    RlcL2MeasCb    *measCb    = NULLP;
-   U16           cntr;
-   U16          ueIdx = 0;     
+   uint16_t       cntr;
+   uint16_t       ueIdx = 0;     
 
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
    {
@@ -117,11 +117,11 @@ PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
  *      -# RFAILED 
  *
 */
-PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
+static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId)
 {
    RlcL2MeasCb    *measCb    = NULLP;
-   U16           cntr;
-   U16          ueIdx = 0;     
+   uint16_t       cntr;
+   uint16_t       ueIdx = 0;     
 
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
    {
@@ -147,7 +147,7 @@ PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
 
 
       {
-         U32 myIdx =0;
+         uint32_t myIdx =0;
          S16                  ret;           /* Return value */
             RlcUlUeCb             *ueCb = NULL;  
 
@@ -165,18 +165,18 @@ PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
 }
 
 
-PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId)
+static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId)
 {
    RlcL2MeasCb    *measCb    = NULLP;
-   U16           cntr;
-   U16           cntr1;
-   U16            ueIdx = 0;
-   U16            qciIdx = 0;
-   U16           *numQci;
+   uint16_t       cntr;
+   uint16_t       cntr1;
+   uint16_t       ueIdx = 0;
+   uint16_t       qciIdx = 0;
+   uint16_t       *numQci;
    #ifndef XEON_SPECIFIC_CHANGES
-   U8             freeIdx = gCb->genCfg.maxUe;
+   uint8_t        freeIdx = gCb->genCfg.maxUe;
    #else
-   U16	         freeIdx = LKW_MAX_UE;
+   uint16_t       freeIdx = LKW_MAX_UE;
    #endif 
 
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
@@ -306,21 +306,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId)
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 rlcCfgFillUlRbCb
-(
-RlcCb            *gCb,
-RlcUlRbCb        *rbCb,
-RlcUlUeCb        *ueCb,
-RlcEntCfgInfo   *entCfg
-)
-#else
-PRIVATE S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg)
-RlcCb            *gCb;
-RlcUlRbCb        *rbCb;
-RlcUlUeCb        *ueCb;
-RlcEntCfgInfo   *entCfg;
-#endif
+static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg)
 {
 
    RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId, 
@@ -415,21 +401,7 @@ RlcEntCfgInfo   *entCfg;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 rlcCfgUpdateUlRb
-(
-RlcCb            *gCb,
-RlcUlRbCb        *rbCb,
-void            *ptr,
-RlcEntCfgInfo   *entCfg
-)
-#else
-PRIVATE S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg)
-RlcCb            *gCb;
-RlcUlRbCb        *rbCb;
-void            *ptr;
-RlcEntCfgInfo   *entCfg;
-#endif
+static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg)
 {
    
    switch (rbCb->mode)
@@ -484,23 +456,7 @@ RlcEntCfgInfo   *entCfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 rlcValidateRbCfgParams
-(
-RlcCb            *gCb,
-CmLteRnti       ueId,
-CmLteCellId     cellId,
-RlcEntCfgInfo   *cfgToValidate,
-CmStatus        *status
-)
-#else
-S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status)
-RlcCb            *gCb;
-CmLteRnti       ueId;
-CmLteCellId     cellId;
-RlcEntCfgInfo   *cfgToValidate;
-CmStatus        *status;
-#endif
+S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status)
 {
    if (cellId == 0)
    {
@@ -614,7 +570,6 @@ CmStatus        *status;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateUlRb
 (
 RlcCb             *gCb,
@@ -622,13 +577,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData 
 )
-#else
-S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData)
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData; 
-#endif
 {
 
    RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
@@ -673,7 +621,7 @@ RlcUlCfgTmpData   *cfgTmpData;
             {
                if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP))
                {
-                  cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_RB_PRSNT;;
+                  cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_RB_PRSNT;
                   return RFAILED;
                }
             }
@@ -711,7 +659,7 @@ RlcUlCfgTmpData   *cfgTmpData;
                      cfgEntData->rbCb);
                if(cfgEntData->rbCb != NULLP)
                {
-                  cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_RB_PRSNT;;
+                  cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_RB_PRSNT;
                   return RFAILED;
                }
             }
@@ -725,7 +673,7 @@ RlcUlCfgTmpData   *cfgTmpData;
          /*Allocating the memory for receive buffer */
          if(CM_LTE_MODE_UM == cfgToValidate->entMode)
          {
-            U16 winLen;
+            uint16_t winLen;
         
             
             cfgEntData->rbCb->m.umUl.umWinSz = RLC_POWER(2, 
@@ -738,7 +686,7 @@ RlcUlCfgTmpData   *cfgTmpData;
          else if(CM_LTE_MODE_AM == cfgToValidate->entMode)
          {
 #ifndef LTE_TDD 
-             U32 hashIndex;
+             uint32_t hashIndex;
               RLC_ALLOC(gCb,
                     cfgEntData->rbCb->m.amUl.recBufLst,
                     (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp )));
@@ -835,7 +783,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgRollBackUlRb
 (
 RlcCb             *gCb,
@@ -843,15 +790,6 @@ CmLteRnti        ueId,
 RlcEntCfgInfo    *cfg,
 RlcUlEntTmpData   *cfgEntData
 )
-#else
-S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData)
-(
-RlcCb             *gCb;
-CmLteRnti        ueId;
-RlcEntCfgInfo    *cfg;
-RlcUlEntTmpData   *cfgEntData;
-)
-#endif
 {
 
    if(CKW_CFG_ADD == cfg->cfgType)
@@ -888,7 +826,6 @@ RlcUlEntTmpData   *cfgEntData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 Void rlcCfgApplyUlRb
 (
 RlcCb             *gCb,
@@ -896,15 +833,6 @@ RlcEntCfgInfo    *cfgToAply,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData)
-(
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToAply;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-)
-#endif
 {
   
    switch(cfgToAply->cfgType)
@@ -1013,7 +941,7 @@ RlcUlCfgTmpData   *cfgTmpData;
          break;
       }
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1031,7 +959,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateDelUlUe
 (
 RlcCb             *gCb,
@@ -1039,13 +966,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData)
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
 
    RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, 
@@ -1055,7 +975,7 @@ RlcUlCfgTmpData   *cfgTmpData;
    /* Check for ueId is present or not */
    if ( cfgTmpData->ueId == 0 )
    {
-      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_UE_UNKWN;;
+      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_UE_UNKWN;
       RLOG_ARG1(L_ERROR,DBG_UEID,cfgTmpData->ueId, 
             "UeId is 0 for CELLID;%d",
             cfgTmpData->cellId);
@@ -1068,7 +988,7 @@ RlcUlCfgTmpData   *cfgTmpData;
       RLOG_ARG1(L_ERROR,DBG_CELLID, cfgTmpData->cellId,
             "UeId [%d]: UeCb not found",
             cfgTmpData->ueId);
-      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_UE_UNKWN;;
+      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_UE_UNKWN;
       return RFAILED;
    }
    return ROK;
@@ -1085,26 +1005,18 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyDelUlUe
 (
 RlcCb             *gCb,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-Void rlcCfgApplyDelUlUe(gCb, cfgTmpData)
-(
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgTmpData;
-)
-#endif
 {
    
 #ifdef LTE_L2_MEAS
    rlcDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId);
 #endif
    rlcDbmDelUlUeCb(gCb,cfgTmpData->ueCb, FALSE);
-   RETVOID;
+   return;
 }
   
 
@@ -1123,7 +1035,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateDelUlCell
 (
 RlcCb             *gCb,
@@ -1132,14 +1043,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData)
-RlcCb             *gCb;
-CmLteCellId      cellId;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
 
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
@@ -1150,7 +1053,7 @@ RlcUlCfgTmpData   *cfgTmpData;
    /* Check for cellId is present or not */
    if ( cellId == 0 )
    {
-      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_CELL_UNKWN;;
+      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_CELL_UNKWN;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellId , "CellId is 0");
       return RFAILED;
    }
@@ -1159,7 +1062,7 @@ RlcUlCfgTmpData   *cfgTmpData;
    rlcDbmFetchUlCellCb(gCb,cellId, &cfgTmpData->cellCb);
    if (!cfgTmpData->cellCb)
    {
-      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_CELL_UNKWN;;
+      cfgEntData->entUlCfgCfm.status.reason =  CKW_CFG_REAS_CELL_UNKWN;
       RLOG_ARG0(L_ERROR, DBG_CELLID,cellId, "CellCb not found");
       return RFAILED;
    }
@@ -1177,23 +1080,11 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
-Void rlcCfgApplyDelUlCell
-(
-RlcCb             *gCb,
-RlcUlCfgTmpData   *cfgInfo
-)
-#else
-Void rlcCfgApplyDelUlCell(gCb, cfgEntData)
-(
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgInfo;
-)
-#endif
+Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo)
 {
    
    rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb);
-   RETVOID;
+   return;
 }
 
 /** 
@@ -1210,7 +1101,6 @@ RlcUlCfgTmpData   *cfgInfo;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateReEstRb
 (
 RlcCb             *gCb,
@@ -1219,14 +1109,6 @@ CmLteCellId      cellId,
 RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData
 )
-#else
-S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData)
-RlcCb             *gCb;
-CmLteRnti        ueId;
-CmLteCellId      cellId;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-#endif
 {
    CmLteRlcId   rlcId;   /* RLC Identifier */
 
@@ -1270,25 +1152,14 @@ RlcUlEntTmpData   *cfgEntData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyReEstUlRb
 (
-RlcCb             *gCb,
-CmLteRnti        ueId,
-CmLteCellId      cellId,
-Bool             sndReEstInd,
-RlcUlEntTmpData   *cfgEntData
-)
-#else
-Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData)
-(
-RlcCb             *gCb;
-CmLteRnti        ueId;
-CmLteCellId      cellId;
-Bool             sndReEstInd;
-RlcUlEntTmpData   *cfgEntData;
+RlcCb           *gCb,
+CmLteRnti       ueId,
+CmLteCellId     cellId,
+Bool            sndReEstInd,
+RlcUlEntTmpData *cfgEntData
 )
-#endif
 {
    CmLteRlcId   rlcId;   /* RLC Identifier */
    
@@ -1317,7 +1188,7 @@ RlcUlEntTmpData   *cfgEntData;
             break;
          }
    }
-   RETVOID;
+   return;
 }
 
 /** 
@@ -1333,21 +1204,13 @@ RlcUlEntTmpData   *cfgEntData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateUeIdChng
 (
-RlcCb             *gCb,
+RlcCb            *gCb,
 CkwUeInfo        *ueInfo,
 CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData
+RlcUlCfgTmpData  *cfgTmpData
 )
-#else
-S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData)
-RlcCb             *gCb;
-CkwUeInfo        *ueInfo;
-CkwUeInfo        *newUeInfo;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
    RlcUlUeCb   *ueCb;
 
@@ -1398,23 +1261,13 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyUlUeIdChng
 (
-RlcCb             *gCb,
-CkwUeInfo        *ueInfo,
-CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData
-)
-#else
-Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData)
-(
-RlcCb             *gCb;
+RlcCb            *gCb,
 CkwUeInfo        *ueInfo,
 CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData;
+RlcUlCfgTmpData  *cfgTmpData
 )
-#endif
 {
    
 #ifdef LTE_L2_MEAS
@@ -1426,8 +1279,8 @@ RlcUlCfgTmpData   *cfgTmpData;
    cfgTmpData->ueCb->cellId =newUeInfo->cellId;
    if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
                               (PTR)cfgTmpData->ueCb, 
-                              (U8 *)&(cfgTmpData->ueCb->ueId),
-                              (U16) sizeof(CmLteRnti)))
+                              (uint8_t *)&(cfgTmpData->ueCb->ueId),
+                              (uint16_t) sizeof(CmLteRnti)))
 
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,
@@ -1435,7 +1288,7 @@ RlcUlCfgTmpData   *cfgTmpData;
             newUeInfo->ueId);
    }
 
-   RETVOID;
+   return;
 }
 /********************************************************************30**