X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptui.c;h=05f7e3511cf11c3548fb843fded602a4dc3cbb98;hb=6fee61a10e1ad48ff7105b3201038ac8a337fd4a;hp=ff502749f7dc7b183613fe906c4b11fd67609034;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c
index ff502749f..05f7e3511 100755
--- a/src/5gnrmac/rg_ptui.c
+++ b/src/5gnrmac/rg_ptui.c
@@ -83,30 +83,30 @@ extern "C" {
 #ifdef PTRGUIRGU
 /** @brief Confirmation from MAC to RLC for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, U8 status));
+S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, uint8_t status));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
-EXTERN S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo  * datInd));
+S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo  * datInd));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels*/
-EXTERN S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo  * datInd));
+S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo  * datInd));
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on common channels. */
-EXTERN S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo  * staInd));
+S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo  * staInd));
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on dedicated channels. */
-EXTERN S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo  * staInd));
+S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo  * staInd));
 #ifdef LTE_L2_MEAS
 /**@brief HARQ Status Indication from MAC to RLC */
-EXTERN S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId,
+S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId,
          RguHarqStatusInd *harqStatusInd));
 #endif
 /**@brief PDB FLow Control Indication from MAC to RLC */
-EXTERN S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId,
+S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId,
          RguFlowCntrlInd *flowCntrlInd));
 #endif /*--#ifdef PTRGUIRGU--*/
 S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
@@ -117,17 +117,17 @@ S16 RgUiRguHqStaIndRbuf ARGS((Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd
 #endif
 
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
-PRIVATE S16  RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo  *datInd));
+static S16  RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo  *datInd));
 #endif
-EXTERN Void rgFreeSharableSBuf ARGS((Data **data, Size size));
+Void rgFreeSharableSBuf ARGS((Data **data, Size size));
 
 #ifdef RGR_CQI_REPT 
-EXTERN S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd));
+S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd));
 #endif
 /* LTE_ADV_FLAG_REMOVED_START */
-EXTERN S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd));
+S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd));
 /* LTE_ADV_FLAG_REMOVED_END */
-EXTERN S16 PtUiRgrUeStaInd ARGS
+S16 PtUiRgrUeStaInd ARGS
 ((
 Pst* pst, 
 SuId suId, 
@@ -136,29 +136,23 @@ RgrUeStaIndInfo *staInd
 #ifdef PTRGUICRG
 /** @brief Confirmation from MAC to RRC for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, U8 status));
+S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, uint8_t status));
 /** @brief Configuration Confirm from MAC to RRC */
-EXTERN S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, U8 status));
+S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status));
 #endif /*--#ifdef PTRGUICRG--*/
 
 #ifdef PTRGUIRGR
 /** @brief Confirmation from MAC to RRM for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, U8 status));
+S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, uint8_t status));
 /** @brief Configuration Confirm from MAC to RRM */
-EXTERN S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status));
-EXTERN S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd));
+S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status));
+S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd));
 /* Added for SI Enhancement*/
-#ifdef RGR_SI_SCH
-EXTERN S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status));
-EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, 
-                                RgrCfgTransId transId, U8 siId, U8 status));
-#endif/*RGR_SI_SCH*/
 #endif /*--#ifdef PTRGUIRGR--*/
 
 #ifdef PTRGUIRGM
 S16 PtUiRgmPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
-S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, U8 status));
 S16 PtUiRgmTransModeInd  ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd));
 #endif
 S16 RgUiRgmSendPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
@@ -167,7 +161,7 @@ S16 RgUiRgmChangeTransModeInd ARGS((Pst* pst, SuId suId, RgmTransModeInd *transM
 S16 RgUiRguFlowCntrlInd ARGS((Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd));
 /* Added for sending TTI tick to RRM */
 /** @brief TTI indication from MAC to RRM */
-PRIVATE CONSTANT RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] =
+static const RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] =
 {
 #ifdef LCRGUIRGR
    cmPkRgrTtiInd,
@@ -181,42 +175,8 @@ PRIVATE CONSTANT RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] =
 #endif
 };
 
