X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg_mux.c;h=d7da7b31c0de1daa236b41b130e11cb265b4a106;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=2e1acbb2b8a339b7ca86b7ab0bef8789365f238b;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index 2e1acbb2b..d7da7b31c 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -174,8 +174,6 @@ RgErrInfo *err; S16 ret; RgMUXSubHdr subHdr; - TRC2(rgMUXAddCes) - if (NULLP != pdu->contResId) { if(pdu->schdTbSz >= RG_CRES_ELM_LEN) @@ -305,7 +303,6 @@ RgErrInfo *err; U8 lenBytes; MsgLen elmTotLen; - TRC2(rgMUXInsSdu) SFndLenMsg(sdu, &msgLen); RG_MUX_CALC_LEN(msgLen,lenBytes,elmTotLen); @@ -373,7 +370,7 @@ RgErrInfo *err; U32 padSize = 0; #endif #ifdef ANSI -PUBLIC S16 rgMUXAddPadd +S16 rgMUXAddPadd ( Inst inst, MsgLen *schdTbSz, @@ -382,7 +379,7 @@ Bool isRar, RgErrInfo *err ) #else -PUBLIC S16 rgMUXAddPadd(inst,schdTbSz, sduBuf, isRar, err) +S16 rgMUXAddPadd(inst,schdTbSz, sduBuf, isRar, err) Inst inst; MsgLen *schdTbSz; Buffer *sduBuf; @@ -393,7 +390,6 @@ RgErrInfo *err; S16 ret = ROK; Buffer *padBuf = NULLP; RgMUXSubHdr subHdr; - TRC2(rgMUXAddPadd) #ifdef L2_OPTMZ padSize = 0; @@ -532,8 +528,6 @@ RgErrInfo *err; RgRguDDatReqPerUe *dDatReq; RgRguCmnDatReq *cDatReq; - TRC2(rgMUXAddSdus) - switch(pdu->reqType) { case EVTRGUCDATREQ: @@ -650,7 +644,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgMUXBldPdu +S16 rgMUXBldPdu ( Inst inst, RgBldPduInfo *pdu, @@ -658,7 +652,7 @@ Buffer **txPdu, RgErrInfo *err ) #else -PUBLIC S16 rgMUXBldPdu(inst, pdu, txPdu, err) +S16 rgMUXBldPdu(inst, pdu, txPdu, err) Inst inst; RgBldPduInfo *pdu; Buffer **txPdu; @@ -667,9 +661,6 @@ RgErrInfo *err; { Buffer *mBuf = NULLP; - TRC2(rgMUXBldPdu) - - if (rgGetMsg(inst, &mBuf) != ROK) { /* Buffer couldnt get allocated. Return a failure */ @@ -739,8 +730,6 @@ RgErrInfo *err; RgRguCmnDatReq *cDatReq; U32 lchIdx, pduIdx; - TRC2(rgMUXAddSdus) - switch(pdu->reqType) { case EVTRGUCDATREQ: @@ -957,7 +946,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgMUXBldPdu +S16 rgMUXBldPdu ( Inst inst, RgBldPduInfo *pdu, @@ -965,7 +954,7 @@ RgTfuDatReqTbInfo *tb, RgErrInfo *err ) #else -PUBLIC S16 rgMUXBldPdu(inst, pdu, tb, err) +S16 rgMUXBldPdu(inst, pdu, tb, err) Inst inst; RgBldPduInfo *pdu; RgTfuDatReqTbInfo *tb; @@ -976,8 +965,6 @@ RgErrInfo *err; Buffer *mBuf2; /* MAC CEs */ //U32 lchIdx, pduIdx; - TRC2(rgMUXBldPdu) - /* Reseting macHdr and macCes pointers */ if(tb->macHdr) SResetMBuf(tb->macHdr); @@ -1037,7 +1024,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgMUXBldRarPdu +S16 rgMUXBldRarPdu ( RgCellCb *cell, RgInfRaRntiInfo *alloc, @@ -1045,7 +1032,7 @@ Buffer **txPdu, RgErrInfo *err ) #else -PUBLIC S16 rgMUXBldRarPdu(cell, alloc, txPdu, err) +S16 rgMUXBldRarPdu(cell, alloc, txPdu, err) RgCellCb *cell; RgInfRaRntiInfo *alloc; Buffer **txPdu; @@ -1060,8 +1047,6 @@ RgErrInfo *err; U8 idx; Inst inst = cell->macInst - RG_INST_START; - TRC2(rgMUXBldRarPdu) - schdTbSz = alloc->schdTbSz; /* RAR PDU Requirements */ /* @@ -1194,8 +1179,6 @@ U8 *grnt; { U16 riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb); - TRC2(rgMUXGet20bitRarGrnt); - grnt[2] = msg3Grnt->cqiBit; /* cqi bit is 0, output from sched */ grnt[2] |= (msg3Grnt->delayBit << 1); grnt[2] |= (msg3Grnt->tpc << 2); @@ -1226,14 +1209,14 @@ U8 *grnt; * **********************************************************/ #ifdef ANSI -PUBLIC U16 rgMUXCalcRiv +U16 rgMUXCalcRiv ( U8 bw, U8 rbStart, U8 numRb ) #else -PUBLIC U16 rgMUXCalcRiv(bw, rbStart, numRb) +U16 rgMUXCalcRiv(bw, rbStart, numRb) U8 bw; U8 rbStart; U8 numRb; @@ -1242,8 +1225,6 @@ U8 numRb; U8 numRbMinus1 = numRb - 1; U16 riv; - TRC2(rgMUXCalcRiv); - if (numRbMinus1 <= bw/2) { riv = bw * numRbMinus1 + rbStart;