X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_slot_ind.c;h=11dd47eb6c12e337a832836c6c9ded5f131b7906;hb=6b44407d464a5a4e060999255233a7cfe78bb0fa;hp=103623a34fa4e73ab08de95dd004242396bc0f95;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index 103623a34..11dd47eb6 100644 --- 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 "rgu.h" +#include "rgu.x" #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); +extern uint16_t fillUlDciReq(SlotIndInfo currTimingInfo); /* function pointers for packing slot ind from mac to sch */ MacSchSlotIndFunc macSchSlotIndOpts[] = { packMacSchSlotInd, - macSchSlotInd, + MacSchSlotInd, 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; } + if(dlSchedInfo->ulGrant != NULLP) + { + currDlSlot = &macCb.macCell[cellIdx]->\ + dlSlot[dlSchedInfo->schSlotValue.ulDciTime.slot]; + currDlSlot->dlInfo.ulGrant = dlSchedInfo->ulGrant; + } } return ROK; } @@ -300,6 +309,9 @@ uint8_t macProcSlotInd(SlotIndInfo slotInd) /* Trigger for UL TTI REQ */ fillUlTtiReq(slotInd); + + /* Trigger for UL DCI REQ */ + fillUlDciReq(slotInd); return ROK; } /* macProcSlotInd */