X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_mux.c;h=d7da7b31c0de1daa236b41b130e11cb265b4a106;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=13d92aef58bc9a693681e2fe000f065b095388aa;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c
index 13d92aef5..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)
@@ -186,7 +184,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CEHDR_FAIL;
             RLOG0(L_ERROR, "Muxing of Contention Resolution CE sub-header is failed");
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          RG_PACK_CE(pdu->contResId->resId[0], RG_CRES_LEN, ceBuf, ret);
@@ -195,7 +193,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CE_FAIL;
             RLOG0(L_ERROR, "Muxing of Contention Resolution CE is failed")
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          pdu->schdTbSz -= RG_CRES_ELM_LEN;
       }
@@ -211,7 +209,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CEHDR_FAIL;
             RLOG0(L_ERROR, "Muxing of TA CE sub-hdr is failed")
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          taVal = pdu->ta.val;
@@ -221,7 +219,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CE_FAIL;
             RLOG0(L_ERROR, "Muxing of TA CE is failed")
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          pdu->schdTbSz -= RG_TA_ELM_LEN;
          RLOG1(L_DEBUG,"TA muxed by MAC: %u", pdu->ta.val);
@@ -239,7 +237,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CEHDR_FAIL;
             RLOG0(L_ERROR, "Muxing of SCELL Activation CE sub-hdr is failed")
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          /* Adding the ACT CE */
@@ -249,7 +247,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_CE_FAIL;
             RLOG0(L_ERROR, "Muxing of SCELL Activation CE is failed")
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          pdu->schdTbSz -= RG_SCELL_CE_ELM_LEN;
 
@@ -260,7 +258,7 @@ RgErrInfo      *err;
   /*LcId is not yet decided in 5G-NR spec for MAC CEs Hence, not writing code
    * new MAC CEs. */
 
-   RETVALUE(ROK);
+   return ROK;
 } /* rgMUXAddCes */
 
 /**
@@ -305,7 +303,6 @@ RgErrInfo      *err;
    U8             lenBytes;
    MsgLen         elmTotLen;
 
-   TRC2(rgMUXInsSdu)
    SFndLenMsg(sdu, &msgLen);
 
    RG_MUX_CALC_LEN(msgLen,lenBytes,elmTotLen);
@@ -322,7 +319,7 @@ RgErrInfo      *err;
       {
          err->errCause = RGERR_MUX_BLD_SDUHDR_FAIL;
          RLOG1(L_ERROR, "RGERR_MUX_BLD_SDUHDR_FAIL for LCID:%d",lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
 #ifndef L2_OPTMZ /* no need to pack as passing not muxing all LCs PDUs to 1*/
@@ -337,7 +334,7 @@ RgErrInfo      *err;
       {
          err->errCause = RGERR_MUX_BLD_SDU_FAIL;
          RLOG1(L_ERROR, "RGERR_MUX_BLD_SDU_FAIL for LCID:%d",lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       *schdTbSz -= elmTotLen;
@@ -349,9 +346,9 @@ RgErrInfo      *err;
                lcId, ((S16)elmTotLen), lenBytes,lcId);
       RLOG3(L_ERROR, "msglen %d schdTbSz %d LCID:%d",
                ((S16)msgLen), ((S16)*schdTbSz),lcId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -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;
@@ -413,7 +409,7 @@ RgErrInfo      *err;
          {
             err->errCause = RGERR_MUX_BLD_PADHDR_FAIL;
             RLOG0(L_ERROR, "RGERR_MUX_BLD_PADHDR_FAIL");
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
          *schdTbSz -= 1;
@@ -437,7 +433,7 @@ RgErrInfo      *err;
             {
                err->errCause = RGERR_MUX_BLD_PAD_FAIL;
                RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL");
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             *schdTbSz = 0;
          }
@@ -462,7 +458,7 @@ RgErrInfo      *err;
                   {
                      err->errCause = RGERR_MUX_BLD_PAD_FAIL;
                      RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL");
-                     RETVALUE(RFAILED);
+                     return RFAILED;
                   }
 
                   *schdTbSz -= RG_MAX_PAD_ARR_SZ;
@@ -484,7 +480,7 @@ RgErrInfo      *err;
                   {
                      err->errCause = RGERR_MUX_BLD_PAD_FAIL;
                      RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL");
-                     RETVALUE(RFAILED);
+                     return RFAILED;
 
                   }
                   *schdTbSz = 0;
@@ -494,7 +490,7 @@ RgErrInfo      *err;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* rgMUXAddPadd */
 
 #ifndef L2_OPTMZ
@@ -532,8 +528,6 @@ RgErrInfo      *err;
    RgRguDDatReqPerUe *dDatReq;
    RgRguCmnDatReq    *cDatReq;
 
-   TRC2(rgMUXAddSdus)
-
    switch(pdu->reqType)
    {
       case EVTRGUCDATREQ:
@@ -544,7 +538,7 @@ RgErrInfo      *err;
             if(rgMUXInsSdu(inst,&pdu->schdTbSz, 
                      RG_CCCH_LCID, cDatReq->pdu, sduBuf, err) != ROK)
             {
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             RG_FREE_MSG(cDatReq->pdu);
          }
@@ -575,7 +569,7 @@ RgErrInfo      *err;
                            sduBuf, err) != ROK)
                         {
                            RLOG1(L_ERROR, "FAILED for LCID:%d",datReqTb->lchData[idx1].lcId);
-                           RETVALUE(RFAILED);
+                           return RFAILED;
                         }
                      }
                      RG_FREE_MSG(datReqTb->lchData[idx1].pdu.mBuf[idx2]);
@@ -601,7 +595,7 @@ RgErrInfo      *err;
                         {
                            RLOG2(L_ERROR, "FAILED TB Size %d LCID:%d",
                                     ((S16)pdu->schdTbSz),datReqTb->lchData[idx1].lcId);
-                           RETVALUE(RFAILED);
+                           return RFAILED;
                         }
                      }
                      RG_FREE_MSG(datReqTb->lchData[idx1].pdu.mBuf[idx2]);
