[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-420] GNB-DU Configuration Query and response

[o-du/l2.git] / src / cm / du_app_rlc_inf.h

diff --git a/src/cm/du_app_rlc_inf.h b/src/cm/du_app_rlc_inf.h
index 519862d..5dd9f6c 100644 (file)
--- a/src/cm/du_app_rlc_inf.h
+++ b/src/cm/du_app_rlc_inf.h
@@ -38,9 +38,6 @@
 #define RB_ID_SRB 0
 #define RB_ID_DRB 1
 
-#define RB_TYPE_SRB 0        /* Signalling Radio Bearer */
-#define RB_TYPE_DRB 1        /* Data Radio Bearer */
-
 /* RLC Direction Config */
 #define RLC_CFG_DIR_UL        1     /*!< Uplink direction */
 #define RLC_CFG_DIR_DL        2     /*!< Downlink direction */
@@ -54,6 +51,12 @@
 #define LCH_DTCH      4      /*!< DTCH Logical Channel */
 #define LCH_DCCH      5      /*!< DCCH Logical Channel */
 
+typedef enum
+{
+   RB_TYPE_SRB,      /* Signalling Radio Bearer */
+   RB_TYPE_DRB       /* Data Radio Bearer */
+}RlcRbType;  
+
 typedef enum
 {
    TRANSMISSION_IN_PROGRESS,
@@ -180,7 +183,7 @@ typedef struct rlcBearerCfg
 {
    ConfigType   configType;
    uint8_t      rbId;
-   uint8_t      rbType;
+   RlcRbType    rbType;
    uint8_t      lcId;
    uint8_t      lcType;
    Snssai       *snssai; 
@@ -197,7 +200,7 @@ typedef struct rlcBearerCfg
 typedef struct rlcUeCfg
 {
    uint16_t     cellId;
-   uint8_t      ueIdx;
+   uint8_t      ueId;
    uint8_t      numLcs;
    RlcBearerCfg rlcLcCfg[MAX_NUM_LC];
    UeCfgState rlcUeCfgState; /* InActive / Completed */
@@ -206,7 +209,7 @@ typedef struct rlcUeCfg
 typedef struct rlcUeCfgRsp
 {
    uint16_t       cellId;
-   uint16_t       ueIdx;
+   uint16_t       ueId;
    RlcRsp         result;
    FailureReason  reason;
 }RlcUeCfgRsp;
@@ -228,7 +231,7 @@ typedef struct rlcUeDeleteRsp
 typedef struct ulRrcMsgInfo
 {
    uint16_t   cellId;       /* Cell Id */
-   uint16_t   ueIdx;        /* UE Index */
+   uint16_t   ueId;         /* UE Id */
    uint8_t    lcId;         /* Logical channel Id */
    uint16_t   msgLen;       /* RRC message length (in bytes) */
    uint8_t    *rrcMsg;      /* RRC Message (UL-DCCH Message) */
@@ -238,7 +241,7 @@ typedef struct ulRrcMsgInfo
 typedef struct ulUserDatInfo
 {
    uint16_t   cellId;       /* Cell Id */
-   uint16_t   ueIdx;        /* UE Index */
+   uint16_t   ueId;         /* UE Id */
    uint8_t    rbId;
    uint16_t   msgLen;       /* User data length (in bytes) */
    uint8_t    *userData;    /* User data (UL-DTCH Message) */
@@ -248,8 +251,8 @@ typedef struct ulUserDatInfo
 typedef struct dlRrcMsgInfo
 {
    uint16_t   cellId;         /* Cell Id */
-   uint16_t   ueIdx;          /* UE index */
-   uint8_t    rbType;         /* Radio Bearer Type */
+   uint16_t   ueId;           /* UE Id */
+   RlcRbType  rbType;         /* Radio Bearer Type */
    uint8_t    rbId;           /* Radio Bearer Id */
    uint8_t    lcType;         /* Logical channel type */
    uint8_t    lcId;           /* Logical channel Id */
@@ -274,10 +277,16 @@ typedef struct rrcDeliveryStatus
    uint16_t  triggeringMessage;
 }RrcDeliveryStatus;
 
+typedef struct
+{
+  uint32_t sd:24;
+  uint8_t sst;
+}SliceIdentifier;
+
 /*Pm Metric for NW Slicing from RLC to DUAPP*/
 typedef struct slicePm
 {
-  uint32_t networkSliceIdentifier;
+  SliceIdentifier networkSliceIdentifier;
   double ThpDl;
   double ThpUl;
 }SlicePm;
@@ -291,7 +300,7 @@ typedef struct slicePmList
 typedef struct rrcDeliveryReportInfo
 {
    uint16_t  cellId;
-   uint16_t  ueIdx;
+   uint16_t  ueId;
    uint8_t   srbId;
    RrcDeliveryStatus  rrcDeliveryStatus;
 }RrcDeliveryReport;
@@ -300,7 +309,7 @@ typedef struct rrcDeliveryReportInfo
 typedef struct dlDataMsgInfo
 {
    uint16_t   cellId;         /* Cell Id */
-   uint16_t   ueIdx;          /* UE index */
+   uint16_t   ueId;           /* UE Id */
    uint8_t    rbId;           /* Radio Bearer Id */
    uint16_t   msgLen;         /* Message length */
    Buffer     *dlMsg;         /* DL Data */