X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.x;h=58552aa17f666114902d5c563690ce94b1c64890;hb=112672aee2b176d420e1474b13a5655c3d1e92b4;hp=7987f8c6a30f251197e516c171ef5d864de0dbc2;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/cm/rgr.x b/src/cm/rgr.x
index 7987f8c6a..58552aa17 100755
--- a/src/cm/rgr.x
+++ b/src/cm/rgr.x
@@ -247,7 +247,7 @@ typedef enum _rgrSiPerd
    RGR_SI_PERD_512 = 512   /**< SI Periodicity 512 RF */
 } RgrSiPeriodicity;
 
-/*rgr_x_001.main_11 ccpu00115364 ADD changed U8 to enum for modPrd*/
+/*rgr_x_001.main_11 ccpu00115364 ADD changed uint8_t to enum for modPrd*/
 /*modification period = (modificationPeriodCoeff * defaultPagingCycle)%m*/
 /*where modificationPeriodCoeff={2,4,8,16} defaultPagingCycle={32,64,128,256}*/
 /**
@@ -404,16 +404,16 @@ typedef enum rgrSchFrmt1b3TypEnum
 /** @brief Transaction ID between MAC and RRM */
 typedef struct rgrCfgTransId
 {
-   U8 trans[RGR_CFG_TRANSID_SIZE]; /*!< RRM Transaction ID */
+   uint8_t trans[RGR_CFG_TRANSID_SIZE]; /*!< RRM Transaction ID */
 } RgrCfgTransId;
 
 /** @brief  Downlink HARQ configuration per Cell */
 typedef struct rgrDlHqCfg
 {
-   U8  maxDlHqTx;            /*!< Maximum number of DL HARQ Transmissions.
+   uint8_t  maxDlHqTx;            /*!< Maximum number of DL HARQ Transmissions.
                                   Minimum value is 1, maximum can be defined
                                   by the user */    
-   U8  maxMsg4HqTx;          /*!< Maximum msg4(Random Access) HARQ Transmissions
+   uint8_t  maxMsg4HqTx;          /*!< Maximum msg4(Random Access) HARQ Transmissions
                                   Minimum value is 1, Maximum can be defined by
                                   the user */
 } RgrDlHqCfg;
@@ -422,21 +422,21 @@ typedef struct rgrDlHqCfg
 typedef struct rgrRntiCfg
 {
    CmLteRnti startRnti;      /*!< Start RNTI for the range managed by MAC */
-   U16       size;           /*!< Indicates contiguous range of RNTI managed by
+   uint16_t       size;           /*!< Indicates contiguous range of RNTI managed by
                                   MAC */
 } RgrRntiCfg;
 
 /** @brief Downlink common channel code rate configuration per cell */
 typedef struct rgrDlCmnCodeRateCfg
 {
-   U16 bcchPchRaCodeRate;    /*!< BCCH on DLSCH, PCH and RARsp coding rate.
+   uint16_t bcchPchRaCodeRate;    /*!< BCCH on DLSCH, PCH and RARsp coding rate.
                               * This defines the actual number of bits per 1024
                               * physical layer bits  */
-   U16 pdcchCodeRate;        /*!< PDCCH code rate defines actual number of bits
+   uint16_t pdcchCodeRate;        /*!< PDCCH code rate defines actual number of bits
                               * per 1024 physical layer bits. This is used to
                               * calculate aggregation level for PDCCH meant 
                               * for broadcasting RNTIs  */
-   U8  ccchCqi;              /*!< Default CQI to be used for Msg4 in case where 
+   uint8_t  ccchCqi;              /*!< Default CQI to be used for Msg4 in case where 
                               * no CQI is available for the UE. ccchCqi ranges
                               * from 1 to 15.*/
 } RgrDlCmnCodeRateCfg;
@@ -444,22 +444,22 @@ typedef struct rgrDlCmnCodeRateCfg
 /** @brief Control Format Indicator (CFI) configuration per cell */
 typedef struct rgrCfiCfg
 {
-   U8 cfi;                   /*!< CFI for PDCCH: a value in set {1,2,3} */
+   uint8_t cfi;                   /*!< CFI for PDCCH: a value in set {1,2,3} */
 } RgrCfiCfg;
 
 /** @brief PUSCH sub-band configuration per cell */
 typedef struct rgrPuschSubBandCfg
 {
-  U8 subbandStart;           /*!< Sub-band start */
-  U8 numSubbands;            /*!< Number of equal sized sub-bands */
-  U8 size;                   /*!< Size of a sub-band */ 
-  U8 dmrs[RGR_MAX_SUBBANDS]; /*!< DMRS information per sub-band */
+  uint8_t subbandStart;           /*!< Sub-band start */
+  uint8_t numSubbands;            /*!< Number of equal sized sub-bands */
+  uint8_t size;                   /*!< Size of a sub-band */ 
+  uint8_t dmrs[RGR_MAX_SUBBANDS]; /*!< DMRS information per sub-band */
 } RgrPuschSubBandCfg;
 
 /** @brief Uplink common channel code rate configuration per cell */
 typedef struct rgrUlCmnCodeRateCfg
 {
-   U8 ccchCqi;              /*!< CCCH CQI index, also used as default
+   uint8_t ccchCqi;              /*!< CCCH CQI index, also used as default
                              *  initial CQI for UEs */
 } RgrUlCmnCodeRateCfg;
 
@@ -468,15 +468,15 @@ typedef struct rgrUlCmnCodeRateCfg
 /** @brief Target Uplink CQI to achieve through group power control configured per cell */
 typedef struct rgrUlTrgCqiCfg
 {
-   U8 trgCqi;                /*!< Target UL CQI to be achieved through power 
+   uint8_t trgCqi;                /*!< Target UL CQI to be achieved through power 
                                control.Range is defined is between 1 to 15 */
 } RgrUlTrgCqiCfg;
 /** 
   @brief Bandwidth configuration per cell */
 typedef struct rgrBwCfg
 {
-   U8 dlTotalBw;            /*!< Total Dowlink Bandwidth */
-   U8 ulTotalBw;            /*!< Total Uplink Bandwidth  */
+   uint8_t dlTotalBw;            /*!< Total Dowlink Bandwidth */
+   uint8_t ulTotalBw;            /*!< Total Uplink Bandwidth  */
 } RgrBwCfg;
 
 /** 
@@ -491,12 +491,12 @@ typedef struct rgrPhichCfg
   @brief PUCCH configuration per cell */
 typedef struct rgrPucchCfg
 {
-   U8  resourceSize;       /*!< PUCCH resource-size or N^(2)_RB (in RBs) */
-   U16 n1PucchAn;          /*!< N^(1)_PUCCH */
-   U8  deltaShift;         /*!< Delta Shift for PUCCH: a value in set {1,2,3} */ 
-   U8  cyclicShift;        /*!< Cyclic Shift for PUCCH (N^(1)_CS): a value in
+   uint8_t  resourceSize;       /*!< PUCCH resource-size or N^(2)_RB (in RBs) */
+   uint16_t n1PucchAn;          /*!< N^(1)_PUCCH */
+   uint8_t  deltaShift;         /*!< Delta Shift for PUCCH: a value in set {1,2,3} */ 
+   uint8_t  cyclicShift;        /*!< Cyclic Shift for PUCCH (N^(1)_CS): a value in
                              range [0-7] */ 
-   U8  maxPucchRb;         /*!< The max number of RBs for PUCCH. This will be
+   uint8_t  maxPucchRb;         /*!< The max number of RBs for PUCCH. This will be
                                 used to limit the max CFI value when dynamic
                                 CFI feature is enabled. If there is no 
                                 limitation on the max PUCCH RBs, this variable
@@ -511,32 +511,32 @@ typedef struct rgrSrsCfg
    RgrSrsCfgPrd srsCfgPrdEnum; /*!< SRS configuration period (in subframes).*/
    RgrSrsBwCfg  srsBwEnum;     /*!< SRS Bandwidth configuration per cell.
                                  Range - [0-7] */
-   U8           srsSubFrameCfg;/*!< SRS subframe configuration index per cell.
+   uint8_t           srsSubFrameCfg;/*!< SRS subframe configuration index per cell.
                                  Range - [0-15] */
 } RgrSrsCfg;
 /** 
   @brief RACH configuration per cell */
 typedef struct rgrRachCfg
 {
-   U8  preambleFormat;        /*!< RACH Preamble format: a value in set {0,1,2,3} */
-   U8  raWinSize;             /*!< RA Window size */
+   uint8_t  preambleFormat;        /*!< RACH Preamble format: a value in set {0,1,2,3} */
+   uint8_t  raWinSize;             /*!< RA Window size */
   /** @brief Ocassion at Which Random Access Is Expected */
    struct raOccasionS
    {
-      U8       size;         /*!< Number of subframe numbers */
+      uint8_t       size;         /*!< Number of subframe numbers */
       RgrRaSfn sfnEnum;      /*!< System Frame Number */
-      U8       subFrameNum[RGR_MAX_SUBFRAME_NUM]; /*!< Subframe numbers */
+      uint8_t       subFrameNum[RGR_MAX_SUBFRAME_NUM]; /*!< Subframe numbers */
    } raOccasion;             /*!< Random access occasions */
-   U8  maxMsg3Tx;            /*!< Maximum number of message 3 transmissions */
-   U8  numRaPreamble;        /*!< Number of RA Preambles */
-   U8  sizeRaPreambleGrpA;   /*!< Size of RA Preamble in Group A */
-   U16 msgSizeGrpA;          /*!< MESSAGE_SIZE_GROUP_A */ 
-   U8  prachResource;        /*!< N^RA_PRB: PRACH resource for random access */
+   uint8_t  maxMsg3Tx;            /*!< Maximum number of message 3 transmissions */
+   uint8_t  numRaPreamble;        /*!< Number of RA Preambles */
+   uint8_t  sizeRaPreambleGrpA;   /*!< Size of RA Preamble in Group A */
+   uint16_t msgSizeGrpA;          /*!< MESSAGE_SIZE_GROUP_A */ 
+   uint8_t  prachResource;        /*!< N^RA_PRB: PRACH resource for random access */
 /**@name RGR_V1 */
 /**@{ */
 #ifdef RGR_V1
    /* rgr_x_001.main_7: [ccpu00112372] Added contention resolution timer */
-   U8  contResTmr;           /*!< Contention resolution timer */
+   uint8_t  contResTmr;           /*!< Contention resolution timer */
 #endif
 /**@} */
 } RgrRachCfg;
@@ -546,17 +546,17 @@ typedef struct rgrRachCfg
 */
 typedef struct rgrSiCfg
 {
-   U8  siWinSize;  /*!< SI window size */
-   U8  retxCnt;    /*!< Retransmission count */
+   uint8_t  siWinSize;  /*!< SI window size */
+   uint8_t  retxCnt;    /*!< Retransmission count */
    /* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
 /**@name RGR_SI_SCH */
 /**@{ */
 #ifdef RGR_SI_SCH
-/*rgr_x_001.main_11 ccpu00115364 MOD changed U8 to enum for modPrd*/
+/*rgr_x_001.main_11 ccpu00115364 MOD changed uint8_t to enum for modPrd*/
    RgrModPeriodicity  modPrd;     /*!< Modificiation Period for SI */  
-   U8  numSi;      /*!<Number of SIs, SI Id starts from 1 */
+   uint8_t  numSi;      /*!<Number of SIs, SI Id starts from 1 */
    RgrSiPeriodicity siPeriodicity[RGR_MAX_NUM_SI]; /*!<Periodicities of SIs */
-   U16              minPeriodicity;  /*!< Minimum Periodicity Configured */
+   uint16_t              minPeriodicity;  /*!< Minimum Periodicity Configured */
 #endif/*RGR_SI_SCH*/
 /**@} */
 } RgrSiCfg;
@@ -566,7 +566,7 @@ typedef struct rgrSiCfg
 typedef struct rgrTpcRntiCfg
 {
    CmLteRnti startTpcRnti;   /*!< Start RNTI for TPC */
-   U16       size;           /*!< Indicates contiguous range of RNTI */
+   uint16_t       size;           /*!< Indicates contiguous range of RNTI */
 } RgrTpcRntiCfg;
 
 /* rgr_x_001.main_6 : documentation update. */
@@ -592,11 +592,11 @@ typedef struct rgrUlPwrCfg
  * @brief Cell-specific hopping configuration */
 typedef struct rgrPuschCfg
 {
-   U8       numSubBands; /*!< Number of sub-bands 
+   uint8_t       numSubBands; /*!< Number of sub-bands 
                             Currently this is unused parameter */
    Bool     isIntraHop;  /*!< Hopping mode inter/intra subframe
                              Currently this is unused parameter */
-   U8       hopOffst;    /*!< Hopping offset {0 ... 98} 
+   uint8_t       hopOffst;    /*!< Hopping offset {0 ... 98} 
                               Currently this is unused parameter*/
 } RgrPuschCfg;
 
@@ -605,15 +605,15 @@ typedef struct rgrPuschCfg
 typedef struct rgrCodeBookRstCfg
 {
    Bool   pres;          /*!< Code Book restriction present ?*/
-   U32    pmiBitMap[2];  /*!< Array for number of Bits for ports and TX Mode*/
+   uint32_t    pmiBitMap[2];  /*!< Array for number of Bits for ports and TX Mode*/
 } RgrCodeBookRstCfg;
 /**
  *  @brief Range of PDCCH Order Preamble Set managed by MAC */
 typedef struct rgrPreambleSetCfg
 {
    Bool    pres;      /*!< Indicates if other configuration fields are valid */
-   U8      start;     /*!< Start Preamble ID for the range managed by MAC */
-   U8      size;      /*!< Indicates contiguous range of premables managaed by
+   uint8_t      start;     /*!< Start Preamble ID for the range managed by MAC */
+   uint8_t      size;      /*!< Indicates contiguous range of premables managaed by
                         MAC */
 } RgrPreambleSetCfg; 
 
@@ -629,7 +629,7 @@ typedef struct rgrCmnLchCfg
                                CM_LTE_LCH_CCCH
                                CM_LTE_LCH_DCCH
                                CM_LTE_LCH_DTCH */  
-   U8            dir;        /*!< Indicates Direction. Direction can take following 
+   uint8_t            dir;        /*!< Indicates Direction. Direction can take following 
                                   values:
                                   RGR_DIR_TX
                                   RGR_DIR_RX
@@ -651,9 +651,9 @@ typedef struct rgrCmnLchCfg
   @brief RGR configuration for DLFS scheduler */ 
 typedef struct rgrDlfsCfg
 {
-  U8 isDlFreqSel;            /*!< Indicates if resource allocation is frequency
+  uint8_t isDlFreqSel;            /*!< Indicates if resource allocation is frequency
                                   selective or not */
-  U8 thresholdCqi;           /*!< This value is used by the DL frequency 
+  uint8_t thresholdCqi;           /*!< This value is used by the DL frequency 
                                selective   scheduler. This is the threshold
                                value below which the sub-band is not
                                considered for allocation for a frequency
@@ -701,8 +701,8 @@ typedef enum _rgrAbsPatternType
   @brief RGR RB range for SFR */
 typedef struct rgrSfrRbRange
 {
-   U8   startRb;  /*<! Start RB for cell edge user */
-   U8   endRb;    /*<! End RB for cell edge user */
+   uint8_t   startRb;  /*<! Start RB for cell edge user */
+   uint8_t   endRb;    /*<! End RB for cell edge user */
 } RgrSfrRbRange;
 
 #ifdef TFU_UPGRADE
@@ -737,16 +737,16 @@ typedef struct rgrDsfrConfig
 typedef struct rgrAbsConfig
 {
    RgrFeatureStatus status; /*!< Indicate feature is enabled or disabled */            
-   U32  absPatternType; /*!< Indicate it as Mute and/or Transmit type */
-   U8   absPattern[RGR_ABS_PATTERN_LEN]; /*!< ABS pattern */
-   U32  absLoadPeriodicity; /*!< ABS Load Ind periodicity in msec */ 
+   uint32_t  absPatternType; /*!< Indicate it as Mute and/or Transmit type */
+   uint8_t   absPattern[RGR_ABS_PATTERN_LEN]; /*!< ABS pattern */
+   uint32_t  absLoadPeriodicity; /*!< ABS Load Ind periodicity in msec */ 
 } RgrAbsConfig;
 
 /**
   @brief RGR configuration for LTE Advanced feature */
 typedef struct rgrLteAdvancedCellConfig
 {
-   U32                        pres;   /*!< To indicate presence of feature config */
+   uint32_t                        pres;   /*!< To indicate presence of feature config */
    RgrAbsConfig               absCfg; /*!< Configuration of ABS feature */
    RgrSfrConfig               sfrCfg; /*!< Configuration of SFR feature */
    RgrDsfrConfig              dsfrCfg;/*!< Configuration of DSFR feature */
@@ -759,10 +759,10 @@ typedef struct rgrLteAdvancedCellConfig
 /** @brief PRACH resource information for TDD */
 typedef struct rgrTddPrachInfo
 {
-   U8        freqIdx;          /*!< Frequency Index */
+   uint8_t        freqIdx;          /*!< Frequency Index */
    RgrRaSfn  sfn;              /*!< Even/Odd/All Radio Frames */
-   U8        halfFrm;          /*!< First/Second Half Frame */
-   U8        ulStartSfIdx;     /*!< Uplink Start Subframe Index;
+   uint8_t        halfFrm;          /*!< First/Second Half Frame */
+   uint8_t        ulStartSfIdx;     /*!< Uplink Start Subframe Index;
                                     RGR_TDD_SPL_UL_IDX must be used
                                     to configure special subframes */
 } RgrTddPrachInfo;
@@ -770,7 +770,7 @@ typedef struct rgrTddPrachInfo
 /** @brief Set of PRACH information for TDD */
 typedef struct rgrTddPrachRscInfo
 {
-   U8               numRsc;           /*!< Number of PRACH resources*/
+   uint8_t               numRsc;           /*!< Number of PRACH resources*/
    RgrTddPrachInfo  prachInfo[RGR_TDD_MAX_FREQ_RSRC];     /*!< PRACH information */
 } RgrTddPrachRscInfo;
 #endif /* LTE_TDD */
@@ -779,11 +779,11 @@ typedef struct rgrTddPrachRscInfo
 /** @brief set of PF Scheduler Parameters */ 
 typedef struct rgrEnbPfs
 {
-   U8           tptCoeffi;    /*!< Downlink Throughput Coeffiecient
+   uint8_t           tptCoeffi;    /*!< Downlink Throughput Coeffiecient
                                           Range 0 -10 */
-   U8           fairCoeffi;   /*!< Downlink Fairness Coeffiecient
+   uint8_t           fairCoeffi;   /*!< Downlink Fairness Coeffiecient
                                          Range 0 -10 */
-   U32          qciWgt[RGR_MAX_NUM_QCI];   /*!< Downlink Qci Weights */
+   uint32_t          qciWgt[RGR_MAX_NUM_QCI];   /*!< Downlink Qci Weights */
 } RgrEnbPfs;
 
 /** 
@@ -818,18 +818,34 @@ typedef struct rgrCellCntrlCmdCfg
       struct rachOvrLd
       {
          Bool backOffEnb; /*!< backoff RACH during overlaod */
-         U8   backOffVal; /*!< backoff value during overload */
+         uint8_t   backOffVal; /*!< backoff value during overload */
       }rachOvrLd;
 
       /** @brief CPU OverLoad Cntrl Cmd Description */
       struct cpuOvrLd
       {
-         U8 instruction;  /*!< CPU Over Load Cntrl Instruction */
+         uint8_t instruction;  /*!< CPU Over Load Cntrl Instruction */
       }cpuOvrLd;
    }cmdDesc;
 } RgrCellCntrlCmdCfg;
 
 
