X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_pt.c;h=b8ff43b77e52fe1547280d4bfa7f03b9aaf454f1;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=9fdc5d9e661d7e2a8a69a967bc3bcab73aa41396;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c
index 9fdc5d9e6..b8ff43b77 100755
--- a/src/5gnrsch/rg_sch_pt.c
+++ b/src/5gnrsch/rg_sch_pt.c
@@ -251,21 +251,19 @@ PRIVATE CONSTANT L2MeasStopCfm RgMacSchL2MeasStopCfmMt[RG_MAX_SCH] =
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacCellReg
+S16 RgSchMacCellReg
 (
 Pst* pst,
 RgInfCellReg*   regReq
 )
 #else
-PUBLIC S16 RgSchMacCellReg(pst, regReq)
+S16 RgSchMacCellReg(pst, regReq)
 Pst* pst;
 RgInfCellReg*   regReq;
 #endif
 {
 
-   TRC3(RgSchMacCellReg);
-
-   RETVALUE((*RgSchMacCellRegReqMt[0])(pst, regReq));
+   return ((*RgSchMacCellRegReqMt[0])(pst, regReq));
 }
 
 /**
@@ -283,21 +281,19 @@ RgInfCellReg*   regReq;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchDedBoUpdt
+S16 RgMacSchDedBoUpdt
 (
 Pst* pst,
 RgInfDedBoRpt*  boRpt
 )
 #else
-PUBLIC S16 RgMacSchDedBoUpdt(pst, boRpt)
+S16 RgMacSchDedBoUpdt(pst, boRpt)
 Pst* pst;
 RgInfDedBoRpt*  boRpt;
 #endif
 {
 
-   TRC3(RgMacSchDedBoUpdt);
-
-   RETVALUE((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt));
+   return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt));
 }
 
 /**
@@ -315,21 +311,19 @@ RgInfDedBoRpt*  boRpt;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchCmnBoUpdt
+S16 RgMacSchCmnBoUpdt
 (
 Pst* pst,
 RgInfCmnBoRpt*  boRpt
 )
 #else
-PUBLIC S16 RgMacSchCmnBoUpdt(pst, boRpt)
+S16 RgMacSchCmnBoUpdt(pst, boRpt)
 Pst* pst;
 RgInfCmnBoRpt*  boRpt;
 #endif
 {
 
-   TRC3(RgMacSchCmnBoUpdt);
-
-   RETVALUE((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt));
+   return ((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt));
 }
 
 /*Fix: start: Inform UE delete to scheduler*/
@@ -347,21 +341,19 @@ RgInfCmnBoRpt*  boRpt;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchUeDel
+S16 RgMacSchUeDel
 (
 Pst* pst,
 RgInfUeDelInd*  ueDelInd
 )
 #else
-PUBLIC S16 RgMacSchUeDel(pst, datInd)
+S16 RgMacSchUeDel(pst, datInd)
 Pst* pst;
 RgInfUeDelInd*  ueDelInd;
 #endif
 {
 
-   TRC3(RgMacSchUeDel);
-
-   RETVALUE((*RgMacSchUeDelIndMt[0])(pst, ueDelInd));
+   return ((*RgMacSchUeDelIndMt[0])(pst, ueDelInd));
 }
 /*Fix: end: Inform UE delete to scheduler*/
 /**
@@ -379,21 +371,19 @@ RgInfUeDelInd*  ueDelInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchSfRecp
+S16 RgMacSchSfRecp
 (
 Pst* pst,
 RgInfSfDatInd*  datInd
 )
 #else
-PUBLIC S16 RgMacSchSfRecp(pst, datInd)
+S16 RgMacSchSfRecp(pst, datInd)
 Pst* pst;
 RgInfSfDatInd*  datInd;
 #endif
 {
 
-   TRC3(RgMacSchSfRecp);
-
-   RETVALUE((*RgMacSchSfRecpIndMt[0])(pst, datInd));
+   return ((*RgMacSchSfRecpIndMt[0])(pst, datInd));
 }
 
 /**
@@ -411,21 +401,19 @@ RgInfSfDatInd*  datInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacSfAlloc
+S16 RgSchMacSfAlloc
 (
 Pst* pst,
 RgInfSfAlloc*   resAllocReq
 )
 #else
-PUBLIC S16 RgSchMacSfAlloc(pst, resAllocReq)
+S16 RgSchMacSfAlloc(pst, resAllocReq)
 Pst* pst;
 RgInfSfAlloc*   resAllocReq;
 #endif
 {
 
-   TRC3(RgSchMacSfAlloc);
-
-   RETVALUE((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq));
+   return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq));
 }
 
 /**
@@ -441,21 +429,19 @@ RgInfSfAlloc*   resAllocReq;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacRstHqEnt
+S16 RgSchMacRstHqEnt
 (
 Pst*                 pst,    
 RgInfResetHqEnt*     hqEntInfo
 )
 #else
-PUBLIC S16 RgSchMacRstHqEnt(pst, hqEntInfo)
+S16 RgSchMacRstHqEnt(pst, hqEntInfo)
 Pst*                 pst;
 RgInfResetHqEnt*     hqEntInfo;
 #endif
 {
 
-   TRC3(RgSchMacRstHqEnt)
-
-   RETVALUE((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo));
+   return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo));
 }
 
 /**
@@ -473,21 +459,19 @@ RgInfResetHqEnt*     hqEntInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacRlsHq
+S16 RgSchMacRlsHq
 (
 Pst* pst,
 RgInfRlsHqInfo* sfHqInfo
 )
 #else
-PUBLIC S16 RgSchMacRlsHq(pst, sfHqInfo)
+S16 RgSchMacRlsHq(pst, sfHqInfo)
 Pst* pst;
 RgInfRlsHqInfo* sfHqInfo;
 #endif
 {
 
-   TRC3(RgSchMacRlsHq);
-
-   RETVALUE((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo));
+   return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo));
 }
 
 /**
@@ -505,21 +489,19 @@ RgInfRlsHqInfo* sfHqInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacRlsRnti
+S16 RgSchMacRlsRnti
 (
 Pst* pst,
 RgInfRlsRnti*   rlsRnti
 )
 #else
-PUBLIC S16 RgSchMacRlsRnti(pst, rlsRnti)
+S16 RgSchMacRlsRnti(pst, rlsRnti)
 Pst* pst;
 RgInfRlsRnti*   rlsRnti;
 #endif
 {
 
-   TRC3(RgSchMacRlsRnti);
-
-   RETVALUE((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti));
+   return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti));
 }
 
 /**
@@ -535,21 +517,19 @@ RgInfRlsRnti*   rlsRnti;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacLcgReg
+S16 RgSchMacLcgReg
 (
 Pst*                pst,
 RgInfLcgRegReq      *lcgRegReq
 )
 #else
-PUBLIC S16 RgSchMacLcgReg(pst, lcgRegReq)
+S16 RgSchMacLcgReg(pst, lcgRegReq)
 Pst*                pst;
 RgInfLcgRegReq       *lcgRegReq;
 #endif
 {
 
-   TRC3(RgSchMacLcgReg);
-
-   RETVALUE((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq));
+   return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq));
 } /* end of RgSchMacLcgReg */
 
 #ifdef LTEMAC_SPS
@@ -567,21 +547,19 @@ RgInfLcgRegReq       *lcgRegReq;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchSpsRel
+S16 RgMacSchSpsRel
 (
 Pst*                pst,
 RgInfSpsRelInfo*    relInfo
 )
 #else
-PUBLIC S16 RgMacSchSpsRel(pst, relInfo)
+S16 RgMacSchSpsRel(pst, relInfo)
 Pst*                pst;
 RgInfSpsRelInfo*    relInfo;
 #endif
 {
 
-   TRC3(RgMacSchS);
-
-   RETVALUE((*RgMacSchSpsRelIndMt[0])(pst, relInfo));
+   return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo));
 } /* end of RgMacSchSpsRel */
 
 /**
@@ -597,21 +575,19 @@ RgInfSpsRelInfo*    relInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacSpsLcReg
+S16 RgSchMacSpsLcReg
 (
 Pst*                pst,
 RgInfSpsLcInfo      *lcInfo
 )
 #else
-PUBLIC S16 RgSchMacSpsLcReg(pst, lcInfo)
+S16 RgSchMacSpsLcReg(pst, lcInfo)
 Pst*                pst;
 RgInfSpsLcInfo      *lcInfo;
 #endif
 {
 
-   TRC3(RgSchMacSpsLcReg);
-
-   RETVALUE((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo));
+   return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo));
 } /* end of RgSchMacSpsLcReg */
 
 
@@ -629,21 +605,19 @@ RgInfSpsLcInfo      *lcInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacUlSpsReset
+S16 RgSchMacUlSpsReset
 (
 Pst*                pst,
 RgInfUlSpsReset      *ulSpsResetInfo
 )
 #else
-PUBLIC S16 RgSchMacUlSpsReset(pst, ulSpsResetInfo)
+S16 RgSchMacUlSpsReset(pst, ulSpsResetInfo)
 Pst*                pst;
 RgInfUlSpsReset      *ulSpsResetInfo;
 #endif
 {
 
-   TRC3(RgSchMacUlSpsReset);
-
-   RETVALUE((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo));
+   return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo));
 } /* end of RgSchMacUlSpsReset */
 
 
@@ -661,23 +635,21 @@ RgInfUlSpsReset      *ulSpsResetInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacSpsLcDereg
+S16 RgSchMacSpsLcDereg
 (
 Pst*                pst,
 CmLteCellId         cellId,
 CmLteRnti           crnti
 )
 #else
-PUBLIC S16 RgSchMacSpsLcDereg(pst, cellId, crnti)
+S16 RgSchMacSpsLcDereg(pst, cellId, crnti)
 Pst*                pst;
 CmLteCellId         cellId;
 CmLteRnti           crnti;
 #endif
 {
 
-   TRC3(RgSchMacSpsLcDereg);
-
-   RETVALUE((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti));
+   return ((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti));
 } /* end of RgSchMacSpsLcDereg */
 
 #endif /* LTEMAC_SPS */
@@ -695,21 +667,19 @@ CmLteRnti           crnti;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2Meas
+S16 RgSchMacL2Meas
 (
 Pst*                pst,
 RgInfL2MeasReq      *measInfo
 )
 #else
-PUBLIC S16 RgSchMacL2Meas(pst, measInfo)
+S16 RgSchMacL2Meas(pst, measInfo)
 Pst*                pst;
 RgInfL2MeasReq      *measInfo;
 #endif
 {
 
-   TRC3(RgSchMacL2Meas);
-
-   RETVALUE((*RgSchMacL2MeasReqMt[0])(pst, measInfo));
+   return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo));
 } /* end of RgSchMacL2Meas */
 
 /**
@@ -725,21 +695,19 @@ RgInfL2MeasReq      *measInfo;
 *      -# ROK
 **/   
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasStop
+S16 RgSchMacL2MeasStop
 (       
 Pst*                pst,
 RgInfL2MeasStopReq *measInfo
 )     
 #else 
-PUBLIC S16 RgSchMacL2MeasStop(pst, measInfo)
+S16 RgSchMacL2MeasStop(pst, measInfo)
 Pst*                pst;
 RgInfL2MeasStopReq *measInfo;
 #endif
 {  
      
-   TRC3(RgSchMacL2MeasStop);
-        
-   RETVALUE((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo));
+   return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo));
 } /* end of RgSchMacL2Meas */
 
 /**
@@ -755,21 +723,19 @@ RgInfL2MeasStopReq *measInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasSend
+S16 RgSchMacL2MeasSend
 (
 Pst*                pst,
 RgInfL2MeasSndReq *measInfo
 )
 #else
-PUBLIC S16 RgSchMacL2MeasSend(pst, measInfo)
+S16 RgSchMacL2MeasSend(pst, measInfo)
 Pst*                pst;
 RgInfL2MeasSndReq *measInfo;
 #endif
 {
 
-   TRC3(RgSchMacL2MeasSend);
-
-   RETVALUE((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo));
+   return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo));
 } /* end of RgSchMacL2MeasSend */
 
 /**
@@ -785,21 +751,19 @@ RgInfL2MeasSndReq *measInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchL2Meas
+S16 RgMacSchL2Meas
 (
 Pst*                pst,
 RgInfL2MeasCfm      *measInfo
 )
 #else
-PUBLIC S16 RgMacSchL2Meas(pst, measInfo)
+S16 RgMacSchL2Meas(pst, measInfo)
 Pst*                pst;
 RgInfL2MeasCfm      *measInfo;
 #endif
 {
 
-   TRC3(RgMacSchL2Meas);
-
-   RETVALUE((*RgMacSchL2MeasCfmMt[0])(pst, measInfo));
+   return ((*RgMacSchL2MeasCfmMt[0])(pst, measInfo));
 } /* end of RgSchMacL2Meas */
 /**
 * @brief Request from MAC to SCH for L2 Measurement
@@ -814,21 +778,19 @@ RgInfL2MeasCfm      *measInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchL2MeasStop
+S16 RgMacSchL2MeasStop
 (
 Pst*                pst,   
 RgInfL2MeasCfm      *measInfo
 )
 #else
-PUBLIC S16 RgMacSchL2MeasStop(pst, measInfo)
+S16 RgMacSchL2MeasStop(pst, measInfo)
 Pst*                pst;
 RgInfL2MeasCfm      *measInfo;
 #endif
 {
     
-   TRC3(RgMacSchL2MeasStop);
-
-   RETVALUE((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo));
+   return ((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo));
 } /* end of RgSchMacL2MeasStop*/
 #endif/*LTE_L2_MEAS*/
 /**********************************************************************