X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tenb_stats.c;h=a10b138da7289fabaa5bb71825cc5881a9bf6f14;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;hp=006326713f68b392c0bf51df34419ba4d2616c86;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_tenb_stats.c b/src/5gnrrlc/kw_tenb_stats.c
index 006326713..a10b138da 100755
--- a/src/5gnrrlc/kw_tenb_stats.c
+++ b/src/5gnrrlc/kw_tenb_stats.c
@@ -29,18 +29,7 @@
 **********************************************************************/
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library defines */
-#include "cm_llist.h"      /* common link list  defines  */
-#include "cm_hash.h"       /* common hash list  defines */
-#include "cm_lte.h"        /* common LTE defines */
+#include "common_def.h"
 #include "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -51,16 +40,6 @@
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */
@@ -73,10 +52,10 @@
 #endif
 
 #ifdef TENB_STATS
-PUBLIC TSL2CellStatsCb* l2CellStats[L2_STATS_MAX_CELLS];
-PUBLIC TSL2UeStatsCb*   l2UeStats[L2_STATS_MAX_UES];
-PUBLIC CmLListCp        freeL2UeStatsLst; /*!< Free Pool of UE stats Blocks */
-PUBLIC CmLListCp        inUseL2UeStatsLst;/*!< In Use Pool of UE stats Blocks */
+TSL2CellStatsCb* l2CellStats[L2_STATS_MAX_CELLS];
+TSL2UeStatsCb*   l2UeStats[L2_STATS_MAX_UES];
+CmLListCp        freeL2UeStatsLst; /*!< Free Pool of UE stats Blocks */
+CmLListCp        inUseL2UeStatsLst;/*!< In Use Pool of UE stats Blocks */
 
 /*
 *
@@ -90,21 +69,9 @@ PUBLIC CmLListCp        inUseL2UeStatsLst;/*!< In Use Pool of UE stats Blocks */
 *
 *
 */
-#ifdef ANSI
-PUBLIC Void TSL2AllocStatsMem 
-(
- Region region,
- Pool   pool 
-)
-#else
-PUBLIC Void TSL2AllocStatsMem(region, pool)
- Region region;
- Pool   pool;
-#endif
+Void TSL2AllocStatsMem(Region region,Pool pool)
 {
-   U32 cnt=0;
-
-   TRC2(TSL2AllocStatsMem)
+   uint32_t cnt=0;
 
    cmLListInit(&inUseL2UeStatsLst);     
    cmLListInit(&freeL2UeStatsLst);      
@@ -118,7 +85,7 @@ PUBLIC Void TSL2AllocStatsMem(region, pool)
          			printf("\n STATS Unexpected MEM Alloc Failure\n");
       		 }
    	  }
-        cmMemset((U8 *)l2CellStats[cnt], 0x00, (Size)sizeof(TSL2CellStatsCb));
+        memset(l2CellStats[cnt], 0x00, sizeof(TSL2CellStatsCb));
    }
 
    for (cnt=0; cnt < L2_STATS_MAX_UES; cnt++)
@@ -132,13 +99,13 @@ PUBLIC Void TSL2AllocStatsMem(region, pool)
          		 	printf("\n STATS Unexpected MEM Alloc Failure at %d\n", (int)cnt);
       		 }
 		  }
-        cmMemset((U8 *)statsCb, 0x00, (Size)sizeof(TSL2UeStatsCb));
+        memset(statsCb, 0x00, sizeof(TSL2UeStatsCb));
         statsCb->lnk.node = (PTR)statsCb;
         cmLListAdd2Tail(&freeL2UeStatsLst, &statsCb->lnk);
         l2UeStats[cnt] = statsCb;
    }
 
-   RETVOID;
+   return;
 }
 
 /*
@@ -153,21 +120,11 @@ PUBLIC Void TSL2AllocStatsMem(region, pool)
 *
 *
 */
-#ifdef ANSI
-PUBLIC TSL2UeStatsCb* TSL2AllocUeStatsBlk 
-(
- U16   rnti
-)
-#else
-PUBLIC TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti)
- U16   rnti;
-#endif
+TSL2UeStatsCb* TSL2AllocUeStatsBlk (uint16_t rnti)
 {
    CmLList          *tmp = NULLP;
    TSL2UeStatsCb  *statsCb = NULLP;
 
-   TRC2(TSL2AllocUeStatsBlk)
-
    tmp = freeL2UeStatsLst.first;
    if (tmp == NULLP)
    {
@@ -177,10 +134,10 @@ PUBLIC TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti)
    statsCb = (TSL2UeStatsCb *)(tmp->node);
    cmLListAdd2Tail(&inUseL2UeStatsLst, tmp);
 
-   statsCb->stats.rnti = (U32)rnti;
+   statsCb->stats.rnti = (uint32_t)rnti;
    statsCb->inUse = TRUE;
 
-   RETVALUE(statsCb);
+   return (statsCb);
 }
 
 /*
@@ -195,26 +152,14 @@ PUBLIC TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti)
 *
 *
 */
