X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_mux.c;h=1473e7af587c7a165a985be85e4cad4341cba328;hb=6946c38335eb7394883a6f2686b2e6417e8ceb6f;hp=d7da7b31c0de1daa236b41b130e11cb265b4a106;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index d7da7b31c..1473e7af5 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -66,25 +66,25 @@ static int RLOG_MODULE_ID=4096; #include "ss_msg.x" /* MAC includes */ /* local defines */ #ifndef T2K_MEM_LEAK_DBG -EXTERN S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); + S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); #else char* file = __FILE__; -U32 line = __LINE__; +uint32_t line = __LINE__; #endif /* local typedefs */ /* global variables */ -U32 rgDlrate_rgu; +uint32_t rgDlrate_rgu; /* local externs */ -PRIVATE Void rgMUXGet20bitRarGrnt ARGS((U8 ulBw, +static Void rgMUXGet20bitRarGrnt ARGS((uint8_t ulBw, RgInfRarUlGrnt *msg3Grnt, - U8 *grnt)); -EXTERN U16 rgMUXCalcRiv ARGS((U8 bw, - U8 rbStart, - U8 numRb)); + uint8_t *grnt)); +uint16_t rgMUXCalcRiv ARGS((uint8_t bw, + uint8_t rbStart, + uint8_t numRb)); #ifndef MS_MBUF_CORRUPTION #define MS_BUF_ADD_ALLOC_CALLER() @@ -100,11 +100,11 @@ EXTERN U16 rgMUXCalcRiv ARGS((U8 bw, #define RG_PACK_CE(_ce, _len, _ceBuf, _ret) {\ MS_BUF_ADD_ALLOC_CALLER(); \ - _ret = SAddPstMsgMult((U8 *)(&(_ce)), _len, _ceBuf);\ + _ret = SAddPstMsgMult((uint8_t *)(&(_ce)), _len, _ceBuf);\ } #define RG_MUX_CALC_LEN(_len,_lenBytes,_elmTotLen) {\ - U8 _hdrLen;\ + uint8_t _hdrLen;\ _lenBytes = (_len <= 255) ? 1 : 2;\ _hdrLen = _lenBytes + RG_SDU_SHDR_LEN;\ _elmTotLen = _hdrLen + _len;\ @@ -155,21 +155,13 @@ EXTERN U16 rgMUXCalcRiv ARGS((U8 bw, * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgMUXAddCes +static S16 rgMUXAddCes ( Inst inst, RgBldPduInfo *pdu, Buffer *ceBuf, RgErrInfo *err ) -#else -PRIVATE S16 rgMUXAddCes(inst,pdu, ceShdrBuf, ceBuf, err) -Inst inst; -RgBldPduInfo *pdu; -Buffer *ceBuf; -RgErrInfo *err; -#endif { S16 ret; RgMUXSubHdr subHdr; @@ -202,7 +194,7 @@ RgErrInfo *err; { if(pdu->schdTbSz >= RG_TA_ELM_LEN) { - U8 taVal; /* Moving from outer scope to available scope */ + uint8_t taVal; /* Moving from outer scope to available scope */ RG_PACK_SHDR_FIXD_SZ(subHdr, RG_TA_LCID_IDX, ceBuf, ret); if(ret != ROK) @@ -270,7 +262,7 @@ RgErrInfo *err; * * @param[in] Inst inst * @param[in] MsgLen *schdTbSz - * @param[in] U8 lcId + * @param[in] uint8_t lcId * @param[in] Buffer *sdu * @param[out] Buffer *sduBuf * @param[out] RgErrInfo *err @@ -278,29 +270,19 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgMUXInsSdu +static S16 rgMUXInsSdu ( Inst inst, MsgLen *schdTbSz, -U8 lcId, +uint8_t lcId, Buffer *sdu, Buffer *sduBuf, RgErrInfo *err ) -#else -PRIVATE S16 rgMUXInsSdu(inst,schdTbSz, lcId, sdu, sduBuf, err) -Inst inst; -MsgLen *schdTbSz; -U8 lcId; -Buffer *sdu; -Buffer *sduBuf; -RgErrInfo *err; -#endif { S16 ret; MsgLen msgLen = 0; - U8 lenBytes; + uint8_t lenBytes; MsgLen elmTotLen; SFndLenMsg(sdu, &msgLen); @@ -367,9 +349,8 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef L2_OPTMZ -U32 padSize = 0; +uint32_t padSize = 0; #endif -#ifdef ANSI S16 rgMUXAddPadd ( Inst inst, @@ -378,14 +359,6 @@ Buffer *sduBuf, Bool isRar, RgErrInfo *err ) -#else -S16 rgMUXAddPadd(inst,schdTbSz, sduBuf, isRar, err) -Inst inst; -MsgLen *schdTbSz; -Buffer *sduBuf; -Bool isRar; -RgErrInfo *err; -#endif { S16 ret = ROK; Buffer *padBuf = NULLP; @@ -509,21 +482,13 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgMUXAddSdus +static S16 rgMUXAddSdus ( Inst inst, RgBldPduInfo *pdu, Buffer *sduBuf, RgErrInfo *err ) -#else -PRIVATE S16 rgMUXAddSdus(inst,pdu, sduBuf, err) -Inst inst; -RgBldPduInfo *pdu; -Buffer *sduBuf; -RgErrInfo *err; -#endif { RgRguDDatReqPerUe *dDatReq; RgRguCmnDatReq *cDatReq; @@ -551,7 +516,7 @@ RgErrInfo *err; { if(pdu->tbIndex == 1) { - U16 idx1, idx2; + uint16_t idx1, idx2; /* Adding this temporary variable for optimization */ RguDatReqTb *datReqTb = &dDatReq->datReqTb[0]; @@ -578,7 +543,7 @@ RgErrInfo *err; } else if(pdu->tbIndex == 2) { - U16 idx1, idx2; + uint16_t idx1, idx2; RguDatReqTb *datReqTb = &dDatReq->datReqTb[1]; for (idx1=0; (idx1 < datReqTb->nmbLch); idx1++) { @@ -643,7 +608,6 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgMUXBldPdu ( Inst inst, @@ -651,13 +615,6 @@ RgBldPduInfo *pdu, Buffer **txPdu, RgErrInfo *err ) -#else -S16 rgMUXBldPdu(inst, pdu, txPdu, err) -Inst inst; -RgBldPduInfo *pdu; -Buffer **txPdu; -RgErrInfo *err; -#endif { Buffer *mBuf = NULLP; @@ -708,8 +665,7 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgMUXAddSdus +static S16 rgMUXAddSdus ( Inst inst, RgBldPduInfo *pdu, @@ -717,18 +673,10 @@ Buffer *sHdrBuf, RgTfuDatReqTbInfo *tb, RgErrInfo *err ) -#else -PRIVATE S16 rgMUXAddSdus(pdu, sHdrBuf, tb, err) -Inst inst; -RgBldPduInfo *pdu; -Buffer *sHdrBuf; -RgTfuDatReqTbInfo *tb; -RgErrInfo *err; -#endif { RgRguDDatReqPerUe *dDatReq; RgRguCmnDatReq *cDatReq; - U32 lchIdx, pduIdx; + uint32_t lchIdx, pduIdx; switch(pdu->reqType) { @@ -751,7 +699,7 @@ RgErrInfo *err; = cDatReq->pdu; tb->lchInfo[tb->numLch].numPdu++; tb->numLch++; - RLOG3(L_INFO,"MSG4 is muxed numLch=%ld numPdu=%ld tbaddr =%p", tb->numLch,tb->lchInfo[tb->numLch-1].numPdu, (U32)tb); + RLOG3(L_INFO,"MSG4 is muxed numLch=%ld numPdu=%ld tbaddr =%p", tb->numLch,tb->lchInfo[tb->numLch-1].numPdu, (uint32_t)tb); } break; @@ -762,7 +710,7 @@ RgErrInfo *err; { if(pdu->tbIndex == 1) { - U16 idx1, idx2; + uint16_t idx1, idx2; /* Adding this temporary variable for optimization */ RguDatReqTb *datReqTb = &dDatReq->datReqTb[0]; @@ -831,7 +779,7 @@ RgErrInfo *err; } else if(pdu->tbIndex == 2) { - U16 idx1, idx2; + uint16_t idx1, idx2; RguDatReqTb *datReqTb = &dDatReq->datReqTb[1]; tb->numLch = lchIdx = 0; // prc_trace_format_string(0x40,3,": AddSdus: numOfLch=%d numOfPdu=%d, schdSz=%d", datReqTb->nmbLch, datReqTb->lchData[0].pdu.numPdu, pdu->schdTbSz); @@ -945,7 +893,6 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgMUXBldPdu ( Inst inst, @@ -953,17 +900,10 @@ RgBldPduInfo *pdu, RgTfuDatReqTbInfo *tb, RgErrInfo *err ) -#else -S16 rgMUXBldPdu(inst, pdu, tb, err) -Inst inst; -RgBldPduInfo *pdu; -RgTfuDatReqTbInfo *tb; -RgErrInfo *err; -#endif { Buffer *mBuf1; /* MAC hearder */ Buffer *mBuf2; /* MAC CEs */ - //U32 lchIdx, pduIdx; + //uint32_t lchIdx, pduIdx; /* Reseting macHdr and macCes pointers */ if(tb->macHdr) @@ -1023,7 +963,6 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgMUXBldRarPdu ( RgCellCb *cell, @@ -1031,20 +970,13 @@ RgInfRaRntiInfo *alloc, Buffer **txPdu, RgErrInfo *err ) -#else -S16 rgMUXBldRarPdu(cell, alloc, txPdu, err) -RgCellCb *cell; -RgInfRaRntiInfo *alloc; -Buffer **txPdu; -RgErrInfo *err; -#endif { Buffer *datBuf = NULLP; S16 ret; - U8 data[RG_RAR_ELEM_LEN]; - U8 hdrByte; + uint8_t data[RG_RAR_ELEM_LEN]; + uint8_t hdrByte; MsgLen schdTbSz; - U8 idx; + uint8_t idx; Inst inst = cell->macInst - RG_INST_START; schdTbSz = alloc->schdTbSz; @@ -1118,9 +1050,9 @@ RgErrInfo *err; { rgMUXGet20bitRarGrnt(cell->bwCfg.ulTotalBw, &(alloc->crntiInfo[idx].grnt), &data[1]); } - data[1] |= ((U8)((alloc->crntiInfo[idx].ta.val) << 4)); + data[1] |= ((uint8_t)((alloc->crntiInfo[idx].ta.val) << 4)); data[4] = (alloc->crntiInfo[idx].tmpCrnti) >> 8; - data[5] = (U8) (alloc->crntiInfo[idx].tmpCrnti); + data[5] = (uint8_t) (alloc->crntiInfo[idx].tmpCrnti); RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, "Rar,Rapid=%d, Temp CRNTI:%d", @@ -1163,21 +1095,14 @@ RgErrInfo *err; * File : rg_mux.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgMUXGet20bitRarGrnt +static Void rgMUXGet20bitRarGrnt ( -U8 ulBw, +uint8_t ulBw, RgInfRarUlGrnt *msg3Grnt, -U8 *grnt +uint8_t *grnt ) -#else -PRIVATE Void rgMUXGet20bitRarGrnt(ulBw, msg3Grnt, grnt) -U8 ulBw; -RgInfRarUlGrnt *msg3Grnt; -U8 *grnt; -#endif { - U16 riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb); + uint16_t riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb); grnt[2] = msg3Grnt->cqiBit; /* cqi bit is 0, output from sched */ grnt[2] |= (msg3Grnt->delayBit << 1); @@ -1187,12 +1112,12 @@ U8 *grnt; grnt[1] = (msg3Grnt->iMcsCrnt >> 3); /* Forcing right shift to insert 0 as the LSB: * since this is assumed in the computation */ - grnt[1] |= (U8)((riv << 1) & 0xFE); + grnt[1] |= (uint8_t)((riv << 1) & 0xFE); - grnt[0] = (U8)((riv >> 7) & 0x07); + grnt[0] = (uint8_t)((riv >> 7) & 0x07); grnt[0] |= ((msg3Grnt->hop & 0x01) << 3); - RETVOID; + return; } /* rgMUXGet20bitRarGrnt */ /*********************************************************** @@ -1208,22 +1133,15 @@ U8 *grnt; * File : rg_mux.c * **********************************************************/ -#ifdef ANSI -U16 rgMUXCalcRiv +uint16_t rgMUXCalcRiv ( -U8 bw, -U8 rbStart, -U8 numRb +uint8_t bw, +uint8_t rbStart, +uint8_t numRb ) -#else -U16 rgMUXCalcRiv(bw, rbStart, numRb) -U8 bw; -U8 rbStart; -U8 numRb; -#endif { - U8 numRbMinus1 = numRb - 1; - U16 riv; + uint8_t numRbMinus1 = numRb - 1; + uint16_t riv; if (numRbMinus1 <= bw/2) {