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
Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Handling of drx timer in SCH...
[o-du/l2.git]
/
src
/
cm
/
mac_sch_interface.h
diff --git
a/src/cm/mac_sch_interface.h
b/src/cm/mac_sch_interface.h
index
6085d95
..
0466468
100644
(file)
--- a/
src/cm/mac_sch_interface.h
+++ b/
src/cm/mac_sch_interface.h
@@
-106,9
+106,9
@@
#define DEFAULT_K2_VALUE_FOR_SCS60 2
#define DEFAULT_K2_VALUE_FOR_SCS120 3
#define DEFAULT_K2_VALUE_FOR_SCS60 2
#define DEFAULT_K2_VALUE_FOR_SCS120 3
-#define ADD_DELTA_TO_TIME(crntTime, toFill, incr) \
+#define ADD_DELTA_TO_TIME(crntTime, toFill, incr
, numOfSlot
) \
{ \
{ \
- if ((crntTime.slot + incr) > (
MAX_SLOTS
- 1)) \
+ if ((crntTime.slot + incr) > (
numOfSlot
- 1)) \
{ \
toFill.sfn = (crntTime.sfn + 1); \
} \
{ \
toFill.sfn = (crntTime.sfn + 1); \
} \
@@
-116,7
+116,7
@@
{ \
toFill.sfn = crntTime.sfn; \
} \
{ \
toFill.sfn = crntTime.sfn; \
} \
- toFill.slot = (crntTime.slot + incr) %
MAX_SLOTS
; \
+ toFill.slot = (crntTime.slot + incr) %
numOfSlot
; \
if (toFill.sfn >= MAX_SFN) \
{ \
toFill.sfn%=MAX_SFN; \
if (toFill.sfn >= MAX_SFN) \
{ \
toFill.sfn%=MAX_SFN; \
@@
-1202,6
+1202,7
@@
typedef struct schMacCellGrpCfg
SchTagCfg tagCfg;
SchPhrCfg phrCfg; /* To be used only if phrCfgSetupPres is true */
#ifdef NR_DRX
SchTagCfg tagCfg;
SchPhrCfg phrCfg; /* To be used only if phrCfgSetupPres is true */
#ifdef NR_DRX
+ bool drxCfgPresent;
SchDrxCfg drxCfg; /* Drx configuration */
#endif
}SchMacCellGrpCfg;
SchDrxCfg drxCfg; /* Drx configuration */
#endif
}SchMacCellGrpCfg;
@@
-1656,6
+1657,9
@@
typedef struct schUeCfg
uint8_t numLcs;
SchLcCfg schLcCfg[MAX_NUM_LC];
SchDataTransmission dataTransmissionInfo;
uint8_t numLcs;
SchLcCfg schLcCfg[MAX_NUM_LC];
SchDataTransmission dataTransmissionInfo;
+#ifdef NR_DRX
+ bool drxConfigIndicatorRelease;
+#endif
}SchUeCfg;
typedef struct schUeCfgRsp
}SchUeCfg;
typedef struct schUeCfgRsp