#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 */
#ifdef __cplusplus
-EXTERN "C" {
+extern "C" {
#endif /*__cplusplus*/
/** @file cm_lte.x
/* definitions for Common LTE */
/** @brief Radio Bearer ID */
-typedef U8 CmLteRbId;
+typedef uint8_t CmLteRbId;
/** @brief Cell ID */
-typedef U16 CmLteCellId;
+typedef uint16_t CmLteCellId;
/** @brief RNTI */
-typedef U16 CmLteRnti;
+typedef uint16_t CmLteRnti;
/** @brief Mode Type TM/UM/AM */
-typedef U8 CmLteRlcMode;
+typedef uint8_t CmLteRlcMode;
/** @brief Logical Channel ID */
-typedef U8 CmLteLcId;
+typedef uint8_t CmLteLcId;
/** @brief Logical Channel Type */
-typedef U8 CmLteLcType;
+typedef uint8_t CmLteLcType;
/** @brief Transport Channel Type */
-typedef U8 CmLteTrchType;
+typedef uint8_t CmLteTrchType;
/** @brief Contention Resolution ID */
-typedef U8 CmLteContResId[6];
+typedef uint8_t CmLteContResId[6];
/** @brief RLC ID */
typedef struct cmLteRlcId
{
CmLteRbId rbId; /*!< Radio Bearer ID */
- U8 rbType; /*!< RB Type */
+ uint8_t rbType; /*!< RB Type */
CmLteRnti ueId; /*!< UE ID */
CmLteCellId cellId; /*!< Cell ID */
}CmLteRlcId;
/** @brief LTE Timing Info */
typedef struct cmLteTimingInfo
{
- U16 hSfn; /*!< Hyper System Frame Number */
- U16 sfn; /*!< System Frame Number */
- U8 subframe; /*!< Subframe number */
+#if 0
+ uint16_t hSfn; /*!< Hyper System Frame Number */
+#endif
+ uint16_t sfn; /*!< System Frame Number */
+ uint16_t slot; /*!< Subframe number */
} CmLteTimingInfo;
/** @brief PDCP ID */
CmLteCellId cellId; /*!< Cell ID */
CmLteRnti ueId; /*!< UE ID */
CmLteRbId rbId; /*!< PDCP Instance ID */
- U8 rbType; /*!< RB type */
+ uint8_t rbType; /*!< RB type */
} CmLtePdcpId;
/* Defining structures for Memory Information for L2-MEAS */
typedef struct cmLtePoolInfo
{
- U32 poolSize;
- U32 totAvailable;
- U32 crntUsed;
- U32 maxUsed;
+ uint32_t poolSize;
+ uint32_t totAvailable;
+ uint32_t crntUsed;
+ uint32_t maxUsed;
} CmLtePoolInfo;
typedef struct cmLteRegionInfo
{
- U8 regionType; /* 0-SSI 1-Shared */
- U8 regionId;
- U8 numPools;
- U8 isGenMemInfoUpdated;
+ uint8_t regionType; /* 0-SSI 1-Shared */
+ uint8_t regionId;
+ uint8_t numPools;
+ uint8_t isGenMemInfoUpdated;
CmLtePoolInfo poolInfo[MAX_POOL_SIZE];
}CmLteRegionInfo;
typedef struct cmLteMemInfo
{
- U8 numRegions;
- U8 idx;
+ uint8_t numRegions;
+ uint8_t idx;
CmLteRegionInfo regInfo[MAX_REGION_SIZE];
}CmLteMemInfo;
/** @brief CPU Utilization INFO */
typedef struct cmLteCpuUtilInfo
{
- U32 avgCpuUtil; /*!< average cpu utilization */
- U32 maxCpuUtil; /*!< Max cpu utilization */
+ uint32_t avgCpuUtil; /*!< average cpu utilization */
+ uint32_t maxCpuUtil; /*!< Max cpu utilization */
}CmLteCpuUtilInfo;
/** @brief CPU INFO */
typedef struct cmLteCpuInfo
{
- U8 numCores; /*!< number of cores*/
+ uint8_t numCores; /*!< number of cores*/
CmLteCpuUtilInfo cpuUtil[CM_MAX_CPU_CORES]; /*!< cpu measurement info*/
}CmLteCpuInfo;
/** @brief CPU Utilization INFO */
typedef struct cmCpuUtilStatsInfo
{
- U32 numSamples;
- U32 maxCpuUtil; /*!< Max cpu utilization */
- U32 totCpuUtil; /*!< Total cpu utilization */
+ uint32_t numSamples;
+ uint32_t maxCpuUtil; /*!< Max cpu utilization */
+ uint32_t totCpuUtil; /*!< Total cpu utilization */
}CmCpuUtilStatsInfo;
/** @brief CPU INFO */
typedef struct cmCpuStatsInfo
{
- U8 numCores; /*!< number of cores*/
+ uint8_t numCores; /*!< number of cores*/
CmCpuUtilStatsInfo cpuUtil[CM_MAX_CPU_CORES]; /*!< cpu measurement info*/
}CmCpuStatsInfo;
/** @brief Counter Statistics */
-typedef U32 CntrSts;
+typedef uint32_t CntrSts;
/** @brief Aggregation Level */
typedef enum cmLteAggrLvl
* PACK/UNPACK Functions
***************************************************************************/
-EXTERN PUBLIC S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo);
+S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo);
-EXTERN PUBLIC S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo);
+S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo);
-EXTERN PUBLIC S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo);
-EXTERN PUBLIC S16 UpdateSocMemInfo(U8 area , CmLteMemInfo *mInfo);
+S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo);
+S16 UpdateSocMemInfo(uint8_t area , CmLteMemInfo *mInfo);
-EXTERN S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo);
+S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo);
-EXTERN S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo);
-EXTERN PUBLIC Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,U8 Idx);
+S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo);
+Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,uint8_t Idx);
-EXTERN PUBLIC S16 SGetRegPoolInfo(U8* numRegion, U8* numPool);
+S16 SGetRegPoolInfo(uint8_t* numRegion, uint8_t* numPool);
/* Packing Functions */
-EXTERN S16 cmPkLteRlcId ARGS ((
+S16 cmPkLteRlcId ARGS ((
CmLteRlcId *param,
Buffer *mBuf
));
-EXTERN S16 cmPkLteTimingInfo ARGS ((
+S16 cmPkLteTimingInfo ARGS ((
CmLteTimingInfo *param,
Buffer *mBuf
));
-EXTERN S16 cmPkLtePdcpId ARGS ((
+S16 cmPkLtePdcpId ARGS ((
CmLtePdcpId *param,
Buffer *mBuf
));
/* Unpack Function */
-EXTERN S16 cmUnpkLteRlcId ARGS ((
+S16 cmUnpkLteRlcId ARGS ((
CmLteRlcId *param,
Buffer *mBuf
));
-EXTERN S16 cmUnpkLteTimingInfo ARGS ((
+S16 cmUnpkLteTimingInfo ARGS ((
CmLteTimingInfo *param,
Buffer *mBuf
));
-EXTERN S16 cmUnpkLtePdcpId ARGS ((
+S16 cmUnpkLtePdcpId ARGS ((
CmLtePdcpId *param,
Buffer *mBuf
));
typedef struct cmTtiProc
{
- U32 totTtiProcessingTime;
- U32 numOfTti;
- U32 maxTtiProcessingTime;
- U32 ttiStretchCount;
- U32 ttiThresholdExceedCount;
+ uint32_t totTtiProcessingTime;
+ uint32_t numOfTti;
+ uint32_t maxTtiProcessingTime;
+ uint32_t ttiStretchCount;
+ uint32_t ttiThresholdExceedCount;
/* this count is added to compare phy reported tti stretch and calculated tti stretch */
- U32 phyReptTtiStretchCount;
+ uint32_t phyReptTtiStretchCount;
}CmTtiProc;
-EXTERN CmTtiProc ttiProc;
+CmTtiProc ttiProc;
-EXTERN Void cmUpdateTtiCounters(U32 ttiProcessingTime);
-EXTERN Void cmResetTtiCounters(Void);
+Void cmUpdateTtiCounters(uint32_t ttiProcessingTime);
+Void cmResetTtiCounters(Void);
#endif
#ifdef __cplusplus