-
-/** @brief Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps */
-PRIVATE CONSTANT RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] =
-{
-#ifdef LCRGUIRGR
-   cmPkRgrBndCfm,
-#else
-   PtUiRgrBndCfm,
-#endif
-#ifdef NX
-   NxLiRgrBndCfm,
-#else
-   PtUiRgrBndCfm,
-#endif
-};
-
-/** @brief Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps  via RGM interface*/
-PRIVATE CONSTANT RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] =
-{
-#ifdef RGM_LC
-   cmPkRgmBndCfm,
-#else
-   PtUiRgmBndCfm,
-#endif
-#ifdef RM
-   RmLiRgmBndCfm, /*To be added by RRM*/
-#else
-   PtUiRgmBndCfm,
-#endif
-};
-
-
 /** @brief Configuration Confirm from MAC to RRM */
-PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] =
+static const RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] =
 {
 #ifdef LCRGUIRGR
    cmPkRgrCfgCfm,
@@ -229,42 +189,9 @@ PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] =
 };
 
 /* Added for SI Enhancement*/
-#ifdef RGR_SI_SCH
-/** @brief SI Configuration Confirm from MAC to RRM */
-PRIVATE CONSTANT RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] =
-{
-#ifdef LCRGUIRGR
-   cmPkRgrSiCfgCfm,
-#else
-   PtUiRgrSiCfgCfm,
-#endif
-#ifdef NX
-   NxLiRgrSiCfgCfm,
-#else
-   PtUiRgrSiCfgCfm,
-#endif
-};
-
-
-/** @brief Warning SI Configuration Confirm from MAC to RRM */
-PRIVATE CONSTANT RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] =
-{
-#ifdef LCRGUIRGR
-   cmPkRgrWarningSiCfgCfm,
-#else
-   PtUiRgrWarningSiCfgCfm,
-#endif
-#ifdef NX
-   NxLiRgrWarningSiCfgCfm,
-#else
-   PtUiRgrWarningSiCfgCfm,
-#endif
-};
-
-#endif/*RGR_SI_SCH */
 /** @brief Confirmation from MAC to RRC for the bind/Unbind 
  * request for the interface saps */
-PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] =
+static const CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] =
 {
 #ifdef LCRGUICRG
    cmPkCrgBndCfm,
@@ -279,7 +206,7 @@ PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] =
 };
 
 /** @brief Configuration Confirm from MAC to RRC */
-PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] =
+static const CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] =
 {
 #ifdef LCRGUICRG
    cmPkCrgCfgCfm,
@@ -296,7 +223,7 @@ PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] =
 
 /** @brief Confirmation from MAC to RLC for the bind/Unbind 
  * request for the interface saps */
-PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] =
+static const RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
    cmPkRguBndCfm,
@@ -317,7 +244,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] =
 
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
-PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
+static const RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
 //   cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */
@@ -338,7 +265,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
 
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels*/
-PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
+static const RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
 //   cmPkRguDDatInd,  /* TODO: Call packRcvdUlData instead */
@@ -361,7 +288,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on common channels. */
-PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
+static const RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
    //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */
@@ -384,7 +311,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on dedicated channels. */
-PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] =
+static const RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
    //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */
@@ -408,7 +335,7 @@ PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] =
  * as a response to the DdatReq primitive from RLC.
  * Informs RLC of the successful transmission of TB's 
  * (ACK/NACK) along with Mapping Info. */
-PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] =
+static const RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
    cmPkRguHqStaInd,
@@ -432,7 +359,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] =
    RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
 #ifdef RGR_CQI_REPT
 /** @brief TTI indication from MAC to RRM */
-PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] =
+static const RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] =
 {
 #ifdef LCRGUIRGR
    cmPkRgrStaInd,
@@ -449,7 +376,7 @@ PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] =
 
 /* LTE_ADV_FLAG_REMOVED_START */
 /** @brief LOAD INF indication from MAC to RRM */
-PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] =
+static const RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] =
 {
 #ifdef LCRGUIRGR
    cmPkRgrLoadInfInd,
@@ -465,7 +392,7 @@ PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] =
 /* LTE_ADV_FLAG_REMOVED_END */
 
 /** @brief TTI indication from MAC to RRM */
-PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] =
+static const RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] =
 {
 #ifdef LCRGUIRGR
    cmPkRgrUeStaInd,
@@ -480,7 +407,7 @@ PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] =
 };
 
 /** @brief Average PRB usage indication from MAC to RRM */
-PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] =
+static const RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] =
 {
 #ifdef RGM_LC
    cmPkRgmPrbRprtInd,
@@ -496,7 +423,7 @@ PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] =
 
 
 /** @brief Transmission Mode Change indication from MAC to RRM */
-PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] =
+static const RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] =
 {
 #ifdef RGM_LC
    cmPkRgmTransModeInd,
@@ -510,7 +437,7 @@ PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR]
 #endif
 };
 
-PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
+static const RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
    cmPkRguFlowCntrlInd,
@@ -533,73 +460,6 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
 #endif /* __cplusplus */
 
 #ifdef RG
-
-/**
-* @brief Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps
-*
-* @details
-*
-*     Function : RgUiRgrBndCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 RgUiRgrBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 RgUiRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
-{
-
-   return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
-
-}
-/**
-* @brief Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps via RGM interface
-*
-* @details
-*
-*     Function : RgUiRgmBndCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 RgUiRgmBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 RgUiRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
-{
-
-   return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
-
-}
-
-
 
 /* Added for sending TTI tick to RRM */
 
@@ -616,19 +476,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrTtiInd
-(
-Pst* pst,
-SuId suId,
-RgrTtiIndInfo  *ttiInd
-)
-#else
-S16 RgUiRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
+S16 RgUiRgrTtiInd(Pst* pst,SuId suId,RgrTtiIndInfo *ttiInd)
 {
 
    return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
@@ -647,23 +495,11 @@ RgrTtiIndInfo *ttiInd;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrCfgCfm
-(
-Pst* pst,
-RgrCfgTransId transId,
-U8 status
-)
-#else
-S16 RgUiRgrCfgCfm(pst, transId, status)
-Pst* pst;
-RgrCfgTransId transId;
-U8 status;
-#endif
+S16 RgUiRgrCfgCfm(Pst* pst,RgrCfgTransId transId,uint8_t status)
 {
 
    return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status));
