X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_lte.c;h=8a08904cbee19e274906cec0bae31a13fbf8e3ac;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=58257ee486d6f15e934ab176cd5ebacd70414530;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c index 58257ee48..8a08904cb 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; /*********************************************************** @@ -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, ¶m->rbId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbType, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->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, ¶m->hSfn, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf); - CMCHKUNPK(SUnpkU16,¶m->slot, mBuf); - RETVALUE(ROK); + //CMCHKUNPK(oduPackUInt16, ¶m->hSfn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + CMCHKUNPK(oduPackUInt16,¶m->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,41 +277,40 @@ 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, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkLteRbId, ¶m->rbId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->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 { - 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); @@ -352,24 +346,24 @@ 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 { - 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++) @@ -387,22 +381,22 @@ 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 { - 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; @@ -419,20 +413,20 @@ 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 { - U8 idx= 0; + uint8_t idx= 0; for(idx=0; idx < cpuInfo->numCores; idx++) { cpuInfo->cpuUtil[idx].maxCpuUtil = 0; @@ -440,29 +434,29 @@ 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 { - U8 idx= 0; + uint8_t idx= 0; cpuMeasInfo->numCores = cpuInfo->numCores; for(idx=0; idx < cpuInfo->numCores; idx++) { 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(uint32_t ttiProcessingTime) { ttiProc.numOfTti++; ttiProc.totTtiProcessingTime += ttiProcessingTime; @@ -487,10 +481,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 +492,7 @@ PUBLIC Void cmResetTtiCounters(Void) ttiProc.ttiStretchCount = 0; ttiProc.ttiThresholdExceedCount = 0; ttiProc.phyReptTtiStretchCount = 0; - RETVOID; + return; } #endif