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-516][Task-ID: ODUHIGH-535] Implementation of E2 Removal...
[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
58f894a
..
adb77f0
100644
(file)
--- a/
src/cm/mac_sch_interface.h
+++ b/
src/cm/mac_sch_interface.h
@@
-1972,7
+1972,6
@@
typedef struct schModulationInfo
typedef struct schUeCfgReq
{
uint16_t cellId;
typedef struct schUeCfgReq
{
uint16_t cellId;
- uint8_t ueId;
uint8_t beamIdx;
uint16_t crnti;
bool macCellGrpCfgPres;
uint8_t beamIdx;
uint16_t crnti;
bool macCellGrpCfgPres;
@@
-1992,7
+1991,6
@@
typedef struct schUeCfgReq
typedef struct schUeRecfgReq
{
uint16_t cellId;
typedef struct schUeRecfgReq
{
uint16_t cellId;
- uint8_t ueId;
uint8_t beamIdx;
uint16_t crnti;
bool macCellGrpRecfgPres;
uint8_t beamIdx;
uint16_t crnti;
bool macCellGrpRecfgPres;
@@
-2021,7
+2019,6
@@
typedef struct schUeCfgRsp
{
uint16_t cellId;
uint8_t beamIdx;
{
uint16_t cellId;
uint8_t beamIdx;
- uint16_t ueId;
uint16_t crnti;
SchMacRsp rsp;
CauseOfResult cause;
uint16_t crnti;
SchMacRsp rsp;
CauseOfResult cause;
@@
-2248,30
+2245,54
@@
typedef struct schRlsHqInfo
SchUeHqInfo *ueHqInfo;
}SchRlsHqInfo;
SchUeHqInfo *ueHqInfo;
}SchRlsHqInfo;
-typedef struct schStatsInfo
+/* Statistics Request from MAC to SCH */
+typedef struct schStatsGrpInfo
{
{
- SchMeasurementType type;
- uint16_t periodicity; /* In milliseconds */
-}SchStatsInfo;
+ uint8_t groupId;
+ uint16_t periodicity; /* In milliseconds */
+ uint8_t numStats;
+ SchMeasurementType statsList[MAX_NUM_STATS];
+}SchStatsGrpInfo;
typedef struct schStatsReq
{
typedef struct schStatsReq
{
- uint8_t numStats;
- SchStatsInfo statsList[MAX_NUM_STATS];
+ uint64_t subscriptionId;
+ uint8_t numStatsGroup;
+ SchStatsGrpInfo statsGrpList[MAX_NUM_STATS_GRP];
}SchStatsReq;
}SchStatsReq;
-typedef struct schStatsRsp
+/* Statistics Response from SCH to MAC */
+typedef struct schStatsGrpRejected
{
{
- SchMacRsp rsp;
+ uint8_t groupId;
CauseOfResult cause;
CauseOfResult cause;
+}SchStatsGrpRejected;
+
+typedef struct schStatsRsp
+{
+ uint64_t subscriptionId;
+ uint8_t numGrpAccepted;
+ uint8_t statsGrpAcceptedList[MAX_NUM_STATS_GRP];
+ uint8_t numGrpRejected;
+ SchStatsGrpRejected statsGrpRejectedList[MAX_NUM_STATS_GRP];
}SchStatsRsp;
}SchStatsRsp;
-typedef struct schStatsInd
+/* Statistics Indication from SCH to MAC */
+typedef struct schStats
{
SchMeasurementType type;
double value;
{
SchMeasurementType type;
double value;
+}SchStats;
+
+typedef struct schStatsInd
+{
+ uint64_t subscriptionId;
+ uint8_t groupId;
+ uint8_t numStats;
+ SchStats measuredStatsList[MAX_NUM_STATS];
}SchStatsInd;
}SchStatsInd;
+
/* function declarations */
uint8_t MacMessageRouter(Pst *pst, void *msg);
uint8_t SchMessageRouter(Pst *pst, void *msg);
/* function declarations */
uint8_t MacMessageRouter(Pst *pst, void *msg);
uint8_t SchMessageRouter(Pst *pst, void *msg);