X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_ex_ms.c;h=d08e840ea8efe2ebe3e46b92e9aef80d6fb09478;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=b8b68dd22db1baad6c820bccfbdd981a8a209692;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_ex_ms.c b/src/5gnrsch/rg_sch_ex_ms.c
index b8b68dd22..d08e840ea 100755
--- a/src/5gnrsch/rg_sch_ex_ms.c
+++ b/src/5gnrsch/rg_sch_ex_ms.c
@@ -33,17 +33,7 @@
 registered with SSI during the LTE MAC Task initialization.
 */
 /* 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 "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -55,22 +45,13 @@ registered with SSI during the LTE MAC Task initialization.
 
 
 /* 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 "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
 #include "rgm.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"        /* typedefs for Scheduler */
 #include "rg_sch.x"        /* typedefs for Scheduler */
-
+#include "mac_sch_interface.h"
 
 
 
@@ -93,19 +74,17 @@ registered with SSI during the LTE MAC Task initialization.
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 schActvTsk
+S16 schActvTsk
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PUBLIC S16 schActvTsk(pst, mBuf)
+S16 schActvTsk(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(schActvTsk)
-
    switch(pst->srcEnt)
    {
       /* The originator of this message is the stack manager,
@@ -116,7 +95,7 @@ Buffer  *mBuf;                      /* message buffer       */
 #ifdef LCRGMILRG
             case EVTMACSCHGENCFGREQ:
                /* Process a config. request */
-               cmUnpkLrgSchCfgReq(HandleSchGenCfgReq, pst, mBuf);
+               cmUnpkLrgSchCfgReq(SchProcGenCfgReq, pst, mBuf);
                break;
             case EVTLRGSCHCNTRLREQ:
                /* Process a control request */
@@ -179,7 +158,7 @@ Buffer  *mBuf;                      /* message buffer       */
                break;
          }
          break;
-      case ENTTF:
+      case ENTLWRMAC:
          switch(pst->event)
          {
 /*#ifdef LCRGLITFU L2Split */
@@ -209,9 +188,6 @@ Buffer  *mBuf;                      /* message buffer       */
             case EVTTFUTIMINGADVIND:
                cmUnpkTfuTimingAdvInd(RgLiTfuTimingAdvInd, pst, mBuf);
                break;
-            case EVTTFUSCHTTIIND:
-               cmUnpkTfuSchTtiInd(RgLiTfuSchTtiInd, pst, mBuf);
-               break;
             case EVTTFUPUCCHDELPWR:
                cmUnpkTfuPucchDeltaPwr(RgLiTfuPucchDeltaPwrInd, pst, mBuf);
                break;
@@ -236,7 +212,7 @@ Buffer  *mBuf;                      /* message buffer       */
                break;
          }
          break;
-      case ENTRG: /* When MAC sends a msg to Scheduler instance */
+      case ENTMAC: /* When MAC sends a msg to Scheduler instance */
          switch(pst->event)
          {
 #ifdef LCSCH
@@ -263,6 +239,9 @@ Buffer  *mBuf;                      /* message buffer       */
                break;
 #endif
 #endif            
+            case EVENT_SLOT_IND_TO_SCH:
+               unpackMacSchSlotInd(MacSchSlotInd, pst, mBuf);
+               break;
             default:
                RGSCH_FREE_MSG(mBuf);
                break;
@@ -289,8 +268,8 @@ Buffer  *mBuf;                      /* message buffer       */
           RGSCH_FREE_MSG(mBuf);
           break;
    }
-   SExitTsk();
-   RETVALUE(ROK);
+   ODU_EXIT_TASK();
+   return ROK;
 }/* end of schActvTsk */