+/**
+  * @brief
+  * eNB level Scheduler Configurations
+  * along with other PFS config Parameters
+  */
+typedef struct macSchedGnbCfg
+{
+   uint8_t         numTxAntPorts;    /*!< Number of Tx antenna ports */
+   uint8_t         ulSchdType;     /*!< Indicates which UL scheduler to use, range
+                               * is 0..(number of schedulers - 1) */
+   uint8_t         dlSchdType;     /*!< Indicates which DL scheduler to use, range
+                               * is 0..(number of schedulers - 1) */
+   uint8_t         numCells;       /*!< Max number of cells */
+   uint8_t         maxUlUePerTti;  /*!< Max number of UE in UL per TTI */
+   uint8_t         maxDlUePerTti;  /*!< Max number of UE in DL per TTI */
+}MacSchedGnbCfg;
 /**
   * @brief
   * eNB level Scheduler Configurations
@@ -837,15 +853,15 @@ typedef struct rgrCellCntrlCmdCfg
   */
 typedef struct rgrSchedEnbCfg
 {
-   U8         numTxAntPorts;    /*!< Number of Tx antenna ports */
-   U8         dlSchdType;     /*!< Indicates which DL scheduler to use, range
+   uint8_t         numTxAntPorts;    /*!< Number of Tx antenna ports */
+   uint8_t         dlSchdType;     /*!< Indicates which DL scheduler to use, range
                                * is 0..(number of schedulers - 1) */
    union       rgrDlSchInfoS
    {
       RgrEnbPfs     dlPfs;      /*!< Information related to DL PFS 
                                   Scheduler */
    } dlSchInfo;
-   U8         ulSchdType;     /*!< Indicates which UL scheduler to use, range
+   uint8_t         ulSchdType;     /*!< Indicates which UL scheduler to use, range
                                 is 0..(number of schedulers - 1) */
    union       rgrUlSchInfoS
    {
@@ -856,7 +872,7 @@ typedef struct rgrSchedEnbCfg
                                   There is no range defined for the  
                                   values, However the product of all
                                   three priorities must not exceed the
-                                  range of U32 */
+                                  range of uint32_t */
    } ulSchInfo;
    RgrCellAccsMode     accsMode;       /*!< Cell Access Mode */ 
 #ifdef RG_5GTF
@@ -875,11 +891,11 @@ TODO: Check if this is to be added to re-configuration as well
 /* SPS_DEV */
 typedef struct rgrSpsCellCfg
 {
-   U8        maxSpsDlBw; /*!< BW used of SPS Scheduling */ 
+   uint8_t        maxSpsDlBw; /*!< BW used of SPS Scheduling */ 
                                                             
-   U16       maxSpsUePerDlSf; /*!< Maximum DL SPS UEs that can be 
+   uint16_t       maxSpsUePerDlSf; /*!< Maximum DL SPS UEs that can be 
                                                            scheduled in a TTI */
-   U16       maxSpsUePerUlSf; /*!< Maximum UL SPS UEs that can be scheduled
+   uint16_t       maxSpsUePerUlSf; /*!< Maximum UL SPS UEs that can be scheduled
                                 in a TTI */
 } RgrSpsCellCfg;
 
@@ -888,8 +904,8 @@ typedef struct rgrSpsCellCfg
  */
 typedef struct rgrCellCsgParamCfg
 {
-   U8   minDlResNonCsg;  /*!< Min PDSCH Resources for Non-CSG Members */
-   U8   minUlResNonCsg;  /*!< Min PUSCH Resources for Non-CSG Members */
+   uint8_t   minDlResNonCsg;  /*!< Min PDSCH Resources for Non-CSG Members */
+   uint8_t   minUlResNonCsg;  /*!< Min PUSCH Resources for Non-CSG Members */
 } RgrCellCsgParamCfg;
 
 /** @brief LAA Cell Configuration */
@@ -901,62 +917,62 @@ typedef struct rgrLteUCfg
 /* emtc */
 typedef struct rgrEmtcSiSchedInfo
 {
-   U8   emtcSiNarrowBand; /*!< narrowband assigned to SI */
-   U16  emtcSiTbs;         /*!< tbs value for SI */
+   uint8_t   emtcSiNarrowBand; /*!< narrowband assigned to SI */
+   uint16_t  emtcSiTbs;         /*!< tbs value for SI */
 }RgrEmtcSiSchedInfo;
 
 typedef struct rgrEmtcPrmbleMap
 {
-     U8  firstPreamble;       /*!< for each CE mode, starting preamble */
-     U8  lastPreamble;        /*!< for each CE mode, starting preamble */
+     uint8_t  firstPreamble;       /*!< for each CE mode, starting preamble */
+     uint8_t  lastPreamble;        /*!< for each CE mode, starting preamble */
 }RgrEmtcPrmbleMap;
 
 typedef struct rgrEmtcRachCElevelInfoLst
 {
-   U8                emtcRarHopping;         /*!< by defualt off */
-   U16               raEmtcWinSize;          /*!< RA Window size */
-   U16               raEmtcContResTmr;       /*!< Contension Resolution */
-   U16               emtcPreambleTransMax;   /*!< PreambleTransMax  */
+   uint8_t                emtcRarHopping;         /*!< by defualt off */
+   uint16_t               raEmtcWinSize;          /*!< RA Window size */
+   uint16_t               raEmtcContResTmr;       /*!< Contension Resolution */
+   uint16_t               emtcPreambleTransMax;   /*!< PreambleTransMax  */
    RgrEmtcPrmbleMap  emtcPreambleMap;           /*!< preamble mapping Info */ 
 }RgrEmtcRachCElevelInfoLst;
 
 typedef struct rgrEmtcRachCfg
 {
-   U8 emtcCeLvlSupported;
+   uint8_t emtcCeLvlSupported;
    RgrEmtcRachCElevelInfoLst ceLevelInfo[RGR_MAX_CE_LEVEL]; /* for all CE levels 0,1,2,3*/
 }RgrEmtcRachCfg;
 
 typedef struct rgrEmtcPdschCfg
 {
-   U16 emtcMaxRepCeModeA;   /*!< max repetition for CE ModeA */ 
-   U16 emtcMaxRepCeModeB;   /*!< max repetition for CE ModeB */ 
+   uint16_t emtcMaxRepCeModeA;   /*!< max repetition for CE ModeA */ 
+   uint16_t emtcMaxRepCeModeB;   /*!< max repetition for CE ModeB */ 
 }RgrEmtcPdschCfg;
 
 typedef struct rgrEmtcPuschCfg
 {
-   U16 emtcMaxRepCeModeA;  /*!< max repetition for CE ModeA */ 
-   U16 emtcMaxRepCeModeB;  /*!< max repetition for CE ModeB */
-   U8  emtcHoppingOffset;  /*!< Hopping offset */
+   uint16_t emtcMaxRepCeModeA;  /*!< max repetition for CE ModeA */ 
+   uint16_t emtcMaxRepCeModeB;  /*!< max repetition for CE ModeB */
+   uint8_t  emtcHoppingOffset;  /*!< Hopping offset */
 }RgrEmtcPuschCfg;
 
 typedef struct rgrEmtcPrachCEParamLst
 {
-   U8   emtcPrachCfgIdx;         /*!< Prach config index */
-   U8   emtcPrachFreqOffset;     /*!< Prach Frequency Offset */
-   U16  emtcPrachStartSubFrame;  /*!< Starting sub frame */
-   U8   emtcMaxPremAttemptCE;    /*!< max preamble attempt  CE */
-   U8   emtcNumRepPerPreambleAtt;/*!< num of repetition per preamble attempt*/
-   U8   emtcNumMpdcchNBtoMonitor;/*!< num of Mpddch NB to monitor */
-   U8   emtcMpdcchNBtoMonitor[RGR_MAX_NUM_MPDCCH_MONITOR];/*!<  Mpddch NB to monitor */
-   U16  emtcMpdcchNumRep;        /*!< num of Mpddch Number of repetition */
-   U8   emtcPrachHoppingCfg;     /*!< num of Prach Hopping config */
+   uint8_t   emtcPrachCfgIdx;         /*!< Prach config index */
+   uint8_t   emtcPrachFreqOffset;     /*!< Prach Frequency Offset */
+   uint16_t  emtcPrachStartSubFrame;  /*!< Starting sub frame */
+   uint8_t   emtcMaxPremAttemptCE;    /*!< max preamble attempt  CE */
+   uint8_t   emtcNumRepPerPreambleAtt;/*!< num of repetition per preamble attempt*/
+   uint8_t   emtcNumMpdcchNBtoMonitor;/*!< num of Mpddch NB to monitor */
+   uint8_t   emtcMpdcchNBtoMonitor[RGR_MAX_NUM_MPDCCH_MONITOR];/*!<  Mpddch NB to monitor */
+   uint16_t  emtcMpdcchNumRep;        /*!< num of Mpddch Number of repetition */
+   uint8_t   emtcPrachHoppingCfg;     /*!< num of Prach Hopping config */
 }RgrEmtcPrachCEParamLst;
 
 typedef struct rgrEmtcPrachCfg
 {
-   U8           emtcMpdcchStartSFCssRaFdd;  /*!< mdpcch start SubFrame Ra type2 */
-   U8           emtcPrachHopingOffset;      /*!< prach hopping offset value */
-   U8           emtcInitialCElevel;         /*!< Initial CE level to start with */
+   uint8_t           emtcMpdcchStartSFCssRaFdd;  /*!< mdpcch start SubFrame Ra type2 */
+   uint8_t           emtcPrachHopingOffset;      /*!< prach hopping offset value */
+   uint8_t           emtcInitialCElevel;         /*!< Initial CE level to start with */
    RgrEmtcPrachCEParamLst emtcPrachCEparmLst[RGR_MAX_CE_LEVEL];
 }RgrEmtcPrachCfg;
 
@@ -964,11 +980,11 @@ typedef struct rgrEmtcPrachCfg
 /*Changes by Simran*/
 typedef struct rgrFddDownlinkOrTddSubframeBitmapLC
 {
-   U8 sfnPtnChoice;
+   uint8_t sfnPtnChoice;
    union
    {
-      U16 ptn10;
-      U32 ptn40[2];
+      uint16_t ptn10;
+      uint32_t ptn40[2];
    }u;
 }RgrFddDownlinkOrTddSubframeBitmapLC;
 
@@ -977,43 +993,43 @@ typedef struct rgrEmtcSiCfg
 {
    Bool             siHoppingEnable;      /*!< SI Hopping enabled or not */
    RgrModPeriodicity  modPrd;     /*!< Modificiation Period for SI */  
-   U8               siWinSizeBr;          /*!< SI window size */
-   U8               sib1Repetition;       /*!< sib1-br repetition */
-   U8               siRepetition;         /*!< SI repetition pattern
+   uint8_t               siWinSizeBr;          /*!< SI window size */
+   uint8_t               sib1Repetition;       /*!< sib1-br repetition */
+   uint8_t               siRepetition;         /*!< SI repetition pattern
                                                everyRF,every2ndRF,every4thRF,every8thRF*/
-   U16              startSymbolLc;
+   uint16_t              startSymbolLc;
    /*Changes by Simran*/
    RgrFddDownlinkOrTddSubframeBitmapLC    fddDLOrTddSfBitmapLC;
-   //U16              fddDlOrTddSfBitmapBR; /*!< 10 bit value for sending SI*/
+   //uint16_t              fddDlOrTddSfBitmapBR; /*!< 10 bit value for sending SI*/
    RgrEmtcSiSchedInfo schdInfo[RGR_MAX_NUM_SI];
-   U8               numSi;      /*!<Number of SIs, SI Id starts from 1 */
+   uint8_t               numSi;      /*!<Number of SIs, SI Id starts from 1 */
    RgrSiPeriodicity siPeriodicity[RGR_MAX_NUM_SI]; /*!<Periodicities of SIs */
 } RgrEmtcSiCfg;
 
 typedef struct rgrEmtcPucchCfg
 {
-   U16       emtcN1pucchAnInfoLst[RGR_MAX_CE_LEVEL];  /*!< Max CE level is 4 */
-   U8        emtcPucchNumRepCEMsg4Lvl0;           /*!< update the level 0 */
-   U8        emtcPucchNumRepCEMsg4Lvl1;           /*!< update the level 1 */
-   U8        emtcPucchNumRepCEMsg4Lvl2;           /*!< update the level 2 */
-   U8        emtcPucchNumRepCEMsg4Lvl3;           /*!< update the level 3 */
+   uint16_t       emtcN1pucchAnInfoLst[RGR_MAX_CE_LEVEL];  /*!< Max CE level is 4 */
+   uint8_t        emtcPucchNumRepCEMsg4Lvl0;           /*!< update the level 0 */
+   uint8_t        emtcPucchNumRepCEMsg4Lvl1;           /*!< update the level 1 */
+   uint8_t        emtcPucchNumRepCEMsg4Lvl2;           /*!< update the level 2 */
+   uint8_t        emtcPucchNumRepCEMsg4Lvl3;           /*!< update the level 3 */
 }RgrEmtcPucchCfg;
 
 typedef struct rgrEmtcRntiCfg
 {
    CmLteRnti rntiCeModeAStart;      /*!< EMTC Start RNTI for the range managed by MAC */
    CmLteRnti rntiCeModeARange;      /*!< EMTC Range of RNTI for the CEMODE A */
-   U16       rntiCeModeBStart;      /*!< EMTC Start RNTI for the range managed by MAC */
+   uint16_t       rntiCeModeBStart;      /*!< EMTC Start RNTI for the range managed by MAC */
    CmLteRnti rntiCeModeBRange;      /*!< EMTC Range of RNTI for the CEMODE B */
-   U16       size;           /*!< Indicates contiguous range of RNTI managed by EMTC
+   uint16_t       size;           /*!< Indicates contiguous range of RNTI managed by EMTC
                                   MAC */
 } RgrEmtcRntiCfg;
 
 typedef struct rgrEmtcCellCfg
 {
-   U16               pci;            /*!< Physical Cell ID */
-   U32               emtcT300Tmr;    /*!< T300 timer as per Rel13 */
-   U32               emtcT301Tmr;    /*!< T301 timer as per Rel13 */
+   uint16_t               pci;            /*!< Physical Cell ID */
+   uint32_t               emtcT300Tmr;    /*!< T300 timer as per Rel13 */
+   uint32_t               emtcT301Tmr;    /*!< T301 timer as per Rel13 */
    RgrEmtcSiCfg      emtcSiCfg;      /*!< SI configuration */
    RgrEmtcRachCfg    emtcRachCfg;    /*!< Rach config as per Rel13*/
    RgrEmtcPdschCfg   emtcPdschCfg;   /*!< Pdsch config as per Rel13*/
@@ -1021,9 +1037,9 @@ typedef struct rgrEmtcCellCfg
    RgrEmtcPrachCfg   emtcPrachCfg;   /*!< Prach config as per Rel13*/
    RgrEmtcPucchCfg   emtcPucchCfg;   /*!< Pucch config as per Rel13*/
    RgrEmtcRntiCfg    emtcMacRnti;
-   U8                emtcPdschNbIdx;
-   U8                emtcMpdcchNbIdx;
-   U8                emtcPuschNbIdx;
+   uint8_t                emtcPdschNbIdx;
+   uint8_t                emtcMpdcchNbIdx;
+   uint8_t                emtcPuschNbIdx;
 }RgrEmtcCellCfg;
 
 #endif
@@ -1040,19 +1056,122 @@ typedef enum rgSchSfType
 typedef struct rgr5gtfCellCfg
 {
    RgSchSfType     dynConfig[MAX_5GTF_SUBFRAME_INFO];
-   U8              uePerGrp;
-   U8              ueGrpPerTti;
-   U8              numUes;
-   U8              numOfCC;
-   U8              bwPerCC;
-   U8              cfi;
+   uint8_t              uePerGrp;
+   uint8_t              ueGrpPerTti;
+   uint8_t              numUes;
+   uint8_t              numOfCC;
+   uint8_t              bwPerCC;
+   uint8_t              cfi;
 }Rgr5gtfCellCfg;
 #endif
 
+/** @brief This enum defines dl ul transmission periodicity as per spec 38.331
+ * servingCellConfigCommon */
+typedef enum rgrDlUlTxPrdcty
+{
+   RGR_DLULTXPRDCTY_MS0DOT5    = 0,  /*!<Periodicity of 0.5 ms*/
+   RGR_DLULTXPRDCTY_MS0DOT625, /*!<Periodicity of 0.625 ms*/
+   RGR_DLULTXPRDCTY_MS1,       /*!<Periodicity of 1 ms */
+   RGR_DLULTXPRDCTY_MS1DOT25,  /*!<Periodicity of 1.25 ms */
+   RGR_DLULTXPRDCTY_MS2,       /*!<Periodicity of 2 ms */
+   RGR_DLULTXPRDCTY_MS2DOT5,   /*!<Periodicity of 2.5 ms */
+   RGR_DLULTXPRDCTY_MS5,       /*!<Periodicity of 5 ms */
+   RGR_DLULTXPRDCTY_MS10       /*!<Periodicity of 10 ms */
+}RgrDlUlTxPrdcty;
+
+#if 0
+typedef struct rgrSlotCfg
+{
+Bool duplexMode;  /*!< FDD:0, TDD:1 */
+uint32_t  slotFrmt[RGR_MAX_SLOTS_IN_10MS]; /*!< Least significant 2 bits indicates:
+                                        00-DL, 01-UL, 10-Flexi, 11-Mixed
+                                        Rest 28 bits indicates 14 symbols
+                                        types(DL/UL/Flexi) 2 bits for
+                                        each symbol*/
+RgrDlUlTxPrdcty  dlUlTxPrdcty;       /*!< dl-ul-Transmission periodicity
+                                          as per 38.331 in servingCellConfigCommon*/
+
+}RgrSlotCfg;
+#endif
 /** @} */
 /** @brief Cell Configuration at RRM */
 typedef struct rgrCellCfg
 {
+
+#if 0
+   CmLteCellId         cellId;         /*!< Cell ID */
+   uint16_t                 pci;            /*!< Physical Cell ID */
+   uint8_t                  maxMsg3PerUlSlot; /*!< Maximum MSG3 that may be scheduled
+                                            per uplink slot */
+   uint8_t                  maxUePerUlSlot;   /*!<Maximum UE scheduled per UL slot */
+   uint8_t                  maxUePerDlSlot;   /*!<Maximum UE scheduled per DL in a TTI */
+   Bool                isCpUlExtend;   /*!< Cyclic prefix: TRUE-extended, 
+                                         FALSE-normal for UL */
+   Bool                isCpDlExtend;   /*!< Cyclic prefix: TRUE-extended, 
+                                         FALSE-normal for DL*/
+   RgrDlHqCfg          dlHqCfg;        /*!< HARQ related configuration */ 
+   RgrCfiCfg           cfiCfg;         /*!< CFI for PDCCH */
+   RgrUlTrgCqiCfg      trgUlCqi;       /*!< Target UL CQI */
+   RgrDlCmnCodeRateCfg dlCmnCodeRate;  /*!< Coding rate for common DL channels: 
+                                         Expressed in multiples of 1024 */
+   RgrUlCmnCodeRateCfg ulCmnCodeRate;  /*!< Coding rate for common UL channels: 
+                                         Expressed as index into CQI table */
+   RgrBwCfg            bwCfg;          /*!< Bandwidth configuration */
+   RgrUlPwrCfg         pwrCfg;         /*!< Cell-specific power configuration */
+   RgrPuschCfg         puschCfg;       /*!< Cell-specific hopping configuration */
+   RgrPreambleSetCfg   macPreambleSet; /*!< Range of PDCCH Order Preamble IDs
+                                         to be managed by MAC */
+
+   uint16_t                bcchTxPwrOffset; /*!< Tx Pwr Offset for BCCH tx on PDSCH.
+                                         Offset to the reference signal 
+                                         power. Value: 0 -> 10000, 
+                                         representing -6 dB to 4 dB in 0.001
+                                         dB steps */                                    
+   uint16_t                pcchTxPwrOffset; /*!< Tx Pwr Offset for PCCH tx.
+                                         Offset to the reference signal 
+                                         power. Value: 0 -> 10000, 
+                                         representing -6 dB to 4 dB in 0.001
+                                         dB steps */                                    
+   uint16_t                rarTxPwrOffset; /*!< Tx Pwr Offset for RAR tx.
+                                        Offset to the reference signal 
+                                        power. Value: 0 -> 10000, 
+                                        representing -6 dB to 4 dB in 0.001
+                                        dB steps */          
+   uint8_t                   nrMu; /*!<Indicates the number of Slot for a radio frame*/
+   uint8_t                   tbScalingField;/*!< TB Scaling Factor used while
+                                         calucating TBS for P-RNTI, or
+                                         RA-RNTI*/
+   RgrSlotCfg        slotCfg;         /*!< Slot config as per 38.211, sec
+                                              11.1 and
+                                              38.331
+                                              tdd-UL-DL-configcommon */
+#if 0 //TODO: uncomment after study
+   RgrDataDmrsTypAPosEnum dmrsTypAPos;      /*!< Position of (first) DL DM-RS is
+                                              included in NR-PBCH payload. value is 2 or 3 */
+
+   RgrSsPbchBlockCfg  ssPbchCfg;  /*!< SS PBCH Block configuration */
+   RgrFreqRangeType  freqRangeType;       /*!<Cell Frequency Range type (<=
+                                            3Ghz, 3 < x <= 6Ghz, > 6Ghz)*/
+   RgrType0PdcchCSSCfg type0PdcchCSSCfg; /*!< Type 0 CSS Config params */
+   RgrFreqInfoDlCfg      freqInfoDlCfg;    /*!< DL Frequency information
+                                             config  */
+   RgrSulCellCfg         sulCellCfg;   /*!< SUL Cell config */
+   RgrUlCfgCmn         ulCmnCfg;  /*!< initial UL Bwp and Ul freq
+                                    information */
+#endif
+   Bool                initDlBwpPres; /*!< intial common
+                                        DL BWP is present or not */
+   RgrBwpDlCmn      initDlBwp;    /*!<Initial Dl BWP*/
+   RgrAddlBwpCfg    addlBwpCfg; /*!<Additional BWP Configuration apart from
+                    Initial  BWP*/
+
+   RgrCellNsCfgInfo   nsCfg;   /*!< NSI Cfg */
+
+   RgrCellPfsCfgInfo   pfsCfg;   /*!< Pfs Config */
+   Bool   isRateMatchSsPbchEnbld; /*!<PDSCH rate match enabled for SS PBCH */
+   Bool   isRateMatchCsetEnbld; /*!<PDSCH rate match enabled */
+#endif
+#if 1
    CmLteCellId         cellId;         /*!< Cell ID */
    Inst                macInst;        /*!< MAC instance that is serving the cell */
    /**@name RGR_V1 */
@@ -1060,46 +1179,46 @@ typedef struct rgrCellCfg
 #ifdef RGR_V1
    /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number
       of  MSG3s */
-   U8                  maxMsg3PerUlSf; /*!< Maximum MSG3 that may be scheduled
+   uint8_t                  maxMsg3PerUlSf; /*!< Maximum MSG3 that may be scheduled
                                          per uplink subframe */
 #endif /* RGR_V1 */
    /** @} */
-   U8                  maxUePerUlSf;   /*!< Maximum UEs that may be scheduled
+   uint8_t                  maxUePerUlSf;   /*!< Maximum UEs that may be scheduled
                                          per uplink subframe. Currently this is
                                          unused parameter */
-   U8                  maxUePerDlSf;   /*!< Maximum UE to be considered for DL 
+   uint8_t                  maxUePerDlSf;   /*!< Maximum UE to be considered for DL 
                                          scheduling in a TTI.Currently this is
                                          unused parameter */
    /*[ccpu00138609]-ADD- Max limit for Msg4/DL CCCH Ues */
-   U8                  maxCcchPerDlSf; /*!< Max num of Msg4/DL CCCH SDU UEs that
+   uint8_t                  maxCcchPerDlSf; /*!< Max num of Msg4/DL CCCH SDU UEs that
                                          can be scheduled per TTI. It cannot 
                                          exceed max UE per Dl sf. If set as
                                          0, this will be a don't care 
                                          parameter */ 
-   U8                  maxUlBwPerUe;   /*!< Maximum number of RBs that can be  
+   uint8_t                  maxUlBwPerUe;   /*!< Maximum number of RBs that can be  
                                          allocated to an UE in an UL subframe
                                          Maximum value is defined by 
                                          RG_SCH_CMN_MAX_UL_BW_PER_UE in   
                                          rg_env.h. This can be modified as
                                          per need basis */
-   U8                  maxDlBwPerUe;   /*!< Maximum number of RBs that can be    
+   uint8_t                  maxDlBwPerUe;   /*!< Maximum number of RBs that can be    
                                          allocated to an UE in an DL subframe  
                                          Maximum value is defined by     
                                          RG_SCH_CMN_MAX_DL_BW_PER_UE in
                                          rg_env.h. This can be modified as 
                                          per need basis */
-   U8                  maxDlRetxBw;    /*!< Maximum number of RBs that can be     
+   uint8_t                  maxDlRetxBw;    /*!< Maximum number of RBs that can be     
                                          allocated for retransmission in DL
                                          Maximum value is defined by 
                                          RG_SCH_CMN_MAX_DL_RETX_BW in   
                                          rg_env.h. This can be modified as   
                                          per need basis */
-   U8                  maxDlUeNewTxPerTti; /*!< Maximum number of UEs that can  
+   uint8_t                  maxDlUeNewTxPerTti; /*!< Maximum number of UEs that can  
                                              be scheduled for a new DL    
                                              transmission in a TTI. Value should
                                              be configured by the user as per  
                                              specific needs */ 
-   U8                  maxUlUeNewTxPerTti;  /*!< Maximum number of UEs that can 
+   uint8_t                  maxUlUeNewTxPerTti;  /*!< Maximum number of UEs that can 
                                               be scheduled for a new UL 
                                               transmission in a TTI. Value should 
                                               be configured by the user as per  
@@ -1115,7 +1234,7 @@ typedef struct rgrCellCfg
    S8                  pMax;           /*!< To limit the Cell Uplink 
                                          transmission power */
 
-   U8                  dlfsSchdType;   /*!< Indicates which DLFS scheduler to use, range
+   uint8_t                  dlfsSchdType;   /*!< Indicates which DLFS scheduler to use, range
                                         * is 0..(number of schedulers - 1) */
    RgrDlHqCfg          dlHqCfg;        /*!< HARQ related configuration */ 
    RgrRntiCfg          macRnti;        /*!< Range of RNTIs to be managed by MAC */   
@@ -1138,15 +1257,15 @@ typedef struct rgrCellCfg
    RgrPuschCfg         puschCfg;       /*!< Cell-specific hopping configuration */
    RgrPreambleSetCfg   macPreambleSet; /*!< Range of PDCCH Order Preamble IDs
                                          to be managed by MAC */
-   U8                  numCmnLcs;      /*!< Number of common logical channels*/
+   uint8_t                  numCmnLcs;      /*!< Number of common logical channels*/
    RgrCmnLchCfg        cmnLcCfg[RGR_MAX_CMN_LC_PER_CELL];  /*!< Configuration for 
                                                              common logical channels */
    RgrCellCsgParamCfg  csgParamCfg;    /* Cell-specific configuration for CSG */
    /** @name LTE_TDD */
    /** @{ */
 #ifdef LTE_TDD
-   U8                  ulDlCfgIdx;     /*!< UL-DL configuration index*/
-   U8                  spclSfCfgIdx;   /*!< Special Subframe configuration index*/
+   uint8_t                  ulDlCfgIdx;     /*!< UL-DL configuration index*/
+   uint8_t                  spclSfCfgIdx;   /*!< Special Subframe configuration index*/
    RgrTddPrachRscInfo  prachRscInfo;   /*!< PRACH information */
 #endif /* LTE_TDD */
    /** @} */
@@ -1154,7 +1273,7 @@ typedef struct rgrCellCfg
    /* rgr_x_001.main_4: Added 0 as valid value to shut off RGR TICKs. */
    /** @name RGR_RRM_TICK */
    /** @{ */
-   U8                  rrmTtiIndPrd;   /*!< Periodicity of TTI indication from
+   uint8_t                  rrmTtiIndPrd;   /*!< Periodicity of TTI indication from
                                          MAC towards RGR user. Range [0-255]. A
                                          value of 1 means one tick per System
                                          Frame and 2 means one tick per 2 System
@@ -1169,32 +1288,32 @@ typedef struct rgrCellCfg
    RgrLteAdvancedCellConfig  rgrLteAdvCfg; /*!< RGR Configuration of LTE Adv */
    /* LTE_ADV_FLAG_REMOVED_END */
 #ifdef AIRSPAN
-   U8                dlCqiOverrideFloor;
-   U8                dlCqiOverrideCeil;
-   U8                ulCqiOverrideFloor;
-   U8                ulCqiOverrideCeil;
+   uint8_t                dlCqiOverrideFloor;
+   uint8_t                dlCqiOverrideCeil;
+   uint8_t                ulCqiOverrideFloor;
+   uint8_t                ulCqiOverrideCeil;
 #endif  
    /** @} */
-   U16 t300TmrVal;               /*!< t300Timer value configured in Frames */
+   uint16_t t300TmrVal;               /*!< t300Timer value configured in Frames */
 
    /* ccpu00132314-ADD-Tx power offsets for Common PDSCH transmissions */                                   
-   U16                bcchTxPwrOffset; /*!< Tx Pwr Offset for BCCH tx on PDSCH.
+   uint16_t                bcchTxPwrOffset; /*!< Tx Pwr Offset for BCCH tx on PDSCH.
                                          Offset to the reference signal 
                                          power. Value: 0 -> 10000, 
                                          representing -6 dB to 4 dB in 0.001
                                          dB steps */                                    
-   U16                pcchTxPwrOffset; /*!< Tx Pwr Offset for PCCH tx.
+   uint16_t                pcchTxPwrOffset; /*!< Tx Pwr Offset for PCCH tx.
                                          Offset to the reference signal 
                                          power. Value: 0 -> 10000, 
                                          representing -6 dB to 4 dB in 0.001
                                          dB steps */                                    
-   U16                rarTxPwrOffset; /*!< Tx Pwr Offset for RAR tx.
+   uint16_t                rarTxPwrOffset; /*!< Tx Pwr Offset for RAR tx.
                                         Offset to the reference signal 
                                         power. Value: 0 -> 10000, 
                                         representing -6 dB to 4 dB in 0.001
                                         dB steps */          
    /* ccpu00138898 - Added Tx pwr offset for PHICH Tx*/
-   U16                phichTxPwrOffset; /*!< Tx Pwr Offset for PHICH tx.
+   uint16_t                phichTxPwrOffset; /*!< Tx Pwr Offset for PHICH tx.
                                           Offset to the reference signal 
                                           power. Value: 0 -> 10000, 
                                           representing -6 dB to 4 dB in 0.001
@@ -1216,6 +1335,7 @@ typedef struct rgrCellCfg
 #ifdef RG_5GTF
    Rgr5gtfCellCfg     Cell5gtfCfg;
 #endif
+#endif
 } RgrCellCfg;
 /** 
   @brief Downlink Aperiodic CQI reporting related configuration per UE */
@@ -1226,8 +1346,8 @@ typedef struct rgrUeAprdDlCqiCfg
    RgrAprdCqiMode     aprdModeEnum;   /*!< Aperiodic CQI reporting mode */
    /* These two fields are only valid for Pcell*/
 #ifdef LTE_ADV
-   U8                 triggerSet1;    /*!< Trigger set one*/
-   U8                 triggerSet2;    /*!< Trigger set two*/
+   uint8_t                 triggerSet1;    /*!< Trigger set one*/
+   uint8_t                 triggerSet2;    /*!< Trigger set two*/
 #endif
 } RgrUeAprdDlCqiCfg;
 
@@ -1242,12 +1362,12 @@ typedef struct rgrUePrdDlCqiCfg
    RgrPrdCqiMode       prdModeEnum;   /*!< Peiodic CQI reporting mode. */
    RgrCqiPrdicity      prdicityEnum;  /*!< Periodicity values for CQI. 
                                            Currently, this is unused parameter. */
-   U8                  subframeOffst; /*!< Subframe offset. 
+   uint8_t                  subframeOffst; /*!< Subframe offset. 
                                            Currently, this is unused parameter. */
    S8                  cqiOffst;      /*!< Delta^cqi_offset: (actual_value*10).
                                            Currently, this is unused parameter. */ 
-   U8                  k;             /*!< k value: range [1-4] */
-   U16                 cqiPmiCfgIdx;  /*!< CQI-PMI configuration index. */
+   uint8_t                  k;             /*!< k value: range [1-4] */
+   uint16_t                 cqiPmiCfgIdx;  /*!< CQI-PMI configuration index. */
 } RgrUePrdDlCqiCfg;
 
 #else /* TFU_UPGRADE */
