X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=8436719e5151c4be910cb1c9cd8f275ebcc55bd7;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=742a6d87ac7031f6aa51aa3d28b12ecb5fcfb54c;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git

diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index 742a6d87a..8436719e5 100755
--- a/src/cm/rgr.c
+++ b/src/cm/rgr.c
@@ -181,13 +181,13 @@ S16 cmPkRgrBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkRgrBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
@@ -254,7 +254,7 @@ Buffer *mBuf;
 #endif
 {
    SuId suId;
-   U8 status;
+   uint8_t status;
    
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
@@ -700,13 +700,13 @@ S16 cmPkRgrCfgCfm
 (
 Pst* pst,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkRgrCfgCfm(pst, transId, status)
 Pst* pst;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
@@ -772,7 +772,7 @@ Buffer *mBuf;
 #endif
 {
    RgrCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
 
    if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
@@ -820,14 +820,14 @@ S16 cmPkRgrSiCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkRgrSiCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
@@ -905,7 +905,7 @@ Buffer *mBuf;
 {
    SuId suId;
    RgrCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
@@ -1888,17 +1888,19 @@ Buffer *mBuf;
 {
 
      S32 i;
-     U32 tmpEnum; 
-     		 CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf); 
+     uint32_t tmpEnum; 
+     CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf); 
 
-	  for (i=0; i < param->numSi ; i++) {
-   	  	 CMCHKUNPK(oduPackUInt32,(U32*)&tmpEnum,mBuf);
-	  		 param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum;
+     for (i=0; i < param->numSi ; i++) 
+     {
+     	 CMCHKUNPK(oduPackUInt32,(uint32_t*)&tmpEnum,mBuf);
+	 param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum;
      }   
 
-     for (i=0; i < param->numSi ; i++) {
-   		 CMCHKUNPK(oduPackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
-   		 CMCHKUNPK(oduPackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
+     for (i=0; i < param->numSi ; i++)
+     {
+   	 CMCHKUNPK(oduPackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
+   	 CMCHKUNPK(oduPackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
      }
      //CMCHKUNPK(oduPackUInt16, &param->fddDlOrTddSfBitmapBR, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
@@ -1918,7 +1920,7 @@ Buffer *mBuf;
      CMCHKUNPK(oduPackUInt8, &param->siRepetition, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->sib1Repetition, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->siWinSizeBr, mBuf);
-     CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
      param->modPrd = (RgrModPeriodicity) tmpEnum;
      CMCHKUNPK(oduPackUInt8, &param->siHoppingEnable, mBuf);
 
@@ -2209,10 +2211,10 @@ RgrPhichCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ngEnum = (RgrPhichNg) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->isDurExtend, mBuf);
    return ROK;
@@ -2364,13 +2366,13 @@ RgrSrsCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->isSrsCfgSetup, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBwEnum = (RgrSrsBwCfg) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->srsSubFrameCfg, mBuf);
    return ROK;
@@ -2457,7 +2459,7 @@ RgrRachCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 #ifdef RGR_V1 
@@ -2468,7 +2470,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->preambleFormat, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->raWinSize, mBuf);
       CMCHKUNPK(oduPackUInt8, &param->raOccasion.size, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum;
       for (i=0; i<param->raOccasion.size; i++) {
          CMCHKUNPK(oduPackUInt8, &param->raOccasion.subFrameNum[i], mBuf);
@@ -2523,12 +2525,12 @@ Buffer *mBuf;
                        sizeof(param->siPeriodicity[0]);
 
    for (idx=param->numSi-1; idx >= 0; idx--) {
-   /* Enum to be packed/unpacked as U32 instead of S32 */
+   /* Enum to be packed/unpacked as uint32_t instead of S32 */
       CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->numSi, mBuf);
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->modPrd, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->modPrd, mBuf);
 #endif/*RGR_SI_SCH*/
    CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf);
    CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf);
@@ -2564,7 +2566,7 @@ RgrSiCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
 #ifdef RGR_SI_SCH
    S16 idx;
@@ -2575,7 +2577,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->retxCnt, mBuf);
 #ifdef RGR_SI_SCH
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->modPrd = (RgrModPeriodicity) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf);
 
@@ -2584,9 +2586,9 @@ Buffer *mBuf;
       param->numSi = sizeof(param->siPeriodicity)/
                        sizeof(param->siPeriodicity[0]);
 
-   /* Enum to be packed/unpacked as U32 instead of S32 */
+   /* Enum to be packed/unpacked as uint32_t instead of S32 */
    for (idx=0; idx < param->numSi; idx++) {
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum;
    }
 #endif/*RGR_SI_SCH*/
@@ -2737,11 +2739,11 @@ RgrUlPwrCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(SUnpkS8, &param->p0NominalPusch, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->alpha = (RgrPwrAlpha) tmpEnum;
    CMCHKUNPK(SUnpkS8, &param->p0NominalPucch, mBuf);
    CMCHKUNPK(SUnpkS8, &param->deltaPreambleMsg3, mBuf);
@@ -3199,11 +3201,11 @@ RgrTddPrachInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->freqIdx, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->sfn = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->halfFrm, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ulStartSfIdx, mBuf);
@@ -3460,7 +3462,7 @@ Buffer           *mBuf
    for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx)
    {
 
-      CMCHKPK(oduUnpackUInt32, param->dynConfig[(U8)idx], mBuf);
+      CMCHKPK(oduUnpackUInt32, param->dynConfig[(uint8_t)idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf);
    CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf);
@@ -3488,7 +3490,7 @@ Buffer           *mBuf
    for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx)
    {
 
-      CMCHKUNPK(oduPackUInt32, &param->dynConfig[(U8)idx], mBuf);
+      CMCHKUNPK(oduPackUInt32, &param->dynConfig[(uint8_t)idx], mBuf);
    }
    return ROK;
 }
@@ -3661,10 +3663,10 @@ S16 cmPkRgrAbsConfig(param, mBuf)
 {
    S8   indx = 0;
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
    for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) 
    {
-      CMCHKPK(oduUnpackUInt8, param->absPattern[(U8)indx], mBuf);
+      CMCHKPK(oduUnpackUInt8, param->absPattern[(uint8_t)indx], mBuf);
    }
 
    CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf);
