X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2F5gnrsch%2Frg_sch_pt.c;h=55df2204d0b912d20932b35b82cc322d197b247b;hb=9076bc05cb36d3ed99890b2e3f57f6d06f4a7e93;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..55df2204d 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 */ @@ -266,13 +251,13 @@ 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 @@ -280,7 +265,7 @@ RgInfCellReg* regReq; TRC3(RgSchMacCellReg); - RETVALUE((*RgSchMacCellRegReqMt[0])(pst, regReq)); + return ((*RgSchMacCellRegReqMt[0])(pst, regReq)); } /** @@ -298,13 +283,13 @@ 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 @@ -312,7 +297,7 @@ RgInfDedBoRpt* boRpt; TRC3(RgMacSchDedBoUpdt); - RETVALUE((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); + return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); } /** @@ -330,13 +315,13 @@ 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 @@ -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*/ @@ -362,13 +347,13 @@ 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 @@ -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*/ /** @@ -394,13 +379,13 @@ 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 @@ -408,7 +393,7 @@ RgInfSfDatInd* datInd; TRC3(RgMacSchSfRecp); - RETVALUE((*RgMacSchSfRecpIndMt[0])(pst, datInd)); + return ((*RgMacSchSfRecpIndMt[0])(pst, datInd)); } /** @@ -426,13 +411,13 @@ 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 @@ -440,7 +425,7 @@ RgInfSfAlloc* resAllocReq; TRC3(RgSchMacSfAlloc); - RETVALUE((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); + return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); } /** @@ -456,13 +441,13 @@ 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 @@ -470,7 +455,7 @@ RgInfResetHqEnt* hqEntInfo; TRC3(RgSchMacRstHqEnt) - RETVALUE((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); + return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); } /** @@ -488,13 +473,13 @@ 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 @@ -502,7 +487,7 @@ RgInfRlsHqInfo* sfHqInfo; TRC3(RgSchMacRlsHq); - RETVALUE((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); + return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); } /** @@ -520,13 +505,13 @@ 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 @@ -534,7 +519,7 @@ RgInfRlsRnti* rlsRnti; TRC3(RgSchMacRlsRnti); - RETVALUE((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); + return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); } /** @@ -550,13 +535,13 @@ 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 @@ -564,7 +549,7 @@ RgInfLcgRegReq *lcgRegReq; TRC3(RgSchMacLcgReg); - RETVALUE((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); + return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); } /* end of RgSchMacLcgReg */ #ifdef LTEMAC_SPS @@ -582,13 +567,13 @@ 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 @@ -596,7 +581,7 @@ RgInfSpsRelInfo* relInfo; TRC3(RgMacSchS); - RETVALUE((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); + return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); } /* end of RgMacSchSpsRel */ /** @@ -612,13 +597,13 @@ 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 @@ -626,7 +611,7 @@ RgInfSpsLcInfo *lcInfo; TRC3(RgSchMacSpsLcReg); - RETVALUE((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); + return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); } /* end of RgSchMacSpsLcReg */ @@ -644,13 +629,13 @@ 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 @@ -658,7 +643,7 @@ RgInfUlSpsReset *ulSpsResetInfo; TRC3(RgSchMacUlSpsReset); - RETVALUE((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); + return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); } /* end of RgSchMacUlSpsReset */ @@ -676,14 +661,14 @@ 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; @@ -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 */ @@ -710,13 +695,13 @@ 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 @@ -724,7 +709,7 @@ RgInfL2MeasReq *measInfo; TRC3(RgSchMacL2Meas); - RETVALUE((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -740,13 +725,13 @@ 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 @@ -754,7 +739,7 @@ RgInfL2MeasStopReq *measInfo; TRC3(RgSchMacL2MeasStop); - RETVALUE((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -770,13 +755,13 @@ 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 @@ -784,7 +769,7 @@ RgInfL2MeasSndReq *measInfo; TRC3(RgSchMacL2MeasSend); - RETVALUE((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasSend */ /** @@ -800,13 +785,13 @@ 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 @@ -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 @@ -829,13 +814,13 @@ 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 @@ -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*/ /**********************************************************************