X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lim.c;h=b00335239b54ac104c96f7674a4e1b42bd493623;hb=29b5f01d779caab32dbc5b3686a5d917e4c818ec;hp=d710c4f226acaa0382f921dcd69513b90ac44844;hpb=18376996c17ece8306c1fe9539a00010bea607d5;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index d710c4f22..b00335239 100755
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -36,17 +36,7 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=182;
 static int RLOG_MODULE_ID=4096;
 /* 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 services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
@@ -57,15 +47,6 @@ static int RLOG_MODULE_ID=4096;
 #include "du_log.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"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -84,17 +65,6 @@ PRIVATE S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
 #endif
 PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
                                           Bool error));
-
-/* function pointers for packing slot ind from mac to sch */
-//S16 packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd);
-
-MacSchSlotIndFunc macSchSlotIndOpts[] =
-{
-   packMacSchSlotInd,  
-   macSchSlotInd,                                             
-   packMacSchSlotInd
-}; 
-
 #ifdef RG_UNUSED
 PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
                                           Bool error));
@@ -628,7 +598,7 @@ void fillMacToSchPst(Pst *pst)
    pst->dstInst = 1;
    pst->region = 0;
    pst->pool =  0;
-   pst->selector = MAC_SELECTOR_TC;
+   pst->selector = ODU_SELECTOR_TC;
 }
 
 /*******************************************************************
@@ -655,68 +625,40 @@ void fapiMacConfigRsp()
    MacSendCellCfgCfm(RSP_OK);
 }
 
-/**
- * @brief Transmission time interval indication from PHY.
- *
- * @details
- *
- *     Function : sendSlotIndMacToSch
- * 
- *      This API is invoked by MAC to send slot ind to scheduler.
- *           
- *  @param[in]  SlotIndInfo    *slotInd
- *  @return  S16
- *      -# ROK 
- *      -# RFAILED 
- **/
-int sendSlotIndMacToSch(SlotIndInfo *slotInd)
-{
-   /* fill Pst structure to send to lwr_mac to MAC */
-   Pst pst;
-
-   fillMacToSchPst(&pst);
-   pst.event = EVENT_SLOT_IND_TO_SCH;
-
-   return(*macSchSlotIndOpts[pst.selector])(&pst,slotInd);
-}
-
-
 /*******************************************************************
  *
- * @brief Send slot indication to DU APP
+ * @brief Send stop indication to DU APP
  *
  * @details
  *
- *    Function : sendSlotIndMacToDuApp
+ *    Function : sendStopIndMacToDuApp
  *
  *    Functionality:
- *       Send slot indication to DU APP
+ *       Send stop indication to DU APP
  *
- * @params[in] Slot indication info 
+ * @params[in] Pst info 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-int sendSlotIndMacToDuApp(SlotIndInfo *slotInd)
+uint8_t sendStopIndMacToDuApp()
 {
    Pst pst;
-   uint16_t ret;
-   SlotInfo  *slotInfo;
+   uint8_t ret = ROK;
 
+   MacCellStopInfo *cellStopId; 
+  
    /*  Allocate sharable memory */
-   MAC_ALLOC_SHRABL_BUF(slotInfo, sizeof(SlotInfo));
-   if(!slotInfo)
+   MAC_ALLOC_SHRABL_BUF(cellStopId, sizeof(MacCellStopInfo));
+   if(!cellStopId)
    {
-      DU_LOG("\nMAC : Slot Indication memory allocation failed");
+      DU_LOG("\nMAC : Stop Indication memory allocation failed");
       return RFAILED;
    }
-
-   slotInfo->cellId = macCb.macCell->cellId;
-   slotInfo->sfn = slotInd->sfn;
-   slotInfo->slot = slotInd->slot;
+   cellStopId->cellId = macCb.macCell->cellId;
 
    /* Fill Pst */
-   pst.selector  = DU_MAC_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTRG;
    pst.dstEnt    = ENTDUAPP;
    pst.dstInst   = 0;
@@ -725,21 +667,19 @@ int sendSlotIndMacToDuApp(SlotIndInfo *slotInd)
    pst.srcProcId = rgCb[pst.srcInst].rgInit.procId;
    pst.region = MAC_MEM_REGION;
    pst.pool = MAC_POOL;
-   pst.event = EVENT_MAC_SLOT_IND;
+   pst.event = EVENT_MAC_STOP_IND;
    pst.route = 0;
    pst.prior = 0;
    pst.intfVer = 0;
- 
-   ret = MacDuAppSlotInd(&pst, slotInfo);
+
+   ret = MacDuAppStopInd(&pst, cellStopId);
    if(ret != ROK)
    {
-	   DU_LOG("\nMAC: Failed to send slot indication to DU APP");
-      MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, slotInfo, sizeof(SlotInfo));
+      DU_LOG("\nMAC: Failed to send stop indication to DU APP");
+      MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, cellStopId, sizeof(MacCellStopInfo));
    }
-   
-   return ret;
+   return ROK;
 }
-
 #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
  /**
  * @brief Transmission of non-rt indication from CL.