@@ -3701,7 +3703,7 @@ S16 cmPkRgrSfrConfig(param, mBuf)
 #endif
 {
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
 #ifdef TFU_UPGRADE   
    CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf);
    CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf);
@@ -3742,7 +3744,7 @@ S16 cmPkRgrDsfrConfig(param, mBuf)
 #endif
 {
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
 
    return ROK;
 
@@ -3777,7 +3779,7 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf)
 #endif
 {
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->status, mBuf);
    return ROK;
 
 }
@@ -3855,9 +3857,9 @@ S16 cmUnpkRgrAbsConfig(param, mBuf)
    CMCHKUNPK(oduPackUInt32, &param->absPatternType, mBuf);
    for (indx = 0; indx <RGR_ABS_PATTERN_LEN; indx++) 
    {
-      CMCHKUNPK(oduPackUInt8, &param->absPattern[(U8)indx], mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->absPattern[(uint8_t)indx], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 
@@ -3895,10 +3897,10 @@ S16 cmUnpkRgrSfrConfig(param, mBuf)
    CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.startRb, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.endRb, mBuf);
 #ifdef TFU_UPGRADE   
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pwrThreshold.pLow, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pwrThreshold.pHigh, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pLow, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pHigh, mBuf);
 #endif   
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 }
@@ -4240,7 +4242,7 @@ Buffer *mBuf;
    CMCHKPK(oduPackUInt16, &param->phichTxPwrOffset, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->isDynCfiEnb, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->isAutoCfgModeEnb, mBuf);
-   CMCHKPK(oduPackUInt32, (U32*)&param->msg4pAVal, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t*)&param->msg4pAVal, mBuf);
    /*LAA: Unpack LAA Cell params*/
    CMCHKUNPK(cmUnpkRgrLteUCellCfg, &param->lteUCfg, mBuf);
    #ifdef LTE_ADV
@@ -4322,11 +4324,11 @@ RgrUeAprdDlCqiCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum;
 
 #ifdef LTE_ADV
@@ -4410,13 +4412,13 @@ RgrUePrdDlCqiCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdicityEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->subframeOffst, mBuf);
    CMCHKUNPK(SUnpkS8, &param->cqiOffst, mBuf);