-#ifdef ANSI
-PUBLIC Void TSL2DeallocUeStatsBlk 
-(
- U16              rnti,
- TSL2UeStatsCb  *statsCb
-)
-#else
-PUBLIC Void TSL2DeallocUeStatsBlk(rnti, statsCb)
- U16              rnti;
- TSL2UeStatsCb  *statsCb;
-#endif
+Void TSL2DeallocUeStatsBlk(uint16_t rnti,TSL2UeStatsCb *statsCb)
 {
-   TRC2(TSL2DeallocUeStatsBlk)
-
    statsCb->inUse = FALSE;
    cmLListDelFrm(&inUseL2UeStatsLst, &statsCb->lnk);
    freeL2UeStatsLst.crnt = freeL2UeStatsLst.first;
    cmLListInsAfterCrnt(&freeL2UeStatsLst, &statsCb->lnk);
 
-   RETVOID;
+   return;
 }
 
 /*
@@ -229,24 +174,14 @@ PUBLIC Void TSL2DeallocUeStatsBlk(rnti, statsCb)
 *
 *
 */
-#ifdef ANSI
-PUBLIC TSL2CellStatsCb* TSL2AllocCellStatsBlk 
-(
- U32 cellId
-)
-#else
-PUBLIC TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId)
- U32 cellId;
-#endif
+TSL2CellStatsCb* TSL2AllocCellStatsBlk(uint32_t cellId)
 {
-   TRC2(TSL2AllocCellStatsBlk)
-
    if (cellId != 1)
    {
       printf("\n STATS Unexpected CellID = %d\n", (int)cellId);
    }
 
-   RETVALUE(l2CellStats[cellId-1]);
+   return (l2CellStats[cellId-1]);
 }
 
 /*
@@ -261,19 +196,10 @@ PUBLIC TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId)
 *
 *
 */
-#ifdef ANSI
-PUBLIC Void TSL2DeallocCellStatsBlk 
-(
- U32 cellId
-)
-#else
-PUBLIC Void TSL2DeallocCellStatsBlk(cellId)
- U32 cellId;
-#endif
+Void TSL2DeallocCellStatsBlk(uint32_t cellId)
 {
-   TRC2(TSL2DeallocCellStatsBlk)
 
-   RETVOID;
+   return;
 }
 
 /*
@@ -291,26 +217,14 @@ PUBLIC Void TSL2DeallocCellStatsBlk(cellId)
 *
 *
 */
-#ifdef ANSI
-PUBLIC Void TSL2SendStatsToApp
-(
- Pst    *pst,
- SuId   suId
- )
-#else
-PUBLIC Void TSL2SendStatsToApp(pst, suId)
- Pst    *pst;
- SuId   suId;
-#endif
+Void TSL2SendStatsToApp(Pst    *pst, SuId   suId)
 {
-   U32 idx;
-
-   TRC2(TSL2SendStatsToApp)
+   uint32_t idx;
 
    for (idx = 0; idx < L2_STATS_MAX_UES; idx++)
    {
       TSL2UeStatsCb *statsCb = l2UeStats[idx];
-      U32 rnti;
+      uint32_t rnti;
       if (statsCb->inUse != TRUE)
       {
          continue;
@@ -328,8 +242,8 @@ PUBLIC Void TSL2SendStatsToApp(pst, suId)
 #endif
       }
       rnti = statsCb->stats.rnti;
-      cmMemset((U8 *)&statsCb->stats.nonPersistent, 0x00, (Size)sizeof(statsCb->stats.nonPersistent));
-      /* cmMemset((U8 *)&statsCb->stats, 0x00, (Size)sizeof(TSInfL2UeStats)); */
+      memset(&statsCb->stats.nonPersistent, 0x00, sizeof(statsCb->stats.nonPersistent));
+      /* memset(&statsCb->stats, 0x00, sizeof(TSInfL2UeStats)); */
       statsCb->stats.rnti = rnti;
    }
 
@@ -337,7 +251,7 @@ PUBLIC Void TSL2SendStatsToApp(pst, suId)
    for (idx = 0; idx < L2_STATS_MAX_CELLS; idx++)
    {
       TSL2CellStatsCb *statsCellCb = l2CellStats[idx];
-      U32 cellId;
+      uint32_t cellId;
       if (pst->selector == 0)
       {
          /* Loose Coupling */
@@ -351,10 +265,10 @@ PUBLIC Void TSL2SendStatsToApp(pst, suId)
 #endif
       }
       cellId = statsCellCb->cellId;
-      cmMemset((U8 *)l2CellStats[idx], 0x00, (Size)sizeof(TSInfL2CellStats));
+      memset(l2CellStats[idx], 0x00, sizeof(TSInfL2CellStats));
       statsCellCb->cellId = cellId;
    }
-   RETVOID;
+   return;
 }
 #endif /* TENB_STATS */
 /**********************************************************************