X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptui.c;h=ff502749f7dc7b183613fe906c4b11fd67609034;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=d47637f2cbe75b593c3b8cfe3baca7020e0a3d90;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c
index d47637f2c..ff502749f 100755
--- a/src/5gnrmac/rg_ptui.c
+++ b/src/5gnrmac/rg_ptui.c
@@ -112,7 +112,7 @@ EXTERN S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId,
 S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
 #ifdef LTE_L2_MEAS
 #ifdef MAC_RLC_HARQ_STA_RBUF
-PUBLIC S16 RgUiRguHqStaIndRbuf ARGS((Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd));
+S16 RgUiRguHqStaIndRbuf ARGS((Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd));
 #endif 
 #endif
 
@@ -157,14 +157,14 @@ EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId,
 #endif /*--#ifdef PTRGUIRGR--*/
 
 #ifdef PTRGUIRGM
-PUBLIC S16 PtUiRgmPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
-PUBLIC S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, U8 status));
-PUBLIC S16 PtUiRgmTransModeInd  ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd));
+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
-PUBLIC S16 RgUiRgmSendPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
-PUBLIC S16 RgUiRgmChangeTransModeInd ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd));
+S16 RgUiRgmSendPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd));
+S16 RgUiRgmChangeTransModeInd ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd));
 
-PUBLIC S16 RgUiRguFlowCntrlInd ARGS((Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd));
+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] =
@@ -304,7 +304,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] =
    PtUiRguBndCfm,
 #endif
 #ifdef KW
-   KwLiRguBndCfm,
+   RlcLiRguBndCfm,
 #else
    PtUiRguBndCfm,
 #endif
@@ -325,7 +325,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguCDatInd,
 #endif
 #ifdef KW
-   KwLiRguCDatInd,
+   //RlcProcCommLcUlData,
 #else
    PtUiRguCDatInd,
 #endif
@@ -346,7 +346,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguDDatInd,
 #endif
 #ifdef KW
-   KwLiRguDDatInd,
+   //RlcProcDedLcUlData,
 #else
    PtUiRguDDatInd,
 #endif
@@ -416,7 +416,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] =
    PtUiRguHqStaInd,
 #endif
 #ifdef KW
-   KwLiRguHqStaInd,
+   RlcLiRguHqStaInd,
 #else
    PtUiRguHqStaInd,
 #endif
@@ -518,7 +518,7 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
    PtUiRguFlowCntrlInd,
 #endif
 #ifdef KW
-   KwLiRguFlowCntrlInd,
+   RlcLiRguFlowCntrlInd,
 #else
    PtUiRguFlowCntrlInd,
 #endif
@@ -549,22 +549,20 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrBndCfm
+S16 RgUiRgrBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgrBndCfm(pst, suId, status)
+S16 RgUiRgrBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(RgUiRgrBndCfm);
-
    return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -583,22 +581,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmBndCfm
+S16 RgUiRgmBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgmBndCfm(pst, suId, status)
+S16 RgUiRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(RgUiRgmBndCfm);
-
    return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -621,22 +617,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrTtiInd
+S16 RgUiRgrTtiInd
 (
 Pst* pst,
 SuId suId,
 RgrTtiIndInfo  *ttiInd
 )
 #else
-PUBLIC S16 RgUiRgrTtiInd(pst, suId, ttiInd)
+S16 RgUiRgrTtiInd(pst, suId, ttiInd)
 Pst* pst;
 SuId suId;
 RgrTtiIndInfo *ttiInd;
 #endif
 {
 
-   TRC3(RgUiRgrTtiInd);
-
    return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
 
 }
@@ -658,22 +652,20 @@ RgrTtiIndInfo *ttiInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrCfgCfm
+S16 RgUiRgrCfgCfm
 (
 Pst* pst,
 RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgrCfgCfm(pst, transId, status)
+S16 RgUiRgrCfgCfm(pst, transId, status)
 Pst* pst;
 RgrCfgTransId transId;
 U8 status;
 #endif
 {
 
-   TRC3(RgUiRgrCfgCfm);
-
    return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status));
 
 }