@@ -4500,7 +4502,7 @@ RgrUeDlPCqiSetup *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt16, &param->cqiPResIdx, mBuf);
@@ -4511,7 +4513,7 @@ Buffer *mBuf;
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKUNPK(oduPackUInt16, &param->riCfgIdx, mBuf); 
    CMCHKUNPK(oduPackUInt8, &param->sANCQI, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = (RgrPrdCqiMode) tmpEnum;
    return ROK;
 }
@@ -4662,16 +4664,16 @@ RgrUeUlSrsSetupCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKUNPK(oduPackUInt16, &param->srsCfgIdx, mBuf); 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBw = (RgrUlSrsBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->duration, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->sANSrs, mBuf);
@@ -5446,12 +5448,12 @@ RgrUeAckNackRepCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->isAckNackEnabled, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->pucchAckNackRep, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum;
    return ROK;
 }
@@ -5523,14 +5525,14 @@ RgrUeTxModeCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum;
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->txModeEnum = (RgrTxMode) tmpEnum;
    return ROK;
 }
@@ -5753,7 +5755,7 @@ RgrUeSpsDlCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 
@@ -5763,7 +5765,7 @@ Buffer *mBuf;
    for (i=0; i<param->numPucchVal; i++) {
       CMCHKUNPK(oduPackUInt32, &param->n1PucchVal[i], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlSpsPrdctyEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt16, &param->explicitRelCnt, mBuf);
    return ROK;
@@ -5852,12 +5854,12 @@ RgrUeSpsUlCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 
    CMCHKUNPK(oduPackUInt8, &param->isUlSpsEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->implicitRelCnt = tmpEnum;
 
 #ifdef LTE_TDD
@@ -5867,7 +5869,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->pwrCfgPres, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0NominalPuschVal, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0UePuschVal, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulSpsPrdctyEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->lcCnt, mBuf); 
    for (i=0; i<param->lcCnt; i++) {
@@ -6246,11 +6248,11 @@ RgrUeTxAntSelCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->selType = (RgrUeTxAntSelType) tmpEnum;
    return ROK;
 }
@@ -6363,8 +6365,8 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf);
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf);
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf);
-      CMCHKUNPK(cmUnpkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
-      CMCHKUNPK(cmUnpkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
+      CMCHKUNPK(cmUnpkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
+      CMCHKUNPK(cmUnpkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
       CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf);
       CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf);
       for(idx = 0; idx < 5; idx++)
@@ -6377,7 +6379,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf);
 
    }
-   CMCHKUNPK(cmUnpkTknU32,&(emtcEpdcchCfg->startSymbolr11),mBuf);
+   CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf);
    for(indx = 0; indx < 5; indx++)
    {
       CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf);
@@ -6449,7 +6451,7 @@ S16 cmPkRgrEmtcUeCfg
    {
       CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf);
    }
-   CMCHKPK(cmPkTknU32,&emtcEpdcchCfg->startSymbolr11,mBuf);
+   CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf);
    for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--)
    {
       epdcchAddModLst =  &(emtcEpdcchCfg->epdcchAddModLst[indx]);
@@ -6463,8 +6465,8 @@ S16 cmPkRgrEmtcUeCfg
       }
       CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf);
       CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf);
