X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg_uim.c;h=ab7110c78984dc4cedf27ab05a50d8e716ad42ec;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=e99696c60c666384f53ed8ff3a8e3ae47985e7f6;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index e99696c60..ab7110c78 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. * @@ -96,14 +96,14 @@ PUBLIC U8 rgRguUlSap; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguBndReq +S16 RgUiRguBndReq ( Pst *pst, SuId suId, SpId spId ) #else -PUBLIC S16 RgUiRguBndReq(pst, suId, spId) +S16 RgUiRguBndReq(pst, suId, spId) Pst *pst; SuId suId; SpId spId; @@ -114,9 +114,6 @@ SpId spId; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRguBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -204,22 +201,20 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguUbndReq +S16 RgUiRguUbndReq ( Pst *pst, SpId spId, Reason reason ) #else -PUBLIC S16 RgUiRguUbndReq(pst, spId, reason) +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 +260,27 @@ 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 +S16 rgUIMRguBndCfm ( Inst inst, SpId spId, -U8 status +uint8_t status ) #else -PUBLIC S16 rgUIMRguBndCfm(inst,spId, status) +S16 rgUIMRguBndCfm(inst,spId, status) Inst inst; SpId spId; -U8 status; +uint8_t status; #endif { S16 ret = ROK; - TRC2(rgUIMRguBndCfm) - - ret = RgUiRguBndCfm(&rgCb[inst].rguSap[spId].sapCfg.sapPst, rgCb[inst].rguSap[spId].sapCfg.suId, status); if (ret != ROK) @@ -318,14 +310,14 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguDDatReq +S16 RgUiRguDDatReq ( Pst *pst, SpId spId, RguDDatReqInfo *datReq ) #else -PUBLIC S16 RgUiRguDDatReq(pst, spId, datReq) +S16 RgUiRguDDatReq(pst, spId, datReq) Pst *pst; SpId spId; RguDDatReqInfo *datReq; @@ -334,15 +326,12 @@ 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 @@ -440,14 +429,14 @@ RguDDatReqInfo *datReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguCDatReq +S16 RgUiRguCDatReq ( Pst *pst, SpId spId, RguCDatReqInfo *datReq ) #else -PUBLIC S16 RgUiRguCDatReq(pst, spId, datReq) +S16 RgUiRguCDatReq(pst, spId, datReq) Pst *pst; SpId spId; RguCDatReqInfo *datReq; @@ -456,9 +445,6 @@ RguCDatReqInfo *datReq; Inst inst; S16 ret = ROK; - TRC3(RgUiRguCDatReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -531,25 +517,22 @@ RguCDatReqInfo *datReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguDStaRsp +S16 RgUiRguDStaRsp ( Pst *pst, SpId spId, RguDStaRspInfo *staRsp ) #else -PUBLIC S16 RgUiRguDStaRsp(pst, spId, staRsp) +S16 RgUiRguDStaRsp(pst, spId, staRsp) Pst *pst; SpId spId; RguDStaRspInfo *staRsp; #endif { Inst inst; - - S16 ret = ROK; - VOLATILE U32 startTime = 0; - - TRC3(RgUiRguDStaRsp) + S16 ret = ROK; + VOLATILE uint32_t startTime = 0; RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -589,14 +572,14 @@ RguDStaRspInfo *staRsp; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguCStaRsp +S16 RgUiRguCStaRsp ( Pst *pst, SpId spId, RguCStaRspInfo *staRsp ) #else -PUBLIC S16 RgUiRguCStaRsp(pst, spId, staRsp) +S16 RgUiRguCStaRsp(pst, spId, staRsp) Pst *pst; SpId spId; RguCStaRspInfo *staRsp; @@ -605,9 +588,6 @@ RguCStaRspInfo *staRsp; Inst inst; S16 ret = ROK; - TRC3(RgUiRguCStaRsp) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -672,14 +652,14 @@ RguCStaRspInfo *staRsp; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiRguL2MUlThrpMeasReq +S16 RgUiRguL2MUlThrpMeasReq ( Pst *pst, SpId spId, RguL2MUlThrpMeasReqInfo *measReq ) #else -PUBLIC S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq) +S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq) Pst *pst; SpId spId; RguL2MUlThrpMeasReqInfo *measReq; @@ -689,9 +669,6 @@ RguL2MUlThrpMeasReqInfo *measReq; S16 ret = ROK; - TRC3(RgUiRguL2MUlThrpMeasReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -756,14 +733,14 @@ RguL2MUlThrpMeasReqInfo *measReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgUIMSndDedStaInd +S16 rgUIMSndDedStaInd ( Inst inst, RgUpSapCb *rguSap, RgRguDedStaInd *staInd ) #else -PUBLIC S16 rgUIMSndDedStaInd(inst,rguSap,staInd) +S16 rgUIMSndDedStaInd(inst,rguSap,staInd) Inst inst; RgUpSapCb *rguSap; RgRguDedStaInd *staInd; @@ -771,8 +748,6 @@ RgRguDedStaInd *staInd; { S16 ret = ROK; - TRC2(rgUIMSndDedStaInd) - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd)); ret = RgUiRguDStaInd(&(rguSap->sapCfg.sapPst), rguSap->sapCfg.suId, @@ -805,14 +780,14 @@ RgRguDedStaInd *staInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgUIMSndCmnStaInd +S16 rgUIMSndCmnStaInd ( Inst inst, RgUpSapCb *rguDlSap, RgRguCmnStaInd *staInd ) #else -PUBLIC S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd) +S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd) Inst inst, RgUpSapCb *rguDlSap, RgRguCmnStaInd *staInd; @@ -820,10 +795,6 @@ RgRguCmnStaInd *staInd; { S16 ret = ROK; - - TRC2(rgUIMSndCmnStaInd) - - ret = RgUiRguCStaInd(&(rguDlSap->sapCfg.sapPst), rguDlSap->sapCfg.suId, staInd); if (ret != ROK) @@ -854,14 +825,14 @@ RgRguCmnStaInd *staInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgUIMSndDedDatInd +S16 rgUIMSndDedDatInd ( Inst inst, RgUpSapCb *rguUlSap, RgRguDedDatInd *datInd ) #else -PUBLIC S16 rgUIMSndDedDatInd(datInd) +S16 rgUIMSndDedDatInd(datInd) Inst inst; RgUpSapCb *rguUlSap; RgRguDedDatInd *datInd; @@ -869,10 +840,6 @@ RgRguDedDatInd *datInd; { S16 ret = ROK; - - TRC2(rgUIMSndDedDatInd) - - rguUlSap->sapSts.numPduTxmit += datInd->numLch; #ifndef SS_RBUF ret = RgUiRguDDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, @@ -909,14 +876,14 @@ RgRguDedDatInd *datInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgUIMSndCmnDatInd +S16 rgUIMSndCmnDatInd ( Inst inst, RgUpSapCb *rguUlSap, RgRguCmnDatInd *datInd ) #else -PUBLIC S16 rgUIMSndCmnDatInd(datInd) +S16 rgUIMSndCmnDatInd(datInd) Inst inst; RgUpSapCb *rguUlSap; RgRguCmnDatInd *datInd; @@ -924,9 +891,6 @@ RgRguCmnDatInd *datInd; { S16 ret = ROK; - TRC2(rgUIMSndCmnDatInd) - - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd)); rguUlSap->sapSts.numPduTxmit++; @@ -963,14 +927,14 @@ RgRguCmnDatInd *datInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiCrgBndReq +S16 RgUiCrgBndReq ( Pst *pst, SuId suId, SpId spId ) #else -PUBLIC S16 RgUiCrgBndReq(pst, suId, spId) +S16 RgUiCrgBndReq(pst, suId, spId) Pst *pst; SuId suId; SpId spId; @@ -981,9 +945,6 @@ SpId spId; RgUstaDgn dgn; /* Alarm diagnostics structure */ Inst inst; - TRC3(RgUiCrgBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1071,22 +1032,20 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiCrgUbndReq +S16 RgUiCrgUbndReq ( Pst *pst, SpId spId, Reason reason ) #else -PUBLIC S16 RgUiCrgUbndReq(pst, spId, reason) +S16 RgUiCrgUbndReq(pst, spId, reason) Pst *pst; SpId spId; Reason reason; #endif { Inst inst; - TRC3(RgUiCrgUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1133,27 +1092,25 @@ 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 +S16 rgUIMCrgBndCfm ( Inst inst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 rgUIMCrgBndCfm(inst,suId, status) +S16 rgUIMCrgBndCfm(inst,suId, status) Inst inst; SuId suId; -U8 status; +uint8_t status; #endif { - TRC2(rgUIMCrgBndCfm) - if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { @@ -1185,7 +1142,7 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgUiCrgCfgReq +S16 RgUiCrgCfgReq ( Pst *pst, SpId spId, @@ -1193,7 +1150,7 @@ CrgCfgTransId transId, CrgCfgReqInfo *cfgReqInfo ) #else -PUBLIC S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo) +S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo) Pst *pst; SpId spId; CrgCfgTransId transId; @@ -1202,15 +1159,13 @@ CrgCfgReqInfo *cfgReqInfo; { 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 +1236,29 @@ 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) +S16 rgUIMCrgCfgCfm(inst,transId, status) Inst inst; CrgCfgTransId transId; -U8 status; +uint8_t 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'; @@ -1321,12 +1274,12 @@ U8 status; #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) #ifdef ANSI -PUBLIC S16 rgBatchProc +S16 rgBatchProc ( Void ) #else -PUBLIC S16 rgBatchProc() +S16 rgBatchProc() Void; #endif { @@ -1334,14 +1287,14 @@ Void; 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 +1305,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 +1318,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;