@@ -694,22 +686,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiCrgBndCfm
+S16 RgUiCrgBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiCrgBndCfm(pst, suId, status)
+S16 RgUiCrgBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(RgUiCrgBndCfm);
-
    return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
 
 }
@@ -731,7 +721,7 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiCrgCfgCfm
+S16 RgUiCrgCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -739,7 +729,7 @@ CrgCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiCrgCfgCfm(pst, suId, transId, status)
+S16 RgUiCrgCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CrgCfgTransId transId;
@@ -747,8 +737,6 @@ U8 status;
 #endif
 {
 
-   TRC3(RgUiCrgCfgCfm);
-
    return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
@@ -769,28 +757,26 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRguBndCfm
+S16 RgUiRguBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRguBndCfm(pst, suId, status)
+S16 RgUiRguBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(RgUiRguBndCfm);
-
    return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
 
 }
 
-PUBLIC int macDDatIndSnt;
-PUBLIC int macCDatIndSnt;
+int macDDatIndSnt;
+int macCDatIndSnt;
 
 
 /**
@@ -808,14 +794,14 @@ PUBLIC int macCDatIndSnt;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRguCDatInd
+S16 RgUiRguCDatInd
 (
 Pst* pst,
 SuId suId,
 RguCDatIndInfo  * datInd
 )
 #else
-PUBLIC S16 RgUiRguCDatInd(pst, suId, datInd)
+S16 RgUiRguCDatInd(pst, suId, datInd)
 Pst* pst;
 SuId suId;
 RguCDatIndInfo  * datInd;
@@ -823,8 +809,6 @@ RguCDatIndInfo  * datInd;
 {
    macCDatIndSnt++;
 
-   TRC3(RgUiRguCDatInd);
-
    return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd));
 
 }
@@ -845,14 +829,14 @@ RguCDatIndInfo  * datInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRguDDatInd
+S16 RgUiRguDDatInd
 (
 Pst* pst,
 SuId suId,
 RguDDatIndInfo  * datInd
 )
 #else
-PUBLIC S16 RgUiRguDDatInd(pst, suId, datInd)
+S16 RgUiRguDDatInd(pst, suId, datInd)
 Pst* pst;
 SuId suId;
 RguDDatIndInfo  * datInd;
@@ -860,8 +844,6 @@ RguDDatIndInfo  * datInd;
 {
    macDDatIndSnt++;
 
-   TRC3(RgUiRguDDatInd);
-
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
    return (RgUiRguDDatIndRbuf(datInd));
 #else 
@@ -888,22 +870,20 @@ RguDDatIndInfo  * datInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRguCStaInd
+S16 RgUiRguCStaInd
 (
 Pst* pst,
 SuId suId,
 RguCStaIndInfo  * staInd
 )
 #else
-PUBLIC S16 RgUiRguCStaInd(pst, suId, staInd)
+S16 RgUiRguCStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RguCStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(RgUiRguCStaInd);
-
    return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
@@ -927,43 +907,40 @@ RguCStaIndInfo  * staInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRguDStaInd
+S16 RgUiRguDStaInd
 (
 Pst* pst,
 SuId suId,
 RguDStaIndInfo  * staInd
 )
 #else
-PUBLIC S16 RgUiRguDStaInd(pst, suId, staInd)
+S16 RgUiRguDStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RguDStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(RgUiRguDStaInd);
-
    return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
 #ifdef LTE_L2_MEAS
 /* TODO: Function header */
 #ifdef ANSI
-PUBLIC S16 RgUiRguHqStaInd
+S16 RgUiRguHqStaInd
 (
 Pst* pst,
 SuId suId,
 RguHarqStatusInd *harqStatusInd
 )
 #else
-PUBLIC S16 RgUiRguHqStaInd(pst, suId, harqStatusInd)
+S16 RgUiRguHqStaInd(pst, suId, harqStatusInd)
 Pst* pst;
 SuId suId;
 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);
@@ -976,14 +953,14 @@ RguHarqStatusInd *harqStatusInd;
 #endif /* LTE_L2_MEAS */
 
 #ifdef ANSI
