X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptui.c;h=6d007c7411a87e3af12568230e6b7dac40f06a9f;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=75857d03bf490fabf24b9db802f012b03dd31b3e;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index 75857d03b..6d007c741 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -83,51 +83,51 @@ extern "C" { #ifdef PTRGUIRGU /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo * datInd)); +S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo * datInd)); /** @brief Data Indication from MAC to RLC to * forward the data received for dedicated channels*/ -EXTERN S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo * datInd)); +S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo * datInd)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -EXTERN S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo * staInd)); +S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo * staInd)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on dedicated channels. */ -EXTERN S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo * staInd)); +S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo * staInd)); #ifdef LTE_L2_MEAS /**@brief HARQ Status Indication from MAC to RLC */ -EXTERN S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId, +S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId, RguHarqStatusInd *harqStatusInd)); #endif /**@brief PDB FLow Control Indication from MAC to RLC */ -EXTERN S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId, +S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId, RguFlowCntrlInd *flowCntrlInd)); #endif /*--#ifdef PTRGUIRGU--*/ 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 #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) -PRIVATE S16 RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo *datInd)); +static S16 RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo *datInd)); #endif -EXTERN Void rgFreeSharableSBuf ARGS((Data **data, Size size)); +Void rgFreeSharableSBuf ARGS((Data **data, Size size)); #ifdef RGR_CQI_REPT -EXTERN S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd)); +S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd)); #endif /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd)); +S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd)); /* LTE_ADV_FLAG_REMOVED_END */ -EXTERN S16 PtUiRgrUeStaInd ARGS +S16 PtUiRgrUeStaInd ARGS (( Pst* pst, SuId suId, @@ -136,38 +136,38 @@ RgrUeStaIndInfo *staInd #ifdef PTRGUICRG /** @brief Confirmation from MAC to RRC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRC */ -EXTERN S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, U8 status)); +S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status)); #endif /*--#ifdef PTRGUICRG--*/ #ifdef PTRGUIRGR /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRM */ -EXTERN S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status)); -EXTERN S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd)); +S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); +S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd)); /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH -EXTERN S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status)); -EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, - RgrCfgTransId transId, U8 siId, U8 status)); +S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); +S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, + RgrCfgTransId transId, uint8_t siId, uint8_t status)); #endif/*RGR_SI_SCH*/ #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, uint8_t 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] = +static const RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrTtiInd, @@ -184,7 +184,7 @@ PRIVATE CONSTANT RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] = /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = +static const RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrBndCfm, @@ -200,7 +200,7 @@ PRIVATE CONSTANT RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps via RGM interface*/ -PRIVATE CONSTANT RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = +static const RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmBndCfm, @@ -216,7 +216,7 @@ PRIVATE CONSTANT RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = /** @brief Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrCfgCfm, @@ -231,7 +231,7 @@ PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH /** @brief SI Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrSiCfgCfm, @@ -247,7 +247,7 @@ PRIVATE CONSTANT RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = /** @brief Warning SI Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrWarningSiCfgCfm, @@ -264,7 +264,7 @@ PRIVATE CONSTANT RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = #endif/*RGR_SI_SCH */ /** @brief Confirmation from MAC to RRC for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = +static const CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = { #ifdef LCRGUICRG cmPkCrgBndCfm, @@ -279,7 +279,7 @@ PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = }; /** @brief Configuration Confirm from MAC to RRC */ -PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = +static const CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = { #ifdef LCRGUICRG cmPkCrgCfgCfm, @@ -296,7 +296,7 @@ PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = +static const RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguBndCfm, @@ -304,7 +304,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = PtUiRguBndCfm, #endif #ifdef KW - KwLiRguBndCfm, + RlcLiRguBndCfm, #else PtUiRguBndCfm, #endif @@ -317,7 +317,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = +static const RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU // cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */ @@ -325,7 +325,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = PtUiRguCDatInd, #endif #ifdef KW - KwLiRguCDatInd, + //RlcProcCommLcUlData, #else PtUiRguCDatInd, #endif @@ -338,7 +338,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = /** @brief Data Indication from MAC to RLC to * forward the data received for dedicated channels*/ -PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = +static const RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU // cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ @@ -346,7 +346,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = PtUiRguDDatInd, #endif #ifdef KW - KwLiRguDDatInd, + //RlcProcDedLcUlData, #else PtUiRguDDatInd, #endif @@ -361,7 +361,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = +static const RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ @@ -384,7 +384,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on dedicated channels. */ -PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = +static const RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ @@ -408,7 +408,7 @@ PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = * as a response to the DdatReq primitive from RLC. * Informs RLC of the successful transmission of TB's * (ACK/NACK) along with Mapping Info. */ -PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = +static const RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguHqStaInd, @@ -416,7 +416,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = PtUiRguHqStaInd, #endif #ifdef KW - KwLiRguHqStaInd, + RlcLiRguHqStaInd, #else PtUiRguHqStaInd, #endif @@ -432,7 +432,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT /** @brief TTI indication from MAC to RRM */ -PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = +static const RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrStaInd, @@ -449,7 +449,7 @@ PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = /* LTE_ADV_FLAG_REMOVED_START */ /** @brief LOAD INF indication from MAC to RRM */ -PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = +static const RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrLoadInfInd, @@ -465,7 +465,7 @@ PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = /* LTE_ADV_FLAG_REMOVED_END */ /** @brief TTI indication from MAC to RRM */ -PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = +static const RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrUeStaInd, @@ -480,7 +480,7 @@ PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = }; /** @brief Average PRB usage indication from MAC to RRM */ -PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = +static const RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmPrbRprtInd, @@ -496,7 +496,7 @@ PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = /** @brief Transmission Mode Change indication from MAC to RRM */ -PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] = +static const RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmTransModeInd, @@ -510,7 +510,7 @@ PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] #endif }; -PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = +static const RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguFlowCntrlInd, @@ -518,7 +518,7 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = PtUiRguFlowCntrlInd, #endif #ifdef KW - KwLiRguFlowCntrlInd, + RlcLiRguFlowCntrlInd, #else PtUiRguFlowCntrlInd, #endif @@ -544,28 +544,26 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrBndCfm +S16 RgUiRgrBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiRgrBndCfm(pst, suId, status) +S16 RgUiRgrBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiRgrBndCfm); - - RETVALUE((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); } /** @@ -578,28 +576,26 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgmBndCfm +S16 RgUiRgmBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiRgmBndCfm(pst, suId, status) +S16 RgUiRgmBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiRgmBndCfm); - - RETVALUE((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); } @@ -621,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)); } @@ -653,28 +647,26 @@ RgrTtiIndInfo *ttiInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrCfgCfm +S16 RgUiRgrCfgCfm ( Pst* pst, RgrCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiRgrCfgCfm(pst, transId, status) +S16 RgUiRgrCfgCfm(pst, transId, status) Pst* pst; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiRgrCfgCfm); - - RETVALUE((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); + return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); } @@ -689,28 +681,26 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiCrgBndCfm +S16 RgUiCrgBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiCrgBndCfm(pst, suId, status) +S16 RgUiCrgBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiCrgBndCfm); - - RETVALUE((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); } @@ -726,30 +716,28 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiCrgCfgCfm +S16 RgUiCrgCfgCfm ( Pst* pst, SuId suId, CrgCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiCrgCfgCfm(pst, suId, transId, status) +S16 RgUiCrgCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; CrgCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiCrgCfgCfm); - - RETVALUE((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -764,33 +752,31 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRguBndCfm +S16 RgUiRguBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiRguBndCfm(pst, suId, status) +S16 RgUiRguBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t 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; /** @@ -808,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; @@ -823,9 +809,7 @@ RguCDatIndInfo * datInd; { macCDatIndSnt++; - TRC3(RgUiRguCDatInd); - - RETVALUE((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); + return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); } @@ -845,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; @@ -860,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 } @@ -888,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)); } @@ -927,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 @@ -1003,30 +980,28 @@ RguFlowCntrlInd *flowCntrlInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrSiCfgCfm +S16 RgUiRgrSiCfgCfm ( Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgUiRgrSiCfgCfm(pst, suId, transId, status) +S16 RgUiRgrSiCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(RgUiRgrSiCfgCfm); - - RETVALUE((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -1040,32 +1015,30 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 siId -* @param[in] U8 status +* @param[in] uint8_t siId +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgUiRgrWarningSiCfgCfm +S16 RgUiRgrWarningSiCfgCfm ( Pst* pst, SuId suId, RgrCfgTransId transId, -U8 siId, -U8 status +uint8_t siId, +uint8_t status ) #else -PUBLIC S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status) +S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 siId; -U8 status; +uint8_t siId; +uint8_t status; #endif { - TRC3(RgUiRgrWarningSiCfgCfm); - - RETVALUE((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) + return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) (pst, suId, transId, siId, status)); } @@ -1089,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 */ @@ -1125,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 */ @@ -1160,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--*/ @@ -1193,32 +1160,30 @@ RgrUeStaIndInfo *ueStaInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiCrgBndCfm +S16 PtUiCrgBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiCrgBndCfm(pst, suId, status) +S16 PtUiCrgBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiCrgBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1234,35 +1199,33 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiCrgCfgCfm +S16 PtUiCrgCfgCfm ( Pst* pst, SuId suId, CrgCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiCrgCfgCfm(pst, suId, transId, status) +S16 PtUiCrgCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; CrgCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiCrgCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif /*--ifdef PTRGUICRG--*/ @@ -1279,32 +1242,30 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRguBndCfm +S16 PtUiRguBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiRguBndCfm(pst, suId, status) +S16 PtUiRguBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiRguBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1325,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; } @@ -1366,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; } @@ -1409,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; } @@ -1452,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; } @@ -1542,32 +1491,30 @@ RguHarqStatusInd *flowCntrlInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrBndCfm +S16 PtUiRgrBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiRgrBndCfm(pst, suId, status) +S16 PtUiRgrBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiRgrBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1587,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; } @@ -1623,35 +1568,33 @@ RgrTtiIndInfo *ttiInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrCfgCfm +S16 PtUiRgrCfgCfm ( Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiRgrCfgCfm(pst, suId, transId, status) +S16 PtUiRgrCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiRgrCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1667,35 +1610,33 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrSiCfgCfm +S16 PtUiRgrSiCfgCfm ( Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiRgrSiCfgCfm(pst, suId, transId, status) +S16 PtUiRgrSiCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiRgrSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1709,38 +1650,36 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 siId -* @param[in] U8 status +* @param[in] uint8_t siId +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgrWarningSiCfgCfm +S16 PtUiRgrWarningSiCfgCfm ( Pst* pst, SuId suId, RgrCfgTransId transId, -U8 siId, -U8 status +uint8_t siId, +uint8_t status ) #else -PUBLIC S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status) +S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 siId; -U8 status; +uint8_t siId; +uint8_t status; #endif { - TRC3(PtUiRgrWarningSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); UNUSED(siId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif/* RGR_SI_SCH */ @@ -1762,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 */ @@ -1801,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 */ @@ -1840,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--*/ @@ -1877,32 +1810,30 @@ RgrUeStaIndInfo *ueStaInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ #ifdef ANSI -PUBLIC S16 PtUiRgmBndCfm +S16 PtUiRgmBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 PtUiRgmBndCfm(pst, suId, status) +S16 PtUiRgmBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC3(PtUiRgmBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1920,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; } @@ -1958,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 @@ -1997,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)); } /** @@ -2029,26 +1955,25 @@ 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) -PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) +static S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) { S16 ret = ROK; Void *elem = NULLP; @@ -2058,7 +1983,7 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) if (NULLP == elem) { SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktDrop++; - U32 i,j; + uint32_t i,j; for(i = 0; i< datInd->numLch; i++) { for(j = 0; j < datInd->lchData[i].pdu.numPdu; j++) @@ -2078,32 +2003,32 @@ 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}; + uint8_t rngBufDeqIndx = 0; + static Pst rgDDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0}; + static 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); while(NULLP != elmIndx) { datReqRing= (RguInfoRingElem *)elmIndx; - SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;;//Number of pkt processed in tti + SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;//Number of pkt processed in tti if(datReqRing->msg) { if(datReqRing->event == EVTRGUDDATREQ) @@ -2147,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}; + uint8_t rngBufDeqIndx = 0; + static Pst rgDStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0}; + static Pst rgCStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,0}; Void *elmIndx = NULLP; RguInfoRingElem *staRspRing=NULLP; @@ -2174,7 +2099,7 @@ Void; while(NULLP != elmIndx) { staRspRing= (RguInfoRingElem *)elmIndx; - SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;;//Number of pkt processed in tti + SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;//Number of pkt processed in tti if(staRspRing->msg!= NULLP) { @@ -2219,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; @@ -2250,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