X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_uim.c;h=043292dee8f9b6fc5374fd3f027da7cba4355eda;hb=762bc0a2a50222d74b01d9a88071bfaf5d90979b;hp=e99696c60c666384f53ed8ff3a8e3ae47985e7f6;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index e99696c60..043292dee 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -74,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. * @@ -95,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; @@ -203,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; @@ -265,30 +246,15 @@ 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) @@ -317,32 +283,17 @@ 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 @@ -439,26 +390,16 @@ 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 @@ -530,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; @@ -588,26 +520,16 @@ 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 @@ -671,27 +593,17 @@ 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 @@ -755,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, @@ -804,26 +707,15 @@ 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) @@ -853,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, @@ -908,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++; @@ -962,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; @@ -1070,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; @@ -1133,27 +970,13 @@ 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) { @@ -1184,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'; @@ -1281,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'; @@ -1320,28 +1124,20 @@ U8 status; } /* 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; @@ -1352,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; @@ -1365,7 +1161,7 @@ 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; } return ROK;