X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg_tom.c;h=316d2162fa27cc26325f8223df73c49c1c5cbd0f;hb=22dec8bbab96f5bfad385f0a23cd33c95edb2e1f;hp=a181fd597f232473d7e80be389563e9a9dc464c4;hpb=5d64905a366e340b65b01021ec4eec4f7350a94e;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index a181fd597..316d2162f 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -36,6 +36,7 @@ static int RLOG_MODULE_ID=4096; invoked by PHY towards MAC */ /* header include files -- defines (.h) */ +#include #include "envopt.h" /* environment options */ #include "envdep.h" /* environment dependent */ #include "envind.h" /* environment independent */ @@ -613,10 +614,12 @@ SlotIndInfo slotInd } #endif -/* Trigger for DL TTI REQ */ - CmLteTimingInfo dlTtiReqtimingInfo; - RGADDTOCRNTTIME(cellCb->crntTime, dlTtiReqtimingInfo, TFU_DELTA); - handleDlTtiReq(&dlTtiReqtimingInfo); + + /* Trigger for DL TTI REQ */ + handleDlTtiReq(slotInd); + + /* Trigger for UL TTI REQ */ + handleUlTtiReq(slotInd); dlSf = &cellCb->subFrms[(slotInd.slot % RG_NUM_SUB_FRAMES)]; @@ -1511,8 +1514,8 @@ Inst inst; #ifdef LTEMAC_SPS Bool isSpsRnti=FALSE; Pst schPst1; - RgInfSpsRelInfo relInfo; - Bool spsToBeActvtd = FALSE; + // RgInfSpsRelInfo relInfo; + Bool spsToBeActvtd = FALSE; U16 sduSize = 0; #endif U32 lcgBytes[RGINF_MAX_LCG_PER_UE]; @@ -1664,10 +1667,12 @@ Inst inst; ueCb->ul.implRelCntr = 0; ueCb->ul.explRelCntr = 0; - relInfo.cellSapId = cellCb->schInstMap.cellSapId; +#if 0 + relInfo.cellSapId = cellCb->schInstMap.cellSapId; relInfo.cRnti = ueCb->ueId; - relInfo.isExplRel = FALSE; + relInfo.isExplRel= FALSE; //TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo); +#endif } } else