@@ -1258,13 +1378,13 @@ typedef struct rgrUePrdDlCqiCfg
 /* Reference: 36.313: CQI-ReportPeriodic */
 typedef struct rgrUeDlPCqiSetup
 {
-      U16  cqiPResIdx;  /*!< cqi-PUCCH-ResourceIndex (0.. 1185) */
-      U16  cqiPCfgIdx;  /*!< cqi-pmi-ConfigIndex (0..1023) */
-      U8   cqiRepType;  /*!< Wideband CQI = 1  Subband CQI =2 */
-      U8   k;           /*!< Ref: 36.213 [23, 7.2.2] (1..4). 
+      uint16_t  cqiPResIdx;  /*!< cqi-PUCCH-ResourceIndex (0.. 1185) */
+      uint16_t  cqiPCfgIdx;  /*!< cqi-pmi-ConfigIndex (0..1023) */
+      uint8_t   cqiRepType;  /*!< Wideband CQI = 1  Subband CQI =2 */
+      uint8_t   k;           /*!< Ref: 36.213 [23, 7.2.2] (1..4). 
                              Valid only for Subband CQI */
-      U8   riEna;       /*!< Rand Indicator is Enabled TRUE(1) FALSE(0) */
-      U16  riCfgIdx;    /*!< ri-ConfigIndex    (0..1023)  */
+      uint8_t   riEna;       /*!< Rand Indicator is Enabled TRUE(1) FALSE(0) */
+      uint16_t  riCfgIdx;    /*!< ri-ConfigIndex    (0..1023)  */
       Bool sANCQI;      /*!< simultaneousAckNackAndCQI TRUE(1) FALSE(0) */
       RgrPrdCqiMode prdModeEnum;   /*!< Peiodic CQI reporting mode */
 }RgrUeDlPCqiSetup;
@@ -1275,7 +1395,7 @@ typedef struct rgrUeDlPCqiSetup
 */
 typedef struct  rgrUeDlPCqiCfg
 {
-   U8                 type;               /*!< Setup(1) or Release(0) */    
+   uint8_t                 type;               /*!< Setup(1) or Release(0) */    
    RgrUeDlPCqiSetup   cqiSetup;           /*!< Periodic CQI Setup */
 } RgrUePrdDlCqiCfg;
 
@@ -1330,7 +1450,7 @@ typedef enum rgrUlSrsCycShiftInfo
 */
 typedef struct rgrUeUlSrsSetupCfg 
 {
-   U16               srsCfgIdx;         /*!< SRS Configuration Index ISRS   
+   uint16_t               srsCfgIdx;         /*!< SRS Configuration Index ISRS   
                                             Ref:  36.213: Table 8.2-1; Range: 0-636*/
    RgrUlSrsBwInfo    srsBw;        /*!< SRS Bandwidth */
    RgrUlSrsHoBwInfo  srsHopBw;     /*!< SRS Hoping Bandwidth */
@@ -1345,8 +1465,8 @@ typedef struct rgrUeUlSrsSetupCfg
                                      same value for all the UEs configured for
                                      the same  cell. */
 /* rgr_x_001.main_13 - DEL - Removed the redeclaration of sANSrs and added the proper comment termination  above  */
-   U8                txComb;       /*!< Tranmission Comb: 0..1 */
-   U8                fDomPosi;     /*!< Frequency Domain Position */
+   uint8_t                txComb;       /*!< Tranmission Comb: 0..1 */
+   uint8_t                fDomPosi;     /*!< Frequency Domain Position */
 }RgrUeUlSrsSetupCfg;
 
 
@@ -1368,8 +1488,8 @@ typedef enum rgrUeDsrTransMax
 */
 typedef struct rgrUeSrSetupCfg
 {
-   U16              srResIdx;       /*!< Range: 0-2047; Reference: SchedulingRequestConfig  */
-   U8               srCfgIdx;       /*!< Range: 0 -155; Reference: SchedulingRequestConfig */
+   uint16_t              srResIdx;       /*!< Range: 0-2047; Reference: SchedulingRequestConfig  */
+   uint8_t               srCfgIdx;       /*!< Range: 0 -155; Reference: SchedulingRequestConfig */
    /*ccpu00131601:DEL - dTMax will not be required by scheduler */
 }RgrUeSrSetupCfg;
 
@@ -1387,7 +1507,7 @@ typedef struct rgrUeSrCfg
 */
 typedef struct  rgrUeUlSrsCfg
 {
-   U8                      type;      /*!< Release=0 Setup =1 */
+   uint8_t                      type;      /*!< Release=0 Setup =1 */
    RgrUeUlSrsSetupCfg      srsSetup;  /*!< SRS Setup Configuration */
 
 }RgrUeUlSrsCfg;
@@ -1397,17 +1517,17 @@ typedef struct  rgrUeUlSrsCfg
 #ifdef LTE_ADV/* Sprint 3*/
 typedef struct rgrUePucchFormat3Cfg
 {
-   U8  sCellAckN3ResAntP0Count;
-   U8  sCellAckN3ResAntP1Count;
-   U16 sCellAckN3ResAntP0[4];
-   U16 sCellAckN3ResAntP1[4];
+   uint8_t  sCellAckN3ResAntP0Count;
+   uint8_t  sCellAckN3ResAntP1Count;
+   uint16_t sCellAckN3ResAntP0[4];
+   uint16_t sCellAckN3ResAntP1[4];
 }RgrUePucchFormat3Cfg;
 typedef struct rgrUePucchFormat1BCSCfg
 {
-   U8  sCellAckN1ResTb1Count; /* !< num of N1 res for TB1 */
-   U8  sCellAckN1ResTb2Count; /* !< num of N1 res for TB2 */
-   U16 sCellAckN1ResTb1[4];   /*!< TB1 N1 resources */
-   U16 sCellAckN1ResTb2[4];   /* !< TB2 N1 resources */
+   uint8_t  sCellAckN1ResTb1Count; /* !< num of N1 res for TB1 */
+   uint8_t  sCellAckN1ResTb2Count; /* !< num of N1 res for TB2 */
+   uint16_t sCellAckN1ResTb1[4];   /*!< TB1 N1 resources */
+   uint16_t sCellAckN1ResTb2[4];   /* !< TB2 N1 resources */
 }RgrUePucchFormat1BCSCfg;
 typedef struct rgrUeSCellAckPucchCfg
 {
@@ -1429,9 +1549,9 @@ typedef struct rgrUeSCellAckPucchCfg
 typedef struct rgrUePuschDedCfg 
 {
    Bool   pres;       /*! Prsent TRUE(1)/FALSE(0) */ 
-   U8     bACKIdx;    /*! betaOffset-ACK-Index (0..15) */
-   U8     bRIIdx;     /*! betaOffset-RI-Index (0..15) */  
-   U8     bCQIIdx;    /*! betaOffset-CQI-Index (0..15) */
+   uint8_t     bACKIdx;    /*! betaOffset-ACK-Index (0..15) */
+   uint8_t     bRIIdx;     /*! betaOffset-RI-Index (0..15) */  
+   uint8_t     bCQIIdx;    /*! betaOffset-CQI-Index (0..15) */
 }RgrUePuschDedCfg;
 /** 
 * @brief Downlink CQI reporting related configuration per UE
@@ -1447,15 +1567,15 @@ typedef struct rgrUeDlCqiCfg
 typedef struct rgrUeMeasGapCfg
 {
    Bool isMesGapEnabled;    /*!< Is Measuremnet Gap enabled or disabled */
-   U8   gapPrd;             /*!< Gap period 40ms/80ms */
-   U8   gapOffst;           /*!< Gap offset - Vaue is 0 to 1*/
+   uint8_t   gapPrd;             /*!< Gap period 40ms/80ms */
+   uint8_t   gapOffst;           /*!< Gap offset - Vaue is 0 to 1*/
 } RgrUeMeasGapCfg;
 /**
  @brief DRX Long Cycle Offset */
 typedef struct rgrDrxLongCycleOffst
 {
-   U16      longDrxCycle;   /*!< DRX Long Cycle value in subframes*/
-   U16      drxStartOffst;  /*!< DRX Long Cycle offset value in subframes*/ 
+   uint16_t      longDrxCycle;   /*!< DRX Long Cycle value in subframes*/
+   uint16_t      drxStartOffst;  /*!< DRX Long Cycle offset value in subframes*/ 
 } RgrDrxLongCycleOffst;
 
 /**
@@ -1463,8 +1583,8 @@ typedef struct rgrDrxLongCycleOffst
 typedef struct rgrDrxShortDrx
 {
    Bool    pres;             /*!< Short cycle is configured or not */
