Merge "[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-531] RIC Subscription Modification...

[o-du/l2.git] / src / cm / cm_lte.c

diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c
index d9327aa..3c8e706 100755 (executable)
--- a/src/cm/cm_lte.c
+++ b/src/cm/cm_lte.c
@@ -70,7 +70,7 @@
 
 
 /* public variable declarations */
-U32 cmLteTime;
+uint32_t cmLteTime;
 
 \f
 /***********************************************************
@@ -88,17 +88,7 @@ U32 cmLteTime;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
 
@@ -126,17 +116,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
 
@@ -164,17 +144,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
@@ -201,17 +171,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
@@ -238,17 +198,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
 
@@ -276,17 +226,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
 
@@ -297,20 +237,12 @@ Buffer *mBuf;
    return ROK;
 }
 #ifdef LTE_L2_MEAS 
-#ifdef ANSI
-S16 cmUpdateSsiMemInfo
-(
-CmLteMemInfo *mInfo
-)
-#else
-S16 cmUpdateSsiMemInfo(mInfo)
-CmLteMemInfo *mInfo;
-#endif
+S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo)
 {
-   U8   numReg = 0;
-   U8   numPool = 0;
-   U8   idxReg;
-   U8   idxPool;
+   uint8_t   numReg = 0;
+   uint8_t   numPool = 0;
+   uint8_t   idxReg;
+   uint8_t   idxPool;
    SsMemDbgInfo dbgInfo;
 
    SGetRegPoolInfo(&numReg,&numPool); 
@@ -349,21 +281,11 @@ CmLteMemInfo *mInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmFillMemUtilizationMeas
-(
- CmLteMemInfo *memoryInfo,
-CmLteMemInfo *memInfo
-)
-#else
-S16 cmFillMemUtilizationMeas(memoryInfo,memInfo)
-CmLteMemInfo *memoryInfo;
-CmLteMemInfo *memInfo;
-#endif
+S16 cmFillMemUtilizationMeas( CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo)
 {
-   U8 idxReg = 0;
-   U8 idxPool = 0;
-   U8 numPool = 0;
+   uint8_t idxReg = 0;
+   uint8_t idxPool = 0;
+   uint8_t numPool = 0;
 
    memoryInfo->numRegions = memInfo->numRegions;
    for(idxReg=0; idxReg < memInfo->numRegions; idxReg++)
@@ -384,19 +306,11 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearMemUtilizationCounter
-(
-CmLteMemInfo *memInfo
-)
-#else
-S16 cmClearMemUtilizationCounter(memInfo)
-CmLteMemInfo *memInfo;
-#endif
+S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo)
 {
-   U8 idxReg = 0;
-   U8 idxPool = 0;
-   U8 numPool = 0;
+   uint8_t idxReg = 0;
+   uint8_t idxPool = 0;
+   uint8_t numPool = 0;
    for(idxReg=0; idxReg < memInfo->numRegions; idxReg++)
    {
       memInfo->regInfo[idxReg].regionId = 0;
@@ -416,17 +330,9 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearCpuUtilizationCounter
-(
-CmCpuStatsInfo *cpuInfo
-)
-#else
-S16 cmClearCpuUtilizationCounter(cpuInfo)
-CmCpuStatsInfo *cpuInfo
-#endif
+S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo)
 {
-   U8 idx= 0;
+   uint8_t idx= 0;
    for(idx=0; idx < cpuInfo->numCores; idx++)
    {
       cpuInfo->cpuUtil[idx].maxCpuUtil = 0;
@@ -437,19 +343,9 @@ CmCpuStatsInfo *cpuInfo
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmFillCpuUtilizationMeas
-(
-CmLteCpuInfo *cpuMeasInfo,
-CmCpuStatsInfo *cpuInfo
-)
-#else
-S16 cmFillCpuUtilizationMeas(cpuMeasInfo,cpuInfo)
-CmLteCpuInfo *cpuMeasInfo;
-CmCpuStatsInfo *cpuInfo;
-#endif
+S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo)
 {
-   U8 idx= 0;
+   uint8_t idx= 0;
    cpuMeasInfo->numCores = cpuInfo->numCores;
    for(idx=0; idx < cpuInfo->numCores; idx++)
    {
@@ -465,7 +361,7 @@ CmCpuStatsInfo *cpuInfo;
 CmTtiProc ttiProc;
 #define TTI_1MS 950
 
-Void cmUpdateTtiCounters(U32 ttiProcessingTime)
+Void cmUpdateTtiCounters(uint32_t ttiProcessingTime)
 {
    ttiProc.numOfTti++;
    ttiProc.totTtiProcessingTime += ttiProcessingTime;
@@ -481,7 +377,7 @@ Void cmUpdateTtiCounters(U32 ttiProcessingTime)
    {
       ttiProc.ttiStretchCount++;
    }
-   RETVOID;    
+   return;    
 }
 
 Void cmResetTtiCounters(Void)
@@ -492,7 +388,7 @@ Void cmResetTtiCounters(Void)
        ttiProc.ttiStretchCount = 0;
        ttiProc.ttiThresholdExceedCount = 0;
        ttiProc.phyReptTtiStretchCount = 0;
-       RETVOID;
+       return;
 }
 #endif