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

diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c
index cfe0b7c13..d47637f2c 100755
--- a/src/5gnrmac/rg_ptui.c
+++ b/src/5gnrmac/rg_ptui.c
@@ -34,15 +34,7 @@
        Portable functions corresponding to these primitives are also defined.
 */
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgr.h"           /* RGR Interface defines */
@@ -50,13 +42,6 @@
 #include "rgm.h"           /* RGM Interface defines*/
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "crg.x"           /* CRG Interface includes */
 #include "rgr.x"           /* RGR Interface includes */
 #include "rgu.x"           /* RGU Interface includes */
@@ -240,8 +225,6 @@ PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] =
 #endif
 #ifdef NX
    NxLiRgrCfgCfm,
-#else
-   PtUiRgrCfgCfm,
 #endif
 };
 
@@ -337,7 +320,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] =
 PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
-   cmPkRguCDatInd,
+//   cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */
 #else
    PtUiRguCDatInd,
 #endif
@@ -347,7 +330,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguCDatInd,
 #endif
 #ifdef LWLCRGUIRGU
-   cmPkRguCDatInd,
+//   cmPkRguCDatInd, /* TODO:Call packRcvdUlData instead */
 #else
    PtUiRguCDatInd,
 #endif
@@ -358,7 +341,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
 PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
-   cmPkRguDDatInd,
+//   cmPkRguDDatInd,  /* TODO: Call packRcvdUlData instead */
 #else
    PtUiRguDDatInd,
 #endif
@@ -368,7 +351,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
    PtUiRguDDatInd,
 #endif
 #ifdef LWLCRGUIRGU
-   cmPkRguDDatInd,
+//   cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */
 #else
    PtUiRguDDatInd,
 #endif
@@ -381,17 +364,17 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
 PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
-   cmPkRguCStaInd,
+   //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */
 #else
    PtUiRguCStaInd,
 #endif
 #ifdef KW
-   KwLiRguCStaInd,
+   //RlcMacProcSchedRep,
 #else
    PtUiRguCStaInd,
 #endif
 #ifdef LWLCRGUIRGU
-   cmPkRguCStaInd,
+   //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */
 #else
    PtUiRguCStaInd,
 #endif
@@ -404,17 +387,17 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
 PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] =
 {
 #ifdef LCRGUIRGU
-   cmPkRguDStaInd,
+   //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */
 #else
    PtUiRguDStaInd,
 #endif
 #ifdef KW
-   KwLiRguDStaInd,
+   //RlcMacProcSchedRep,
 #else
    PtUiRguDStaInd,
 #endif
 #ifdef LWLCRGUIRGU
-   cmPkRguDStaInd,
+   //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */
 #else
    PtUiRguDStaInd,
 #endif
@@ -582,7 +565,7 @@ U8 status;
 
    TRC3(RgUiRgrBndCfm);
 
-   RETVALUE((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
+   return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
 
 }
 /**
@@ -616,7 +599,7 @@ U8 status;
 
    TRC3(RgUiRgmBndCfm);
 
-   RETVALUE((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
+   return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
 
 }
 
@@ -654,7 +637,7 @@ RgrTtiIndInfo *ttiInd;
 
    TRC3(RgUiRgrTtiInd);
 
-   RETVALUE((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
+   return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
 
 }
 
@@ -678,14 +661,12 @@ RgrTtiIndInfo *ttiInd;
 PUBLIC S16 RgUiRgrCfgCfm
 (
 Pst* pst,
-SuId suId,
 RgrCfgTransId transId,
 U8 status
 )
 #else
-PUBLIC S16 RgUiRgrCfgCfm(pst, suId, transId, status)
+PUBLIC S16 RgUiRgrCfgCfm(pst, transId, status)
 Pst* pst;
-SuId suId;
 RgrCfgTransId transId;
 U8 status;
 #endif
@@ -693,7 +674,7 @@ U8 status;
 
    TRC3(RgUiRgrCfgCfm);
 
-   RETVALUE((*RgUiRgrCfgCfmMt[pst->selector])(pst, suId, transId, status));
+   return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status));
 
 }
 
@@ -729,7 +710,7 @@ U8 status;
 
    TRC3(RgUiCrgBndCfm);
 
-   RETVALUE((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
+   return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
 
 }
 
@@ -768,7 +749,7 @@ U8 status;
 
    TRC3(RgUiCrgCfgCfm);
 
-   RETVALUE((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
+   return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
 
@@ -804,7 +785,7 @@ U8 status;
 
    TRC3(RgUiRguBndCfm);
 
-   RETVALUE((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
+   return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
 
 }
 
@@ -844,7 +825,7 @@ RguCDatIndInfo  * datInd;
 
    TRC3(RgUiRguCDatInd);
 
-   RETVALUE((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd));
+   return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd));
 
 }
 
@@ -882,9 +863,9 @@ RguDDatIndInfo  * datInd;
    TRC3(RgUiRguDDatInd);
 
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
-   RETVALUE(RgUiRguDDatIndRbuf(datInd));
+   return (RgUiRguDDatIndRbuf(datInd));
 #else 
-   RETVALUE((*RgUiRguDDatIndMt[pst->selector])(pst, suId, datInd));
+   return ((*RgUiRguDDatIndMt[pst->selector])(pst, suId, datInd));
 #endif    
 }
 
@@ -923,7 +904,7 @@ RguCStaIndInfo  * staInd;
 
    TRC3(RgUiRguCStaInd);
 
-   RETVALUE((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
+   return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
 
@@ -962,7 +943,7 @@ RguDStaIndInfo  * staInd;
 
    TRC3(RgUiRguDStaInd);
 
-   RETVALUE((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
+   return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
 #ifdef LTE_L2_MEAS
@@ -986,9 +967,9 @@ RguHarqStatusInd *harqStatusInd;
 #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF)
    S16 ret=ROK;
    ret = RgUiRguHqStaIndRbuf(pst,suId,harqStatusInd);
-   RETVALUE(ret);
+   return (ret);
 #else 
-   RETVALUE((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd));
+   return ((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd));
 #endif 
 
 } /* RgUiRguHqStaInd */
@@ -1008,7 +989,7 @@ SuId suId;
 RguFlowCntrlInd *flowCntrlInd;
 #endif
 {
-  RETVALUE((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd));
+  return ((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd));
 }
 /* Added for SI Enhancement*/
 #ifdef RGR_SI_SCH
@@ -1045,7 +1026,7 @@ U8 status;
 
    TRC3(RgUiRgrSiCfgCfm);
 
-   RETVALUE((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
+   return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
 
 }
 
@@ -1084,7 +1065,7 @@ U8 status;
 {
    TRC3(RgUiRgrWarningSiCfgCfm);
 
-   RETVALUE((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
+   return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
          (pst, suId, transId, siId, status));
 }
 
@@ -1124,7 +1105,7 @@ RgrStaIndInfo *staInd;
 
    TRC3(RgUiRgrStaInd);
 
-   RETVALUE((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
+   return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
 
 }
 #endif /* End of RGR_CQI_REPT */
@@ -1160,7 +1141,7 @@ PUBLIC S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
 
    TRC3(RgUiRgrLoadInfInd);
 
-   RETVALUE((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
+   return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
 
 }
 /* LTE_ADV_FLAG_REMOVED_END */
@@ -1195,7 +1176,7 @@ RgrUeStaIndInfo *ueStaInd;
 
    TRC3(RgUiRgrUeStaInd);
 
-   RETVALUE((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
+   return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
 
 }
 #endif /*--ifdef RG--*/
@@ -1237,7 +1218,7 @@ U8 status;
    UNUSED(suId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1281,7 +1262,7 @@ U8 status;
    UNUSED(transId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*--ifdef PTRGUICRG--*/
@@ -1323,7 +1304,7 @@ U8 status;
    UNUSED(suId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1364,7 +1345,7 @@ RguCDatIndInfo  * datInd;
    UNUSED(suId);
    UNUSED(datInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1405,7 +1386,7 @@ RguDDatIndInfo  * datInd;
    UNUSED(suId);
    UNUSED(datInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1448,7 +1429,7 @@ RguCStaIndInfo  * staInd;
    UNUSED(suId);
    UNUSED(staInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1491,7 +1472,7 @@ RguDStaIndInfo  * staInd;
    UNUSED(suId);
    UNUSED(staInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #ifdef LTE_L2_MEAS
@@ -1517,7 +1498,7 @@ RguHarqStatusInd *harqStatusInd;
    UNUSED(suId);
    UNUSED(harqStatusInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /* LTE_L2_MEAS */
@@ -1543,7 +1524,7 @@ RguHarqStatusInd *flowCntrlInd;
    UNUSED(suId);
    UNUSED(flowCntrlInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1586,7 +1567,7 @@ U8 status;
    UNUSED(suId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1626,7 +1607,7 @@ RgrTtiIndInfo *ttiInd;
    UNUSED(suId);
    UNUSED(ttiInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1670,7 +1651,7 @@ U8 status;
    UNUSED(transId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1714,7 +1695,7 @@ U8 status;
    UNUSED(transId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1759,7 +1740,7 @@ U8 status;
    UNUSED(siId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif/* RGR_SI_SCH */
 
@@ -1801,7 +1782,7 @@ RgrStaIndInfo *staInd;
    UNUSED(suId);
    UNUSED(staInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /* End of RGR_CQI_REPT */
@@ -1840,7 +1821,7 @@ PUBLIC S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
    UNUSED(suId);
    UNUSED(loadInfInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 /* LTE_ADV_FLAG_REMOVED_END */
@@ -1879,7 +1860,7 @@ RgrUeStaIndInfo *ueStaInd;
    UNUSED(suId);
    UNUSED(ueStaInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*--ifdef PTRGUIRGR--*/
@@ -1921,7 +1902,7 @@ U8 status;
    UNUSED(suId);
    UNUSED(status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1959,7 +1940,7 @@ RgmPrbRprtInd *prbRprtInd;
    UNUSED(suId);
    UNUSED(prbRprtInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1997,7 +1978,7 @@ RgmTransModeInd *transModeInd;
    UNUSED(suId);
    UNUSED(transModeInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif
@@ -2031,7 +2012,7 @@ RgmPrbRprtInd *prbRprtInd;
 
 {
    TRC2(RgUiRgmSendPrbRprtInd);
-   RETVALUE((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
+   return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
 }
 
 /**
@@ -2063,7 +2044,7 @@ RgmTransModeInd *transModeInd;
 
 {
    TRC2(RgUiRgmChangeTransModeInd);
-   RETVALUE((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
+   return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
 }
 
 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF)
@@ -2097,7 +2078,7 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
          SRngIncrWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC);
          SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktRate++;
       }
-  RETVALUE(ret);
+  return (ret);
 }
 #endif
 #ifdef RLC_MAC_DAT_REQ_RBUF
@@ -2166,7 +2147,7 @@ Void;
       break;
    }
  
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif 
 
@@ -2238,7 +2219,7 @@ Void;
       break;
    }
  
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif 
 #ifdef LTE_L2_MEAS
@@ -2274,7 +2255,7 @@ RguHarqStatusInd *harqStatusInd;
       SRngIncrWIndx(SS_RNG_BUF_MAC_HARQ);
       SsRngInfoTbl[SS_RNG_BUF_MAC_HARQ].pktRate++;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 #endif
 #endif