X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_uim.c;h=043292dee8f9b6fc5374fd3f027da7cba4355eda;hb=d526f86c752d12c797597fcb970572e8cd40f560;hp=48cc4ad1a2989774f5e5d80087766fe64c20ee09;hpb=451e626d5ac7c7e7586bab23358161230449af46;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index 48cc4ad1a..043292dee 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -41,17 +41,7 @@ static int RLOG_FILE_ID=178; /* header/extern include files (.x) */ /* header include files (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timers defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_llist.h" /* common linked list defines */ -#include "cm_mblk.h" /* memory management */ -#include "cm_tkns.h" /* common tokens */ -#include "cm_lte.h" +#include "common_def.h" #include "crg.h" /* CRG defines */ #include "lrg.h" /* layer management defines for LTE-MAC */ #include "tfu.h" @@ -63,15 +53,6 @@ static int RLOG_FILE_ID=178; /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" #include "crg.x" /* CRG types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "tfu.x" @@ -93,10 +74,10 @@ static int RLOG_FILE_ID=178; /* forward references */ #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -PUBLIC S16 rgBatchProc(Void); +S16 rgBatchProc(Void); #endif -PUBLIC U8 rgRguDlSap; -PUBLIC U8 rgRguUlSap; +uint8_t rgRguDlSap; +uint8_t rgRguUlSap; /** * @brief Handler for Bind request. * @@ -114,28 +95,18 @@ PUBLIC U8 rgRguUlSap; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguBndReq +S16 RgUiRguBndReq ( Pst *pst, SuId suId, SpId spId ) -#else -PUBLIC S16 RgUiRguBndReq(pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif { Inst inst; S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRguBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -201,7 +172,7 @@ SpId spId; /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRguBndReq */ @@ -222,23 +193,14 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguUbndReq +S16 RgUiRguUbndReq ( Pst *pst, SpId spId, Reason reason ) -#else -PUBLIC S16 RgUiRguUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif { Inst inst; - TRC3(RgUiRguUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -267,9 +229,9 @@ Reason reason; RGLOGERROR(inst,ERRCLS_INT_PAR, ERG011, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, "Invalid SAP Id:RgUiRguUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRguUbndReq */ /** * @brief API for sending bind confirm from MAC to RLC @@ -284,39 +246,24 @@ Reason reason; * * @param[in] Inst inst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMRguBndCfm -( -Inst inst, -SpId spId, -U8 status -) -#else -PUBLIC S16 rgUIMRguBndCfm(inst,spId, status) -Inst inst; -SpId spId; -U8 status; -#endif +S16 rgUIMRguBndCfm(Inst inst,SpId spId,uint8_t status) { S16 ret = ROK; - TRC2(rgUIMRguBndCfm) - - ret = RgUiRguBndCfm(&rgCb[inst].rguSap[spId].sapCfg.sapPst, rgCb[inst].rguSap[spId].sapCfg.suId, status); if (ret != ROK) { RLOG0(L_ERROR,"RgUiRguBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMRguBndCfm*/ @@ -336,39 +283,24 @@ U8 status; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguDDatReq -( -Pst *pst, -SpId spId, -RguDDatReqInfo *datReq -) -#else -PUBLIC S16 RgUiRguDDatReq(pst, spId, datReq) -Pst *pst; -SpId spId; -RguDDatReqInfo *datReq; -#endif +S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo *datReq) { S16 ret = ROK; Inst inst; #ifndef NO_ERRCLS - U32 id; - U32 id1; - U32 id2; - U32 id3; + uint32_t id; + uint32_t id1; + uint32_t id2; + uint32_t id3; #endif - TRC3(RgUiRguDDatReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS if (datReq == NULLP) { RLOG0(L_ERROR,"Input Message Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) @@ -389,7 +321,7 @@ RguDDatReqInfo *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); } #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -404,7 +336,7 @@ RguDDatReqInfo *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); } #endif - RETVALUE(RFAILED); + return RFAILED; } /* Update RGU SAP statistics for received sdu count */ @@ -438,7 +370,7 @@ RguDDatReqInfo *datReq; ret = rgROMDedDatReq(inst,datReq); SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,sizeof(RguDDatReqInfo), SS_SHARABLE_MEMORY); datReq = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguDDatReq */ @@ -458,33 +390,23 @@ RguDDatReqInfo *datReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguCDatReq +S16 RgUiRguCDatReq ( Pst *pst, SpId spId, RguCDatReqInfo *datReq ) -#else -PUBLIC S16 RgUiRguCDatReq(pst, spId, datReq) -Pst *pst; -SpId spId; -RguCDatReqInfo *datReq; -#endif { Inst inst; S16 ret = ROK; - TRC3(RgUiRguCDatReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS if (datReq == NULLP) { RLOG0(L_ERROR,"Input Message Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) @@ -499,7 +421,7 @@ RguCDatReqInfo *datReq; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCDatReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -507,7 +429,7 @@ RguCDatReqInfo *datReq; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCDatReq failed ",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -529,7 +451,7 @@ RguCDatReqInfo *datReq; } ret = SPutStaticBuffer(pst->region, pst->pool,(Data *)datReq,sizeof(RguCDatReqInfo) , SS_SHARABLE_MEMORY); datReq = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguCDatReq */ @@ -549,26 +471,17 @@ RguCDatReqInfo *datReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguDStaRsp +S16 RgUiRguDStaRsp ( Pst *pst, SpId spId, RguDStaRspInfo *staRsp ) -#else -PUBLIC S16 RgUiRguDStaRsp(pst, spId, staRsp) -Pst *pst; -SpId spId; -RguDStaRspInfo *staRsp; -#endif { Inst inst; + S16 ret = ROK; + volatile uint32_t startTime = 0; - S16 ret = ROK; - VOLATILE U32 startTime = 0; - - TRC3(RgUiRguDStaRsp) RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -585,7 +498,7 @@ RguDStaRspInfo *staRsp; /*stoping Task*/ SStopTask(startTime, PID_MAC_STA_RSP); - RETVALUE(ret); + return (ret); } /* RgUiRguDStaRsp */ @@ -607,33 +520,23 @@ RguDStaRspInfo *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguCStaRsp +S16 RgUiRguCStaRsp ( Pst *pst, SpId spId, RguCStaRspInfo *staRsp ) -#else -PUBLIC S16 RgUiRguCStaRsp(pst, spId, staRsp) -Pst *pst; -SpId spId; -RguCStaRspInfo *staRsp; -#endif { Inst inst; S16 ret = ROK; - TRC3(RgUiRguCStaRsp) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS if (staRsp == NULLP) { RLOG0(L_ERROR,"Input Response Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId == rgCb[inst].rguSap[spId].sapCfg.spId) @@ -648,7 +551,7 @@ RguCStaRspInfo *staRsp; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCStaRsp failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -656,7 +559,7 @@ RguCStaRspInfo *staRsp; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCStaRsp failed",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -664,12 +567,12 @@ RguCStaRspInfo *staRsp; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId,"Processing Of Status Response Failed"); - RETVALUE(ret); + return (ret); } ret = SPutStaticBuffer(pst->region, pst->pool, (Data *)staRsp,sizeof(RguCStaRspInfo) , SS_SHARABLE_MEMORY); staRsp = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguCStaRsp */ #ifdef LTE_L2_MEAS @@ -690,34 +593,24 @@ RguCStaRspInfo *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguL2MUlThrpMeasReq +S16 RgUiRguL2MUlThrpMeasReq ( Pst *pst, SpId spId, RguL2MUlThrpMeasReqInfo *measReq ) -#else -PUBLIC S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq) -Pst *pst; -SpId spId; -RguL2MUlThrpMeasReqInfo *measReq; -#endif { Inst inst; S16 ret = ROK; - TRC3(RgUiRguL2MUlThrpMeasReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS if (measReq == NULLP) { RLOG0(L_ERROR,"Input Response Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId == rgCb[inst].rguSap[spId].sapCfg.spId) @@ -732,7 +625,7 @@ RguL2MUlThrpMeasReqInfo *measReq; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -740,7 +633,7 @@ RguL2MUlThrpMeasReqInfo *measReq; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -752,7 +645,7 @@ RguL2MUlThrpMeasReqInfo *measReq; SPutStaticBuffer(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo) , SS_SHARABLE_MEMORY); measReq= NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguL2MUlThrpMeasReq */ #endif @@ -774,24 +667,15 @@ RguL2MUlThrpMeasReqInfo *measReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndDedStaInd +S16 rgUIMSndDedStaInd ( Inst inst, RgUpSapCb *rguSap, RgRguDedStaInd *staInd ) -#else -PUBLIC S16 rgUIMSndDedStaInd(inst,rguSap,staInd) -Inst inst; -RgUpSapCb *rguSap; -RgRguDedStaInd *staInd; -#endif { S16 ret = ROK; - TRC2(rgUIMSndDedStaInd) - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd)); ret = RgUiRguDStaInd(&(rguSap->sapCfg.sapPst), rguSap->sapCfg.suId, @@ -799,9 +683,9 @@ RgRguDedStaInd *staInd; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguDStaInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndDedStaInd */ @@ -823,34 +707,23 @@ RgRguDedStaInd *staInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndCmnStaInd +S16 rgUIMSndCmnStaInd ( Inst inst, RgUpSapCb *rguDlSap, RgRguCmnStaInd *staInd ) -#else -PUBLIC S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd) -Inst inst, -RgUpSapCb *rguDlSap, -RgRguCmnStaInd *staInd; -#endif { S16 ret = ROK; - - TRC2(rgUIMSndCmnStaInd) - - ret = RgUiRguCStaInd(&(rguDlSap->sapCfg.sapPst), rguDlSap->sapCfg.suId, staInd); if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguCStaInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndCmnStaInd */ @@ -872,26 +745,15 @@ RgRguCmnStaInd *staInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndDedDatInd +S16 rgUIMSndDedDatInd ( Inst inst, RgUpSapCb *rguUlSap, RgRguDedDatInd *datInd ) -#else -PUBLIC S16 rgUIMSndDedDatInd(datInd) -Inst inst; -RgUpSapCb *rguUlSap; -RgRguDedDatInd *datInd; -#endif { S16 ret = ROK; - - TRC2(rgUIMSndDedDatInd) - - rguUlSap->sapSts.numPduTxmit += datInd->numLch; #ifndef SS_RBUF ret = RgUiRguDDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, @@ -899,13 +761,13 @@ RgRguDedDatInd *datInd; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguDdatInd Failed"); - RETVALUE(ret); + return (ret); } #else SRngIncrWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC); SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktRate++; #endif - RETVALUE(ret); + return (ret); } /* rgUIMSndDedDatInd */ @@ -927,25 +789,10 @@ RgRguDedDatInd *datInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndCmnDatInd -( -Inst inst, -RgUpSapCb *rguUlSap, -RgRguCmnDatInd *datInd -) -#else -PUBLIC S16 rgUIMSndCmnDatInd(datInd) -Inst inst; -RgUpSapCb *rguUlSap; -RgRguCmnDatInd *datInd; -#endif +S16 rgUIMSndCmnDatInd(Inst inst,RgUpSapCb *rguUlSap,RgRguCmnDatInd *datInd) { S16 ret = ROK; - TRC2(rgUIMSndCmnDatInd) - - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd)); rguUlSap->sapSts.numPduTxmit++; @@ -957,9 +804,9 @@ RgRguCmnDatInd *datInd; { RGDBGERRNEW(inst,(rgPBuf(inst),"RgUiRguCDatInd Failed\n")); RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguCDatInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndCmnDatInd */ /** @@ -981,28 +828,13 @@ RgRguCmnDatInd *datInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgBndReq -( -Pst *pst, -SuId suId, -SpId spId -) -#else -PUBLIC S16 RgUiCrgBndReq(pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif +S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId) { S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ Inst inst; - TRC3(RgUiCrgBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1067,7 +899,7 @@ SpId spId; #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiCrgBndReq */ @@ -1089,23 +921,9 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgUbndReq -( -Pst *pst, -SpId spId, -Reason reason -) -#else -PUBLIC S16 RgUiCrgUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif +S16 RgUiCrgUbndReq(Pst *pst,SpId spId,Reason reason) { Inst inst; - TRC3(RgUiCrgUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1125,7 +943,7 @@ Reason reason; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1134,9 +952,9 @@ Reason reason; RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiCrgUbndReq */ /** @@ -1152,35 +970,21 @@ Reason reason; * * @param[in] Inst inst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMCrgBndCfm -( -Inst inst, -SuId suId, -U8 status -) -#else -PUBLIC S16 rgUIMCrgBndCfm(inst,suId, status) -Inst inst; -SuId suId; -U8 status; -#endif +S16 rgUIMCrgBndCfm(Inst inst,SuId suId,uint8_t status) { - TRC2(rgUIMCrgBndCfm) - if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { RLOG0(L_ERROR,"RgUiCrgBndCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgUIMCrgBndCfm*/ /** @@ -1203,33 +1007,23 @@ U8 status; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgCfgReq +S16 RgUiCrgCfgReq ( Pst *pst, SpId spId, CrgCfgTransId transId, CrgCfgReqInfo *cfgReqInfo ) -#else -PUBLIC S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo) -Pst *pst; -SpId spId; -CrgCfgTransId transId; -CrgCfgReqInfo *cfgReqInfo; -#endif { Inst inst; S16 ret = ROK; - U8 cfmStatus = 0x00ff; - U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; - - TRC3(RgUiCrgCfgReq); + uint8_t cfmStatus = 0x00ff; + uint8_t prntTrans[CRG_CFG_TRANSID_SIZE+1]; RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; /* Ensuring transId is always Null terminated. */ - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE); prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; @@ -1238,7 +1032,7 @@ CrgCfgReqInfo *cfgReqInfo; { RLOG0(L_ERROR,"Input Param crgReqInfo is NULL "); rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Upper SAP Id and State validation */ @@ -1259,7 +1053,7 @@ CrgCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1272,7 +1066,7 @@ CrgCfgReqInfo *cfgReqInfo; sizeof(CrgCfgReqInfo)); cfgReqInfo = NULLP; rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCOMCfgReq(inst,transId, cfgReqInfo); SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, @@ -1281,10 +1075,10 @@ CrgCfgReqInfo *cfgReqInfo; if (ret != ROK) { RLOG0(L_ERROR,"Configuration Request Handling Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiCrgCfgReq */ /** @@ -1300,31 +1094,22 @@ CrgCfgReqInfo *cfgReqInfo; * * @param[in] Inst inst * @param[in] CrgCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMCrgCfgCfm +S16 rgUIMCrgCfgCfm ( Inst inst, CrgCfgTransId transId, -U8 status +uint8_t status ) -#else -PUBLIC S16 rgUIMCrgCfgCfm(inst,transId, status) -Inst inst; -CrgCfgTransId transId; -U8 status; -#endif { S16 ret = ROK; - U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[CRG_CFG_TRANSID_SIZE+1]; - TRC2(rgUIMCrgCfgCfm) - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE); prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; @@ -1332,35 +1117,27 @@ U8 status; if (ret != ROK) { RLOG0(L_ERROR,"RgUiCrgCfgCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMCrgCfgCfm */ #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -#ifdef ANSI -PUBLIC S16 rgBatchProc -( -Void -) -#else -PUBLIC S16 rgBatchProc() -Void; -#endif +S16 rgBatchProc(Void) { /* Read from Ring Buffer and process RLC BO Update */ Pst pst = {0}; SpId spId = 0; RguDStaRspInfo *staRsp; - U32 elmIndx = 0; + uint32_t elmIndx = 0; #ifndef LTE_ADV /* Fill pst */ pst.srcProcId = 1; pst.dstProcId = 1; - pst.dstEnt = ENTRG; + pst.dstEnt = ENTMAC; pst.dstInst = 0; - pst.srcEnt = ENTKW; + pst.srcEnt = ENTRLC; pst.srcInst = 1; pst.prior = PRIOR0; pst.route = RTESPEC; @@ -1371,7 +1148,7 @@ Void; #else #endif - elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); + elmIndx = (uint32_t)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); while(NULLP != elmIndx) { staRsp = (RguDStaRspInfo *)elmIndx; @@ -1384,10 +1161,10 @@ Void; staRsp = NULLP; SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); - if((elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP) + if((elmIndx = (uint32_t)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP) break; } - RETVALUE(ROK); + return ROK; } #endif