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=ef72cf2dcbc0f83b21e02c51f6d52be135108f45;hpb=d10b52519198632f93deae9574adc69c7ce12efa;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index ef72cf2dc..ff502749f 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 */ @@ -127,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 @@ -172,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] = @@ -240,8 +225,6 @@ PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = #endif #ifdef NX NxLiRgrCfgCfm, -#else - PtUiRgrCfgCfm, #endif }; @@ -321,7 +304,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = PtUiRguBndCfm, #endif #ifdef KW - KwLiRguBndCfm, + RlcLiRguBndCfm, #else PtUiRguBndCfm, #endif @@ -337,17 +320,17 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU -// cmPkRguCDatInd, /* Call packRcvdUlData instead */ +// cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */ #else PtUiRguCDatInd, #endif #ifdef KW - KwLiRguCDatInd, + //RlcProcCommLcUlData, #else PtUiRguCDatInd, #endif #ifdef LWLCRGUIRGU -// cmPkRguCDatInd, /* Call packRcvdUlData instead */ +// cmPkRguCDatInd, /* TODO:Call packRcvdUlData instead */ #else PtUiRguCDatInd, #endif @@ -358,17 +341,17 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU -// cmPkRguDDatInd, /* Call packRcvdUlData instead */ +// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ #else PtUiRguDDatInd, #endif #ifdef KW - KwLiRguDDatInd, + //RlcProcDedLcUlData, #else PtUiRguDDatInd, #endif #ifdef LWLCRGUIRGU -// cmPkRguDDatInd, /* Call packRcvdUlData instead */ +// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ #else PtUiRguDDatInd, #endif @@ -381,7 +364,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU - //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */ + //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ #else PtUiRguCStaInd, #endif @@ -391,7 +374,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = PtUiRguCStaInd, #endif #ifdef LWLCRGUIRGU - //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */ + //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ #else PtUiRguCStaInd, #endif @@ -404,7 +387,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU - //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */ + //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ #else PtUiRguDStaInd, #endif @@ -414,7 +397,7 @@ PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = PtUiRguDStaInd, #endif #ifdef LWLCRGUIRGU - //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */ + //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ #else PtUiRguDStaInd, #endif @@ -433,7 +416,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = PtUiRguHqStaInd, #endif #ifdef KW - KwLiRguHqStaInd, + RlcLiRguHqStaInd, #else PtUiRguHqStaInd, #endif @@ -535,7 +518,7 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = PtUiRguFlowCntrlInd, #endif #ifdef KW - KwLiRguFlowCntrlInd, + RlcLiRguFlowCntrlInd, #else PtUiRguFlowCntrlInd, #endif @@ -566,23 +549,21 @@ 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); - - RETVALUE((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); } /** @@ -600,23 +581,21 @@ 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); - - RETVALUE((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); } @@ -638,23 +617,21 @@ 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); - - RETVALUE((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd)); + return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd)); } @@ -675,23 +652,21 @@ 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); - - RETVALUE((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); + return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); } @@ -711,23 +686,21 @@ 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); - - RETVALUE((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); } @@ -748,7 +721,7 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiCrgCfgCfm +S16 RgUiCrgCfgCfm ( Pst* pst, SuId suId, @@ -756,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; @@ -764,9 +737,7 @@ U8 status; #endif { - TRC3(RgUiCrgCfgCfm); - - RETVALUE((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -786,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); - - RETVALUE((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status)); } -PUBLIC int macDDatIndSnt; -PUBLIC int macCDatIndSnt; +int macDDatIndSnt; +int macCDatIndSnt; /** @@ -825,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; @@ -840,9 +809,7 @@ RguCDatIndInfo * datInd; { macCDatIndSnt++; - TRC3(RgUiRguCDatInd); - - RETVALUE((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); + return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); } @@ -862,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; @@ -877,12 +844,10 @@ RguDDatIndInfo * datInd; { macDDatIndSnt++; - 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 } @@ -905,23 +870,21 @@ 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); - - RETVALUE((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd)); + return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd)); } @@ -944,69 +907,66 @@ 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); - - RETVALUE((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd)); + 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); - RETVALUE(ret); + return (ret); #else - RETVALUE((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd)); + return ((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd)); #endif } /* RgUiRguHqStaInd */ #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; #endif { - RETVALUE((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd)); + return ((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd)); } /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH @@ -1025,7 +985,7 @@ RguFlowCntrlInd *flowCntrlInd; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrSiCfgCfm +S16 RgUiRgrSiCfgCfm ( Pst* pst, SuId suId, @@ -1033,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; @@ -1041,9 +1001,7 @@ U8 status; #endif { - TRC3(RgUiRgrSiCfgCfm); - - RETVALUE((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -1063,7 +1021,7 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiCfgCfm +S16 RgUiRgrWarningSiCfgCfm ( Pst* pst, SuId suId, @@ -1072,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; @@ -1080,9 +1038,7 @@ U8 siId; U8 status; #endif { - TRC3(RgUiRgrWarningSiCfgCfm); - - RETVALUE((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) + return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) (pst, suId, transId, siId, status)); } @@ -1106,23 +1062,21 @@ 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); - - RETVALUE((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd)); + return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd)); } #endif /* End of RGR_CQI_REPT */ @@ -1142,23 +1096,21 @@ 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); - - RETVALUE((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd)); + return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd)); } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1177,23 +1129,21 @@ 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); - - RETVALUE((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd)); + return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd)); } #endif /*--ifdef RG--*/ @@ -1215,27 +1165,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1256,7 +1204,7 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiCrgCfgCfm +S16 PtUiCrgCfgCfm ( Pst* pst, SuId suId, @@ -1264,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; @@ -1272,14 +1220,12 @@ U8 status; #endif { - TRC3(PtUiCrgCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif /*--ifdef PTRGUICRG--*/ @@ -1301,27 +1247,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1342,27 +1286,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1383,27 +1325,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1426,27 +1366,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1469,79 +1407,73 @@ 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); - RETVALUE(ROK); + return ROK; } #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); - RETVALUE(ROK); + return ROK; } #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); - RETVALUE(ROK); + return ROK; } @@ -1564,27 +1496,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1604,27 +1534,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1645,7 +1573,7 @@ RgrTtiIndInfo *ttiInd; * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrCfgCfm +S16 PtUiRgrCfgCfm ( Pst* pst, SuId suId, @@ -1653,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; @@ -1661,14 +1589,12 @@ U8 status; #endif { - TRC3(PtUiRgrCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1689,7 +1615,7 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrSiCfgCfm +S16 PtUiRgrSiCfgCfm ( Pst* pst, SuId suId, @@ -1697,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; @@ -1705,14 +1631,12 @@ U8 status; #endif { - TRC3(PtUiRgrSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1732,7 +1656,7 @@ U8 status; * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrWarningSiCfgCfm +S16 PtUiRgrWarningSiCfgCfm ( Pst* pst, SuId suId, @@ -1741,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; @@ -1749,15 +1673,13 @@ U8 siId; U8 status; #endif { - TRC3(PtUiRgrWarningSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(siId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif/* RGR_SI_SCH */ @@ -1779,27 +1701,25 @@ 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); - RETVALUE(ROK); + return ROK; } #endif /* End of RGR_CQI_REPT */ @@ -1818,27 +1738,25 @@ 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); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1857,27 +1775,25 @@ 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); - RETVALUE(ROK); + return ROK; } #endif /*--ifdef PTRGUIRGR--*/ @@ -1899,27 +1815,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1937,27 +1851,25 @@ 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); - RETVALUE(ROK); + return ROK; } @@ -1975,27 +1887,25 @@ 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); - RETVALUE(ROK); + return ROK; } #endif @@ -2014,22 +1924,21 @@ 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); - RETVALUE((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd)); + return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd)); } /** @@ -2046,22 +1955,21 @@ 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); - RETVALUE((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd)); + return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd)); } #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) @@ -2095,25 +2003,25 @@ 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 #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); @@ -2164,26 +2072,26 @@ Void; break; } - RETVALUE(ROK); + return ROK; } #endif #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; @@ -2236,20 +2144,20 @@ Void; break; } - RETVALUE(ROK); + return ROK; } #endif #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; @@ -2267,12 +2175,12 @@ 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++; } - RETVALUE(ret); + return (ret); } #endif #endif