X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_lte.c;h=3c8e706f79d432ba698d2d07518a35b296a4f437;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=b5df3db5f10200251160e0d077db009d3288b2dd;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c
index b5df3db5f..3c8e706f7 100755
--- a/src/cm/cm_lte.c
+++ b/src/cm/cm_lte.c
@@ -70,7 +70,7 @@
 
 
 /* public variable declarations */
-PUBLIC U32 cmLteTime;
+uint32_t cmLteTime;
 
 
 /***********************************************************
@@ -88,20 +88,9 @@ PUBLIC U32 cmLteTime;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
-   TRC3(cmPkLteRlcId);
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
@@ -127,20 +116,9 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
-   TRC3(cmUnpkLteRlcId);
 
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
@@ -166,20 +144,9 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
-   TRC3(cmPkLteTimingInfo);
 
    CMCHKPK(oduUnpackUInt16, param->slot, mBuf);
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
@@ -204,20 +171,9 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
-   TRC3(cmUnpkLteTimingInfo);
 
    //CMCHKUNPK(oduPackUInt16, &param->hSfn, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
@@ -242,20 +198,9 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
-   TRC3(cmPkLtePdcpId);
 
    CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
@@ -281,20 +226,9 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
-   TRC3(cmUnpkLtePdcpId);
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -303,20 +237,12 @@ Buffer *mBuf;
    return ROK;
 }
 #ifdef LTE_L2_MEAS 
-#ifdef ANSI
-PUBLIC S16 cmUpdateSsiMemInfo
-(
-CmLteMemInfo *mInfo
-)
-#else
-PUBLIC 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); 
@@ -355,21 +281,11 @@ CmLteMemInfo *mInfo;
    return ROK;
 }
 
-#ifdef ANSI
-PUBLIC S16 cmFillMemUtilizationMeas
-(
- CmLteMemInfo *memoryInfo,
-CmLteMemInfo *memInfo
-)
-#else
-PUBLIC 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++)
@@ -390,19 +306,11 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-PUBLIC S16 cmClearMemUtilizationCounter
-(
-CmLteMemInfo *memInfo
-)
-#else
-PUBLIC 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;
@@ -422,17 +330,9 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-PUBLIC S16 cmClearCpuUtilizationCounter
-(
-CmCpuStatsInfo *cpuInfo
-)
-#else
-PUBLIC 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;
@@ -443,19 +343,9 @@ CmCpuStatsInfo *cpuInfo
    return ROK;
 }
 
-#ifdef ANSI
-PUBLIC S16 cmFillCpuUtilizationMeas
-(
-CmLteCpuInfo *cpuMeasInfo,
-CmCpuStatsInfo *cpuInfo
-)
-#else
-PUBLIC 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++)
    {
@@ -471,7 +361,7 @@ CmCpuStatsInfo *cpuInfo;
 CmTtiProc ttiProc;
 #define TTI_1MS 950
 
-PUBLIC Void cmUpdateTtiCounters(U32 ttiProcessingTime)
+Void cmUpdateTtiCounters(uint32_t ttiProcessingTime)
 {
    ttiProc.numOfTti++;
    ttiProc.totTtiProcessingTime += ttiProcessingTime;
@@ -487,10 +377,10 @@ PUBLIC Void cmUpdateTtiCounters(U32 ttiProcessingTime)
    {
       ttiProc.ttiStretchCount++;
    }
-   RETVOID;    
+   return;    
 }
 
-PUBLIC Void cmResetTtiCounters(Void)
+Void cmResetTtiCounters(Void)
 {
 	ttiProc.totTtiProcessingTime = 0;
 	ttiProc.numOfTti = 0;
@@ -498,7 +388,7 @@ PUBLIC Void cmResetTtiCounters(Void)
 	ttiProc.ttiStretchCount = 0;
 	ttiProc.ttiThresholdExceedCount = 0;
 	ttiProc.phyReptTtiStretchCount = 0;
-	RETVOID;
+	return;
 }
 #endif