X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_l2m.c;h=1f37aa178563ee41badaa8448b8f351ae9e88c59;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=a393f0819f5393152a2f63062addee07c7388aad;hpb=451e626d5ac7c7e7586bab23358161230449af46;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c
index a393f0819..1f37aa178 100755
--- a/src/5gnrmac/rg_l2m.c
+++ b/src/5gnrmac/rg_l2m.c
@@ -33,15 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "crg.h"        
 #include "rgr.h"
@@ -53,15 +45,6 @@
 #include "rg.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -139,7 +122,7 @@ RgErrInfo      *err;
       if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    //Memcpy is already done in rgL2mAllocMeasCb
    /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
@@ -161,7 +144,7 @@ RgErrInfo      *err;
       }
       cell->qciArray[measInfo->t.prbReq.qci[idx]].mask = TRUE;
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mCreateMeasCb */
 
 
@@ -205,9 +188,9 @@ RgErrInfo      *err;
                LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK)
    {
       /* Clear Downlink MeasCb created Above If exists*/
-      RETVALUE(ret);
+      return (ret);
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mMeasReq */
 /** @brief This function sends the measurement confirm
  *  from mac to scheduler
@@ -318,7 +301,7 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
        (cellCb->cellId != measInfo->cellId))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,"unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Call L2M Function to store Meas req */
    ret = rgL2mMeasReq(cellCb, measInfo, &err);
@@ -334,9 +317,9 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
       RLOG_ARG2(L_ERROR,DBG_CELLID,measInfo->cellId,
                "Meas req Failed  errType(%d) errCause(%d)",
                err.errType, err.errCause);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ret);
+   return (ret);
 } /* -- RgSchMacL2MeasReq-- */
 
 /**
@@ -388,7 +371,7 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
       
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
             "Unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    node = cellCb->l2mList.first; 
    while(node != NULLP)
@@ -410,7 +393,7 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
    measCfm.measType    = measInfo->measType;
    measCfm.cfm.status  = LCM_PRIM_OK;
    rgSndL2MeasStopCfm(cellCb, &measCfm);
-   RETVALUE(ret);
+   return (ret);
 } /* -- RgSchMacL2MeasStopReq-- */
 
 /**
@@ -456,12 +439,12 @@ RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
       
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
             "Unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*set sndL2Meas as applicatoin sent l2 meas info request*/
    cellCb->sndL2Meas = TRUE;
 
-   RETVALUE(ret);
+   return (ret);
 }/*RgSchMacL2MeasSendReq*/ 
 
 /** @brief This function inserts the MeasCb in to data base
@@ -521,7 +504,7 @@ RgInfL2MeasReq *measInfo;
       {
          cell->l2mList.crnt = lnk;
          cmLListInsCrnt(&(cell->l2mList), node);
-         RETVALUE(ROK);
+         return ROK;
       }
       else
       {
@@ -530,7 +513,7 @@ RgInfL2MeasReq *measInfo;
    }  /* End of While */
 
    cmLListAdd2Tail(&(cell->l2mList), node);
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mInsertMeasCb */
 
 /** @brief This function allocates memory from the heap
@@ -570,12 +553,12 @@ RgErrInfo      *err;
                    "Allocation of RgL2MeasCb failed");
          err->errType  = RGERR_L2M_MEASREQ;
          err->errCause = RGERR_RAM_MEM_EXHAUST;
-         RETVALUE(NULLP);
+         return (NULLP);
       }
    cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq));
    RGCPYTIMEINFO(cell->crntTime, measCb->startTime);
 
-   RETVALUE(measCb);
+   return (measCb);
 } /* rgL2mAllocMeasCb */
 
 
@@ -622,7 +605,7 @@ RgCellCb  *cell;
       node = node->next;
       crntTime = cell->crntTime;
 
-      if(cell->crntTime.sfn == 0 && (cell->crntTime.subframe % RG_NUM_SUB_FRAMES) == 0)
+      if(cell->crntTime.sfn == 0 && (cell->crntTime.slot % RG_NUM_SUB_FRAMES) == 0)
       {
          measCb->sfnCycle++;
       }
@@ -669,7 +652,7 @@ RgCellCb  *cell;
          continue;
       } 
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2MEas */
 
 #endif /* LTE_L2_MEAS */