X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_tom.c;h=673cc24fde1d3e8fd6fb7d1927739745745912a3;hb=d1ead035ab3b543810f1838b2519904bf84477ec;hp=30fb50e70bd6f7fc2cc8b0fabf8d39b72261e681;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index 30fb50e70..673cc24fd 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -75,6 +75,7 @@ invoked by PHY towards MAC #include "rg_prg.x" /* PRG interface typedefs */ #include "rgm.x" /* layer management typedefs for MAC */ #include "rgm.h" /* layer management typedefs for MAC */ +#include "mac_interface.h" #include "rg.x" /* typedefs for MAC */ #ifdef MAC_RLC_UL_RBUF @@ -1049,7 +1050,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, subframe, lcgBytes) MsgLen cpySz; #ifdef LTEMAC_SPS Pst schPst1; - RgInfSpsRelInfo relInfo; +// RgInfSpsRelInfo relInfo; #endif #ifdef LTE_L2_MEAS @@ -1308,11 +1309,14 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, subframe, lcgBytes) /* Indicate scheduler for explicit release */ cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst)); rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst); + //TODO: commented for compilation without SCH +#if 0 relInfo.cellSapId = cellCb->schInstMap.cellSapId; relInfo.cRnti = ueCb->ueId; relInfo.isExplRel = TRUE; /* Release indicator is called now through the matrix in the function below */ - RgMacSchSpsRel( &schPst1, &relInfo ); + //TODO: commented for compilation without SCH RgMacSchSpsRel( &schPst1, &relInfo ); +#endif ueCb->ul.implRelCntr = 0; } } @@ -1667,7 +1671,7 @@ Inst inst; relInfo.cellSapId = cellCb->schInstMap.cellSapId; relInfo.cRnti = ueCb->ueId; relInfo.isExplRel = FALSE; - RgMacSchSpsRel(&schPst1, &relInfo); + //TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo); } } else @@ -1745,7 +1749,7 @@ Inst inst; rgGetPstToInst(&schPst, inst,cellCb->schInstMap.schInst); sfInfo->cellSapId = cellCb->schInstMap.cellSapId; - RgMacSchSfRecp(&schPst, sfInfo); + //TODO: commented for compilation without SCH RgMacSchSfRecp(&schPst, sfInfo); RETVALUE(ROK); } /* rgTOMDatInd */