X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_lte.c;h=d9327aafc3273801a319a38a0f0b7f08a711684d;hb=42f73fef5ef8722af83284e0f146b2da693a1f68;hp=d7d56fe5ae21e71618e86a9604bf72737b99c1a4;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c
index d7d56fe5a..d9327aafc 100755
--- a/src/cm/cm_lte.c
+++ b/src/cm/cm_lte.c
@@ -70,7 +70,7 @@
 
 
 /* public variable declarations */
-PUBLIC U32 cmLteTime;
+U32 cmLteTime;
 
 
 /***********************************************************
@@ -89,25 +89,24 @@ PUBLIC U32 cmLteTime;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkLteRlcId
+S16 cmPkLteRlcId
 (
 CmLteRlcId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkLteRlcId(param, mBuf)
+S16 cmPkLteRlcId(param, mBuf)
 CmLteRlcId *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkLteRlcId);
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-   CMCHKPK(SPkU8, param->rbType, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -128,25 +127,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLteRlcId
+S16 cmUnpkLteRlcId
 (
 CmLteRlcId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLteRlcId(param, mBuf)
+S16 cmUnpkLteRlcId(param, mBuf)
 CmLteRlcId *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkLteRlcId);
 
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->rbType, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -167,24 +165,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkLteTimingInfo
+S16 cmPkLteTimingInfo
 (
 CmLteTimingInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkLteTimingInfo(param, mBuf)
+S16 cmPkLteTimingInfo(param, mBuf)
 CmLteTimingInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkLteTimingInfo);
 
-   CMCHKPK(SPkU16, param->slot, mBuf);
-   CMCHKPK(SPkU16, param->sfn, mBuf);
-   //CMCHKPK(SPkU16, param->hSfn, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt16, param->slot, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
+   //CMCHKPK(oduUnpackUInt16, param->hSfn, mBuf);
+   return ROK;
 }
 
 
@@ -205,24 +202,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLteTimingInfo
+S16 cmUnpkLteTimingInfo
 (
 CmLteTimingInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLteTimingInfo(param, mBuf)
+S16 cmUnpkLteTimingInfo(param, mBuf)
 CmLteTimingInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkLteTimingInfo);
 
-   //CMCHKUNPK(SUnpkU16, &param->hSfn, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->sfn, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->slot, mBuf);
-   RETVALUE(ROK);
+   //CMCHKUNPK(oduPackUInt16, &param->hSfn, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
+   CMCHKUNPK(oduPackUInt16,&param->slot, mBuf);
+   return ROK;
 }
 
 
@@ -243,25 +239,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkLtePdcpId
+S16 cmPkLtePdcpId
 (
 CmLtePdcpId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkLtePdcpId(param, mBuf)
+S16 cmPkLtePdcpId(param, mBuf)
 CmLtePdcpId *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkLtePdcpId);
 
-   CMCHKPK(SPkU8, param->rbType, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -282,34 +277,33 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLtePdcpId
+S16 cmUnpkLtePdcpId
 (
 CmLtePdcpId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLtePdcpId(param, mBuf)
+S16 cmUnpkLtePdcpId(param, mBuf)
 CmLtePdcpId *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkLtePdcpId);
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->rbType, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
+   return ROK;
 }
 #ifdef LTE_L2_MEAS 
 #ifdef ANSI
-PUBLIC S16 cmUpdateSsiMemInfo
+S16 cmUpdateSsiMemInfo
 (
 CmLteMemInfo *mInfo
 )
 #else
-PUBLIC S16 cmUpdateSsiMemInfo(mInfo)
+S16 cmUpdateSsiMemInfo(mInfo)
 CmLteMemInfo *mInfo;
 #endif
 {
@@ -352,17 +346,17 @@ CmLteMemInfo *mInfo;
          mInfo->regInfo[idxReg].isGenMemInfoUpdated = TRUE; 
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmFillMemUtilizationMeas
+S16 cmFillMemUtilizationMeas
 (
  CmLteMemInfo *memoryInfo,
 CmLteMemInfo *memInfo
 )
 #else
-PUBLIC S16 cmFillMemUtilizationMeas(memoryInfo,memInfo)
+S16 cmFillMemUtilizationMeas(memoryInfo,memInfo)
 CmLteMemInfo *memoryInfo;
 CmLteMemInfo *memInfo;
 #endif
@@ -387,16 +381,16 @@ CmLteMemInfo *memInfo;
          memoryInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed  = memInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmClearMemUtilizationCounter
+S16 cmClearMemUtilizationCounter
 (
 CmLteMemInfo *memInfo
 )
 #else
-PUBLIC S16 cmClearMemUtilizationCounter(memInfo)
+S16 cmClearMemUtilizationCounter(memInfo)
 CmLteMemInfo *memInfo;
 #endif
 {
@@ -419,16 +413,16 @@ CmLteMemInfo *memInfo;
          memInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed  = 0;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmClearCpuUtilizationCounter
+S16 cmClearCpuUtilizationCounter
 (
 CmCpuStatsInfo *cpuInfo
 )
 #else
-PUBLIC S16 cmClearCpuUtilizationCounter(cpuInfo)
+S16 cmClearCpuUtilizationCounter(cpuInfo)
 CmCpuStatsInfo *cpuInfo
 #endif
 {
@@ -440,17 +434,17 @@ CmCpuStatsInfo *cpuInfo
       cpuInfo->cpuUtil[idx].numSamples = 0;
    }
    cpuInfo->numCores = 0;
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmFillCpuUtilizationMeas
+S16 cmFillCpuUtilizationMeas
 (
 CmLteCpuInfo *cpuMeasInfo,
 CmCpuStatsInfo *cpuInfo
 )
 #else
-PUBLIC S16 cmFillCpuUtilizationMeas(cpuMeasInfo,cpuInfo)
+S16 cmFillCpuUtilizationMeas(cpuMeasInfo,cpuInfo)
 CmLteCpuInfo *cpuMeasInfo;
 CmCpuStatsInfo *cpuInfo;
 #endif
@@ -462,7 +456,7 @@ CmCpuStatsInfo *cpuInfo;
       cpuMeasInfo->cpuUtil[idx].avgCpuUtil = cpuInfo->cpuUtil[idx].totCpuUtil/cpuInfo->cpuUtil[idx].numSamples;
       cpuMeasInfo->cpuUtil[idx].maxCpuUtil = cpuInfo->cpuUtil[idx].maxCpuUtil;
    }
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif
@@ -471,7 +465,7 @@ CmCpuStatsInfo *cpuInfo;
 CmTtiProc ttiProc;
 #define TTI_1MS 950
 
-PUBLIC Void cmUpdateTtiCounters(U32 ttiProcessingTime)
+Void cmUpdateTtiCounters(U32 ttiProcessingTime)
 {
    ttiProc.numOfTti++;
    ttiProc.totTtiProcessingTime += ttiProcessingTime;
@@ -490,7 +484,7 @@ PUBLIC Void cmUpdateTtiCounters(U32 ttiProcessingTime)
    RETVOID;    
 }
 
-PUBLIC Void cmResetTtiCounters(Void)
+Void cmResetTtiCounters(Void)
 {
 	ttiProc.totTtiProcessingTime = 0;
 	ttiProc.numOfTti = 0;