X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_slot_ind.c;h=d18588da19a0be418ec38c94776833cd0d5b8bf8;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=2492f2a73eb3c607070e91ec2355189d8a4a2ffc;hpb=15cfc9c3834a5c77b0cfbbe8b6cb0c576db140e6;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index 2492f2a73..d18588da1 100644
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -31,14 +31,6 @@
 #include "mac_harq_dl.h"
 #include "lwr_mac_phy.h"
 
-/* function pointers for packing slot ind from mac to sch */
-MacSchSlotIndFunc macSchSlotIndOpts[] =
-{
-   packMacSchSlotInd,
-   MacSchSlotInd,
-   packMacSchSlotInd
-};
-
 /**
  * @brief process DL allocation from scheduler
  *
@@ -77,8 +69,6 @@ uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
                       dlSlot[dlSchedInfo->schSlotValue.broadcastTime.slot];
          currDlSlot->dlInfo.isBroadcastPres = true;
          memcpy(&currDlSlot->dlInfo.brdcstAlloc, &dlSchedInfo->brdcstAlloc, sizeof(DlBrdcstAlloc));
-         currDlSlot->dlInfo.brdcstAlloc.sib1Alloc.sib1PdcchCfg.dci.pdschCfg = \
-                                            &currDlSlot->dlInfo.brdcstAlloc.sib1Alloc.sib1PdschCfg;
       }
 
       for(ueIdx=0; ueIdx<MAX_NUM_UE; ueIdx++)
@@ -169,7 +159,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);
@@ -347,7 +337,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++)
@@ -387,7 +377,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));
 }
 
 /*******************************************************************