X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fmac_sch_interface.h;h=781973f4a12f9923cb62681df6f9e4809aa841ad;hb=a14bf79bbc001990f96e01ada0dd291bcc9ddcad;hp=fd9554b044aa1cdf02a77f315cf0a2c94bf0a0b5;hpb=9625bef129812dfbc9b0a55ee52395c2fa7fbd93;p=o-du%2Fl2.git diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index fd9554b04..781973f4a 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -51,6 +51,9 @@ #define EVENT_DL_CQI_TO_SCH 32 #define EVENT_UL_CQI_TO_SCH 33 #define EVENT_PHR_IND_TO_SCH 34 +#define EVENT_STATISTICS_REQ_TO_SCH 35 +#define EVENT_STATISTICS_RSP_TO_MAC 36 + /*macros*/ #define MAX_SSB_IDX 1 /* forcing it as 1 for now. Right value is 64 */ #define SCH_SSB_MASK_SIZE 1 @@ -139,14 +142,6 @@ typedef enum RRC_CONNECTED_USERS_RSRC }SchResourceType; -typedef enum -{ - SLICE_NOT_FOUND, - SLICE_CONFIGURED, - SLICE_RECONFIGURED, - RESOURCE_NOT_AVAILABLE -}RspCause; - typedef enum { NO_TRANSMISSION, @@ -154,14 +149,6 @@ typedef enum REPEATITION }PduTxOccsaion; -typedef enum -{ - UNSPECIFIED_CAUSE, - INVALID_PARAM_VALUE, - RESOURCE_UNAVAILABLE, - SYSTEM_ERROR -}SchFailureCause; - typedef enum { SR_PROHIBIT_MS1, @@ -174,13 +161,6 @@ typedef enum SR_PROHIBIT_MS128 }SchSrProhibitTimer; -typedef enum -{ - NOT_APPLICABLE, - INVALID_CELLID, - INVALID_UEID -}ErrorCause; - typedef enum { SR_TRANS_MAX_N4, @@ -471,6 +451,13 @@ typedef enum CQI_PUSCH }CqiUlReportType; +/* Performance measurements from 3GPP TS 28.552 Release 15 */ +typedef enum +{ + SCH_DL_TOTAL_PRB_USAGE, + SCH_UL_TOTAL_PRB_USAGE +}SchMeasurementType; + /*structures*/ typedef struct timeDomainAlloc { @@ -907,7 +894,6 @@ typedef struct schCellCfg uint16_t phyCellId; /* Physical cell id */ SchPlmnInfoList plmnInfoList[MAX_PLMN]; /* Consits of PlmnId and Snssai list */ SchDuplexMode dupMode; /* Duplex type: TDD/FDD */ - uint8_t numerology; /* Supported numerology */ uint8_t dlBandwidth; /* Supported B/W */ uint8_t ulBandwidth; /* Supported B/W */ SchDlCfgCommon dlCfgCommon; /*Spec 38.331 DownlinkConfigCommonSIB*/ @@ -922,8 +908,8 @@ typedef struct schCellCfg SchSSBPeriod ssbPeriod; /* SSB Periodicity in msec */ uint32_t ssbFrequency; /* SB frequency in kHz*/ uint8_t dmrsTypeAPos; - uint8_t scsCommon; /* subcarrier spacing for common [0-3]*/ - SchPdcchConfigSib1 pdcchCfgSib1; /* Req to configure CORESET#0 and SearchSpace#0*/ + uint8_t ssbScs; /* SSB subcarrier spacing*/ + SchPdcchConfigSib1 pdcchCfgSib1; /* Req to configure CORESET#0 and SearchSpace#0*/ uint32_t ssbPbchPwr; /* SSB block power */ uint8_t ssbSubcOffset; /* Subcarrier Offset(Kssb) */ uint16_t sib1PduLen; @@ -934,7 +920,7 @@ typedef struct schCellCfgCfm { uint16_t cellId; /* Cell Id */ SchMacRsp rsp; - SchFailureCause cause; + CauseOfResult cause; }SchCellCfgCfm; /*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.2.2 Cell Del Req*/ @@ -948,7 +934,7 @@ typedef struct schCellDeleteRsp { uint16_t cellId; SchMacRsp rsp; - SchFailureCause cause; + CauseOfResult cause; }SchCellDeleteRsp; /*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.2.3*/ @@ -976,7 +962,7 @@ typedef struct schSliceCfgRsp { Snssai snssai; SchMacRsp rsp; - RspCause cause; + CauseOfResult cause; }SchSliceCfgRsp; /*As per ORAN-WG8 V7.0.0 Sec 11.2.4.3.4 , Slice Cfg and Recfg are same structures*/ @@ -2037,7 +2023,7 @@ typedef struct schUeCfgRsp uint16_t ueId; uint16_t crnti; SchMacRsp rsp; - SchFailureCause cause; + CauseOfResult cause; }SchUeCfgRsp; /*As per WG8 V7.0.0 Sec 11.2.4.3.6, UE ReCFG and UECFG have same structure definition*/ @@ -2056,7 +2042,7 @@ typedef struct schUeDeleteRsp uint16_t cellId; uint16_t crnti; SchMacRsp rsp; - ErrorCause cause; + CauseOfResult cause; }SchUeDeleteRsp; /*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.8' DL HARQ Indication*/ @@ -2261,8 +2247,25 @@ typedef struct schRlsHqInfo SchUeHqInfo *ueHqInfo; }SchRlsHqInfo; +typedef struct schStatsInfo +{ + SchMeasurementType type; + uint16_t periodicity; /* In milliseconds */ +}SchStatsInfo; + +typedef struct schStatsReq +{ + uint8_t numStats; + SchStatsInfo statsList[MAX_NUM_STATS]; +}SchStatsReq; + +typedef struct schStatsRsp +{ + SchMacRsp rsp; + CauseOfResult cause; +}SchStatsRsp; + /* function declarations */ -uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason); uint8_t MacMessageRouter(Pst *pst, void *msg); uint8_t SchMessageRouter(Pst *pst, void *msg);