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
Changes for SR, BSR and MSG5 Handling
[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
103623a
..
11dd47e
100644
(file)
--- a/
src/5gnrmac/mac_slot_ind.c
+++ b/
src/5gnrmac/mac_slot_ind.c
@@
-19,6
+19,8
@@
#include "common_def.h"
#include "lrg.h"
#include "lrg.x"
#include "common_def.h"
#include "lrg.h"
#include "lrg.x"
+#include "rgu.h"
+#include "rgu.x"
#include "du_app_mac_inf.h"
#include "mac_sch_interface.h"
#include "lwr_mac_upr_inf.h"
#include "du_app_mac_inf.h"
#include "mac_sch_interface.h"
#include "lwr_mac_upr_inf.h"
@@
-30,12
+32,13
@@
/* Function declarations */
extern uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo);
extern uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo);
/* Function declarations */
extern uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo);
extern uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo);
+extern uint16_t fillUlDciReq(SlotIndInfo currTimingInfo);
/* function pointers for packing slot ind from mac to sch */
MacSchSlotIndFunc macSchSlotIndOpts[] =
{
packMacSchSlotInd,
/* function pointers for packing slot ind from mac to sch */
MacSchSlotIndFunc macSchSlotIndOpts[] =
{
packMacSchSlotInd,
-
m
acSchSlotInd,
+
M
acSchSlotInd,
packMacSchSlotInd
};
packMacSchSlotInd
};
@@
-89,6
+92,12
@@
uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
msg4Alloc = dlSchedInfo->msg4Alloc;
macCb.macCell[cellIdx]->macRaCb[0].msg4TbSize = msg4Alloc->msg4PdschCfg.codeword[0].tbSize;
}
msg4Alloc = dlSchedInfo->msg4Alloc;
macCb.macCell[cellIdx]->macRaCb[0].msg4TbSize = msg4Alloc->msg4PdschCfg.codeword[0].tbSize;
}
+ if(dlSchedInfo->ulGrant != NULLP)
+ {
+ currDlSlot = &macCb.macCell[cellIdx]->\
+ dlSlot[dlSchedInfo->schSlotValue.ulDciTime.slot];
+ currDlSlot->dlInfo.ulGrant = dlSchedInfo->ulGrant;
+ }
}
return ROK;
}
}
return ROK;
}
@@
-300,6
+309,9
@@
uint8_t macProcSlotInd(SlotIndInfo slotInd)
/* Trigger for UL TTI REQ */
fillUlTtiReq(slotInd);
/* Trigger for UL TTI REQ */
fillUlTtiReq(slotInd);
+
+ /* Trigger for UL DCI REQ */
+ fillUlDciReq(slotInd);
return ROK;
} /* macProcSlotInd */
return ROK;
} /* macProcSlotInd */