-      CMCHKPK(cmPkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
-      CMCHKPK(cmPkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
+      CMCHKPK(cmPkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
+      CMCHKPK(cmPkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf);
@@ -6627,7 +6629,7 @@ Buffer *mBuf;
    CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf);
 
 #endif
-   CMCHKPK(cmPkTknU8, &param->dedPreambleId, mBuf);
+   CMCHKPK(cmPkTknUInt8, &param->dedPreambleId, mBuf);
    CMCHKPK(cmPkRgrCodeBookRstCfg, &param->ueCodeBookRstCfg, mBuf);
    CMCHKPK(cmPkRgrUeCapCfg, &param->ueCapCfg, mBuf);
    CMCHKPK(cmPkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
@@ -6688,7 +6690,7 @@ RgrUeCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -6704,7 +6706,7 @@ Buffer *mBuf;
     * retxBSR-timer */
    CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, &param->ueBsrTmrCfg, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
@@ -6719,10 +6721,10 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeCapCfg, &param->ueCapCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, &param->ueCodeBookRstCfg, mBuf);
-   CMCHKUNPK(cmUnpkTknU8, &param->dedPreambleId, mBuf);
+   CMCHKUNPK(cmUnpkTknUInt8, &param->dedPreambleId, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackModeEnum = tmpEnum;
 
 #endif
@@ -6751,7 +6753,7 @@ Buffer *mBuf;
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKUNPK(cmUnpkRgrLteAdvancedUeConfig, &param->ueLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
 
 #ifdef EMTC_ENABLE
@@ -7729,7 +7731,7 @@ Buffer *mBuf;
 
    CMCHKPK(cmPkRgrUeAprdDlCqiCfg, &param->aprdDlCqiRecfg, mBuf);
    CMCHKPK(cmPkRgrUeTxModeCfg, &param->txMode, mBuf);
-   /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */
+   /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* LTE_ADV_FLAG_REMOVED_START */
    /* KW fix for LTE_ADV */
    CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf);
@@ -7769,14 +7771,14 @@ RgrUeRecfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->oldCrnti, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->newCrnti, mBuf);
    /* LTE_ADV_FLAG_REMOVED_START */
-   /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */
+   /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* KW fix for LTE_ADV */
    CMCHKUNPK(oduPackUInt32, &param->ueRecfgTypes, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
@@ -7811,7 +7813,7 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMeasGapRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, &param->ueCodeBookRstRecfg, mBuf);
 /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
    CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, &param->ulTxAntSel, mBuf);
    /*rgr_c_001.main_7 - Added support for SPS*/
@@ -7850,7 +7852,7 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, &param->sCellAckN1ResCfg,mBuf);
    CMCHKUNPK(oduPackUInt8, &param->simulAckNackCQIFormat3, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
 
    CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
 #ifdef EMTC_ENABLE
@@ -8177,7 +8179,7 @@ Buffer *mBuf;
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkRgrUeDlSecCellRelInfo, &param->ueSCellRelDedCfg[(U8)idx],mBuf);
+      CMCHKPK(cmPkRgrUeDlSecCellRelInfo, &param->ueSCellRelDedCfg[(uint8_t)idx],mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
 
@@ -8312,7 +8314,7 @@ RgrUeSecCellRelInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
 
@@ -8473,7 +8475,7 @@ Buffer      *mBuf;
    }
    for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++)
    {
-      CMCHKUNPK(oduPackUInt32,(U32 *) &param->paLevelPerPrb[count], mBuf);
+      CMCHKUNPK(oduPackUInt32,(uint32_t *) &param->paLevelPerPrb[count], mBuf);
    }
    return ROK;
 }
@@ -8545,7 +8547,7 @@ Buffer      *mBuf;
 #endif
 {
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->cfgType, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->cfgType, mBuf);
    switch(param->cfgType)
    {
       case RGR_SON_PRB_CFG :
@@ -8690,7 +8692,7 @@ Buffer *mBuf;
 #endif
 {
 
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->numOfSCells, mBuf);
@@ -8769,7 +8771,7 @@ Buffer *mBuf;
    S8 idx;
    for(idx = param->numOfSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[(U8)idx], mBuf);
+      CMCHKPK(cmPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[(uint8_t)idx], mBuf);
    }
 
    CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf);
@@ -9492,7 +9494,7 @@ Buffer *mBuf;
 #endif
 {
    MsgLen   msgLen;
-   U32      count;
+   uint32_t      count;
    CmLList  *node, *prevNode;
    RgrSegmentInfo   *pdu;
  
@@ -9558,7 +9560,7 @@ Buffer *mBuf;
 #endif
 {
    MsgLen   msgLen, totalMsgLen;
-   U32      count, loopCnt;
+   uint32_t      count, loopCnt;
    Buffer   *pdu;
    CmLList  *node;
 
@@ -9621,14 +9623,14 @@ S16 cmPkRgrWarningSiStopReq
 Pst           *pst,
 SpId          spId,
 RgrCfgTransId transId,
-U8            siId
+uint8_t            siId
 )
 #else
 S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId)
 Pst           *pst;
 SpId          spId;
 RgrCfgTransId transId;
