X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_slot_ind.c;h=fdd2669e392f77f6d4ca30b866d79ff440c01ae9;hb=b5c5f7e79733f48e4d78e0de1821ad05efa00118;hp=fc32cc140992fbcd175fbd0a07caf9b629d47cc1;hpb=2c0a8253f51c046ed8f291e14e13cde42a43a109;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index fc32cc140..fdd2669e3 100644
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -29,14 +29,7 @@
 #include "lwr_mac_fsm.h"
 #include "mac_utils.h"
 #include "mac_harq_dl.h"
-
-/* function pointers for packing slot ind from mac to sch */
-MacSchSlotIndFunc macSchSlotIndOpts[] =
-{
-   packMacSchSlotInd,
-   MacSchSlotInd,
-   packMacSchSlotInd
-};
+#include "lwr_mac_phy.h"
 
 /**
  * @brief process DL allocation from scheduler
@@ -168,7 +161,7 @@ uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
                         MAC_ALLOC(txPdu, txPduLen);
                         if(!txPdu)
                         {
-                           DU_LOG("\nERROR  -->  MAC : Memory allocation failed in MacProcRlcDlData");
+                           DU_LOG("\nERROR  -->  MAC : Memory allocation failed in MacProcDlAlloc");
                            return RFAILED;
                         }   
                         memcpy(txPdu, retxTb,  txPduLen);
@@ -346,7 +339,7 @@ void buildAndSendMuxPdu(SlotTimingInfo currTimingInfo)
 
    GET_CELL_IDX(currTimingInfo.cellId, cellIdx);
 
-   ADD_DELTA_TO_TIME(currTimingInfo, muxTimingInfo, PHY_DELTA_DL);
+   ADD_DELTA_TO_TIME(currTimingInfo, muxTimingInfo, PHY_DELTA_DL, macCb.macCell[cellIdx]->numOfSlots);
    currDlSlot = &macCb.macCell[cellIdx]->dlSlot[muxTimingInfo.slot];
 
    for(ueIdx=0; ueIdx<MAX_NUM_UE; ueIdx++)
@@ -386,7 +379,7 @@ int sendSlotIndMacToSch(SlotTimingInfo *slotInd)
    Pst pst;
 
    FILL_PST_MAC_TO_SCH(pst, EVENT_SLOT_IND_TO_SCH);
-   return(*macSchSlotIndOpts[pst.selector])(&pst,slotInd);
+   return(SchMessageRouter(&pst, (void *)slotInd));
 }
 
 /*******************************************************************