-   U16     shortDrxCycle;    /*!< DRX Short Cycle value in sub-frames*/
-   U8      drxShortCycleTmr; /*!< Value in multiples of Short DRX Cycles*/
+   uint16_t     shortDrxCycle;    /*!< DRX Short Cycle value in sub-frames*/
+   uint8_t      drxShortCycleTmr; /*!< Value in multiples of Short DRX Cycles*/
 } RgrDrxShortDrx;
 
 /**
@@ -1483,16 +1603,16 @@ typedef struct rgrUeDrxCfg
                                                 only a enum SETUP*/
 #endif
 /** @} */
-   U16                    drxOnDurTmr;       /*!< DRX On-duration Timer value in
+   uint16_t                    drxOnDurTmr;       /*!< DRX On-duration Timer value in
                                              PDCCH subframes */
-   U16                   drxInactvTmr;      /*!< DRX Inactivity Timer value in
+   uint16_t                   drxInactvTmr;      /*!< DRX Inactivity Timer value in
                                               PDCCH subframes */
-   U16                    drxRetxTmr;        /*!< DRX Retransmission Timer value in PDCCH
+   uint16_t                    drxRetxTmr;        /*!< DRX Retransmission Timer value in PDCCH
                                               subframes */
    RgrDrxLongCycleOffst  drxLongCycleOffst; /*!< DRX Long cycle and offset, values in subframes */
    RgrDrxShortDrx        drxShortDrx;       /*!< DRX Short cycle value and offset */
 #ifdef EMTC_ENABLE
-   U16                   emtcDrxUlRetxTmr;  /*Rel13 Drx Ul Retx Timer */
+   uint16_t                   emtcDrxUlRetxTmr;  /*Rel13 Drx Ul Retx Timer */
    Bool                  isEmtcUe;
    Bool                  drxOnDurTmrR13Pres;
    Bool                  drxRetxTmrR13Pres;
@@ -1503,7 +1623,7 @@ typedef struct rgrUeDrxCfg
  * @brief UE capability Configuration */
 typedef struct rgrUeCapCfg
 {
-   U8   pwrClass;        /*!< Power class per UE */
+   uint8_t   pwrClass;        /*!< Power class per UE */
    Bool intraSfFeqHop;   /*!< Intra subframe frequency hopping for PUSCH */
    Bool resAloocType1;   /*!< Resource allocation type 1 for PDSCH */
    Bool simCqiAckNack;   /*!< Simultaneous CQI and ACK/NACK on PUCCH */
@@ -1519,7 +1639,7 @@ typedef struct rgrUeAckNackRepCfg
                                              variable can be used in reconfiguration
                                              also to stop/release the ACK/NACK
                                              Repetition */
-   U16                  pucchAckNackRep;   /*!< n1PUCCH-AN-Rep */
+   uint16_t                  pucchAckNackRep;   /*!< n1PUCCH-AN-Rep */
    RgrAckNackRepFactor  ackNackRepFactor;  /*!< ACK/NACK Repetition factor */
 } RgrUeAckNackRepCfg;
 
@@ -1536,8 +1656,8 @@ typedef struct rgrUeTxModeCfg
   @brief Uplink HARQ configuration per UE */
 typedef struct rgrUeUlHqCfg
 {
-   U8 maxUlHqTx;           /*!< Maximum number of UL HARQ transmissions */
-   U8 deltaHqOffst;        /*!< Delta HARQ offset 
+   uint8_t maxUlHqTx;           /*!< Maximum number of UL HARQ transmissions */
+   uint8_t deltaHqOffst;        /*!< Delta HARQ offset 
                                 Currently this is unused parameter */
 } RgrUeUlHqCfg;
 /** 
@@ -1546,7 +1666,7 @@ typedef struct rgrUeGrpPwrCfg
 {
    Bool            pres;            /*!< Indicates presence of UE PUCCH/PUSCH group power configuration */  
    CmLteRnti       tpcRnti;         /*!< TPC PUCCH/PUSCH RNTI for UE */
-   U8              idx;             /*!< Index for format 3/3A */
+   uint8_t              idx;             /*!< Index for format 3/3A */
 } RgrUeGrpPwrCfg;
 /** 
   @brief Uplink power configuration per UE */
@@ -1558,9 +1678,9 @@ typedef struct rgrUeUlPwrCfg
    Bool           isDeltaMCSEnabled; /*!< To indicate Delta MCS Enabled */
    S8             p0UePusch;         /*!< P_0UE_PUSCH*/
    S8             p0UePucch;         /*!< P_0_PUCCH*/
-   U8             pSRSOffset;        /*!< P_SRS_OFFSET 
+   uint8_t             pSRSOffset;        /*!< P_SRS_OFFSET 
                                           Currently this is unused parameter */
-   U8             trgCqi;            /*!< CQI to aim for during PUSCH power
+   uint8_t             trgCqi;            /*!< CQI to aim for during PUSCH power
                                       *  control. Zero indicates absence, where
                                       *  cell-wide trgCqi is used */
 } RgrUeUlPwrCfg;
@@ -1569,15 +1689,15 @@ typedef struct rgrUeUlPwrCfg
 typedef struct rgrUeQosCfg
 {
    Bool ambrPres;   /*!< Indicates presence of AMBR */  
-   U32  dlAmbr;     /*!< DL AMBR value for UE (bytes/sec): Optional */
-   U32  ueBr;       /*!< UL Byte Rate value for UE (bytes/sec): Optional */
+   uint32_t  dlAmbr;     /*!< DL AMBR value for UE (bytes/sec): Optional */
+   uint32_t  ueBr;       /*!< UL Byte Rate value for UE (bytes/sec): Optional */
 } RgrUeQosCfg;
 /** 
   @brief Time Alignment timer configuration per UE */
 typedef struct rgrUeTaTmrCfg
 {
    Bool       pres;          /*!< rgr_x_001.main_7: Pres=NOTPRSNT indicates taTmr INFINITY */
-   U16        taTmr;         /*!< Timer configuration (in subframes) */
+   uint16_t        taTmr;         /*!< Timer configuration (in subframes) */
 } RgrUeTaTmrCfg;
 /** @name RGR_V1 */
 /** @{ */
@@ -1590,10 +1710,10 @@ typedef struct rgrUeBsrTmrCfg
 {
    Bool      isPrdBsrTmrPres; /*!< Indicates if periodic BSR timer is present
                               */
-   U16       prdBsrTmr;       /*!< periodicBSR-Timer configuration
+   uint16_t       prdBsrTmr;       /*!< periodicBSR-Timer configuration
                                    (in subframes): Value 0xFFFF indicates
                                    'Infinity' */
-   U16       retxBsrTmr;      /*!< retxBSR-Timer configuration (in subframes)
+   uint16_t       retxBsrTmr;      /*!< retxBSR-Timer configuration (in subframes)
                                    : Mandatory parameter */
 } RgrUeBsrTmrCfg;
 #endif
@@ -1605,19 +1725,19 @@ typedef struct rgrUeBsrTmrCfg
 typedef struct rgrUeSpsDlCfg
 {
    Bool        isDlSpsEnabled;   /*!< Bool indicating if DL SPS is enabled */
-   U8          numSpsHqProc;      /*!< Number of SPS harq Proc: Value in set
+   uint8_t          numSpsHqProc;      /*!< Number of SPS harq Proc: Value in set
                                    [1..8] */
-   U8          numPucchVal;      /*!< Count for configured PUCCH values */
-   U32         n1PucchVal[4];    /*!< Array of n1Pucch values */
+   uint8_t          numPucchVal;      /*!< Count for configured PUCCH values */
+   uint32_t         n1PucchVal[4];    /*!< Array of n1Pucch values */
    RgrSpsPrd   dlSpsPrdctyEnum;  /*!< Periodicity for DL SPS */
-   U16         explicitRelCnt;   /*!< Number of SPS ocassions with BO = 0 after 
+   uint16_t         explicitRelCnt;   /*!< Number of SPS ocassions with BO = 0 after 
                                which SPS is released */
 } RgrUeSpsDlCfg;
 
 typedef struct rgrUlSpsLcInfo
 {
    Bool  isSpsEnabled;
-   U8    lcId;
+   uint8_t    lcId;
 }RgrUlSpsLcInfo;
 
 /** 
@@ -1640,7 +1760,7 @@ typedef struct rgrUeSpsUlCfg
       S8             p0UePuschVal;     /*!< Value in range [-8....7] */
    } pwrCfg;
    RgrSpsPrd         ulSpsPrdctyEnum;  /*!< Periodicity for UL SPS */
-   U8                lcCnt;            /*!< Number of logical channels */
+   uint8_t                lcCnt;            /*!< Number of logical channels */
    RgrUlSpsLcInfo    spsLcInfo[RGR_MAX_SPS_LC];/*!< Array of SPS logical channels -
                                                All these are assumed to be 
                                                mapped onto SPS lcg with ID=1 */
@@ -1684,7 +1804,7 @@ typedef struct rgrUeTxAntSelCfg
   @brief PUSH n CQI Reporting related configuration for an UE*/
 typedef struct rgrUeCqiReptCfg
 {
-   U8   numColltdCqiRept;      /*!< Number of CQI reports to be sent in PUSH n
+   uint8_t   numColltdCqiRept;      /*!< Number of CQI reports to be sent in PUSH n
                                  Reporting */
 }RgrUeCqiReptCfg;
 
@@ -1692,8 +1812,8 @@ typedef struct rgrUeCqiReptCfg
   @brief CQI for subband number subBandIdx */
 typedef struct rgrSubBandCqiInfo
 {
-   U8 cqi[2];     /*!< Subband CQI for two codewords */
-   U8 subBandIdx; /*!< Index of the subband starting from 0, 
+   uint8_t cqi[2];     /*!< Subband CQI for two codewords */
+   uint8_t subBandIdx; /*!< Index of the subband starting from 0, 
                        in ascending order of frequency */
 } RgrSubBandCqiInfo;
 
@@ -1702,10 +1822,10 @@ typedef struct rgrSubBandCqiInfo
   @brief A CQI Report used in PUSH n Reporting*/
 typedef struct rgrUeCqiRept
 {
-   U8                  cqi[2];    /*!< Wideband CQI Value for two codewords*/
-   U8                  cqiMode;   /*!< Reporting mode by which CQI was reported */
+   uint8_t                  cqi[2];    /*!< Wideband CQI Value for two codewords*/
+   uint8_t                  cqiMode;   /*!< Reporting mode by which CQI was reported */
    RgrSubBandCqiInfo   sbCqiInfo[RGR_MAX_DL_CQI_SUBBAND];
-   U8                  numSubBand;/*!< Number of Subbands for which CQI is 
+   uint8_t                  numSubBand;/*!< Number of Subbands for which CQI is 
                                        being reported */
 } RgrUeCqiRept;
 
@@ -1715,7 +1835,7 @@ typedef struct rgrUeCqiRept
 typedef struct RgrUeCqiInfo
 {
    RgrUeCqiRept cqiRept[RGR_CQIRPTS_MAXN];    /*!< CQI reports */
-   U8 numCqiRept;       /*!< Number of CQI reports present */
+   uint8_t numCqiRept;       /*!< Number of CQI reports present */
 } RgrUeCqiInfo;
 
 /*rgr_x_001.main_11 ADD added changes for CQI management*/
@@ -1735,12 +1855,12 @@ typedef struct rgrStaIndInfo
 typedef struct rgrLoadInfIndInfo
 {
    CmLteCellId       cellId;             /*!< Cell ID   */
-   U16               bw;                 /*!< Bandwidth */
-   U32               type;
+   uint16_t               bw;                 /*!< Bandwidth */
+   uint32_t               type;
    union
    {
       TknStrOSXL     rntpInfo;           /*!< RNTP Info */
-      U32            absLoadInfo[RGR_ABS_PATTERN_LEN]; 
+      uint32_t            absLoadInfo[RGR_ABS_PATTERN_LEN]; 
    } u;
 }RgrLoadInfIndInfo;
 /* LTE_ADV_FLAG_REMOVED_END */
@@ -1771,7 +1891,7 @@ typedef struct rgrUePdschDedCfg
 /* @brief UE Configuration for LTE Adv feature */
 typedef struct rgrLteAdvancedUeConfig
 {
-   U32      pres;
+   uint32_t      pres;
    Bool     isUeCellEdge;  /*! Flag to indicate UE is cell edge or cell center */
    Bool     isAbsUe;       /*! Flag to indicate ABS UE or Not */
 } RgrLteAdvancedUeConfig;
@@ -1795,40 +1915,40 @@ typedef enum RgrAccessStratumRls
 typedef struct rgrExtaddgrp2
 {
    Bool pres;
-   U8  csiNumRep;// MAPPING
-   U8  mpddchPdschHop;
-   U8  mpdcchStartUESSFDD;// MAPPING
-   U16  mpdcchNumRep;// MAPPING
-   U32  mpddchNB;//1.. maxAvailNarrowBands-r13
+   uint8_t  csiNumRep;// MAPPING
+   uint8_t  mpddchPdschHop;
+   uint8_t  mpdcchStartUESSFDD;// MAPPING
+   uint16_t  mpdcchNumRep;// MAPPING
+   uint32_t  mpddchNB;//1.. maxAvailNarrowBands-r13
 }RgrExtaddgrp2;
 
 typedef struct rgrRbAssignment
 {
- U8 numPRBpairs; // MAPPING
- U8 rbAssignment[5];
+ uint8_t numPRBpairs; // MAPPING
+ uint8_t rbAssignment[5];
 }RgrRbAssignment;
 typedef  struct rgrEpdcchAddModLst
 {
-   U8 setConfigId;
-   U8   transmissionType;
+   uint8_t setConfigId;
+   uint8_t   transmissionType;
    RgrRbAssignment   resBlkAssignment;
-   U32 dmrsScrambSeq;
-   U32 pucchResStartoffset;
-   TknU32   pdschRemapQLcfgId;
-   TknU8  mpdcchNumPRBpair; // MAPPING
+   uint32_t dmrsScrambSeq;
+   uint32_t pucchResStartoffset;
+   TknUInt32   pdschRemapQLcfgId;
+   TknUInt8  mpdcchNumPRBpair; // MAPPING
    RgrExtaddgrp2 extaddgrp2;
 }RgrEpdcchAddModLst;
 
 typedef struct rgrSubFrmPatCfg
 {
    Bool pres;
-   U8 measSfPatFDD[5];
+   uint8_t measSfPatFDD[5];
 }RgrSubFrmPatCfg;
 typedef struct rgrEpdcchConfigRel11
 {  
    Bool pres;
    RgrSubFrmPatCfg sfPtn;
-   TknU32 startSymbolr11;
+   TknUInt32 startSymbolr11;
    RgrEpdcchAddModLst  epdcchAddModLst[RGR_MAX_EPDCCH_SET];
 }RgrEpdcchConfigRel11;
 
@@ -1839,8 +1959,8 @@ typedef struct rgrUeEmtcRecfg
 typedef struct rgrPucchRepCfgRel13
 {
 	Bool isPucchRepPres;
-	U8 modeANumPucchRepFormat1;
-	U8 modeANumPucchRepFormat2;
+	uint8_t modeANumPucchRepFormat1;
+	uint8_t modeANumPucchRepFormat2;
 
 }RgrPucchRepCfgRel13;
 
@@ -1850,18 +1970,18 @@ typedef struct rgrUeEmtcCfg
    Bool pres;
    RgrEpdcchConfigRel11 emtcEpdcchCfg;
    RgrPucchRepCfgRel13 emtcPucchRepCfg;
-   U8                  pdschReptLevModeA;
+   uint8_t                  pdschReptLevModeA;
 }RgrUeEmtcCfg;
 #endif
 
 #ifdef RG_5GTF
 typedef struct rgrUe5gtfCfg
 {
-   U8              grpId;
-   U8              BeamId;
-   U8              numCC;
-   U8              mcs;
-   U8              maxPrb;
+   uint8_t              grpId;
+   uint8_t              BeamId;
+   uint8_t              numCC;
+   uint8_t              mcs;
+   uint8_t              maxPrb;
 }RgrUe5gtfCfg;
 #endif
 
@@ -1898,7 +2018,7 @@ typedef struct rgrUeCfg
    RgrUeCapCfg        ueCapCfg;         /*!< UE Capabilty reconfiguration */
    RgrCodeBookRstCfg  ueCodeBookRstCfg; /*!< Number of bits in code book for
                                             transmission modes */
-   TknU8              dedPreambleId;    /*!< If present, then mapping exists at
+   TknUInt8              dedPreambleId;    /*!< If present, then mapping exists at
                                           RGR user with CRNTI */
 /** @name LTE_TDD */
 /** @{ */
@@ -1953,7 +2073,7 @@ typedef struct rgrUeCfg
    RgrLteAdvancedUeConfig ueLteAdvCfg; /*!< LTE Adv configuration per UE */
    /* LTE_ADV_FLAG_REMOVED_END */
    RgrAccessStratumRls accessStratumRls; /*!< UE Access Stratum Release */
-   U8        csgMmbrSta;     /* CSG Membership status, refer RgrUeCsgMbrStatus */
+   uint8_t        csgMmbrSta;     /* CSG Membership status, refer RgrUeCsgMbrStatus */
 #ifdef EMTC_ENABLE
    RgrUeEmtcCfg emtcUeCfg;
 #endif
@@ -1965,10 +2085,10 @@ typedef struct rgrUeCfg
   @brief QCI, GBR, and MBR configuration for dedicated logical channels */
 typedef struct rgrLchQosCfg
 {
-   U8 qci;                   /*!< QCI for the logical channel. 
+   uint8_t qci;                   /*!< QCI for the logical channel. 
                                   Valid Range:[0-255] (Actual QCI - 1). */
-   U32 gbr;                  /*!< GBR value for a logical channel (bytes/sec). */
-   U32 mbr;                  /*!< MBR value for a logical channel (bytes/sec). */
+   uint32_t gbr;                  /*!< GBR value for a logical channel (bytes/sec). */
+   uint32_t mbr;                  /*!< MBR value for a logical channel (bytes/sec). */
 } RgrLchQosCfg;
 /*rgr_x_001.main_9 - Added support for SPS*/
 /**    
@@ -1991,7 +2111,7 @@ typedef struct rgrDlLchCfg
    RgrLchQosCfg   dlQos;      /*!< DL QoS parameters: Only for dedicated channels */
    /*rgr_x_001.main_9 - Added support for SPS*/
    RgrLchSpsCfg   dlSpsCfg;   /*!< SPS configuration for DL logical channel */