@@ -681,23 +517,11 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiCrgBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 RgUiCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
+S16 RgUiCrgBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
@@ -716,25 +540,11 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiCrgCfgCfm
-(
-Pst* pst,
-SuId suId,
-CrgCfgTransId transId,
-U8 status
-)
-#else
-S16 RgUiCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-U8 status;
-#endif
+S16 RgUiCrgCfgCfm(Pst* pst,SuId suId,CrgCfgTransId transId,uint8_t status)
 {
 
    return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
@@ -752,23 +562,11 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 RgUiRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
+S16 RgUiRguBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
@@ -793,19 +591,7 @@ int macCDatIndSnt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguCDatInd
-(
-Pst* pst,
-SuId suId,
-RguCDatIndInfo  * datInd
-)
-#else
-S16 RgUiRguCDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguCDatIndInfo  * datInd;
-#endif
+S16 RgUiRguCDatInd(Pst* pst,SuId suId,RguCDatIndInfo *datInd)
 {
    macCDatIndSnt++;
 
@@ -828,19 +614,7 @@ RguCDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguDDatInd
-(
-Pst* pst,
-SuId suId,
-RguDDatIndInfo  * datInd
-)
-#else
-S16 RgUiRguDDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguDDatIndInfo  * datInd;
-#endif
+S16 RgUiRguDDatInd(Pst* pst,SuId suId,RguDDatIndInfo *datInd)
 {
    macDDatIndSnt++;
 
@@ -869,19 +643,7 @@ RguDDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguCStaInd
-(
-Pst* pst,
-SuId suId,
-RguCStaIndInfo  * staInd
-)
-#else
-S16 RgUiRguCStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguCStaIndInfo  * staInd;
-#endif
+S16 RgUiRguCStaInd(Pst* pst,SuId suId,RguCStaIndInfo *staInd)
 {
 
    return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
@@ -906,19 +668,7 @@ RguCStaIndInfo  * staInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguDStaInd
-(
-Pst* pst,
-SuId suId,
-RguDStaIndInfo  * staInd
-)
-#else
-S16 RgUiRguDStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguDStaIndInfo  * staInd;
-#endif
+S16 RgUiRguDStaInd(Pst* pst,SuId suId,RguDStaIndInfo  *staInd)
 {
 
    return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
@@ -926,19 +676,7 @@ RguDStaIndInfo  * staInd;
 }
 #ifdef LTE_L2_MEAS
 /* TODO: Function header */
-#ifdef ANSI
-S16 RgUiRguHqStaInd
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 RgUiRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 RgUiRguHqStaInd(Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
 
 #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF)
@@ -952,97 +690,11 @@ RguHarqStatusInd *harqStatusInd;
 } /* RgUiRguHqStaInd */
 #endif /* LTE_L2_MEAS */
 
-#ifdef ANSI
-S16 RgUiRguFlowCntrlInd
-(
-Pst* pst,
-SuId suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 RgUiRguFlowCntrlInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguFlowCntrlInd *flowCntrlInd;
-#endif
+S16 RgUiRguFlowCntrlInd(Pst* pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
   return ((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd));
 }
 /* Added for SI Enhancement*/
-#ifdef RGR_SI_SCH
-/**
-* @brief SI Configuration Confirm from MAC to RRM
-*
-* @details
-*
-*     Function : RgUiRgrSiCfgCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 RgUiRgrSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8 status
-)
-#else
-S16 RgUiRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8 status;
-#endif
-{
-
-   return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
-
-}
-
-/**
-* @brief Warning SI Configuration Confirm from MAC to RRM
-*
-* @details
-*
-*     Function : RgUiRgrWarningSiCfgCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8   siId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 RgUiRgrWarningSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8   siId,
-U8 status
-)
-#else
-S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8  siId;
-U8 status;
-#endif
-{
-   return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
-         (pst, suId, transId, siId, status));
-}
-
-#endif/*RGR_SI_SCH*/
 
 
 /* ccpu00117452 - MOD - Changed macro name from
@@ -1061,19 +713,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrStaInd
-(
-Pst* pst,
-SuId suId,
-RgrStaIndInfo  *staInd
-)
-#else
-S16 RgUiRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo *staInd;
-#endif
+S16 RgUiRgrStaInd(Pst* pst,SuId suId,RgrStaIndInfo *staInd)
 {
 
    return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
@@ -1095,19 +735,7 @@ RgrStaIndInfo *staInd;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 RgUiRgrLoadInfInd
-(
- Pst* pst,
- SuId suId,
- RgrLoadInfIndInfo  *loadInfInd
- )
-#else
-S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
-   Pst* pst;
-   SuId suId;
-   RgrLoadInfIndInfo *loadInfInd;
-#endif
+S16 RgUiRgrLoadInfInd( Pst* pst, SuId suId,RgrLoadInfIndInfo *loadInfInd )
 {
 
    return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
@@ -1128,19 +756,7 @@ S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrUeStaInd
-(
-Pst             *pst,
-SuId            suId,
-RgrUeStaIndInfo *ueStaInd
-)
-#else
-S16 RgUiRgrUeStaInd(pst, suId, ueStaInd)
-Pst             *pst;
-SuId            suId;
-RgrUeStaIndInfo *ueStaInd;
-#endif
+S16 RgUiRgrUeStaInd(Pst  *pst,SuId  suId,RgrUeStaIndInfo *ueStaInd)
 {
 
    return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
@@ -1160,23 +776,11 @@ RgrUeStaIndInfo *ueStaInd;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiCrgBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 PtUiCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
+S16 PtUiCrgBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1199,25 +803,11 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiCrgCfgCfm
-(
-Pst* pst,
-SuId suId,
-CrgCfgTransId transId,
-U8 status
-)
-#else
-S16 PtUiCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-U8 status;
-#endif
+S16 PtUiCrgCfgCfm(Pst* pst,SuId suId,CrgCfgTransId transId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1242,23 +832,11 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 PtUiRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
+S16 PtUiRguBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1285,19 +863,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguCDatInd
-(
-Pst* pst,
-SuId suId,
-RguCDatIndInfo  * datInd
-)
-#else
-S16 PtUiRguCDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguCDatIndInfo  * datInd;
-#endif
+S16 PtUiRguCDatInd(Pst* pst,SuId suId,RguCDatIndInfo  *datInd)
 {
 
    UNUSED(pst);
@@ -1324,19 +890,7 @@ RguCDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguDDatInd
-(
-Pst* pst,
-SuId suId,
-RguDDatIndInfo  * datInd
-)
-#else
-S16 PtUiRguDDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguDDatIndInfo  * datInd;
-#endif
+S16 PtUiRguDDatInd(Pst* pst,SuId suId,RguDDatIndInfo  *datInd)
 {
 
    UNUSED(pst);
@@ -1365,19 +919,7 @@ RguDDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguCStaInd
-(
-Pst* pst,
-SuId suId,
-RguCStaIndInfo  * staInd
-)
-#else
-S16 PtUiRguCStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguCStaIndInfo  * staInd;
-#endif
+S16 PtUiRguCStaInd(Pst* pst,SuId suId,RguCStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1406,19 +948,7 @@ RguCStaIndInfo  * staInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguDStaInd
-(
-Pst* pst,
-SuId suId,
-RguDStaIndInfo  * staInd
-)
-#else
-S16 PtUiRguDStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguDStaIndInfo  * staInd;
-#endif
+S16 PtUiRguDStaInd(Pst* pst,SuId suId,RguDStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1430,19 +960,7 @@ RguDStaIndInfo  * staInd;
 }
 #ifdef LTE_L2_MEAS
 /* TODO: Function Header */
-#ifdef ANSI
-S16 PtUiRguHqStaInd
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 PtUiRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 PtUiRguHqStaInd(Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
 
    UNUSED(pst);
@@ -1454,19 +972,7 @@ RguHarqStatusInd *harqStatusInd;
 }
 #endif /* LTE_L2_MEAS */
 
-#ifdef ANSI
-S16 PtUiRguFlowCntrlInd
-(
-Pst* pst,
-SuId suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 PtUiRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *flowCntrlInd;
-#endif
+S16 PtUiRguFlowCntrlInd(Pst* pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
 
    UNUSED(pst);
@@ -1491,23 +997,11 @@ RguHarqStatusInd *flowCntrlInd;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 PtUiRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
+S16 PtUiRgrBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1533,19 +1027,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrTtiInd
-(
-Pst* pst,
-SuId suId,
-RgrTtiIndInfo *ttiInd
-)
-#else
-S16 PtUiRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
+S16 PtUiRgrTtiInd(Pst* pst,SuId suId,RgrTtiIndInfo *ttiInd)
 {
 
    UNUSED(pst);
@@ -1568,25 +1050,11 @@ RgrTtiIndInfo *ttiInd;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8 status
-)
-#else
-S16 PtUiRgrCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8 status;
-#endif
+S16 PtUiRgrCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1599,90 +1067,6 @@ U8 status;
 }
 
 /* Added for SI Enhancement*/
-#ifdef RGR_SI_SCH
-/**
-* @brief SI Configuration Confirm from MAC to RRM
-*
-* @details
-*
-*     Function : PtUiRgrSiCfgCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 PtUiRgrSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8 status
-)
-#else
-S16 PtUiRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8 status;
-#endif
-{
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(transId);
-   UNUSED(status);
-
-   return ROK;
-
-}
-
-/**
-* @brief Warning SI Configuration Confirm from MAC to RRM
-*
-* @details
-*
-*     Function : PtUiRgrWarningSiCfgCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8 siId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 PtUiRgrWarningSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8 siId,
-U8 status
-)
-#else
-S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8  siId;
-U8 status;
-#endif
-{
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(transId);
-   UNUSED(siId);
-   UNUSED(status);
-
-   return ROK;
-}
-#endif/* RGR_SI_SCH */
-
 
 /* ccpu00117452 - MOD - Changed macro name from
    RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
@@ -1700,19 +1084,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrStaInd
-(
-Pst* pst,
-SuId suId,
-RgrStaIndInfo  *staInd
-)
-#else
-S16 PtUiRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo *staInd;
-#endif
+S16 PtUiRgrStaInd(Pst* pst,SuId suId,RgrStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1737,19 +1109,7 @@ RgrStaIndInfo *staInd;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 PtUiRgrLoadInfInd
-(
- Pst* pst,
- SuId suId,
- RgrLoadInfIndInfo  *loadInfInd
- )
-#else
-S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
-   Pst* pst;
-   SuId suId;
-   RgrLoadInfIndInfo *loadInfInd;
-#endif
+S16 PtUiRgrLoadInfInd( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd )
 {
 
    UNUSED(pst);
@@ -1774,19 +1134,7 @@ S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrUeStaInd
-(
-Pst* pst,
-SuId suId,
-RgrUeStaIndInfo  *ueStaInd
-)
-#else
-S16 PtUiRgrUeStaInd(pst, suId, ueStaInd)
-Pst* pst;
-SuId suId;
-RgrUeStaIndInfo *ueStaInd;
-#endif
+S16 PtUiRgrUeStaInd(Pst* pst,SuId suId,RgrUeStaIndInfo  *ueStaInd)
 {
 
    UNUSED(pst);
@@ -1800,42 +1148,6 @@ RgrUeStaIndInfo *ueStaInd;
 
 
 #ifdef PTRGUIRGM
-/**
-* @brief Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps via RGM interface
-*
-* @details
-*
-*     Function : PtUiRgmBndCfm
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SuId  suId
-*  @param[in]   U8  status
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-S16 PtUiRgmBndCfm
-(
-Pst* pst,
-SuId suId,
-U8 status
-)
-#else
-S16 PtUiRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
-{
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(status);
-
-   return ROK;
-
-}
 
 /**
 * @brief Average PRB indication from MAC to RRM
@@ -1850,19 +1162,7 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgmPrbRprtInd
-(
-Pst* pst,
-SuId suId,
-RgmPrbRprtInd *prbRprtInd
-)
-#else
-S16 PtUiRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd *prbRprtInd;
-#endif
+S16 PtUiRgmPrbRprtInd(Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)
 {
 
    UNUSED(pst);
@@ -1886,19 +1186,7 @@ RgmPrbRprtInd *prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgmTransModeInd
-(
-Pst* pst,
-SuId suId,
-RgmTransModeInd *transModeInd
-)
-#else
-S16 PtUiRgmTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
+S16 PtUiRgmTransModeInd(Pst* pst,SuId suId,RgmTransModeInd *transModeInd)
 {
 
    UNUSED(pst);
@@ -1923,20 +1211,7 @@ RgmTransModeInd *transModeInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgmSendPrbRprtInd
-(
-Pst* pst,
-SuId suId,
-RgmPrbRprtInd *prbRprtInd
-)
-#else
-S16 RgUiRgmSendPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd *prbRprtInd;
-#endif
-
+S16 RgUiRgmSendPrbRprtInd(Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)
 {
    return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
 }
@@ -1954,26 +1229,13 @@ RgmPrbRprtInd *prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgmChangeTransModeInd
-(
-Pst* pst,
-SuId suId,
-RgmTransModeInd *transModeInd
-)
-#else
-S16 RgUiRgmChangeTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
-
+S16 RgUiRgmChangeTransModeInd(Pst* pst,SuId suId,RgmTransModeInd *transModeInd)
 {
    return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
 }
 
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
-PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
+static S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
 {
       S16  ret = ROK;
       Void *elem = NULLP;
@@ -1983,14 +1245,14 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
       if (NULLP == elem)
       {
          SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktDrop++;
-         U32 i,j;
+         uint32_t i,j;
          for(i = 0; i< datInd->numLch; i++)
          {
             for(j = 0; j < datInd->lchData[i].pdu.numPdu; j++)
             {
                if(datInd->lchData[i].pdu.mBuf[j])
                {
-                  SPutMsg(datInd->lchData[i].pdu.mBuf[j]);
+                  ODU_PUT_MSG_BUF(datInd->lchData[i].pdu.mBuf[j]);
                }
             }
          }
@@ -2006,162 +1268,10 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
   return (ret);
 }
 #endif
-#ifdef RLC_MAC_DAT_REQ_RBUF
-#ifdef ANSI
-S16 rgDlDatReqBatchProc
-(
-Void
-)
-#else
-S16 rgDlDatReqBatchProc()
-Void;
-#endif
-{
-/* Read from Ring Buffer and process PDCP packets */
-
-   U8 rngBufDeqIndx = 0;
-   PRIVATE Pst rgDDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0};
-   PRIVATE Pst rgCDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCDATREQ,0,0,2,0};
-   Void *elmIndx = NULLP;
-   RguInfoRingElem *datReqRing=NULLP;
-   elmIndx = SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ);
-   while(NULLP != elmIndx)
-   {
-      datReqRing= (RguInfoRingElem *)elmIndx;
-      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;;//Number of pkt processed in tti
-      if(datReqRing->msg)
-      {
-         if(datReqRing->event == EVTRGUDDATREQ)
-         {
-         RgUiRguDDatReq(&rgDDatRbfuPst, datReqRing->spId, (RguDDatReqInfo *) datReqRing->msg);
-         }
-         else
-         { 
-          //  printf("CSHP:*** Received CDatReq in MAC Ring  \n");
-         RgUiRguCDatReq(&rgCDatRbfuPst, datReqRing->spId, (RguCDatReqInfo *) datReqRing->msg); 
-         }
-      }
-      else
-      {
-	      printf(" Buf Pinter is NULL RBUF Read(%ld) write (%ld) \n",SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].r_addr->read,
-              SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].r_addr->write);
-	      /* Due to the cache issue we are verifying the mbuf pointer again and sending it to rlc if avilable*/
-              if(datReqRing->msg)
-	      {
-		      if(datReqRing->event == EVTRGUDDATREQ)
-			      RgUiRguDDatReq(&rgDDatRbfuPst, datReqRing->spId, (RguDDatReqInfo *) datReqRing->msg);
-		      else 
-			      RgUiRguCDatReq(&rgCDatRbfuPst, datReqRing->spId, (RguCDatReqInfo *) datReqRing->msg); 
-	      }else 
-	      {
-		      printf(" still Buf Pinter is NULL RBUF Read(%ld) write (%ld) \n",SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].r_addr->read,
-		      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].r_addr->write);
-	      } 
-      }
-      datReqRing->msg=NULLP;
-      SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ);
-      datReqRing->event=0; 
-      elmIndx = NULLP;
-      datReqRing= NULLP;
-      rngBufDeqIndx++;
-
-      if(rngBufDeqIndx >= SS_RNG_MAX_DLRLC_TO_DLMAC_DAT_REQ_DQ_CNT)
-        break;
-
-      if((elmIndx = SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ)) == NULLP)
-      break;
-   }
- 
-   return ROK;
-}
-#endif 
-
-#ifdef RLC_MAC_STA_RSP_RBUF
-#ifdef ANSI
-S16 rgDlStaRspBatchProc
-(
-Void
-)
-#else
-S16 rgDlStaRspBatchProc()
-Void;
-#endif
-{
-/* Read from Ring Buffer and process PDCP packets */
-
-   U8 rngBufDeqIndx = 0;
-   PRIVATE Pst rgDStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0};
-   PRIVATE Pst rgCStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,0};
-   Void *elmIndx = NULLP;
-   RguInfoRingElem *staRspRing=NULLP;
-
-   elmIndx = SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
-   while(NULLP != elmIndx)
-   {
-      staRspRing= (RguInfoRingElem *)elmIndx;
-      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;;//Number of pkt processed in tti
-      
-      if(staRspRing->msg!= NULLP)
-      {
-         if( staRspRing->event == EVTRGUDSTARSP)
-         {
-         RgUiRguDStaRsp(&rgDStaRbfuPst, staRspRing->spId, (RguDStaRspInfo *) staRspRing->msg);
-         }
-         else
-         {
-         RgUiRguCStaRsp(&rgCStaRbfuPst, staRspRing->spId, (RguCStaRspInfo *) staRspRing->msg);
-         } 
-      }
-      else
-      {
-	      printf(" Buf Pinter is NULL RBUF Read(%ld) write (%ld) \n",SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].r_addr->read,
-			      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].r_addr->write);
-	      /* Due to the cache issue we are verifying the mbuf pointer again and sending it to rlc if avilable*/
-              if(staRspRing->msg!= NULLP)
-	      {
-		      if( staRspRing->event == EVTRGUDSTARSP)
-			      RgUiRguDStaRsp(&rgDStaRbfuPst, staRspRing->spId, (RguDStaRspInfo *) staRspRing->msg);
-		      else  
-			      RgUiRguCStaRsp(&rgCStaRbfuPst, staRspRing->spId, (RguCStaRspInfo *) staRspRing->msg);
-	      }else 
-	      {
-		      printf(" still Buf Pinter is NULL RBUF Read(%ld) write (%ld) \n",SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].r_addr->read,
-				      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].r_addr->write);
-	      } 
-      }
-      staRspRing->msg=NULLP;
-      SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
-      staRspRing->event =0;    
-      elmIndx = NULLP;
-      staRspRing= NULLP;
 
-      rngBufDeqIndx++;
-
-      if(rngBufDeqIndx >= SS_RNG_MAX_DLRLC_TO_DLMAC_STA_RSP_DQ_CNT)
-        break;
-
-      if((elmIndx = SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP)
-      break;
-   }
- 
-   return ROK;
-}
-#endif 
 #ifdef LTE_L2_MEAS
 #ifdef MAC_RLC_HARQ_STA_RBUF
-#ifdef ANSI
-S16 RgUiRguHqStaIndRbuf 
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 RgUiRguHqStaIndRbuf(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 RgUiRguHqStaIndRbuf (Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
    S16  ret = ROK;
    Void *elem = NULLP;