@@ -611,17 +605,15 @@ RgErrInfo      *err;
          }
          break;
 
-      case EVENT_SLOT_IND_TO_MAC:
-         break;
       default:
          break;
    } /* End of switch(reqType) */
    if(rgMUXAddPadd(inst,&pdu->schdTbSz, sduBuf, FALSE, err) != ROK)
    {
       RLOG1(L_ERROR, "FAILED for TB Size:%d",(S16)pdu->schdTbSz);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -652,7 +644,7 @@ RgErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgMUXBldPdu
+S16 rgMUXBldPdu
 (
 Inst           inst,
 RgBldPduInfo   *pdu,
@@ -660,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;
@@ -669,16 +661,13 @@ RgErrInfo      *err;
 {
    Buffer         *mBuf = NULLP;
 
-   TRC2(rgMUXBldPdu)
-
- 
    if (rgGetMsg(inst, &mBuf) != ROK)
    {
       /* Buffer couldnt get allocated. Return a failure */
       err->errCause = RGERR_MUX_MEM_ALLOC_FAIL;
       err->errType = RGERR_MUX_BLD_PDU;
       RLOG1(L_FATAL, "Memory allocation failed during MUXing of MAC TB: MacInst %d", inst);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(rgMUXAddCes(inst, pdu, mBuf, err) != ROK)
@@ -686,7 +675,7 @@ RgErrInfo      *err;
       RG_FREE_MSG(mBuf);
       err->errType = RGERR_MUX_BLD_PDU;
       RLOG1(L_ERROR, "Failed to Multiplex MAC CEs: MacInst %d", inst);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(rgMUXAddSdus(inst, pdu, mBuf, err) != ROK)
@@ -694,12 +683,12 @@ RgErrInfo      *err;
       RG_FREE_MSG(mBuf);
       err->errType = RGERR_MUX_BLD_PDU;
       RLOG1(L_ERROR, "FAILED to Multiplex MAC SDU: MacInst %d", inst);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *txPdu = mBuf;
 
-   RETVALUE(ROK);
+   return ROK;
 
 }  /* rgMUXBldPdu */
 
@@ -741,8 +730,6 @@ RgErrInfo           *err;
    RgRguCmnDatReq     *cDatReq;
    U32 lchIdx, pduIdx;
 
-   TRC2(rgMUXAddSdus)
-
    switch(pdu->reqType)
    {
       case EVTRGUCDATREQ:
@@ -754,7 +741,7 @@ RgErrInfo           *err;
                      RG_CCCH_LCID, cDatReq->pdu, 
                      sHdrBuf, NULLP, err) != ROK)
             {
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             /* L2 Optimization for mUe/Tti: RLC pdu mbuf pointer will be passed
              * to CL it is stored in DlHqProc->TbInfo and it will be used in
@@ -797,7 +784,7 @@ RgErrInfo           *err;
                            sHdrBuf, NULLP, err) != ROK)
                         {
                            RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED\n"));
-                           RETVALUE(RFAILED);
+                           return RFAILED;
                         }
 
                         /* L2 Optimization for mUe/Tti:Increment numPdu by 1
@@ -864,7 +851,7 @@ RgErrInfo           *err;
                         {
                            RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED TB Size %d\n",
                                     ((S16)pdu->schdTbSz)));
-                           RETVALUE(RFAILED);
+                           return RFAILED;
                         }
                          /* L2 Optimization for mUe/Tti:Increment numPdu by 1
                          * Store pdu buffer in tb to send it to CL/PHY. Increment
@@ -920,11 +907,11 @@ RgErrInfo           *err;
    if(rgMUXAddPadd(inst, &pdu->schdTbSz, sduBuf, NULLP, FALSE, err) != ROK)
    {
       //RGDBGERRNEW((rgPBuf, "FAILED"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    tb->padSize = padSize;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -959,7 +946,7 @@ RgErrInfo           *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgMUXBldPdu
+S16 rgMUXBldPdu
 (
 Inst               inst,
 RgBldPduInfo       *pdu,
@@ -967,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;
@@ -978,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);
@@ -997,7 +982,7 @@ RgErrInfo          *err;
       RG_FREE_TB(tb);
       err->errType = RGERR_MUX_BLD_PDU;
       //RGDBGERRNEW((rgPBuf, "FAILED"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if(rgMUXAddSdus(inst, pdu, mBuf1, tb, err) != ROK)
    {
@@ -1008,14 +993,14 @@ RgErrInfo          *err;
 
       err->errType = RGERR_MUX_BLD_PDU;
       //RGDBGERRNEW((rgPBuf, "FAILED"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 // UDAY 
 //      SPrntMsg(tb->macHdr, 0, 0);
 //   prc_trace_format_string(0x40,3,": padSize=%ld", tb->padSize);
 
    tb->tbPres = TRUE;
-   RETVALUE(ROK);
+   return ROK;
 
 }  /* rgMUXBldPdu */
 
@@ -1039,7 +1024,7 @@ RgErrInfo          *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgMUXBldRarPdu
+S16 rgMUXBldRarPdu
 (
 RgCellCb        *cell,
 RgInfRaRntiInfo *alloc,
@@ -1047,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;
@@ -1062,8 +1047,6 @@ RgErrInfo       *err;
    U8          idx;
    Inst        inst = cell->macInst - RG_INST_START;
 
-   TRC2(rgMUXBldRarPdu)
-
    schdTbSz = alloc->schdTbSz;
    /* RAR PDU Requirements */
    /*
@@ -1087,7 +1070,7 @@ RgErrInfo       *err;
       /* Buffer couldnt get allocated. Return a failure */
       err->errCause = RGERR_MUX_MEM_ALLOC_FAIL;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "FAILED to getMsg");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (TRUE == alloc->backOffInd.pres)
@@ -1104,7 +1087,7 @@ RgErrInfo       *err;
          err->errCause = RGERR_MUX_BLD_BI_FAIL;
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_BI_FAIL");
          RG_FREE_MSG(datBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       schdTbSz--;
    }
@@ -1124,7 +1107,7 @@ RgErrInfo       *err;
             err->errCause = RGERR_MUX_BLD_RAPIDHDR_FAIL;
             RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPIDHDR_FAIL");
             RG_FREE_MSG(datBuf);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
       /* Prepare the data */
@@ -1149,7 +1132,7 @@ RgErrInfo       *err;
          err->errCause = RGERR_MUX_BLD_RAPID_FAIL;
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPID_FAIL");
          RG_FREE_MSG(datBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       schdTbSz -= RG_RAR_ELEM_LEN+RG_RAR_SHDR_LEN;
    }
@@ -1158,12 +1141,12 @@ RgErrInfo       *err;
    {
       RG_FREE_MSG(datBuf);
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"FAILED to mux add padding");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *txPdu = datBuf;
 
-   RETVALUE(ROK);
+   return ROK;
 } /* rgMUXBldRarPdu */
 
 /***********************************************************
@@ -1196,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);
@@ -1228,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;
@@ -1244,8 +1225,6 @@ U8           numRb;
    U8           numRbMinus1 = numRb - 1;
    U16          riv;
 
-   TRC2(rgMUXCalcRiv);
-
    if (numRbMinus1 <= bw/2)
    {
       riv = bw * numRbMinus1 + rbStart;
@@ -1254,7 +1233,7 @@ U8           numRb;
    {
       riv = bw * (bw - numRbMinus1) + (bw - rbStart - 1);
    }
-   RETVALUE(riv);
+   return (riv);
 } /* rgMUXCalcRiv */