X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_lte.c;h=89b145b32e0a787e7c0ab6f56205a4ed7ce9a31e;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=8a08904cbee19e274906cec0bae31a13fbf8e3ac;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c
index 8a08904cb..89b145b32 100755
--- a/src/cm/cm_lte.c
+++ b/src/cm/cm_lte.c
@@ -88,23 +88,13 @@ uint32_t 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)
 {
 
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+   CMCHKPK(oduPackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
    return ROK;
 }
@@ -126,22 +116,12 @@ 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)
 {
 
 
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rbType, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
@@ -164,23 +144,13 @@ 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)
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->slot, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
-   //CMCHKPK(oduUnpackUInt16, param->hSfn, mBuf);
+   CMCHKPK(oduPackUInt16, param->slot, mBuf);
+   CMCHKPK(oduPackUInt16, param->sfn, mBuf);
+   //CMCHKPK(oduPackUInt16, param->hSfn, mBuf);
    return ROK;
 }
 
@@ -201,23 +171,13 @@ 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)
 {
 
 
-   //CMCHKUNPK(oduPackUInt16, &param->hSfn, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
-   CMCHKUNPK(oduPackUInt16,&param->slot, mBuf);
+   //CMCHKUNPK(oduUnpackUInt16, &param->hSfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16,&param->slot, mBuf);
    return ROK;
 }
 
@@ -238,21 +198,11 @@ 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)
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+   CMCHKPK(oduPackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -276,36 +226,18 @@ 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)
 {
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rbType, mBuf);
    return ROK;
 }
 #ifdef LTE_L2_MEAS 
-#ifdef ANSI
-S16 cmUpdateSsiMemInfo
-(
-CmLteMemInfo *mInfo
-)
-#else
-S16 cmUpdateSsiMemInfo(mInfo)
-CmLteMemInfo *mInfo;
-#endif
+S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo)
 {
    uint8_t   numReg = 0;
    uint8_t   numPool = 0;
@@ -349,17 +281,7 @@ 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)
 {
    uint8_t idxReg = 0;
    uint8_t idxPool = 0;
@@ -384,15 +306,7 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearMemUtilizationCounter
-(
-CmLteMemInfo *memInfo
-)
-#else
-S16 cmClearMemUtilizationCounter(memInfo)
-CmLteMemInfo *memInfo;
-#endif
+S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo)
 {
    uint8_t idxReg = 0;
    uint8_t idxPool = 0;
@@ -416,15 +330,7 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearCpuUtilizationCounter
-(
-CmCpuStatsInfo *cpuInfo
-)
-#else
-S16 cmClearCpuUtilizationCounter(cpuInfo)
-CmCpuStatsInfo *cpuInfo
-#endif
+S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo)
 {
    uint8_t idx= 0;
    for(idx=0; idx < cpuInfo->numCores; idx++)
@@ -437,17 +343,7 @@ 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)
 {
    uint8_t idx= 0;
    cpuMeasInfo->numCores = cpuInfo->numCores;