-   U8 rlcReorderTmr;          /*!< RLC reordering timer required for LAA*/
+   uint8_t rlcReorderTmr;          /*!< RLC reordering timer required for LAA*/
 } RgrDlLchCfg;
 
 /** 
@@ -1999,21 +2119,21 @@ typedef struct rgrDlLchCfg
 typedef struct rgrUlLchCfg
 {
   CmLteLcId   lcId;    /*!< LC ID for uplink logical channel*/
-  U8          qci;     /*!< QCI associated with LC ID */
+  uint8_t          qci;     /*!< QCI associated with LC ID */
 } RgrUlLchCfg;
 /** 
   @brief Logical channel group configuration information for uplink logical channels */
 typedef struct rgrUlLcgCfg
 {
-   U8             lcgId;      /*!< Logical channel group ID */
+   uint8_t             lcgId;      /*!< Logical channel group ID */
 /*rgr_x_001.main_11 ADD added changes for L2 measurements*/
 #ifdef LTE_L2_MEAS
-   U8             numLch;      /*!< Number of LC's for this group in Uplink */
+   uint8_t             numLch;      /*!< Number of LC's for this group in Uplink */
    RgrUlLchCfg    lchUlCfg[RGR_MAX_LC_PER_LCG]; /*!< Logical Channel details for
                                                  this LCG*/
 #endif /*LTE_L2_MEAS */
-   U32            gbr;      /*!< Commulative UL GBR of all LC mapping to this LCG */
-   U32            mbr;      /*!< Commulative UL MBR of all LC mapping to this LCG */
+   uint32_t            gbr;      /*!< Commulative UL GBR of all LC mapping to this LCG */
+   uint32_t            mbr;      /*!< Commulative UL MBR of all LC mapping to this LCG */
 } RgrUlLcgCfg;
 
 /** 
@@ -2021,8 +2141,8 @@ typedef struct rgrUlLcgCfg
 typedef struct rgrUlLchQciCfg
 {
    CmLteLcId lcId;           /*!< Logical channel ID */
-   U8        qci;            /*!< Qci */
-   U8        lcgId;          /*!< Logical channel group ID */
+   uint8_t        qci;            /*!< Qci */
+   uint8_t        lcgId;          /*!< Logical channel group ID */
 }RgrUlLchQciCfg;
 
 /** 
@@ -2041,7 +2161,7 @@ typedef struct rgrLchCfg
                                       CM_LTE_LCH_DTCH */  
    RgrDlLchCfg   dlInfo;     /*!< Downlink logical channel configuration information */
    RgrUlLchQciCfg    ulLchQciInfo;  /*!< Uplink logical channel configuration information */
-   U8             lcgId;      /*!< Logical channel group ID */
+   uint8_t             lcgId;      /*!< Logical channel group ID */
 } RgrLchCfg;
 
 /** @brief Set of parameters for logical channelgroup Configuration */
@@ -2056,14 +2176,15 @@ typedef struct rgrLcgCfg
 /** @brief Basic configuration structure at RRM */
 typedef struct rgrCfg
 {
-   U8 cfgType;                /*!< Indicates configuration type */
+   uint8_t cfgType;                /*!< Indicates configuration type */
    union                      /*!< cfgType is selector */ 
    { 
       RgrCellCfg      cellCfg;   /*!< Cell configuration */
       RgrUeCfg        ueCfg;     /*!< UE configuration */ 
       RgrLchCfg       lchCfg;    /*!< Dedicated logical channel configuration */
       RgrLcgCfg       lcgCfg;    /*!< Dedicated logical channel Group configuration */
-      RgrSchedEnbCfg  schedEnbCfg; /*!< EnodeB Sched Configurations */
+      RgrSchedEnbCfg  schedEnbCfg; /*!< EnodeB Sched Configurations */ //TODO:remove this
+      MacSchedGnbCfg  schedGnbCfg; /*!< gNB Sched Configurations */
    } u;
 } RgrCfg;
 
@@ -2080,7 +2201,7 @@ typedef struct rgrActvTime
 typedef struct rgrCellRecfg
 {
    CmLteCellId         cellId;        /*!< Cell ID */
-   U32                 recfgTypes;    /*!< Bitmask indicating reconfiguration types */
+   uint32_t                 recfgTypes;    /*!< Bitmask indicating reconfiguration types */
    RgrActvTime         recfgActvTime; /*!< Activation Time for cell reconfiguration */
    RgrDlHqCfg          dlHqRecfg;     /*!< DL HARQ related reconfiguration */ 
    RgrCfiCfg           cfiRecfg;      /*!< CFI reconfiguration for PDCCH */
@@ -2101,7 +2222,7 @@ typedef struct rgrCellRecfg
 #ifdef RGR_SI_SCH
    RgrSiCfg            siReCfg;       /*!<SI Re-Configuration structure */
 #endif
-   U16                 t300TmrVal;    /*!< t300Timer value configured in Frames */
+   uint16_t                 t300TmrVal;    /*!< t300Timer value configured in Frames */
    /* LTE_ADV_FLAG_REMOVED_START */
    RgrLteAdvancedCellConfig rgrLteAdvCfg; /*!< RGR Configuration of LTE Adv for a cell */
    /* LTE_ADV_FLAG_REMOVED_END */
@@ -2127,7 +2248,7 @@ typedef struct rgrCellRecfg
  */
 typedef struct rgrSCellActDeactInfo 
 {
-   U8          sCellIdx;    /*!< sCell Index to be activated */
+   uint8_t          sCellIdx;    /*!< sCell Index to be activated */
 }RgrSCellActDeactInfo;
 
 /**
@@ -2141,7 +2262,7 @@ typedef struct rgrSCellActDeactInfo
 typedef struct rgrSCellActDeactEvnt 
 {
    CmLteRnti          crnti;       /*!< UE ID: To fetch UeCb in a cell*/
-   U8                 numOfSCells;    /* !<No of SCells to be Activated */
+   uint8_t                 numOfSCells;    /* !<No of SCells to be Activated */
    RgrSCellActDeactInfo    sCellActDeactInfo[RGR_MAX_SCELL_PER_UE]; 
                       /* !<SCH SCell Activation Deactivation Information */
 } RgrSCellActDeactEvnt;
@@ -2161,7 +2282,7 @@ typedef struct rgrUeUlPwrDedSCellCfg
    Bool           isAccumulated;     /*!< To indicate if accumulation is enabled */
    Bool           isDeltaMCSEnabled; /*!< To indicate Delta MCS Enabled */
    S8             p0UePusch;         /*!< P_0UE_PUSCH*/
-   U8             pSRSOffset;        /*!< P_SRS_OFFSET 
+   uint8_t             pSRSOffset;        /*!< P_SRS_OFFSET 
                                        Currently this is unused parameter */
 
 } RgrUeUlPwrDedSCellCfg;
@@ -2170,9 +2291,9 @@ typedef struct rgrUeUlPwrDedSCellCfg
 /** @brief UE Downlink secondary cell config params */
 typedef struct rgrUeSecCellCfg 
 {
-  U8                   sCellIdx;
-  U16                  sCellId;         /*!< This will be secondary cellId */
-  TknU32               sCellDeActTmr;     /*!< for Activating the sCell for UE */
+  uint8_t                   sCellIdx;
+  uint16_t                  sCellId;         /*!< This will be secondary cellId */
+  TknUInt32               sCellDeActTmr;     /*!< for Activating the sCell for UE */
   RgrUeDlCqiCfg        ueSCellDlCqiCfg; /*!< Secondary cell dedicated configuration */
 #ifdef TFU_UPGRADE 
   RgrUePdschDedCfg     uePdschDedCfg;   /*!< Secondary cell dedicated configuration */
@@ -2188,7 +2309,7 @@ typedef struct rgrUeSecCellCfg
 typedef struct rgrUeSecCellInfo 
 {
   Bool                useExtBSRSizes; /*!< If TRUE used R10 Extended BSR Size Table*/
-  U8                  numSCells;
+  uint8_t                  numSCells;
   RgrUeSecCellCfg     ueSCellDedCfg[RGR_MAX_SCELL_PER_UE]; /*!< Secondary cell configuration per
 UE */
 }RgrUeSecCellInfo;
@@ -2196,14 +2317,14 @@ UE */
 /** @brief Configuration of every SCell for a UE*/
 typedef struct rgrUeDlSecCellRelInfo 
 {
-  U8                   sCellIdx;  /*!< This will be secondary cell Idx */
-  U16                  sCellId;   /*!< This will be secondary cellId */
+  uint8_t                   sCellIdx;  /*!< This will be secondary cell Idx */
+  uint16_t                  sCellId;   /*!< This will be secondary cellId */
 }RgrUeDlSecCellRelInfo;
 
 /** @brief Configuration for SCell Release for a UE*/
 typedef struct rgrUeSecCellRelInfo 
 {
-  U8                   numSCells; /*!< This will be the number of secondary cells*/
+  uint8_t                   numSCells; /*!< This will be the number of secondary cells*/
   RgrUeDlSecCellRelInfo   ueSCellRelDedCfg[RGR_MAX_SCELL_PER_UE]; /*!< Secondary cell configuration per
 UE */
 }RgrUeSecCellRelInfo;
@@ -2217,11 +2338,11 @@ typedef struct rgrUeRecfg
    CmLteRnti          oldCrnti;          /*!< Old UE ID */
    CmLteRnti          newCrnti;          /*!< New UE ID: This value must match
                                          'oldCrnti', if no CRNTI change during reconfiguration */ 
-   /*rgr_x_001.main_11 : changing RecfgTypes to U32 
+   /*rgr_x_001.main_11 : changing RecfgTypes to uint32_t 
     * as all 16 bits are exhausted*/
    /* LTE_ADV_FLAG_REMOVED_START */
    /* KW fix for LTE_ADV */
-   U32                ueRecfgTypes;      /*!< Bitmask indicating UE reconfiguration items */
+   uint32_t                ueRecfgTypes;      /*!< Bitmask indicating UE reconfiguration items */
    /* LTE_ADV_FLAG_REMOVED_END */
    RgrUeTxModeCfg     txMode;            /*!< UE transmission mode */
    RgrUeAprdDlCqiCfg  aprdDlCqiRecfg;    /*!< Aperiodic CQI-related information */
@@ -2303,10 +2424,10 @@ typedef struct rgrUeRecfg
    RgrUeSecCellInfo     ueSCellCfgInfo;/*!< Secondary cell dedicated informaton
                                          per UE */
    RgrUeSCellAckPucchCfg        sCellAckN1ResCfg; /*!< N1ResCfg for SCell ack feedback */
-   U8                 simulAckNackCQIFormat3;
+   uint8_t                 simulAckNackCQIFormat3;
 #endif /* LTE_ADV */
    RgrAccessStratumRls    accessStratumRls; /*!< UE Access Stratum Release */
-   U8        csgMmbrSta;     /* CSG Membership status, refer RgrUeCsgMbrStatus */
+   uint8_t        csgMmbrSta;     /* CSG Membership status, refer RgrUeCsgMbrStatus */
 #ifdef EMTC_ENABLE
    RgrUeEmtcRecfg emtcUeRecfg;
 #endif
@@ -2319,7 +2440,7 @@ typedef struct rgrLchRecfg
    CmLteRnti   crnti;        /*!< CRNTI for DTCH and DCCH */
    CmLteLcId   lcId;         /*!< Logical channel ID */
    /*rgr_x_001.main_9 - Added support for SPS*/
-   U8          recfgTypes;   /*!< Reconfiguration type for DL LC */
+   uint8_t          recfgTypes;   /*!< Reconfiguration type for DL LC */
    
 /** @brief Reconfiguration Parameters during the DownLink */
 struct dlRecfgS 
@@ -2330,7 +2451,7 @@ struct dlRecfgS
    } dlRecfg;                /*!< Downlink logical channel reconfiguration information */
    
    RgrUlLchQciCfg ulLchQciInfo;
-   U8             lcgId;      /*!< Logical channel group ID */
+   uint8_t             lcgId;      /*!< Logical channel group ID */
 } RgrLchRecfg;
 
 /** @brief Set of parameters Corresponding To Logical channel group Reconfiguration */
@@ -2341,21 +2462,21 @@ typedef struct rgrLcgRecfg
    /** @brief Uplink Reconfiguration Parameters for logical channel Groups */   
    struct ullcgRecfgS
    {
-      U8             lcgId;     /*!< Logical channel group ID */
+      uint8_t             lcgId;     /*!< Logical channel group ID */
 #ifdef RG_UNUSED
-      U8             numLch;      /*!< Number of LC's for this group in Uplink */
+      uint8_t             numLch;      /*!< Number of LC's for this group in Uplink */
       RgrUlLchCfg    lchUlCfg[RGR_MAX_LC_PER_LCG]; /*!< Logical Channel details for
                                                         this LCG*/
 #endif /*LTE_L2_MEAS */
-      U32            gbr;     /*!< Commulative UL GBR of all LC mapping to this LCG */
-      U32            mbr;     /*!< Commulative UL MBR of all LC mapping to this LCG */
+      uint32_t            gbr;     /*!< Commulative UL GBR of all LC mapping to this LCG */
+      uint32_t            mbr;     /*!< Commulative UL MBR of all LC mapping to this LCG */
    } ulRecfg;
 }RgrLcgRecfg;
 
 /** @brief Basic reconfiguration structure at RRM */
 typedef struct rgrRecfg
 {
-   U8 recfgType;             /*!< Indicates reconfiguration type */
+   uint8_t recfgType;             /*!< Indicates reconfiguration type */
    union                     /*!< Reconfiguration type is selector */
    {
       RgrCellRecfg  cellRecfg; /*!< Cell reconfiguration */
@@ -2368,7 +2489,7 @@ typedef struct rgrRecfg
   @brief Basic Delete information for MAC */
 typedef struct rgrDel
 {
-   U8 delType;               /*!< Indicates configuration item to be deleted */
+   uint8_t delType;               /*!< Indicates configuration item to be deleted */
    /** @brief Indicates The Cell/UE/Logical Channel Group to be deleted  */ 
    union rgrDelU
    {
@@ -2391,7 +2512,7 @@ typedef struct rgrDel
          CmLteCellId cellId; /*!< Cell ID */
          CmLteRnti   crnti;  /*!< CRNTI for DTCH and DCCH */
          CmLteLcId   lcId;   /*!< Logical channel ID */
-         U8          lcgId;  /*!< Logical channel group ID */
+         uint8_t          lcgId;  /*!< Logical channel group ID */
       } lchDel;              /*!< Logical channel delete information */
       
       /** @brief Delete The Logical channel groups */
@@ -2399,7 +2520,7 @@ typedef struct rgrDel
       {
          CmLteCellId cellId; /*!< Cell ID */
          CmLteRnti   crnti;  /*!< CRNTI for DTCH and DCCH */
-         U8          lcgId;  /*!< Logical channel group ID */
+         uint8_t          lcgId;  /*!< Logical channel group ID */
       } lcgDel;
 #ifdef LTE_ADV
       /** @brief Delete Secondary cell for a UE */
@@ -2407,7 +2528,7 @@ typedef struct rgrDel
       {
          CmLteCellId          cellId;           /*!< Cell ID */
          CmLteRnti            crnti;            /*!< UE ID: CRNTI */
-         U32                  ueDelTypes;       /*!< Bitmask indicating UE reconfiguration items */
+         uint32_t                  ueDelTypes;       /*!< Bitmask indicating UE reconfiguration items */
          RgrUeSecCellRelInfo  ueSCellRelCfgInfo;/*!< Secondary cell dedicated informaton*/
       } ueScellRel;
 #endif   
@@ -2454,9 +2575,9 @@ typedef enum rgrPaLevel
 
 typedef struct rgrPrbCfg
 {
-   U8                isSonIcicEnable;
-   U8                numCellEdgeUEs;
-   U8                numCellCentreUEs;
+   uint8_t                isSonIcicEnable;
+   uint8_t                numCellEdgeUEs;
+   uint8_t                numCellCentreUEs;
    CmLteRnti         cellEdgeUe[RG_SCH_MAX_UE];      /*!< List of cell Edge UE's */
    CmLteRnti         cellCentreUe[RG_SCH_MAX_UE];   /*!< List of cell centre UE's */
    RgrPaLevel        paLevelPerPrb[RGR_SCH_MAX_PA_PER_PRB]; /*!< Mapping of PRB to Pa Values */
@@ -2477,7 +2598,7 @@ typedef struct rgrSonCfg
 typedef struct rgrCfgReqInfo
 {
 
-   U8  action;               /*!< Determines configuration/reconfiguration */
+   uint8_t  action;               /*!< Determines configuration/reconfiguration */
    union                     /*!< Action is selector */
    {
       RgrCfg   cfgInfo;      /*!< Configuration information at RRM */
@@ -2500,49 +2621,11 @@ typedef struct rgrCfgReqInfo
 typedef struct rgrTtiIndInfo
 {
    CmLteCellId       cellId;       /*!< Cell ID */
-   U16               hSfn;          /*!< Hyper System Frame Number */
-   U16               sfn;          /*!< System Frame Number */
+   uint16_t               hSfn;          /*!< Hyper System Frame Number */
+   uint16_t               sfn;          /*!< System Frame Number */
 } RgrTtiIndInfo;
 /** @} */
 
-/* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
-/** @name RGR_SI_SCH */
-/** @{ */
-#ifdef RGR_SI_SCH
-/** @brief This structure contains parameters used for specifying SI 
- *  configuration to MAC-Scheduler by RRM as a part of primitive
- *  RgUiRgrSiCfgReq.
- */
-typedef struct rgrSiCfgReqInfo
-{
-   CmLteCellId    cellId;  /*! Cell Id */
-   RgrSiCfgType   cfgType; /*! MIB/SIB1/SI */
-   U8             siId; /*! SI ID, if cfgType is SI. 
-                             SI ID starts from 1  */
-   Buffer         *pdu; /*! PDU, one of MIB/SIB1/SI */
-}RgrSiCfgReqInfo;
-
-/** @brief This structure contains parameters used for specifying SI
- *  configuration to MAC-Scheduler by RRM as a part of primitive
- *  RgUiRgrWarningSiCfgReq.
- */
-typedef struct rgrWarningSiCfgReqInfo
-{
-   U8             emtcEnable; /*! indicates EMTC enabled or not */
-   CmLteCellId    cellId;  /*! Cell Id */
-   U8             siId; /*! SI ID */
-   CmLListCp      siPduLst; /*! list of PDUs,each corresponding to one segment*/
-}RgrWarningSiCfgReqInfo;
-
-typedef struct rgrSegmentInfo
-{
-   CmLList     cmasSegPduLstLnk;
-   Buffer*     pdu;
-}RgrSegmentInfo;
-
-
-#endif /*RGR_SI_SCH*/
-
 #define RGR_UESTA_MAC_CRNTI_CE_RECVD   0x01
 #define RGR_UESTA_MAC_CRNTI_CE_RECVD_IN_SPS_ACTIVE   0x02
 /**
@@ -2551,25 +2634,10 @@ typedef struct rgrUeStaIndInfo
 {
    CmLteCellId       cellId;       /*!< Cell ID */
    CmLteRnti         crnti;        /*!< UE identifier UE ID: CRNTI */
-   U8                status;       /*!< Status */
+   uint8_t                status;       /*!< Status */
 }RgrUeStaIndInfo;
 /** @} */
 
-/** @{ */
-/* LTE_ADV_FLAG_REMOVED_START */
-/** @brief This structure contains parameters used for specifying Load Inf 
- *  i.e RNTP, ABS etc configuration to MAC-Scheduler by RRM as a part of primitive
- *  RgUiRgrLoadInfReq.
- */
-typedef struct rgrLoadInfReqInfo
-{
-   CmLteCellId    cellId;             /*! Cell Id */
-   U8             rgrCcPHighStartRb;  /*! Start RB for power high cell centre user */
-   U8             rgrCcPHighEndRb;    /*! End RB for power high cell centre use */
-}RgrLoadInfReqInfo;
-/* LTE_ADV_FLAG_REMOVED_END */
-/** @} */
-
 /* 
    Function Prototypes 
  */
@@ -2624,7 +2692,7 @@ typedef S16 (*RgrTtiInd) ARGS((
 typedef S16 (*RgrBndCfm) ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status));
+   uint8_t                   status));
 
 /** @brief Request from RRM to MAC to unbind the interface SAPs.
  *
@@ -2653,9 +2721,15 @@ typedef S16 (*RgrUbndReq) ARGS((
  */
 typedef S16 (*RgrCfgReq) ARGS((
    Pst*                 pst,
-   SpId                 spId,
    RgrCfgTransId        transId,
    RgrCfgReqInfo *      cfgReqInfo));
+
+S16 cmPkRgrCfgCfm ARGS((
+   Pst*                 pst,
+   RgrCfgTransId        transId,
+   uint8_t                   status
+));
+
 /** @brief Configuration confirm from MAC to RRM. 
  * 
  * @details This API confirms the RGR User about the status of the Configuration.
@@ -2668,121 +2742,10 @@ typedef S16 (*RgrCfgReq) ARGS((
  */
 typedef S16 (*RgrCfgCfm) ARGS((
    Pst*                 pst,
-   SuId                 suId,
    RgrCfgTransId        transId,
-   U8                   status));
+   uint8_t                   status));
 /* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
 
-/** @name RGR_SI_SCH */
-/** @{ */
-#ifdef RGR_SI_SCH
-/** @brief SI Configuration Request primitive for SI configuration
- *  
- * @details This API is used to configure the System Information from RRM to a MAC scheduler.
- * 
- * @param[in] pst      Pointer to the Post Structure.
- * @param[in] spId     SAP Id of the Service Provider.
- * @param[in] transId  Transaction Id for the transaction between RRM and MAC.
- * @param[in] siCfgReq Parameters for the configuration.
- * @return ROK/RFAILED
- */
-typedef S16 (*RgrSiCfgReq) ARGS((
-   Pst               *pst,
-   SpId              spId,
-   RgrCfgTransId     transId,
-   RgrSiCfgReqInfo   *siCfgReq));
-
-/** @brief SI Configuration Confirm Primitive for configuring Cell/UE/LC  
- *
- * @details This API confirms the SI configuration confirm in the status indication.  
- * 
- * @param[in] pst     Pointer to a post structure.
- * @param[in] suId    SAP Id of the Service User.
- * @param[in] transId Transaction Id between the MAC and The RRM.
- * @param[in] status  Confirmation status information from the MAC to the user.
- * @return ROK/RFAILED.
- */
-typedef S16 (*RgrSiCfgCfm) ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status));
-
-/** @brief SI Configuration Request primitive for warning SI configuration
- *  
- *  @details This API is used to configure the System Info (SIB10,SIB11,SIB12) 
- *           from RRM to a MAC scheduler.
- *    
- *  @param[in] pst      Pointer to the Post Structure.
- *  @param[in] spId     SAP Id of the Service Provider.
- *  @param[in] transId Transaction Id between the MAC and The RRM.
- *  @param[in] WarningsiCfgReq Parameters for the configuration.
- *  @return ROK/RFAILED
- */
-typedef S16 (*RgrWarningSiCfgReq) ARGS((
-   Pst                     *pst,
-   SpId                    spId,
-   RgrCfgTransId           transId,
-   RgrWarningSiCfgReqInfo  *warningSiCfgReq));
-
-
-/** @brief Warning SI Configuration Confirm Primitive    
- *
- * @details This API confirms the Warning SI configuration confirm in the
- *           status indication.  
- * 
- * @param[in] pst     Pointer to a post structure.
- * @param[in] suId    SAP Id of the Service User.
- * @param[in] transId Transaction Id between the MAC and The RRM.
- * @param[in] siId   SI ID
- * @param[in] status  Confirmation status information from the MAC to the user.
- * @return ROK/RFAILED.
- */
-typedef S16 (*RgrWarningSiCfgCfm) ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   siId,
-   U8                   status));
-
-/** @brief SI Configuration stop Request primitive for warning SI configuration
- *
- *  @details Used to stop the System Information(SIB10, SIB11, SIB12) from RRM 
- *           to a MAC schedule
- *
- *  @param[in] pst      Pointer to the Post Structure.
- *  @param[in] spId     SAP Id of the Service Provider.
- *  @param[in] siId     siId to be stopped.
- *  @return ROK/RFAILED
- */ 
-typedef S16 (*RgrWarningSiStopReq) ARGS((
-   Pst               *pst,
-   SpId              spId,
-   RgrCfgTransId     transId,
-   U8                siId ));
-
-#endif /*RGR_SI_SCH*/
-
-/** @{ */
-/* LTE_ADV_FLAG_REMOVED_START */
-/** @brief LOAD INF Configuration Request primitive for RNTP, ABS etc Configuration
- *  
- * @details This API is used to configure the LOAD INF parameters from RRM to a MAC scheduler.
- * 
- * @param[in] pst        Pointer to the Post Structure.
- * @param[in] spId       SAP Id of the Service Provider.
- * @param[in] transId    Transaction Id for the transaction between RRM and MAC.
- * @param[in] loadInfReq Parameters for the configuration.
- * @return ROK/RFAILED
- */
-typedef S16 (*RgrLoadInfReq) ARGS((
-         Pst                 *pst,
-         SpId                spId,
-         RgrCfgTransId       transId,
-         RgrLoadInfReqInfo   *loadInfReq));
-/* LTE_ADV_FLAG_REMOVED_END */
-/** @} */
-
 /* rgr_x_001.main_11 ccpu00117452 - MOD - Changed macro name from
    RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
 #ifdef RGR_CQI_REPT
@@ -2805,22 +2768,6 @@ typedef S16 (*RgrUeStaInd) ARGS((
    RgrUeStaIndInfo        *staInd));
 #ifdef RG
 
-/** @brief Request from RRM to MAC to bind the interface SAPs. 
- * 
- * @details This API is invoked by RRM towards MAC to bind RGR SAP. 
- * This API validates the Pst, spId, suId and sends the bind confirm to
- * RRM.
- *
- *@param[in] pst   Pointer to a post structure.
- *@param[in] suId  SAP Id of the Service User.
- *@param[in] spId  SAP Id of the Service Provider.
- *@return  ROK/RFAILED
-*/
-EXTERN S16 RgUiRgrBndReq ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   SpId                 spId
-));
 /* rgr_x_001.main_3: Added TTI indication from MAC to RGR user */
 /** @name RGR_RRM_TICK */
 /** @{ */
