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
Addressing flow wise comments
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_tom.c
diff --git
a/src/5gnrmac/rg_tom.c
b/src/5gnrmac/rg_tom.c
index
dd3b1e0
..
316d216
100755
(executable)
--- 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) */
invoked by PHY towards MAC
*/
/* header include files -- defines (.h) */
+#include <stdbool.h>
#include "envopt.h" /* environment options */
#include "envdep.h" /* environment dependent */
#include "envind.h" /* environment independent */
#include "envopt.h" /* environment options */
#include "envdep.h" /* environment dependent */
#include "envind.h" /* environment independent */
@@
-76,8
+77,9
@@
invoked by PHY towards MAC
#include "rgm.x" /* layer management typedefs for MAC */
#include "rgm.h" /* layer management typedefs for MAC */
#include "du_app_mac_inf.h"
#include "rgm.x" /* layer management typedefs for MAC */
#include "rgm.h" /* layer management typedefs for MAC */
#include "du_app_mac_inf.h"
+#include "mac.h"
#include "rg.x" /* typedefs for MAC */
#include "rg.x" /* typedefs for MAC */
-
+#include "lwr_mac_fsm.h"
#ifdef MAC_RLC_UL_RBUF
#include "ss_rbuf.h"
#include "ss_rbuf.x"
#ifdef MAC_RLC_UL_RBUF
#include "ss_rbuf.h"
#include "ss_rbuf.x"
@@
-611,6
+613,14
@@
SlotIndInfo slotInd
}
}
#endif
}
}
#endif
+
+
+ /* Trigger for DL TTI REQ */
+ handleDlTtiReq(slotInd);
+
+ /* Trigger for UL TTI REQ */
+ handleUlTtiReq(slotInd);
+
dlSf = &cellCb->subFrms[(slotInd.slot % RG_NUM_SUB_FRAMES)];
if((dlSf->txDone == TRUE) ||
dlSf = &cellCb->subFrms[(slotInd.slot % RG_NUM_SUB_FRAMES)];
if((dlSf->txDone == TRUE) ||
@@
-1504,8
+1514,8
@@
Inst inst;
#ifdef LTEMAC_SPS
Bool isSpsRnti=FALSE;
Pst schPst1;
#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];
U16 sduSize = 0;
#endif
U32 lcgBytes[RGINF_MAX_LCG_PER_UE];
@@
-1657,10
+1667,12
@@
Inst inst;
ueCb->ul.implRelCntr = 0;
ueCb->ul.explRelCntr = 0;
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.cRnti = ueCb->ueId;
-
relInfo.isExplRel
= FALSE;
+
relInfo.isExplRel
= FALSE;
//TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo);
//TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo);
+#endif
}
}
else
}
}
else