X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg_ptui.c;h=f4d91207b9ca93c81ac4100fd0cd55d89d577681;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=24a449e341fda3863d0072df81a975e43068b54c;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c
index 24a449e34..f4d91207b 100755
--- a/src/5gnrmac/rg_ptui.c
+++ b/src/5gnrmac/rg_ptui.c
@@ -83,7 +83,7 @@ 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));
+EXTERN 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));
@@ -136,29 +136,29 @@ 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));
+EXTERN 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));
+EXTERN 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));
+EXTERN 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 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status));
 EXTERN 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 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status));
 EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, 
-                                RgrCfgTransId transId, U8 siId, U8 status));
+                                RgrCfgTransId transId, uint8_t siId, uint8_t 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 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, uint8_t status));
 S16 PtUiRgmTransModeInd  ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd));
 #endif
 S16 RgUiRgmSendPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
@@ -325,7 +325,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguCDatInd,
 #endif
 #ifdef KW
-   RlcLiRguCDatInd,
+   //RlcProcCommLcUlData,
 #else
    PtUiRguCDatInd,
 #endif
@@ -346,7 +346,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguDDatInd,
 #endif
 #ifdef KW
-   RlcLiRguDDatInd,
+   //RlcProcDedLcUlData,
 #else
    PtUiRguDDatInd,
 #endif
@@ -544,7 +544,7 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -553,18 +553,16 @@ S16 RgUiRgrBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiRgrBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiRgrBndCfm);
-
    return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -578,7 +576,7 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -587,18 +585,16 @@ S16 RgUiRgmBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiRgmBndCfm);
-
    return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -635,8 +631,6 @@ RgrTtiIndInfo *ttiInd;
 #endif
 {
 
-   TRC3(RgUiRgrTtiInd);
-
    return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
 
 }
@@ -653,7 +647,7 @@ 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
 **/
@@ -662,18 +656,16 @@ S16 RgUiRgrCfgCfm
 (
 Pst* pst,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiRgrCfgCfm(pst, transId, status)
 Pst* pst;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiRgrCfgCfm);
-
    return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status));
 
 }
@@ -689,7 +681,7 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -698,18 +690,16 @@ S16 RgUiCrgBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiCrgBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiCrgBndCfm);
-
    return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -726,7 +716,7 @@ 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
 **/
@@ -736,19 +726,17 @@ S16 RgUiCrgCfgCfm
 Pst* pst,
 SuId suId,
 CrgCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiCrgCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CrgCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiCrgCfgCfm);
-
    return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
@@ -764,7 +752,7 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -773,18 +761,16 @@ S16 RgUiRguBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiRguBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiRguBndCfm);
-
    return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -823,8 +809,6 @@ RguCDatIndInfo  * datInd;
 {
    macCDatIndSnt++;
 
-   TRC3(RgUiRguCDatInd);
-
    return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd));
 
 }
@@ -860,8 +844,6 @@ RguDDatIndInfo  * datInd;
 {
    macDDatIndSnt++;
 
-   TRC3(RgUiRguDDatInd);
-
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
    return (RgUiRguDDatIndRbuf(datInd));
 #else 
@@ -902,8 +884,6 @@ RguCStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(RgUiRguCStaInd);
-
    return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
@@ -941,8 +921,6 @@ RguDStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(RgUiRguDStaInd);
-
    return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
@@ -963,7 +941,6 @@ RguHarqStatusInd *harqStatusInd;
 #endif
 {
 
-   TRC3(RgUiRguHqStaInd);
 #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF)
    S16 ret=ROK;
    ret = RgUiRguHqStaIndRbuf(pst,suId,harqStatusInd);
@@ -1003,7 +980,7 @@ RguFlowCntrlInd *flowCntrlInd;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1013,19 +990,17 @@ S16 RgUiRgrSiCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 RgUiRgrSiCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(RgUiRgrSiCfgCfm);
-
    return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
@@ -1040,8 +1015,8 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8   siId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t   siId
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1051,20 +1026,18 @@ S16 RgUiRgrWarningSiCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8   siId,
-U8 status
+uint8_t   siId,
+uint8_t status
 )
 #else
 S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8  siId;
-U8 status;
+uint8_t  siId;
+uint8_t status;
 #endif
 {
-   TRC3(RgUiRgrWarningSiCfgCfm);
-
    return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
          (pst, suId, transId, siId, status));
 }
