Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[EPIC-ID: ODUHIGH-488][TASK-ID: ODUHIGH-494]Removed sch_rr.c
[o-du/l2.git]
/
src
/
5gnrmac
/
mac_slot_ind.c
diff --git
a/src/5gnrmac/mac_slot_ind.c
b/src/5gnrmac/mac_slot_ind.c
index
fc32cc1
..
fdd2669
100644
(file)
--- 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"
#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
/**
* @brief process DL allocation from scheduler
@@
-168,7
+161,7
@@
uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
MAC_ALLOC(txPdu, txPduLen);
if(!txPdu)
{
MAC_ALLOC(txPdu, txPduLen);
if(!txPdu)
{
- DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProc
RlcDlData
");
+ DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProc
DlAlloc
");
return RFAILED;
}
memcpy(txPdu, retxTb, txPduLen);
return RFAILED;
}
memcpy(txPdu, retxTb, txPduLen);
@@
-346,7
+339,7
@@
void buildAndSendMuxPdu(SlotTimingInfo currTimingInfo)
GET_CELL_IDX(currTimingInfo.cellId, cellIdx);
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++)
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);
Pst pst;
FILL_PST_MAC_TO_SCH(pst, EVENT_SLOT_IND_TO_SCH);
- return(
*macSchSlotIndOpts[pst.selector])(&pst,slotInd
);
+ return(
SchMessageRouter(&pst, (void *)slotInd)
);
}
/*******************************************************************
}
/*******************************************************************