X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Fmac_ue_mgr.c;h=aaa95de563d845ebc45ba658fbaf10351f33bae1;hb=b864875ccd95278bcfcc40187def1ed7a6fb8aa4;hp=018244cc1353805f21913169dd5a2229d7160c8e;hpb=ca0353e5cb5699aecb6840efe9572934a1150e2b;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c
index 018244cc1..aaa95de56 100644
--- a/src/5gnrmac/mac_ue_mgr.c
+++ b/src/5gnrmac/mac_ue_mgr.c
@@ -28,14 +28,6 @@
 #include "mac.h"
 #include "mac_utils.h"
 
-/* function pointers for packing slot ind from mac to sch */
-MacSchAddUeConfigReqFunc macSchAddUeConfigReqOpts[] =
-{
-   packMacSchAddUeConfigReq,    /* packing for loosely coupled */
-   MacSchAddUeConfigReq,        /* packing for tightly coupled */
-   packMacSchAddUeConfigReq     /* packing for light weight loosely coupled */
-};
-
 MacDuUeCfgRspFunc macDuUeCfgRspOpts[] =
 {
    packDuMacUeCfgRsp,   /* packing for loosely coupled */
@@ -50,20 +42,6 @@ MacDuUeRecfgRspFunc macDuUeRecfgRspOpts[] =
    packDuMacUeRecfgRsp   /* packing for light weight loosly coupled */
 };
 
-MacSchModUeConfigReqFunc macSchModUeConfigReqOpts[] =
-{
-   packMacSchModUeConfigReq,    /* packing for loosely coupled */
-   MacSchModUeConfigReq,        /* packing for tightly coupled */
-   packMacSchModUeConfigReq     /* packing for light weight loosely coupled */
-};
-
-MacSchUeDeleteReqFunc macSchUeDeleteReqOpts[] =
-{
-   packMacSchUeDeleteReq,    /* packing for loosely coupled */
-   MacSchUeDeleteReq,        /* packing for tightly coupled */
-   packMacSchUeDeleteReq     /* packing for light weight loosely coupled */
-};
-
 MacDuUeDeleteRspFunc macDuUeDeleteRspOpts[] =
 {
    packDuMacUeDeleteRsp,   /* packing for loosely coupled */
@@ -1541,14 +1519,14 @@ uint8_t sendUeReqToSch(Pst *pst, void *schUeCfg)
          SchUeCfgReq *schUeCfgReq = NULLP;
          schUeCfgReq = (SchUeCfgReq *)schUeCfg;
          FILL_PST_MAC_TO_SCH(schPst, EVENT_ADD_UE_CONFIG_REQ_TO_SCH);
-         return(*macSchAddUeConfigReqOpts[schPst.selector])(&schPst, schUeCfgReq);
+         return(SchMessageRouter(&schPst, (void *)schUeCfgReq));
       }
       case EVENT_MAC_UE_RECONFIG_REQ:
       {
          SchUeRecfgReq *schUeRecfgReq = NULLP;
          schUeRecfgReq = (SchUeRecfgReq *)schUeCfg;
          FILL_PST_MAC_TO_SCH(schPst, EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH);
-         return(*macSchModUeConfigReqOpts[schPst.selector])(&schPst,schUeRecfgReq);
+         return(SchMessageRouter(&schPst, (void *)schUeRecfgReq));
       }
       default: 
       {
@@ -3347,7 +3325,7 @@ uint8_t sendUeDelReqToSch(Pst *pst, MacUeDelete *ueDelete)
       schUeDel.crnti  = ueDelete->crnti;
       MAC_FREE_SHRABL_BUF(pst->region, pst->pool, ueDelete, sizeof(MacUeDelete));
       FILL_PST_MAC_TO_SCH(schPst, EVENT_UE_DELETE_REQ_TO_SCH);
-      return(*macSchUeDeleteReqOpts[schPst.selector])(&schPst, &schUeDel);
+      return(SchMessageRouter(&schPst, (void *)&schUeDel));
    }
    else
    {