@@ -2833,7 +2780,7 @@ EXTERN S16 RgUiRgrBndReq ARGS((
 * @param[in] ttiInd Parameters containing the information on TTI Indication.
 * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRgrTtiInd ARGS((
+S16 RgUiRgrTtiInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrTtiIndInfo        *ttiInd
@@ -2841,61 +2788,61 @@ EXTERN S16 RgUiRgrTtiInd ARGS((
 #endif
 /** @} */
 /*rgr_x_001.main_9 - Added support for SPS*/
-EXTERN S16 cmPkRgrSpsCellCfg ARGS((
+S16 cmPkRgrSpsCellCfg ARGS((
    RgrSpsCellCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrSpsDlCellCfg ARGS((
+S16 cmUnpkRgrSpsDlCellCfg ARGS((
    RgrSpsCellCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrUeSpsDlCfg ARGS((
+S16 cmPkRgrUeSpsDlCfg ARGS((
    RgrUeSpsDlCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeSpsDlCfg ARGS((
+S16 cmUnpkRgrUeSpsDlCfg ARGS((
    RgrUeSpsDlCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrUeSpsUlCfg ARGS((
+S16 cmPkRgrUeSpsUlCfg ARGS((
    RgrUeSpsUlCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeSpsUlCfg ARGS((
+S16 cmUnpkRgrUeSpsUlCfg ARGS((
    RgrUeSpsUlCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrUeSpsCfg ARGS((
+S16 cmPkRgrUeSpsCfg ARGS((
    RgrUeSpsCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeSpsCfg ARGS((
+S16 cmUnpkRgrUeSpsCfg ARGS((
    RgrUeSpsCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrLchSpsCfg ARGS((
+S16 cmPkRgrLchSpsCfg ARGS((
    RgrLchSpsCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrLchSpsCfg ARGS((
+S16 cmUnpkRgrLchSpsCfg ARGS((
    RgrLchSpsCfg *param,
    Buffer *mBuf
 ));
 
 /*rgr_x_001.main_11 ADD added changes for L2 measurements*/
-EXTERN S16 cmPkRgrUlLchCfg ARGS((
+S16 cmPkRgrUlLchCfg ARGS((
    RgrUlLchCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlLchCfg ARGS((
+S16 cmUnpkRgrUlLchCfg ARGS((
   RgrUlLchCfg *param,
   Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrUlLchQciCfg ARGS((
+S16 cmPkRgrUlLchQciCfg ARGS((
    RgrUlLchQciCfg *param,
    Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlLchQciCfg ARGS((
+S16 cmUnpkRgrUlLchQciCfg ARGS((
   RgrUlLchQciCfg *param,
   Buffer *mBuf
 ));
@@ -2904,88 +2851,88 @@ EXTERN S16 cmUnpkRgrUlLchQciCfg ARGS((
 /*rgr_x_001.main_11 ccpu00117452 - MOD - Changed macro name from
    RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
 #ifdef RGR_CQI_REPT
-EXTERN S16 cmPkRgrUeCqiReptCfg ARGS((
+S16 cmPkRgrUeCqiReptCfg ARGS((
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeCqiReptCfg ARGS((
+S16 cmUnpkRgrUeCqiReptCfg ARGS((
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrSubBandCqiInfo ARGS((
+S16 cmUnpkRgrSubBandCqiInfo ARGS((
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrStaInd ARGS((
+S16 cmPkRgrStaInd ARGS((
 Pst* pst,
 SuId suId,
 RgrStaIndInfo* staInd
 ));
 
-EXTERN S16 cmUnpkRgrStaInd ARGS((
+S16 cmUnpkRgrStaInd ARGS((
 RgrStaInd func,
 Pst *pst,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrStaIndInfo ARGS((
+S16 cmPkRgrStaIndInfo ARGS((
 RgrStaIndInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrStaIndInfo ARGS((
+S16 cmUnpkRgrStaIndInfo ARGS((
 RgrStaIndInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeCqiInfo ARGS((
+S16 cmPkRgrUeCqiInfo ARGS((
 RgrUeCqiInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeCqiInfo ARGS((
+S16 cmUnpkRgrUeCqiInfo ARGS((
 RgrUeCqiInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeCqiRept ARGS((
+S16 cmPkRgrUeCqiRept ARGS((
 RgrUeCqiRept *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrSubBandCqiInfo ARGS((
+S16 cmPkRgrSubBandCqiInfo ARGS((
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeCqiRept ARGS((
+S16 cmUnpkRgrUeCqiRept ARGS((
 RgrUeCqiRept *param,
 Buffer *mBuf
 ));
 #endif
 
 /* LTE_ADV_FLAG_REMOVED_START */
-EXTERN S16 cmPkRgrLoadInfInd ARGS((
+S16 cmPkRgrLoadInfInd ARGS((
 Pst* pst,
 SuId suId,
 RgrLoadInfIndInfo* loadInfInd
 ));
 
-EXTERN S16 cmUnpkRgrLoadInfInd ARGS((
+S16 cmUnpkRgrLoadInfInd ARGS((
 RgrLoadInfInd func,
 Pst *pst,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrLoadInfIndInfo ARGS((
+S16 cmPkRgrLoadInfIndInfo ARGS((
 RgrLoadInfIndInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrLoadInfIndInfo ARGS((
+S16 cmUnpkRgrLoadInfIndInfo ARGS((
 RgrLoadInfIndInfo *param,
 Pst *pst, /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
 Buffer *mBuf
@@ -2993,120 +2940,70 @@ Buffer *mBuf
 /* LTE_ADV_FLAG_REMOVED_END */
 
 #ifdef TFU_UPGRADE 
-EXTERN S16 cmPkRgrUePdschDedCfg ARGS((
+S16 cmPkRgrUePdschDedCfg ARGS((
 RgrUePdschDedCfg  *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUePdschDedCfg ARGS((
+S16 cmUnpkRgrUePdschDedCfg ARGS((
 RgrUePdschDedCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUepACfg ARGS((
+S16 cmPkRgrUepACfg ARGS((
 RgrUepACfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUepACfg ARGS((
+S16 cmUnpkRgrUepACfg ARGS((
 RgrUepACfg *param,
 Buffer *mBuf
 ));
 #endif
 
 #ifdef LTE_ADV
-EXTERN S16 cmPkRgrUeSecCellInfo ARGS((
+S16 cmPkRgrUeSecCellInfo ARGS((
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeSecCellInfo ARGS((
+S16 cmUnpkRgrUeSecCellInfo ARGS((
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeDlSecCellRelInfo ARGS((
+S16 cmPkRgrUeDlSecCellRelInfo ARGS((
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeDlSecCellRelInfo ARGS((
+S16 cmUnpkRgrUeDlSecCellRelInfo ARGS((
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeSecCellRelInfo ARGS((
+S16 cmPkRgrUeSecCellRelInfo ARGS((
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeSecCellRelInfo ARGS((
+S16 cmUnpkRgrUeSecCellRelInfo ARGS((
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 ));
 
 /* Sprint 3 */
-EXTERN S16 cmPkRgrUeSCellAckPucchCfg ARGS((
+S16 cmPkRgrUeSCellAckPucchCfg ARGS((
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeSCellAckPucchCfg ARGS((
+S16 cmUnpkRgrUeSCellAckPucchCfg ARGS((
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 ));
 #endif /* LTE_ADV */
 #ifdef RG
-/** @brief Confirmation from MAC to RRM for the bind request. 
-*
-* @details Confirmation from MAC to RRM for the bind
-* request for the interface saps. This function indicates it through the status To the User.
-*
-*  @param[in] pst     Pointer to a post structure.
-*  @param[in] suId    SAP Id of the Service User.
-*  @param[in] status  Confirmation status for the RGR User.
-*  @return ROK/RFAILED  
-*/
-EXTERN S16 RgUiRgrBndCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   U8                   status
-));
-
-/** @brief Request from RRM to MAC to unbind the interface SAPs. 
- *
- * @details This API is invoked by RRM towards MAC to unbind RGR SAP. 
- * This API validates the Pst, spId, suId and sends the unbdind confirm to
- * 
- * @param[in] pst    Pointer To a post structure.
- * @param[in] spId   Service provider SAP Id.
- * @param[in] reason Cause for the Unbinding.
- * @return ROK/RFAILED.
- */
-EXTERN S16 RgUiRgrUbndReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   Reason               reason
-));
-
-/** @brief Configuration request from RRM to MAC for configuring Cell/UE/LC.
- *
- * @details This API is invoked by RRM towards MAC to configure MAC. 
- *     These API validates the Pst, spId, suId and transfers the config request 
- *     specific information to corresponding ownership module (GOM) API. 
- *  
- *  @param[in] pst        Pointer to a post structure.
- *  @param[in] spId       SAP Id of the Service Provider.
- *  @param[in] transId    MAC to RRM Transaction Id.
- *  @param[in] cfgReqInfo Basic RGR configuration/reconfiguration info at RRM. 
- *  @return  ROK/RFAILED
- */
-EXTERN S16 RgUiRgrCfgReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RgrCfgTransId        transId,
-   RgrCfgReqInfo *      cfgReqInfo
-));
 
 /** @brief Configuration Confirm from MAC to RRM.  
  *
@@ -3114,141 +3011,16 @@ EXTERN S16 RgUiRgrCfgReq ARGS((
  * maskId are returned to RRM if request does not contain crnti (For Handover purpose)
  *
  *  @param[in] pst     A pointer to post Structure.
- *  @param[in] suId    SAP Id for a service Provider.
  *  @param[in] transId MAC to RRM User transaction Id. 
  *  @param[in] status  Status indication from the MAC.  
  *  @return ROK/RFAILED
  */
-EXTERN S16 RgUiRgrCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-/* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
-/** @name RGR_SI_SCH */
-/** @{ */
-#ifdef RGR_SI_SCH
-/** @brief SI Configuration Request primitive used for SI configuration
- *  from RRM to MAC-Scheduler.
- *
- * @details  This primitive specifies the PDU
- *  (MIB/SIB1/SIs) and the associated parameters in the structure
- *  RgrSiCfgReqInfo.
- * 
- * @param[in] pst      Pointer to a post Structure.
- * @param[in] spId     SAP Id of the Service provider.
- * @param[in] transId  RRM to MAC transaction Id.
- * @param[in] siCfgReq Parameters used for specifying SI.
- * @return ROK/RFAILED 
- */
-EXTERN S16 RgUiRgrSiCfgReq ARGS((
-   Pst           *pst,
-   SpId          spId,
-   RgrCfgTransId transId,
-   RgrSiCfgReqInfo   *siCfgReq
-));
-
-/** @brief SI Configuration Confirm from MAC to RRM.
- *
- * @details This primitive is used to confirm the SI configuration to RRM from MAC. 
- * 
- * @param[in] pst     Pointer to a post structure
- * @param[in] suId    Service User SAP Id
- * @param[in] transId Transaction id between RRM and MAC
- * @param[in] status  Confirmation status .
- * @return ROK/RFAILED
- */
-EXTERN S16 RgUiRgrSiCfgCfm ARGS((
+S16 RgUiRgrCfgCfm ARGS((
    Pst*                 pst,
-   SuId                 suId,
    RgrCfgTransId        transId,
-   U8                   status
-));
-
-/** @brief SI Configuration Confirm from MAC to RRM.
- *
- * @details This primitive is used to confirm the SI configuration to RRM 
- *          from MAC. 
- * 
- * @param[in] pst     Pointer to a post structure
- * @param[in] suId    Service User SAP Id
- * @param[in] transId Transaction id between RRM and MAC
- * @param[in] status  Confirmation status .
- * @return ROK/RFAILED
- */
-EXTERN S16 RgUiRgrWarningSiCfgReq ARGS((
-   Pst                    *pst,
-   SpId                   spId,
-   RgrCfgTransId          transId,
-   RgrWarningSiCfgReqInfo *WarningSiCfgReqInfo
-));
-
-
-/** @brief Warning SI Configuration Confirm from MAC to RRM.
- *
- * @details This primitive is used to confirm the Warning SI configuration 
- *          to RRM from MAC. 
- * 
- * @param[in] pst     Pointer to a post structure
- * @param[in] suId    Service User SAP Id
- * @param[in] transId Transaction id between RRM and MAC
- * @param[in] siId    SI ID.
- * @param[in] status  Confirmation status .
- * @return ROK/RFAILED
- */
-EXTERN S16 RgUiRgrWarningSiCfgCfm ARGS((
-   Pst*              pst,
-   SuId              suId,
-   RgrCfgTransId     transId,
-   U8                siId,
-   U8                status
-));
-
-/** @brief SI Configuration Confirm from MAC to RRM.
- *
- * @details This primitive is used to confirm the SI configuration to RRM
- *          from MAC. 
- * 
- * @param[in] pst     Pointer to a post structure
- * @param[in] spId    Service Provider SAP Id
- * @param[in] siId    SI Index
- * @return ROK/RFAILED
- */
-EXTERN S16 RgUiRgrWarningSiStopReq ARGS((
-   Pst           *pst,
-   SpId          spId,
-   RgrCfgTransId transId,
-   U8            siId
+   uint8_t                   status
 ));
 
-#endif /*RGR_SI_SCH*/
-/** @} */
-
-/** @{ */
-/* LTE_ADV_FLAG_REMOVED_START */
-/** @brief LOAD INF Configuration Request primitive used for RNTP, ABS configuration
- *  from RRM to MAC-Scheduler.
- *
- * @details  This primitive specifies the startRb and endRb of CC sub-band for which
- *  we have to increase power at schedular
- *
- *
- * @param[in] pst        Pointer to a post Structure.
- * @param[in] spId       SAP Id of the Service provider.
- * @param[in] transId    RRM to MAC transaction Id.
- * @param[in] loadInfReq Parameters used for specifying LOAD INF.
- * @return ROK/RFAILED
- */
-EXTERN S16 RgUiRgrLoadInfReq ARGS((
-   Pst                 *pst,
-   SpId                spId,
-   RgrCfgTransId       transId,
-   RgrLoadInfReqInfo   *loadInfReq
-));
-/* LTE_ADV_FLAG_REMOVED_END */
-/** @} */
-
 /** @name RGR_CQI_REPT */
 /** @{ */
 /* rgr_x_001.main_11 ccpu00117452 - MOD - Changed macro name from
@@ -3264,13 +3036,13 @@ EXTERN S16 RgUiRgrLoadInfReq ARGS((
  * @param[in] staInd  Status Indication .
  * @return ROK/RFAILED
  */
-EXTERN S16 RgUiRgrStaInd ARGS((
+S16 RgUiRgrStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrStaIndInfo        *staInd
 ));
 #endif
-EXTERN S16 RgUiRgrUeStaInd ARGS((
+S16 RgUiRgrUeStaInd ARGS((
 Pst             *pst,
 SuId            suId,
 RgrUeStaIndInfo *ueStaInd
@@ -3290,7 +3062,7 @@ RgrUeStaIndInfo *ueStaInd
  * @param[in] loadInfInd  LOAD INF Indication .
  * @return ROK/RFAILED
  */
-EXTERN S16 RgUiRgrLoadInfInd ARGS((
+S16 RgUiRgrLoadInfInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrLoadInfIndInfo    *loadInfInd
@@ -3310,7 +3082,7 @@ EXTERN S16 RgUiRgrLoadInfInd ARGS((
  *  @param[in] spId   Service Provider SAP Id
  *  @return ROK/RFAILED  
  */
-EXTERN S16 NxLiRgrBndReq ARGS((
+S16 NxLiRgrBndReq ARGS((
    Pst*                 pst,
    SuId                 suId,
    SpId                 spId
@@ -3329,7 +3101,7 @@ EXTERN S16 NxLiRgrBndReq ARGS((
 * @param[in] RgrTtiIndInfo* ttiInd Information passed as a part of TTI indication from PHY to MAC. 
 * @return ROK/RFAILED 
 */
-EXTERN S16 NxLiRgrTtiInd ARGS((
+S16 NxLiRgrTtiInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrTtiIndInfo        *ttiInd
@@ -3342,13 +3114,13 @@ EXTERN S16 NxLiRgrTtiInd ARGS((
  * 
  * @param[in] Pst*  pst    A pointer to post structure.
  * @param[in] SuId  suId   Service User SAP Id.
- * @param[in] U8    status An information on status confirmation.
+ * @param[in] uint8_t    status An information on status confirmation.
  * @return S16
  */
-EXTERN S16 NxLiRgrBndCfm ARGS((
+S16 NxLiRgrBndCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status
+   uint8_t                   status
 ));
 
 /** @brief Request from RRM to MAC to unbind the interface SAPs 
@@ -3360,7 +3132,7 @@ EXTERN S16 NxLiRgrBndCfm ARGS((
  * @param[in] Reason    reason A cause for unbinding the SAPs.
  * @return S16
  */
-EXTERN S16 NxLiRgrUbndReq ARGS((
+S16 NxLiRgrUbndReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    Reason               reason
@@ -3376,7 +3148,7 @@ EXTERN S16 NxLiRgrUbndReq ARGS((
  * @param[in]   RgrCfgReqInfo* cfgReqInfo A structure containing the configuration information.
  * @return   S16 
  */
-EXTERN S16 NxLiRgrCfgReq ARGS((
+S16 NxLiRgrCfgReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RgrCfgTransId        transId,
@@ -3392,157 +3164,13 @@ EXTERN S16 NxLiRgrCfgReq ARGS((
  * @param[in] RgrCfgTransId transId RRM to MAC transaction Id. 
  * @return S16
  */
-EXTERN S16 NxLiRgrCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-/* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
-/** @name RGR_SI_SCH */
-/* @{ */
-#ifdef RGR_SI_SCH
-
-/** @brief SI Configuration confirm from MAC to RRM 
-*
-* @details  This primitive confirms the SI configuration to the RRM.
-* 
-* @param[in]  Pst*      pst        A pointer to post structure.
-* @param[in]  SuId      suId       Service User SAP Id.
-* @param[in]  RgrCfgTransId transId RRM to MAC transaction Id
-* @param[in]  U8        status      An information on confirmation status.
-* @return S16
-*/
-EXTERN S16 NxLiRgrSiCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-
-
-/* PH04_CMAS */
-EXTERN S16 NxLiRgrWrngSiCfgCfm ARGS((
-Pst*                 pst,
-SuId                 suId,
-RgrCfgTransId        transId,
-U8                   siId,
-U8                   status
-));
-
-
-
-EXTERN S16 NxLiRgrStopWrngSiCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-
-/* PH04_CMAS : end */
-
- 
-/** @brief Warning SI Configuration confirm from MAC to RRM 
-*
-* @details  This primitive confirms the Warning SI configuration to the RRM.
-* 
-* @param[in]  Pst*      pst        A pointer to post structure.
-* @param[in]  SuId      suId       Service User SAP Id.
-* @param[in]  U8        siId       SI Index
-* @param[in]  RgrCfgTransId transId RRM to MAC transaction Id
-* @param[in]  U8        status      An information on confirmation status.
-* @return S16
-*/
-EXTERN S16 NxLiRgrWarningSiCfgCfm ARGS((
+S16 NxLiRgrCfgCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrCfgTransId        transId,
-   U8                   siId,
-   U8                   status
+   uint8_t                   status
 ));
 
-/** @brief SI Configuration request from RRM to MAC for 
- * configuring SI 
- *
- * @details  This primitive is used for the configuration of the SI information in the MAC scheduler.
- *
- * @param[in] Pst*             pst      A pointer to post structure.
- * @param[in] SpId             spId     Service Provider SAP Id.
- * @param[in] RgrCfgTransId    transId, RRM to MAC transaction Id
- * @param[in] RgrSiCfgReqInfo* cfgReqInfo Parameters corresponding to the SI Configuration .
- * @return S16
- */
-EXTERN S16 NxLiRgrSiCfgReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RgrCfgTransId        transId,
-   RgrSiCfgReqInfo * cfgReqInfo
-));
-
- 
-/** @brief Warning SI Configuration request from RRM to MAC for 
- * configuring SI 
- *
- * @details  This primitive is used for the configuration of the SI 
- *           information in the MAC scheduler.
- *
- * @param[in] Pst*             pst      A pointer to post structure.
- * @param[in] SpId             spId     Service Provider SAP Id.
- * @param[in] RgrCfgTransId    transId, RRM to MAC transaction Id
- * @param[in] RgrWarningSiCfgReqInfo  *warningSiCfgReq SI Configuration
- * @return S16
- */
-EXTERN S16 NxLiRgrWarningSiCfgReq ARGS((
-   Pst*                       pst,
-   SpId                      spId,
-   RgrCfgTransId             transId,
-   RgrWarningSiCfgReqInfo  *warningSiCfgReq
-)); 
-
-  
-/** @brief Warning SI Stop request from RRM to MAC for 
- * configuring SI 
- *
- * @details  This primitive is used to stop the SI for a 
- *           perticular siId.
- *
- * @param[in] Pst*             pst      A pointer to post structure.
- * @param[in] SpId             spId     Service Provider SAP Id.
- * @param[in] U8               siId     SI Index
- */
-EXTERN S16 NxLiRgrWarningSiStopReq ARGS((
-   Pst*                       pst,
-   SpId                       spId,
-   RgrCfgTransId              transId,
-   U8                         siId
-)); 
- 
-#endif/*RGR_SI_SCH */
-/** @} */
-
-/** @{ */
-/* LTE_ADV_FLAG_REMOVED_START */
-/** @brief LOAD INF Configuration request from RRM to MAC for
- *         configuring rntp, abs etc
- *
- * @details  This primitive is used for the configuration of the LOAD INF parameters
- *           in the MAC scheduler.
- *
- * @param[in] Pst*               pst        A pointer to post structure.
- * @param[in] SpId               spId       Service Provider SAP Id.
- * @param[in] RgrCfgTransId      transId,   RRM to MAC transaction Id
- * @param[in] RgrLoadInfReqInfo* loadInfReq Parameters corresponding to the LOAD INF Config.
- * @return S16
- */
-EXTERN S16 NxLiRgrLoadInfReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RgrCfgTransId        transId,
-   RgrLoadInfReqInfo*   loadInfReq
-));
-/* LTE_ADV_FLAG_REMOVED_END */
-/** @} */
-
 /** @name RGR_CQI_REPT */
 /** @{ */
 /* rgr_x_001.main_11 ccpu00117452 - MOD - Changed macro name from
@@ -3557,7 +3185,7 @@ EXTERN S16 NxLiRgrLoadInfReq ARGS((
  * @param[in] suId    Service User SAP Id
  * @param[in] staInd  Status Indication .
 */
-EXTERN S16 NxLiRgrStaInd ARGS((
+S16 NxLiRgrStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrStaIndInfo        *staInd
@@ -3575,7 +3203,7 @@ EXTERN S16 NxLiRgrStaInd ARGS((
  * @param[in] suId        Service User SAP Id
  * @param[in] loadInfInd  LOAD INF Indication .
 */
-EXTERN S16 NxLiRgrLoadInfInd ARGS((
+S16 NxLiRgrLoadInfInd ARGS((
    Pst*                  pst,
    SuId                  suId,
    RgrLoadInfIndInfo     *loadInfInd
@@ -3585,546 +3213,380 @@ EXTERN S16 NxLiRgrLoadInfInd ARGS((
 
 #endif
 #if defined(LCRGR)
-/** @brief Request from RRM to MAC to bind the interface SAPs */
-EXTERN S16 cmPkRgrBndReq ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   SpId                 spId
-));
-/** @brief Request from RRM to MAC to bind the interface SAPs */
-EXTERN S16 cmUnpkRgrBndReq ARGS((
-   RgrBndReq            func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
 /* rgr_x_001.main_3: Added TTI indication from MAC to RGR user */
 /** @name RGR_RRM_TICK */
 /** @{ */
 /** @brief Pack function for TTI indication from scheduler to RRM */
-EXTERN S16 cmPkRgrTtiInd ARGS((
+S16 cmPkRgrTtiInd ARGS((
          Pst*                 pst,
          SuId                 suId,
          RgrTtiIndInfo        *ttiInd
          ));
-EXTERN S16 cmPkRgrTtiIndInfo ARGS((
+S16 cmPkRgrTtiIndInfo ARGS((
          RgrTtiIndInfo  *ttiInd,
          Buffer         *mBuf));
 /** @brief Unpack function for TTI indication from scheduler to RRM */
-EXTERN S16 cmUnpkRgrTtiInd   ARGS((
+S16 cmUnpkRgrTtiInd   ARGS((
          RgrTtiInd            func,
          Pst*                 pst,
          Buffer               *mBuf
          ));
-EXTERN S16 cmUnpkRgrTtiIndInfo ARGS((
+S16 cmUnpkRgrTtiIndInfo ARGS((
          RgrTtiIndInfo *param,
          Buffer        *mBuf
          ));
 /** @} */
-EXTERN S16 cmPkRgrBndCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   U8                   status
-));
-
-EXTERN S16 cmUnpkRgrBndCfm ARGS((
-   RgrBndCfm            func,
+S16 cmPkRgrCfgReq ARGS((
    Pst*                 pst,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmPkRgrUbndReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   Reason               reason
-));
-
-EXTERN S16 cmUnpkRgrUbndReq ARGS((
-   RgrUbndReq           func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmPkRgrCfgReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
    RgrCfgTransId        transId,
    RgrCfgReqInfo *      cfgReqInfo
 ));
 
-EXTERN S16 cmUnpkRgrCfgReq ARGS((
+S16 cmUnpkRgrCfgReq ARGS((
    RgrCfgReq            func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmPkRgrCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-
-EXTERN S16 cmUnpkRgrCfgCfm ARGS((
+S16 cmUnpkRgrCfgCfm ARGS((
    RgrCfgCfm            func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmPkRgrCfgTransId ARGS((
+S16 cmPkRgrCfgTransId ARGS((
    RgrCfgTransId        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCfgTransId ARGS((
+S16 cmUnpkRgrCfgTransId ARGS((
    RgrCfgTransId        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDlHqCfg ARGS((
+S16 cmPkRgrDlHqCfg ARGS((
    RgrDlHqCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDlHqCfg ARGS((
+S16 cmUnpkRgrDlHqCfg ARGS((
    RgrDlHqCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrRntiCfg ARGS((
+S16 cmPkRgrRntiCfg ARGS((
    RgrRntiCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrRntiCfg ARGS((
+S16 cmUnpkRgrRntiCfg ARGS((
    RgrRntiCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDlCmnCodeRateCfg ARGS((
+S16 cmPkRgrDlCmnCodeRateCfg ARGS((
    RgrDlCmnCodeRateCfg  *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDlCmnCodeRateCfg ARGS((
+S16 cmUnpkRgrDlCmnCodeRateCfg ARGS((
    RgrDlCmnCodeRateCfg  *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCfiCfg ARGS((
+S16 cmPkRgrCfiCfg ARGS((
    RgrCfiCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCfiCfg ARGS((
+S16 cmUnpkRgrCfiCfg ARGS((
    RgrCfiCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrPuschSubBandCfg ARGS((
+S16 cmPkRgrPuschSubBandCfg ARGS((
    RgrPuschSubBandCfg   *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrPuschSubBandCfg ARGS((
+S16 cmUnpkRgrPuschSubBandCfg ARGS((
    RgrPuschSubBandCfg   *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUlCmnCodeRateCfg ARGS((
+S16 cmPkRgrUlCmnCodeRateCfg ARGS((
    RgrUlCmnCodeRateCfg  *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlCmnCodeRateCfg ARGS((
+S16 cmUnpkRgrUlCmnCodeRateCfg ARGS((
    RgrUlCmnCodeRateCfg  *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUlTrgCqiCfg ARGS((
+S16 cmPkRgrUlTrgCqiCfg ARGS((
    RgrUlTrgCqiCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlTrgCqiCfg ARGS((
+S16 cmUnpkRgrUlTrgCqiCfg ARGS((
    RgrUlTrgCqiCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrBwCfg ARGS((
+S16 cmPkRgrBwCfg ARGS((
    RgrBwCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrBwCfg ARGS((
+S16 cmUnpkRgrBwCfg ARGS((
    RgrBwCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrPhichCfg ARGS((
+S16 cmPkRgrPhichCfg ARGS((
    RgrPhichCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrPhichCfg ARGS((
+S16 cmUnpkRgrPhichCfg ARGS((
    RgrPhichCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrPucchCfg ARGS((
+S16 cmPkRgrPucchCfg ARGS((
    RgrPucchCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrPucchCfg ARGS((
+S16 cmUnpkRgrPucchCfg ARGS((
    RgrPucchCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrSrsCfg ARGS((
+S16 cmPkRgrSrsCfg ARGS((
    RgrSrsCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrSrsCfg ARGS((
+S16 cmUnpkRgrSrsCfg ARGS((
    RgrSrsCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrRachCfg ARGS((
+S16 cmPkRgrRachCfg ARGS((
    RgrRachCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrRachCfg ARGS((
+S16 cmUnpkRgrRachCfg ARGS((
    RgrRachCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrSiCfg ARGS((
+S16 cmPkRgrSiCfg ARGS((
    RgrSiCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrSiCfg ARGS((
+S16 cmUnpkRgrSiCfg ARGS((
    RgrSiCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrTpcRntiCfg ARGS((
+S16 cmPkRgrTpcRntiCfg ARGS((
    RgrTpcRntiCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrTpcRntiCfg ARGS((
+S16 cmUnpkRgrTpcRntiCfg ARGS((
    RgrTpcRntiCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUlPwrCfg ARGS((
+S16 cmPkRgrUlPwrCfg ARGS((
    RgrUlPwrCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlPwrCfg ARGS((
+S16 cmUnpkRgrUlPwrCfg ARGS((
    RgrUlPwrCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrPuschCfg ARGS((
+S16 cmPkRgrPuschCfg ARGS((
    RgrPuschCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrPuschCfg ARGS((
+S16 cmUnpkRgrPuschCfg ARGS((
    RgrPuschCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCodeBookRstCfg ARGS((
+S16 cmPkRgrCodeBookRstCfg ARGS((
    RgrCodeBookRstCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCodeBookRstCfg ARGS((
+S16 cmUnpkRgrCodeBookRstCfg ARGS((
    RgrCodeBookRstCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrPreambleSetCfg ARGS((
+S16 cmPkRgrPreambleSetCfg ARGS((
    RgrPreambleSetCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrPreambleSetCfg ARGS((
+S16 cmUnpkRgrPreambleSetCfg ARGS((
    RgrPreambleSetCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCmnLchCfg ARGS((
+S16 cmPkRgrCmnLchCfg ARGS((
    RgrCmnLchCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCmnLchCfg ARGS((
+S16 cmUnpkRgrCmnLchCfg ARGS((
    RgrCmnLchCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDlfsCfg ARGS((
+S16 cmPkRgrDlfsCfg ARGS((
    RgrDlfsCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDlfsCfg ARGS((
+S16 cmUnpkRgrDlfsCfg ARGS((
    RgrDlfsCfg           *param,
    Buffer               *mBuf
 ));
 
-/* rgr_x_001.main_5-ADD-Added for SI Enhancement. */
-/** @name RGR_SI_SCH */
-/** @{ */
-#ifdef RGR_SI_SCH
-EXTERN S16 cmPkRgrWarningSiCfgReq ARGS((
-   Pst*                     pst,
-   SpId                     spId,
-   RgrCfgTransId            transId,
-   RgrWarningSiCfgReqInfo   *warningSiCfgReqInfo
-));
-
-EXTERN S16 cmUnpkRgrWarningSiCfgReq ARGS((
-   RgrWarningSiCfgReq  func,
-   Pst                 *pst,
-   Buffer              *mBuf
-));
-
-EXTERN S16 cmPkRgrWarningSiCfgReqInfo ARGS((
-   Pst                    *pst,
-   RgrWarningSiCfgReqInfo *param,
-   Buffer                 *mBuf
-));
-
-EXTERN S16 cmUnpkRgrWarningSiCfgReqInfo ARGS((
-   Pst                    *pst,
-   RgrWarningSiCfgReqInfo *param,
-   Buffer                 *mBuf
-));
-
-EXTERN S16 cmPkRgrWarningSiStopReq ARGS((
-   Pst                 *pst,
-   SpId                spId,
-   RgrCfgTransId       transId,
-   U8                  siId
-));
-
-EXTERN S16 cmUnpkRgrWarningSiStopReq ARGS((
-   RgrWarningSiStopReq func,
-   Pst                 *pst,
-   Buffer              *mBuf
-));
-
-
-EXTERN S16 cmPkRgrWarningSiCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   siId,
-   U8                   status
-));
-
-EXTERN S16 cmUnpkRgrWarningSiCfgCfm ARGS((
-   RgrWarningSiCfgCfm          func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-
-
-EXTERN S16 cmPkRgrSiCfgReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RgrCfgTransId        transId,
-   RgrSiCfgReqInfo *    cfgReqInfo
-));
-
-EXTERN S16 cmUnpkRgrSiCfgReq ARGS((
-   RgrSiCfgReq            func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmPkRgrSiCfgReqInfo ARGS((
-   RgrSiCfgReqInfo        *param,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmUnpkRgrSiCfgReqInfo ARGS((
-   RgrSiCfgReqInfo        *param,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmPkRgrSiCfgCfm ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RgrCfgTransId        transId,
-   U8                   status
-));
-
-EXTERN S16 cmUnpkRgrSiCfgCfm ARGS((
-   RgrSiCfgCfm            func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-#endif /*RGR_SI_SCH*/
-/** @} */
-
-/** @{ */
-/* LTE_ADV_FLAG_REMOVED_START */
-EXTERN S16 cmPkRgrLoadInfReq ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RgrCfgTransId        transId,
-   RgrLoadInfReqInfo *  loadInfReq
-));
-
-EXTERN S16 cmUnpkRgrLoadInfReq ARGS((
-   RgrLoadInfReq        func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmPkRgrLoadInfReqInfo ARGS((
-   RgrLoadInfReqInfo    *param,
-   Buffer               *mBuf
-));
-
-EXTERN S16 cmUnpkRgrLoadInfReqInfo ARGS((
-   RgrLoadInfReqInfo    *param,
-   Buffer               *mBuf
-));
-/* LTE_ADV_FLAG_REMOVED_END */
-/** @} */
 
 /** @name LTE_TDD */
 /** @{ */
 #ifdef LTE_TDD
-EXTERN S16 cmPkRgrTddPrachInfo ARGS((
+S16 cmPkRgrTddPrachInfo ARGS((
    RgrTddPrachInfo      *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrTddPrachInfo ARGS((
+S16 cmUnpkRgrTddPrachInfo ARGS((
    RgrTddPrachInfo      *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrTddPrachRscInfo ARGS((
+S16 cmPkRgrTddPrachRscInfo ARGS((
    RgrTddPrachRscInfo   *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrTddPrachRscInfo ARGS((
+S16 cmUnpkRgrTddPrachRscInfo ARGS((
    RgrTddPrachRscInfo   *param,
    Buffer               *mBuf
 ));
 #endif /* LTE_TDD*/
 /** @} */
-EXTERN S16 cmPkRgrEnbPfs ARGS((
+S16 cmPkRgrEnbPfs ARGS((
    RgrEnbPfs         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrEnbPfs ARGS((
+S16 cmUnpkRgrEnbPfs ARGS((
    RgrEnbPfs         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCellCfg ARGS((
+S16 cmPkRgrCellCfg ARGS((
    RgrCellCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCellCfg ARGS((
+S16 cmUnpkRgrCellCfg ARGS((
    RgrCellCfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeAprdDlCqiCfg ARGS((
+S16 cmPkRgrUeAprdDlCqiCfg ARGS((
    RgrUeAprdDlCqiCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeAprdDlCqiCfg ARGS((
+S16 cmUnpkRgrUeAprdDlCqiCfg ARGS((
    RgrUeAprdDlCqiCfg    *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrSchedEnbCfg ARGS((
+S16 cmPkRgrSchedGnbCfg ARGS((
    RgrSchedEnbCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrSchedEnbCfg ARGS((
+S16 cmUnpkRgrSchedGnbCfg ARGS((
    RgrSchedEnbCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUePrdDlCqiCfg ARGS((
+S16 cmPkRgrUePrdDlCqiCfg ARGS((
    RgrUePrdDlCqiCfg     *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUePrdDlCqiCfg ARGS((
+S16 cmUnpkRgrUePrdDlCqiCfg ARGS((
    RgrUePrdDlCqiCfg     *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeDlCqiCfg ARGS((
+S16 cmPkRgrUeDlCqiCfg ARGS((
    RgrUeDlCqiCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeDlCqiCfg ARGS((
+S16 cmUnpkRgrUeDlCqiCfg ARGS((
    RgrUeDlCqiCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeMeasGapCfg ARGS((
+S16 cmPkRgrUeMeasGapCfg ARGS((
    RgrUeMeasGapCfg      *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeMeasGapCfg ARGS((
+S16 cmUnpkRgrUeMeasGapCfg ARGS((
    RgrUeMeasGapCfg      *param,
    Buffer               *mBuf
 ));
 /*rgr_x_001.main_11 ADD added changes for DRX*/
-EXTERN S16 cmPkRgrDrxLongCycleOffst ARGS((
+S16 cmPkRgrDrxLongCycleOffst ARGS((
    RgrDrxLongCycleOffst *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDrxLongCycleOffst ARGS((
+S16 cmUnpkRgrDrxLongCycleOffst ARGS((
    RgrDrxLongCycleOffst *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDrxShortDrx ARGS((
+S16 cmPkRgrDrxShortDrx ARGS((
    RgrDrxShortDrx       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDrxShortDrx ARGS((
+S16 cmUnpkRgrDrxShortDrx ARGS((
    RgrDrxShortDrx       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeDrxCfg ARGS((
+S16 cmPkRgrUeDrxCfg ARGS((
    RgrUeDrxCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeDrxCfg ARGS((
+S16 cmUnpkRgrUeDrxCfg ARGS((
    RgrUeDrxCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeCapCfg ARGS((
+S16 cmPkRgrUeCapCfg ARGS((
    RgrUeCapCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeCapCfg ARGS((
+S16 cmUnpkRgrUeCapCfg ARGS((
    RgrUeCapCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeAckNackRepCfg ARGS((
+S16 cmPkRgrUeAckNackRepCfg ARGS((
    RgrUeAckNackRepCfg   *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeAckNackRepCfg ARGS((
+S16 cmUnpkRgrUeAckNackRepCfg ARGS((
    RgrUeAckNackRepCfg   *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeTxModeCfg ARGS((
+S16 cmPkRgrUeTxModeCfg ARGS((
    RgrUeTxModeCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeTxModeCfg ARGS((
+S16 cmUnpkRgrUeTxModeCfg ARGS((
    RgrUeTxModeCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeUlHqCfg ARGS((
+S16 cmPkRgrUeUlHqCfg ARGS((
    RgrUeUlHqCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeUlHqCfg ARGS((
+S16 cmUnpkRgrUeUlHqCfg ARGS((
    RgrUeUlHqCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeGrpPwrCfg ARGS((
+S16 cmPkRgrUeGrpPwrCfg ARGS((
    RgrUeGrpPwrCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeGrpPwrCfg ARGS((
+S16 cmUnpkRgrUeGrpPwrCfg ARGS((
    RgrUeGrpPwrCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeUlPwrCfg ARGS((
+S16 cmPkRgrUeUlPwrCfg ARGS((
    RgrUeUlPwrCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeUlPwrCfg ARGS((
+S16 cmUnpkRgrUeUlPwrCfg ARGS((
    RgrUeUlPwrCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeQosCfg ARGS((
+S16 cmPkRgrUeQosCfg ARGS((
    RgrUeQosCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeQosCfg ARGS((
+S16 cmUnpkRgrUeQosCfg ARGS((
    RgrUeQosCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeTaTmrCfg ARGS((
+S16 cmPkRgrUeTaTmrCfg ARGS((
    RgrUeTaTmrCfg        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeTaTmrCfg ARGS((
+S16 cmUnpkRgrUeTaTmrCfg ARGS((
    RgrUeTaTmrCfg        *param,
    Buffer               *mBuf
 ));
@@ -4133,247 +3595,247 @@ EXTERN S16 cmUnpkRgrUeTaTmrCfg ARGS((
 #ifdef RGR_V1
 /* rgr_x_001.main_7: [ccpu00112398] Added periodicBSR-Timer and 
    retxBSR-Timer */
-EXTERN S16 cmPkRgrUeBsrTmrCfg ARGS((
+S16 cmPkRgrUeBsrTmrCfg ARGS((
    RgrUeBsrTmrCfg       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeBsrTmrCfg ARGS((
+S16 cmUnpkRgrUeBsrTmrCfg ARGS((
    RgrUeBsrTmrCfg       *param,
    Buffer               *mBuf
 ));
 #endif
 /** @} */
-EXTERN S16 cmPkRgrUeCfg ARGS((
+S16 cmPkRgrUeCfg ARGS((
    RgrUeCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeCfg ARGS((
+S16 cmUnpkRgrUeCfg ARGS((
    RgrUeCfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrLchQosCfg ARGS((
+S16 cmPkRgrLchQosCfg ARGS((
    RgrLchQosCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrLchQosCfg ARGS((
+S16 cmUnpkRgrLchQosCfg ARGS((
    RgrLchQosCfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDlLchCfg ARGS((
+S16 cmPkRgrDlLchCfg ARGS((
    RgrDlLchCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDlLchCfg ARGS((
+S16 cmUnpkRgrDlLchCfg ARGS((
    RgrDlLchCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUlLcgCfg ARGS((
+S16 cmPkRgrUlLcgCfg ARGS((
    RgrUlLcgCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUlLcgCfg ARGS((
+S16 cmUnpkRgrUlLcgCfg ARGS((
    RgrUlLcgCfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrLchCfg ARGS((
+S16 cmPkRgrLchCfg ARGS((
    RgrLchCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrLchCfg ARGS((
+S16 cmUnpkRgrLchCfg ARGS((
    RgrLchCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrLcgCfg ARGS((
+S16 cmPkRgrLcgCfg ARGS((
    RgrLcgCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrLcgCfg ARGS((
+S16 cmUnpkRgrLcgCfg ARGS((
    RgrLcgCfg            *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCfg ARGS((
+S16 cmPkRgrCfg ARGS((
    RgrCfg               *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCfg ARGS((
+S16 cmUnpkRgrCfg ARGS((
    RgrCfg               *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrActvTime ARGS((
+S16 cmPkRgrActvTime ARGS((
    RgrActvTime          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrActvTime ARGS((
+S16 cmUnpkRgrActvTime ARGS((
    RgrActvTime          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrCellRecfg ARGS((
+S16 cmPkRgrCellRecfg ARGS((
    RgrCellRecfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCellRecfg ARGS((
+S16 cmUnpkRgrCellRecfg ARGS((
    RgrCellRecfg         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUeRecfg ARGS((
+S16 cmPkRgrUeRecfg ARGS((
    RgrUeRecfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeRecfg ARGS((
+S16 cmUnpkRgrUeRecfg ARGS((
    RgrUeRecfg           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrLchRecfg ARGS((
+S16 cmPkRgrLchRecfg ARGS((
    RgrLchRecfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrLchRecfg ARGS((
+S16 cmUnpkRgrLchRecfg ARGS((
    RgrLchRecfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrLcgRecfg ARGS((
+S16 cmPkRgrLcgRecfg ARGS((
    RgrLcgRecfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrLcgRecfg ARGS((
+S16 cmUnpkRgrLcgRecfg ARGS((
    RgrLcgRecfg          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrRecfg ARGS((
+S16 cmPkRgrRecfg ARGS((
    RgrRecfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrRecfg ARGS((
+S16 cmUnpkRgrRecfg ARGS((
    RgrRecfg             *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrDel ARGS((
+S16 cmPkRgrDel ARGS((
    RgrDel               *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrDel ARGS((
+S16 cmUnpkRgrDel ARGS((
    RgrDel               *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrRst ARGS((
+S16 cmPkRgrRst ARGS((
    RgrRst               *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrRst ARGS((
+S16 cmUnpkRgrRst ARGS((
    RgrRst               *param,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmPkRgrSonCfg   ARGS((
+S16 cmPkRgrSonCfg   ARGS((
 RgrSonCfg *param,
 Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrSonCfg   ARGS((
+S16 cmUnpkRgrSonCfg   ARGS((
 RgrSonCfg   *param,
 Buffer      *mBuf
 ));
-EXTERN S16 cmPkRgrSonPrbCfg   ARGS((
+S16 cmPkRgrSonPrbCfg   ARGS((
 RgrPrbCfg *param,
 Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrSonPrbCfg   ARGS((
+S16 cmUnpkRgrSonPrbCfg   ARGS((
 RgrPrbCfg   *param,
 Buffer      *mBuf
 ));
-EXTERN S16 cmPkRgrCfgReqInfo ARGS((
+S16 cmPkRgrCfgReqInfo ARGS((
    RgrCfgReqInfo        *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrCfgReqInfo ARGS((
+S16 cmUnpkRgrCfgReqInfo ARGS((
    RgrCfgReqInfo        *param,
    Buffer               *mBuf
 ));
 
 #ifdef LTE_ADV 
-EXTERN S16 cmUnPkRgrSCellActDeactEvnt ARGS((
+S16 cmUnPkRgrSCellActDeactEvnt ARGS((
    RgrSCellActDeactEvnt *param,
    Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrSCellActDeactEvnt ARGS((
+S16 cmPkRgrSCellActDeactEvnt ARGS((
    RgrSCellActDeactEvnt *param,
    Buffer *mBuf
 ));
 #endif /* LTE_ADV */
 
-EXTERN S16 cmPkRgrUeTxAntSelCfg ARGS((
+S16 cmPkRgrUeTxAntSelCfg ARGS((
    RgrUeTxAntSelCfg     *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUeTxAntSelCfg ARGS((
+S16 cmUnpkRgrUeTxAntSelCfg ARGS((
    RgrUeTxAntSelCfg     *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRgrUePuschDedCfg ARGS((
+S16 cmPkRgrUePuschDedCfg ARGS((
    RgrUePuschDedCfg     *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRgrUePuschDedCfg ARGS((
+S16 cmUnpkRgrUePuschDedCfg ARGS((
    RgrUePuschDedCfg     *param,
    Buffer               *mBuf
 ));
 
 #ifdef TFU_UPGRADE
-EXTERN S16 cmPkRgrUeDlPCqiSetup ARGS
+S16 cmPkRgrUeDlPCqiSetup ARGS
 ((
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeDlPCqiSetup ARGS
+S16 cmUnpkRgrUeDlPCqiSetup ARGS
 ((
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeUlSrsSetupCfg ARGS
+S16 cmPkRgrUeUlSrsSetupCfg ARGS
 ((
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeUlSrsSetupCfg ARGS
+S16 cmUnpkRgrUeUlSrsSetupCfg ARGS
 ((
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeSrSetupCfg ARGS
+S16 cmPkRgrUeSrSetupCfg ARGS
 ((
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeSrSetupCfg ARGS
+S16 cmUnpkRgrUeSrSetupCfg ARGS
 ((
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN  S16 cmPkRgrUeSrCfg ARGS
+ S16 cmPkRgrUeSrCfg ARGS
 ((
 RgrUeSrCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeSrCfg ARGS
+S16 cmUnpkRgrUeSrCfg ARGS
 ((
 RgrUeSrCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeUlSrsCfg ARGS
+S16 cmPkRgrUeUlSrsCfg ARGS
 ((
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkRgrUeUlSrsCfg ARGS
+S16 cmUnpkRgrUeUlSrsCfg ARGS
 ((
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
@@ -4384,38 +3846,38 @@ Buffer *mBuf
 
 #ifdef DM
 /** @brief Request from RRM to MAC to bind the interface SAPs */
-EXTERN S16 DmUiRgrBndReq ARGS((
+S16 DmUiRgrBndReq ARGS((
    Pst*                 pst,
    SuId                 suId,
    SpId                 spId
 ));
 /** @brief Confirmation from MAC to RRM for the bind/unbind 
  * request for the interface SAPs */
-EXTERN S16 DmUiRgrBndCfm ARGS((
+S16 DmUiRgrBndCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status
+   uint8_t                   status
 ));
 /** @brief Request from RRM to MAC to unbind the interface SAPs */
-EXTERN S16 DmUiRgrUbndReq ARGS((
+S16 DmUiRgrUbndReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    Reason               reason
 ));
 /** @brief Configuration request from RRM to MAC for 
  * configuring Cell/UE/LC */
-EXTERN S16 DmUiRgrCfgReq ARGS((
+S16 DmUiRgrCfgReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RgrCfgTransId        transId,
    RgrCfgReqInfo *      cfgReqInfo
 ));
 /** @brief Configuration confirm from MAC to RRM */
-EXTERN S16 DmUiRgrCfgCfm ARGS((
+S16 DmUiRgrCfgCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrCfgTransId        transId,
-   U8                   status
+   uint8_t                   status
 ));
 #endif
 /** @brief Sta Indication from Scheduler to RRM 
@@ -4427,34 +3889,34 @@ EXTERN S16 DmUiRgrCfgCfm ARGS((
  * @param[in] suId    Service User SAP Id
  * @param[in] staInd  Status Indication .
 */
-EXTERN S16 NxLiRgrUeStaInd ARGS((
+S16 NxLiRgrUeStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RgrUeStaIndInfo      *ueStaInd
 ));
 
-EXTERN S16 cmPkRgrUeStaInd ARGS
+S16 cmPkRgrUeStaInd ARGS
 ((
 Pst* pst,
 SuId suId,
 RgrUeStaIndInfo* ueStaInd
 ));
 
-EXTERN S16 cmUnpkRgrUeStaInd ARGS
+S16 cmUnpkRgrUeStaInd ARGS
 ((
 RgrUeStaInd  func,
 Pst *pst,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkRgrUeStaIndInfo ARGS
+S16 cmPkRgrUeStaIndInfo ARGS
 ((
 RgrUeStaIndInfo *param,
 Buffer *mBuf
 ));
 
 
-EXTERN S16 cmUnpkRgrUeStaIndInfo ARGS
+S16 cmUnpkRgrUeStaIndInfo ARGS
 ((
 RgrUeStaIndInfo *param,
 Buffer *mBuf
@@ -4462,82 +3924,74 @@ Buffer *mBuf
 
 
 /* LTE_ADV_FLAG_REMOVED_START */
-EXTERN S16 cmPkRgrLteAdvancedUeConfig ARGS((
+S16 cmPkRgrLteAdvancedUeConfig ARGS((
             RgrLteAdvancedUeConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmUnpkRgrLteAdvancedUeConfig ARGS((
+S16 cmUnpkRgrLteAdvancedUeConfig ARGS((
             RgrLteAdvancedUeConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmPkRgrAbsConfig ARGS((
+S16 cmPkRgrAbsConfig ARGS((
             RgrAbsConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmUnpkRgrAbsConfig ARGS((
+S16 cmUnpkRgrAbsConfig ARGS((
             RgrAbsConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmPkRgrSfrConfig ARGS((
+S16 cmPkRgrSfrConfig ARGS((
             RgrSfrConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmUnpkRgrSfrConfig ARGS((
+S16 cmUnpkRgrSfrConfig ARGS((
             RgrSfrConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmPkRgrCellLteAdvancedFeatureCfg ARGS((
+S16 cmPkRgrCellLteAdvancedFeatureCfg ARGS((
             RgrLteAdvancedCellConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmUnpkRgrCellLteAdvancedFeatureCfg ARGS((
+S16 cmUnpkRgrCellLteAdvancedFeatureCfg ARGS((
             RgrLteAdvancedCellConfig *param,
             Buffer *mBuf
             ));
 
-EXTERN S16 cmPkRgrDsfrConfig ARGS((
+S16 cmPkRgrDsfrConfig ARGS((
          RgrDsfrConfig *param,
          Buffer *mBuf
          ));
 
-EXTERN S16 cmUnpkRgrDsfrConfig ARGS((
+S16 cmUnpkRgrDsfrConfig ARGS((
          RgrDsfrConfig *param,
          Buffer *mBuf
          ));
 /* LTE_ADV_FLAG_REMOVED_END */
 
-EXTERN S16 cmPkRgrCellCsgParamCfg ARGS((
+S16 cmPkRgrCellCsgParamCfg ARGS((
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrCellCsgParamCfg ARGS((
+S16 cmUnpkRgrCellCsgParamCfg ARGS((
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 ));
-EXTERN S16 cmPkRgrCellCntrlCmdCfg ARGS((
+S16 cmPkRgrCellCntrlCmdCfg ARGS((
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 ));
-EXTERN S16 cmUnpkRgrCellCntrlCmdCfg ARGS((
+S16 cmUnpkRgrCellCntrlCmdCfg ARGS((
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 ));
 
-#ifdef RLC_MAC_DAT_REQ_RBUF
-EXTERN S16 rgDlDatReqBatchProc ARGS((
-Void));
-#endif
-#ifdef RLC_MAC_STA_RSP_RBUF
-EXTERN S16 rgDlStaRspBatchProc ARGS((
-Void));
-#endif
 #ifdef __cplusplus
 }
 #endif