-PUBLIC S16 RgUiRguFlowCntrlInd
+S16 RgUiRguFlowCntrlInd
 (
 Pst* pst,
 SuId suId,
 RguFlowCntrlInd *flowCntrlInd
 )
 #else
-PUBLIC S16 RgUiRguFlowCntrlInd(pst, suId, harqStatusInd)
+S16 RgUiRguFlowCntrlInd(pst, suId, harqStatusInd)
 Pst* pst;
 SuId suId;
 RguFlowCntrlInd *flowCntrlInd;
@@ -1008,7 +985,7 @@ RguFlowCntrlInd *flowCntrlInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrSiCfgCfm
+S16 RgUiRgrSiCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1016,7 +993,7 @@ RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgrSiCfgCfm(pst, suId, transId, status)
+S16 RgUiRgrSiCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
@@ -1024,8 +1001,6 @@ U8 status;
 #endif
 {
 
-   TRC3(RgUiRgrSiCfgCfm);
-
    return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
@@ -1046,7 +1021,7 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrWarningSiCfgCfm
+S16 RgUiRgrWarningSiCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1055,7 +1030,7 @@ U8   siId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status)
+S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
@@ -1063,8 +1038,6 @@ U8  siId;
 U8 status;
 #endif
 {
-   TRC3(RgUiRgrWarningSiCfgCfm);
-
    return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
          (pst, suId, transId, siId, status));
 }
@@ -1089,22 +1062,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrStaInd
+S16 RgUiRgrStaInd
 (
 Pst* pst,
 SuId suId,
 RgrStaIndInfo  *staInd
 )
 #else