-U8            siId;
+uint8_t            siId;
 #endif
 {
    Buffer *mBuf = NULLP;
@@ -9702,7 +9704,7 @@ Buffer *mBuf;
 #endif
 {
    SpId          spId;
-   U8            siId;
+   uint8_t            siId;
    RgrCfgTransId transId;
 
 
@@ -9757,16 +9759,16 @@ S16 cmPkRgrWarningSiCfgCfm
 Pst*          pst,
 SuId          suId,
 RgrCfgTransId transId,
-U8            siId,
-U8            status
+uint8_t            siId,
+uint8_t            status
 )
 #else
 S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
 Pst*          pst;
 SuId          suId;
 RgrCfgTransId transId;
-U8            siId;
-U8            status;
+uint8_t            siId;
+uint8_t            status;
 #endif
 {
    Buffer *mBuf = NULLP;
@@ -9861,9 +9863,9 @@ Buffer *mBuf;
 #endif
 {
    SuId          suId;
-   U8            siId;
+   uint8_t            siId;
    RgrCfgTransId transId;
-   U8            status;
+   uint8_t            status;
 
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
@@ -10533,7 +10535,7 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numCqiRept, mBuf);
    for (idx = 0; idx < param->numCqiRept; idx++)
@@ -10607,7 +10609,7 @@ Buffer *mBuf;
 #endif
 {
    S8 idx;
-   U8 count;
+   uint8_t count;
 
 
    CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf);
@@ -10684,7 +10686,7 @@ RgrUeCqiRept *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSubBand, mBuf);
    for (idx = 0; idx < param->numSubBand; idx++)
@@ -10886,7 +10888,7 @@ RgrLoadInfIndInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U8                     idx;
+   uint8_t                     idx;
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(oduUnpackUInt16, param->bw, mBuf);
@@ -10939,7 +10941,7 @@ Buffer *mBuf;
 
    /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
    TknStrOSXL  *tknStr;
-   U16         ndx;
+   uint16_t         ndx;
 
 
    CMCHKUNPK(oduPackUInt32, &param->type, mBuf);
@@ -10947,7 +10949,7 @@ Buffer *mBuf;
    {
       for(idx = RGR_ABS_PATTERN_LEN -1 ; idx >= 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt32, &param->u.absLoadInfo[(U8)idx], mBuf);
+         CMCHKUNPK(oduPackUInt32, &param->u.absLoadInfo[(uint8_t)idx], mBuf);
       }
    }
    else
@@ -11059,12 +11061,12 @@ RgrUepACfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, (U8 *)&param->pAPrsnt, mBuf);
+   CMCHKUNPK(oduPackUInt8, (uint8_t *)&param->pAPrsnt, mBuf);
    if (param->pAPrsnt)
    {
-      CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
       param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum;
    }
 
@@ -11253,7 +11255,7 @@ Buffer *mBuf;
    CMCHKPK(cmPkRgrUePdschDedCfg, &param->uePdschDedCfg, mBuf);
 #endif
    CMCHKPK(cmPkRgrUeDlCqiCfg,&param->ueSCellDlCqiCfg, mBuf);
-   CMCHKPK(cmPkTknU32, &param->sCellDeActTmr, mBuf);
+   CMCHKPK(cmPkTknUInt32, &param->sCellDeActTmr, mBuf);
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
 
@@ -11292,7 +11294,7 @@ Buffer *mBuf;
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkRgrUeSecCellCfg, &param->ueSCellDedCfg[(U8)idx],mBuf);
+      CMCHKPK(cmPkRgrUeSecCellCfg, &param->ueSCellDedCfg[(uint8_t)idx],mBuf);
    }
 
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -11332,7 +11334,7 @@ Buffer *mBuf;
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
-   CMCHKUNPK(cmUnpkTknU32, &param->sCellDeActTmr, mBuf);
+   CMCHKUNPK(cmUnpkTknUInt32, &param->sCellDeActTmr, mBuf);
    CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, &param->ueSCellDlCqiCfg, mBuf);
 #ifdef TFU_UPGRADE
    CMCHKUNPK(cmUnpkRgrUePdschDedCfg, &param->uePdschDedCfg, mBuf);
@@ -11374,7 +11376,7 @@ RgrUeSecCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->useExtBSRSizes, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
@@ -11420,14 +11422,14 @@ Buffer *mBuf;
    { 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
@@ -11436,14 +11438,14 @@ Buffer *mBuf;
    {
       for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf);
 
       for(idx = param->u.format3.sCellAckN3ResAntP0Count- 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf);
@@ -11480,10 +11482,10 @@ RgrUeSCellAckPucchCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
 
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pucchFormatType, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pucchFormatType, mBuf);
    //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS)
    if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B)
    {
@@ -11892,7 +11894,7 @@ RgrCellCntrlCmdCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf);