X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_pt.c;h=adf0d389f8d584edcff5b82f3ba4ad0878e588eb;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=13bee92a43b9ae912e1be22533481f11d6d0aec4;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c index 13bee92a4..adf0d389f 100755 --- a/src/5gnrsch/rg_sch_pt.c +++ b/src/5gnrsch/rg_sch_pt.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 */ @@ -56,13 +48,6 @@ #include "rg_sch_inf.h" /* RGU 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 */ @@ -280,7 +265,7 @@ RgInfCellReg* regReq; TRC3(RgSchMacCellReg); - RETVALUE((*RgSchMacCellRegReqMt[0])(pst, regReq)); + return ((*RgSchMacCellRegReqMt[0])(pst, regReq)); } /** @@ -312,7 +297,7 @@ RgInfDedBoRpt* boRpt; TRC3(RgMacSchDedBoUpdt); - RETVALUE((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); + return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); } /** @@ -344,7 +329,7 @@ RgInfCmnBoRpt* boRpt; TRC3(RgMacSchCmnBoUpdt); - RETVALUE((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt)); + return ((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt)); } /*Fix: start: Inform UE delete to scheduler*/ @@ -376,7 +361,7 @@ RgInfUeDelInd* ueDelInd; TRC3(RgMacSchUeDel); - RETVALUE((*RgMacSchUeDelIndMt[0])(pst, ueDelInd)); + return ((*RgMacSchUeDelIndMt[0])(pst, ueDelInd)); } /*Fix: end: Inform UE delete to scheduler*/ /** @@ -408,7 +393,7 @@ RgInfSfDatInd* datInd; TRC3(RgMacSchSfRecp); - RETVALUE((*RgMacSchSfRecpIndMt[0])(pst, datInd)); + return ((*RgMacSchSfRecpIndMt[0])(pst, datInd)); } /** @@ -440,7 +425,7 @@ RgInfSfAlloc* resAllocReq; TRC3(RgSchMacSfAlloc); - RETVALUE((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); + return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); } /** @@ -470,7 +455,7 @@ RgInfResetHqEnt* hqEntInfo; TRC3(RgSchMacRstHqEnt) - RETVALUE((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); + return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); } /** @@ -502,7 +487,7 @@ RgInfRlsHqInfo* sfHqInfo; TRC3(RgSchMacRlsHq); - RETVALUE((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); + return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); } /** @@ -534,7 +519,7 @@ RgInfRlsRnti* rlsRnti; TRC3(RgSchMacRlsRnti); - RETVALUE((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); + return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); } /** @@ -564,7 +549,7 @@ RgInfLcgRegReq *lcgRegReq; TRC3(RgSchMacLcgReg); - RETVALUE((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); + return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); } /* end of RgSchMacLcgReg */ #ifdef LTEMAC_SPS @@ -596,7 +581,7 @@ RgInfSpsRelInfo* relInfo; TRC3(RgMacSchS); - RETVALUE((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); + return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); } /* end of RgMacSchSpsRel */ /** @@ -626,7 +611,7 @@ RgInfSpsLcInfo *lcInfo; TRC3(RgSchMacSpsLcReg); - RETVALUE((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); + return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); } /* end of RgSchMacSpsLcReg */ @@ -658,7 +643,7 @@ RgInfUlSpsReset *ulSpsResetInfo; TRC3(RgSchMacUlSpsReset); - RETVALUE((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); + return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); } /* end of RgSchMacUlSpsReset */ @@ -692,7 +677,7 @@ CmLteRnti crnti; TRC3(RgSchMacSpsLcDereg); - RETVALUE((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti)); + return ((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti)); } /* end of RgSchMacSpsLcDereg */ #endif /* LTEMAC_SPS */ @@ -724,7 +709,7 @@ RgInfL2MeasReq *measInfo; TRC3(RgSchMacL2Meas); - RETVALUE((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -754,7 +739,7 @@ RgInfL2MeasStopReq *measInfo; TRC3(RgSchMacL2MeasStop); - RETVALUE((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -784,7 +769,7 @@ RgInfL2MeasSndReq *measInfo; TRC3(RgSchMacL2MeasSend); - RETVALUE((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasSend */ /** @@ -814,7 +799,7 @@ RgInfL2MeasCfm *measInfo; TRC3(RgMacSchL2Meas); - RETVALUE((*RgMacSchL2MeasCfmMt[0])(pst, measInfo)); + return ((*RgMacSchL2MeasCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** * @brief Request from MAC to SCH for L2 Measurement @@ -843,7 +828,7 @@ RgInfL2MeasCfm *measInfo; TRC3(RgMacSchL2MeasStop); - RETVALUE((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo)); + return ((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasStop*/ #endif/*LTE_L2_MEAS*/ /**********************************************************************