Jira id - ODUHIGH-227

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

diff --git a/src/cm/cm_lte.x b/src/cm/cm_lte.x
index 02ddd08..6272d4d 100755 (executable)
--- a/src/cm/cm_lte.x
+++ b/src/cm/cm_lte.x
@@ -37,22 +37,22 @@
 
 #include <cm_lte.h>
 /* Packing Defines */
-#define cmPkLteRbId              SPkU8
-#define cmPkLteRnti              SPkU16
-#define cmPkLteCellId            SPkU16
-#define cmPkLteRlcMode           SPkU8
-#define cmPkLteLcId              SPkU8
-#define cmPkLteLcType            SPkU8
-#define cmPkLteAggrLvl           SPkU32
+#define cmPkLteRbId              oduUnpackUInt8
+#define cmPkLteRnti              oduUnpackUInt16
+#define cmPkLteCellId            oduUnpackUInt16
+#define cmPkLteRlcMode           oduUnpackUInt8
+#define cmPkLteLcId              oduUnpackUInt8
+#define cmPkLteLcType            oduUnpackUInt8
+#define cmPkLteAggrLvl           oduUnpackUInt32
 
 /* Unpacking Defines */
-#define cmUnpkLteRbId            SUnpkU8
-#define cmUnpkLteRnti            SUnpkU16
-#define cmUnpkLteCellId          SUnpkU16
-#define cmUnpkLteRlcMode         SUnpkU8
-#define cmUnpkLteLcId            SUnpkU8
-#define cmUnpkLteLcType          SUnpkU8
-#define cmUnpkLteAggrLvl         SUnpkU32
+#define cmUnpkLteRbId            oduPackUInt8
+#define cmUnpkLteRnti            oduPackUInt16
+#define cmUnpkLteCellId          oduPackUInt16
+#define cmUnpkLteRlcMode         oduPackUInt8
+#define cmUnpkLteLcId            oduPackUInt8
+#define cmUnpkLteLcType          oduPackUInt8
+#define cmUnpkLteAggrLvl         oduPackUInt32
 
 #define MAX_POOL_SIZE        6      /*!< Maximum pool size */
 #define MAX_REGION_SIZE      5      /*!< Maximum Region size */
@@ -111,9 +111,11 @@ typedef struct cmLteRlcId
 /** @brief LTE Timing Info */
 typedef struct cmLteTimingInfo
 {
+#if 0
    U16 hSfn;                 /*!< Hyper System Frame Number */
+#endif
    U16 sfn;                  /*!< System Frame Number */
-   U8  subframe;             /*!< Subframe number */
+   U16 slot;             /*!< Subframe number */
 } CmLteTimingInfo;
 
 /** @brief PDCP ID */
@@ -210,19 +212,19 @@ typedef enum cmLteUeCategory
  *                         PACK/UNPACK Functions
  ***************************************************************************/
 
-EXTERN PUBLIC S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo);
+EXTERN S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo);
 
-EXTERN PUBLIC S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo);
+EXTERN S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo);
 
-EXTERN PUBLIC S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo);
-EXTERN PUBLIC S16 UpdateSocMemInfo(U8 area , CmLteMemInfo *mInfo);
+EXTERN S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo);
+EXTERN S16 UpdateSocMemInfo(U8 area , CmLteMemInfo *mInfo);
 
 EXTERN S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo);
 
 EXTERN S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo);
-EXTERN PUBLIC Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,U8 Idx);
+EXTERN Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,U8 Idx);
 
-EXTERN PUBLIC S16 SGetRegPoolInfo(U8* numRegion, U8* numPool);
+EXTERN S16 SGetRegPoolInfo(U8* numRegion, U8* numPool);
 
 /* Packing Functions */
 EXTERN S16 cmPkLteRlcId ARGS ((