@@ -1103,8 +1076,6 @@ RgrStaIndInfo *staInd;
 #endif
 {
 
-   TRC3(RgUiRgrStaInd);
-
    return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
@@ -1139,8 +1110,6 @@ S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
 #endif
 {
 
-   TRC3(RgUiRgrLoadInfInd);
-
    return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
 
 }
@@ -1174,8 +1143,6 @@ RgrUeStaIndInfo *ueStaInd;
 #endif
 {
 
-   TRC3(RgUiRgrUeStaInd);
-
    return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
 
 }
@@ -1193,7 +1160,7 @@ RgrUeStaIndInfo *ueStaInd;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1202,18 +1169,16 @@ S16 PtUiCrgBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiCrgBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiCrgBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1234,7 +1199,7 @@ 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
 **/
@@ -1244,19 +1209,17 @@ S16 PtUiCrgCfgCfm
 Pst* pst,
 SuId suId,
 CrgCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiCrgCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CrgCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiCrgCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1279,7 +1242,7 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1288,18 +1251,16 @@ S16 PtUiRguBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiRguBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiRguBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1339,8 +1300,6 @@ RguCDatIndInfo  * datInd;
 #endif
 {
 
-   TRC3(PtUiRguCDatInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(datInd);
@@ -1380,8 +1339,6 @@ RguDDatIndInfo  * datInd;
 #endif
 {
 
-   TRC3(PtUiRguDDatInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(datInd);
@@ -1423,8 +1380,6 @@ RguCStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(PtUiRguCStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1466,8 +1421,6 @@ RguDStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(PtUiRguDStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1492,8 +1445,6 @@ RguHarqStatusInd *harqStatusInd;
 #endif
 {
 
-   TRC3(PtUiRguHqStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(harqStatusInd);
@@ -1518,8 +1469,6 @@ RguHarqStatusInd *flowCntrlInd;
 #endif
 {
 
-   TRC3(PtUiRguFlowCntrlInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(flowCntrlInd);
@@ -1542,7 +1491,7 @@ RguHarqStatusInd *flowCntrlInd;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1551,18 +1500,16 @@ S16 PtUiRgrBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiRgrBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiRgrBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1601,8 +1548,6 @@ RgrTtiIndInfo *ttiInd;
 #endif
 {
 
-   TRC3(PtUiRgrTtiInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(ttiInd);
@@ -1623,7 +1568,7 @@ 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
 **/
@@ -1633,19 +1578,17 @@ S16 PtUiRgrCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiRgrCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiRgrCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1667,7 +1610,7 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1677,19 +1620,17 @@ S16 PtUiRgrSiCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiRgrSiCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiRgrSiCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1709,8 +1650,8 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   RgrCfgTransId  transId
-*  @param[in]   U8 siId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t siId
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1720,20 +1661,18 @@ S16 PtUiRgrWarningSiCfgCfm
 Pst* pst,
 SuId suId,
 RgrCfgTransId transId,
-U8 siId,
-U8 status
+uint8_t siId,
+uint8_t status
 )
 #else
 S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
-U8  siId;
-U8 status;
+uint8_t  siId;
+uint8_t status;
 #endif
 {
-   TRC3(PtUiRgrWarningSiCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1776,8 +1715,6 @@ RgrStaIndInfo *staInd;
 #endif
 {
 
-   TRC3(PtUiRgrStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1815,8 +1752,6 @@ S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
 #endif
 {
 
-   TRC3(PtUiRgrLoadInfInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(loadInfInd);
@@ -1854,8 +1789,6 @@ RgrUeStaIndInfo *ueStaInd;
 #endif
 {
 
-   TRC3(PtUiRgrUeStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(ueStaInd);
@@ -1877,7 +1810,7 @@ RgrUeStaIndInfo *ueStaInd;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -1886,18 +1819,16 @@ S16 PtUiRgmBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 PtUiRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
 
-   TRC3(PtUiRgmBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1934,8 +1865,6 @@ RgmPrbRprtInd *prbRprtInd;
 #endif
 {
 
-   TRC3(PtUiRgmPrbRprtInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(prbRprtInd);
@@ -1972,8 +1901,6 @@ RgmTransModeInd *transModeInd;
 #endif
 {
 
-   TRC3(PtUiRgmTransModeInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transModeInd);
@@ -2011,7 +1938,6 @@ RgmPrbRprtInd *prbRprtInd;
 #endif
 
 {
-   TRC2(RgUiRgmSendPrbRprtInd);
    return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
 }
 
@@ -2043,7 +1969,6 @@ RgmTransModeInd *transModeInd;
 #endif
 
 {
-   TRC2(RgUiRgmChangeTransModeInd);
    return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
 }
 
@@ -2058,7 +1983,7 @@ 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++)
@@ -2094,7 +2019,7 @@ Void;
 {
 /* Read from Ring Buffer and process PDCP packets */
 
-   U8 rngBufDeqIndx = 0;
+   uint8_t 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;
@@ -2103,7 +2028,7 @@ Void;
    while(NULLP != elmIndx)
    {
       datReqRing= (RguInfoRingElem *)elmIndx;
-      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;;//Number of pkt processed in tti
+      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;//Number of pkt processed in tti
       if(datReqRing->msg)
       {
          if(datReqRing->event == EVTRGUDDATREQ)
@@ -2164,7 +2089,7 @@ Void;
 {
 /* Read from Ring Buffer and process PDCP packets */
 
-   U8 rngBufDeqIndx = 0;
+   uint8_t 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;
@@ -2174,7 +2099,7 @@ Void;
    while(NULLP != elmIndx)
    {
       staRspRing= (RguInfoRingElem *)elmIndx;
-      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;;//Number of pkt processed in tti
+      SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;//Number of pkt processed in tti
       
       if(staRspRing->msg!= NULLP)
       {
@@ -2250,8 +2175,8 @@ RguHarqStatusInd *harqStatusInd;
    }
    else
    {
-      cmMemcpy((U8 *)&(harqStaInd->hqStatusInd), (U8 *)harqStatusInd, sizeof(RguHarqStatusInd));
-      cmMemcpy((U8 *)&(harqStaInd->pst), (U8 *)pst, sizeof(Pst));
+      memcpy(&(harqStaInd->hqStatusInd), harqStatusInd, sizeof(RguHarqStatusInd));
+      memcpy(&(harqStaInd->pst), pst, sizeof(Pst));
       SRngIncrWIndx(SS_RNG_BUF_MAC_HARQ);
       SsRngInfoTbl[SS_RNG_BUF_MAC_HARQ].pktRate++;
    }