-PUBLIC S16 RgUiRgrStaInd(pst, suId, staInd)
+S16 RgUiRgrStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RgrStaIndInfo *staInd;
 #endif
 {
 
-   TRC3(RgUiRgrStaInd);
-
    return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
@@ -1125,22 +1096,20 @@ RgrStaIndInfo *staInd;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrLoadInfInd
+S16 RgUiRgrLoadInfInd
 (
  Pst* pst,
  SuId suId,
  RgrLoadInfIndInfo  *loadInfInd
  )
 #else
-PUBLIC S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
+S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
    Pst* pst;
    SuId suId;
    RgrLoadInfIndInfo *loadInfInd;
 #endif
 {
 
-   TRC3(RgUiRgrLoadInfInd);
-
    return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
 
 }
@@ -1160,22 +1129,20 @@ PUBLIC S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrUeStaInd
+S16 RgUiRgrUeStaInd
 (
 Pst             *pst,
 SuId            suId,
 RgrUeStaIndInfo *ueStaInd
 )
 #else
-PUBLIC S16 RgUiRgrUeStaInd(pst, suId, ueStaInd)
+S16 RgUiRgrUeStaInd(pst, suId, ueStaInd)
 Pst             *pst;
 SuId            suId;
 RgrUeStaIndInfo *ueStaInd;
 #endif
 {
 
-   TRC3(RgUiRgrUeStaInd);
-
    return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
 
 }
@@ -1198,22 +1165,20 @@ RgrUeStaIndInfo *ueStaInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiCrgBndCfm
+S16 PtUiCrgBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiCrgBndCfm(pst, suId, status)
+S16 PtUiCrgBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(PtUiCrgBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1239,7 +1204,7 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiCrgCfgCfm
+S16 PtUiCrgCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1247,7 +1212,7 @@ CrgCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiCrgCfgCfm(pst, suId, transId, status)
+S16 PtUiCrgCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CrgCfgTransId transId;
@@ -1255,8 +1220,6 @@ U8 status;
 #endif
 {
 
-   TRC3(PtUiCrgCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1284,22 +1247,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRguBndCfm
+S16 PtUiRguBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRguBndCfm(pst, suId, status)
+S16 PtUiRguBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(PtUiRguBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1325,22 +1286,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRguCDatInd
+S16 PtUiRguCDatInd
 (
 Pst* pst,
 SuId suId,
 RguCDatIndInfo  * datInd
 )
 #else
-PUBLIC S16 PtUiRguCDatInd(pst, suId, datInd)
+S16 PtUiRguCDatInd(pst, suId, datInd)
 Pst* pst;
 SuId suId;
 RguCDatIndInfo  * datInd;
 #endif
 {
 
-   TRC3(PtUiRguCDatInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(datInd);
@@ -1366,22 +1325,20 @@ RguCDatIndInfo  * datInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRguDDatInd
+S16 PtUiRguDDatInd
 (
 Pst* pst,
 SuId suId,
 RguDDatIndInfo  * datInd
 )
 #else
-PUBLIC S16 PtUiRguDDatInd(pst, suId, datInd)
+S16 PtUiRguDDatInd(pst, suId, datInd)
 Pst* pst;
 SuId suId;
 RguDDatIndInfo  * datInd;
 #endif
 {
 
-   TRC3(PtUiRguDDatInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(datInd);
@@ -1409,22 +1366,20 @@ RguDDatIndInfo  * datInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRguCStaInd
+S16 PtUiRguCStaInd
 (
 Pst* pst,
 SuId suId,
 RguCStaIndInfo  * staInd
 )
 #else
-PUBLIC S16 PtUiRguCStaInd(pst, suId, staInd)
+S16 PtUiRguCStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RguCStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(PtUiRguCStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1452,22 +1407,20 @@ RguCStaIndInfo  * staInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRguDStaInd
+S16 PtUiRguDStaInd
 (
 Pst* pst,
 SuId suId,
 RguDStaIndInfo  * staInd
 )
 #else
-PUBLIC S16 PtUiRguDStaInd(pst, suId, staInd)
+S16 PtUiRguDStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RguDStaIndInfo  * staInd;
 #endif
 {
 
-   TRC3(PtUiRguDStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1478,22 +1431,20 @@ RguDStaIndInfo  * staInd;
 #ifdef LTE_L2_MEAS
 /* TODO: Function Header */
 #ifdef ANSI
-PUBLIC S16 PtUiRguHqStaInd
+S16 PtUiRguHqStaInd
 (
 Pst* pst,
 SuId suId,
 RguHarqStatusInd *harqStatusInd
 )
 #else
-PUBLIC S16 PtUiRguHqStaInd(pst, suId, harqStatusInd)
+S16 PtUiRguHqStaInd(pst, suId, harqStatusInd)
 Pst* pst;
 SuId suId;
 RguHarqStatusInd *harqStatusInd;
 #endif
 {
 
-   TRC3(PtUiRguHqStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(harqStatusInd);
@@ -1504,22 +1455,20 @@ RguHarqStatusInd *harqStatusInd;
 #endif /* LTE_L2_MEAS */
 
 #ifdef ANSI
-PUBLIC S16 PtUiRguFlowCntrlInd
+S16 PtUiRguFlowCntrlInd
 (
 Pst* pst,
 SuId suId,
 RguFlowCntrlInd *flowCntrlInd
 )
 #else
-PUBLIC S16 PtUiRguFlowCntrlInd(pst, suId, flowCntrlInd)
+S16 PtUiRguFlowCntrlInd(pst, suId, flowCntrlInd)
 Pst* pst;
 SuId suId;
 RguHarqStatusInd *flowCntrlInd;
 #endif
 {
 
-   TRC3(PtUiRguFlowCntrlInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(flowCntrlInd);
@@ -1547,22 +1496,20 @@ RguHarqStatusInd *flowCntrlInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrBndCfm
+S16 PtUiRgrBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRgrBndCfm(pst, suId, status)
+S16 PtUiRgrBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(PtUiRgrBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1587,22 +1534,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrTtiInd
+S16 PtUiRgrTtiInd
 (
 Pst* pst,
 SuId suId,
 RgrTtiIndInfo *ttiInd
 )
 #else
-PUBLIC S16 PtUiRgrTtiInd(pst, suId, ttiInd)
+S16 PtUiRgrTtiInd(pst, suId, ttiInd)
 Pst* pst;
 SuId suId;
 RgrTtiIndInfo *ttiInd;
 #endif
 {
 
-   TRC3(PtUiRgrTtiInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(ttiInd);
@@ -1628,7 +1573,7 @@ RgrTtiIndInfo *ttiInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrCfgCfm
+S16 PtUiRgrCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1636,7 +1581,7 @@ RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRgrCfgCfm(pst, suId, transId, status)
+S16 PtUiRgrCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
@@ -1644,8 +1589,6 @@ U8 status;
 #endif
 {
 
-   TRC3(PtUiRgrCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1672,7 +1615,7 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrSiCfgCfm
+S16 PtUiRgrSiCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1680,7 +1623,7 @@ RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRgrSiCfgCfm(pst, suId, transId, status)
+S16 PtUiRgrSiCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
@@ -1688,8 +1631,6 @@ U8 status;
 #endif
 {
 
-   TRC3(PtUiRgrSiCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1715,7 +1656,7 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrWarningSiCfgCfm
+S16 PtUiRgrWarningSiCfgCfm
 (
 Pst* pst,
 SuId suId,
@@ -1724,7 +1665,7 @@ U8 siId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
+S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
 Pst* pst;
 SuId suId;
 RgrCfgTransId transId;
@@ -1732,8 +1673,6 @@ U8  siId;
 U8 status;
 #endif
 {
-   TRC3(PtUiRgrWarningSiCfgCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transId);
@@ -1762,22 +1701,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrStaInd
+S16 PtUiRgrStaInd
 (
 Pst* pst,
 SuId suId,
 RgrStaIndInfo  *staInd
 )
 #else
-PUBLIC S16 PtUiRgrStaInd(pst, suId, staInd)
+S16 PtUiRgrStaInd(pst, suId, staInd)
 Pst* pst;
 SuId suId;
 RgrStaIndInfo *staInd;
 #endif
 {
 
-   TRC3(PtUiRgrStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(staInd);
@@ -1801,22 +1738,20 @@ RgrStaIndInfo *staInd;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrLoadInfInd
+S16 PtUiRgrLoadInfInd
 (
  Pst* pst,
  SuId suId,
  RgrLoadInfIndInfo  *loadInfInd
  )
 #else
-PUBLIC S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
+S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
    Pst* pst;
    SuId suId;
    RgrLoadInfIndInfo *loadInfInd;
 #endif
 {
 
-   TRC3(PtUiRgrLoadInfInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(loadInfInd);
@@ -1840,22 +1775,20 @@ PUBLIC S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgrUeStaInd
+S16 PtUiRgrUeStaInd
 (
 Pst* pst,
 SuId suId,
 RgrUeStaIndInfo  *ueStaInd
 )
 #else
-PUBLIC S16 PtUiRgrUeStaInd(pst, suId, ueStaInd)
+S16 PtUiRgrUeStaInd(pst, suId, ueStaInd)
 Pst* pst;
 SuId suId;
 RgrUeStaIndInfo *ueStaInd;
 #endif
 {
 
-   TRC3(PtUiRgrUeStaInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(ueStaInd);
@@ -1882,22 +1815,20 @@ RgrUeStaIndInfo *ueStaInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgmBndCfm
+S16 PtUiRgmBndCfm
 (
 Pst* pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 PtUiRgmBndCfm(pst, suId, status)
+S16 PtUiRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
 U8 status;
 #endif
 {
 
-   TRC3(PtUiRgmBndCfm);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(status);
@@ -1920,22 +1851,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgmPrbRprtInd
+S16 PtUiRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd *prbRprtInd
 )
 #else
-PUBLIC S16 PtUiRgmPrbRprtInd(pst, suId, prbRprtInd)
+S16 PtUiRgmPrbRprtInd(pst, suId, prbRprtInd)
 Pst* pst;
 SuId suId;
 RgmPrbRprtInd *prbRprtInd;
 #endif
 {
 
-   TRC3(PtUiRgmPrbRprtInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(prbRprtInd);
@@ -1958,22 +1887,20 @@ RgmPrbRprtInd *prbRprtInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 PtUiRgmTransModeInd
+S16 PtUiRgmTransModeInd
 (
 Pst* pst,
 SuId suId,
 RgmTransModeInd *transModeInd
 )
 #else
-PUBLIC S16 PtUiRgmTransModeInd(pst, suId, transModeInd)
+S16 PtUiRgmTransModeInd(pst, suId, transModeInd)
 Pst* pst;
 SuId suId;
 RgmTransModeInd *transModeInd;
 #endif
 {
 
-   TRC3(PtUiRgmTransModeInd);
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(transModeInd);
@@ -1997,21 +1924,20 @@ RgmTransModeInd *transModeInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmSendPrbRprtInd
+S16 RgUiRgmSendPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd *prbRprtInd
 )
 #else
-PUBLIC S16 RgUiRgmSendPrbRprtInd(pst, suId, prbRprtInd)
+S16 RgUiRgmSendPrbRprtInd(pst, suId, prbRprtInd)
 Pst* pst;
 SuId suId;
 RgmPrbRprtInd *prbRprtInd;
 #endif
 
 {
-   TRC2(RgUiRgmSendPrbRprtInd);
    return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
 }
 
@@ -2029,21 +1955,20 @@ RgmPrbRprtInd *prbRprtInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmChangeTransModeInd
+S16 RgUiRgmChangeTransModeInd
 (
 Pst* pst,
 SuId suId,
 RgmTransModeInd *transModeInd
 )
 #else
-PUBLIC S16 RgUiRgmChangeTransModeInd(pst, suId, transModeInd)
+S16 RgUiRgmChangeTransModeInd(pst, suId, transModeInd)
 Pst* pst;
 SuId suId;
 RgmTransModeInd *transModeInd;
 #endif
 
 {
-   TRC2(RgUiRgmChangeTransModeInd);
    return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
 }
 
@@ -2083,20 +2008,20 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
 #endif
 #ifdef RLC_MAC_DAT_REQ_RBUF
 #ifdef ANSI
-PUBLIC S16 rgDlDatReqBatchProc
+S16 rgDlDatReqBatchProc
 (
 Void
 )
 #else
-PUBLIC S16 rgDlDatReqBatchProc()
+S16 rgDlDatReqBatchProc()
 Void;
 #endif
 {
 /* Read from Ring Buffer and process PDCP packets */
 
    U8 rngBufDeqIndx = 0;
-   PRIVATE Pst rgDDatRbfuPst ={1,1,ENTRG,0,ENTKW,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0};
-   PRIVATE Pst rgCDatRbfuPst ={1,1,ENTRG,0,ENTKW,1,PRIOR0,RTESPEC,EVTRGUCDATREQ,0,0,2,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);
@@ -2153,20 +2078,20 @@ Void;
 
 #ifdef RLC_MAC_STA_RSP_RBUF
 #ifdef ANSI
-PUBLIC S16 rgDlStaRspBatchProc
+S16 rgDlStaRspBatchProc
 (
 Void
 )
 #else
-PUBLIC S16 rgDlStaRspBatchProc()
+S16 rgDlStaRspBatchProc()
 Void;
 #endif
 {
 /* Read from Ring Buffer and process PDCP packets */
 
    U8 rngBufDeqIndx = 0;
-   PRIVATE Pst rgDStaRbfuPst ={1,1,ENTRG,0,ENTKW,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0};
-   PRIVATE Pst rgCStaRbfuPst ={1,1,ENTRG,0,ENTKW,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,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;
 
@@ -2225,14 +2150,14 @@ Void;
 #ifdef LTE_L2_MEAS
 #ifdef MAC_RLC_HARQ_STA_RBUF
 #ifdef ANSI
-PUBLIC S16 RgUiRguHqStaIndRbuf 
+S16 RgUiRguHqStaIndRbuf 
 (
 Pst* pst,
 SuId suId,
 RguHarqStatusInd *harqStatusInd
 )
 #else
-PUBLIC S16 RgUiRguHqStaIndRbuf(pst, suId, harqStatusInd)
+S16 RgUiRguHqStaIndRbuf(pst, suId, harqStatusInd)
 Pst* pst;
 SuId suId;
 RguHarqStatusInd *harqStatusInd;
@@ -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++;
    }