X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frlc_mac_inf.h;h=4a39a5b25b1526d88a18d2e984ca0d152dc15de6;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=1a61b7dc3b6cc9c4b1506c105f55f1ca9707d946;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git

diff --git a/src/cm/rlc_mac_inf.h b/src/cm/rlc_mac_inf.h
index 1a61b7dc3..4a39a5b25 100644
--- a/src/cm/rlc_mac_inf.h
+++ b/src/cm/rlc_mac_inf.h
@@ -34,55 +34,61 @@
 typedef struct rlcBoStatus
 {
    uint16_t   cellId;     /*!< CELL ID */
-   uint16_t   ueIdx;      /*!< UE ID */
-   bool       commCh;     /*!< Common or Dedicated Channel */
+   uint16_t   ueId;       /*!< UE ID */
    uint8_t    lcId;       /*!< Logical channel ID */
-   uint16_t   bo;         /*!< Buffer occupancy reported by RLC */
+   uint32_t   bo;         /*!< Buffer occupancy reported by RLC */
 }RlcBoStatus;
 
 /* Scheduled logical channel info */
 typedef struct rlcLcSchInfo
 {
-   bool      commCh;      /* Common or dedicated channel */
    uint8_t   lcId;        /*!< Logical channel ID */
-   uint16_t  bufSize;  /*!< Total buffer size in bytes scheduled by MAC */
+   uint32_t  bufSize;  /*!< Total buffer size in bytes scheduled by MAC */
 }RlcLcSchInfo;
 
 /* Schedule result report */
 typedef struct rlcSchedResultRpt
 {
-   //Slot info
+   SlotTimingInfo slotInfo;     /*!< Timing info */
    uint16_t       cellId;       /*!< CELL ID */
    uint16_t       rnti;         /*!< Temporary CRNTI */
    uint8_t        numLc;        /*!< Number of logical channels scheduled */
-   SlotIndInfo    slotInfo;     /*!< Timing info */
    RlcLcSchInfo   lcSch[MAX_NUM_LC];  /*!< Scheduled info of logical channels */
 }RlcSchedResultRpt;
 
 /* DL/UL data transfer */
 typedef struct rlcPduInfo
 {
-   bool       commCh;   /*!<Common or Dedicated Channel */
    uint8_t    lcId;     /*!< Logical channel ID */
    uint16_t   pduLen;   /*!< PDU Length */
    uint8_t    *pduBuf;  /*!< RLC PDU buffer */
 }RlcPduInfo;
  
-typedef struct rlcMacData
+typedef struct rlcDlData
 {
-   // add slot info
-   uint16_t     cellId;       /*!< CELL ID */
-   uint16_t     rnti;         /*!< Temporary CRNTI */
-   SlotIndInfo  slotInfo;     /*!< Timing info */
-   uint8_t      numPdu;       /*!< Number of RLC PDUs */
-   RlcPduInfo   pduInfo[MAX_NUM_PDU];
-}RlcData;
+   SlotTimingInfo slotInfo;     /*!< Timing info */
+   uint16_t       cellId;       /*!< CELL ID */
+   uint16_t       rnti;         /*!< Temporary CRNTI */
+   uint8_t        numPdu;       /*!< Number of RLC PDUs */
+   RlcPduInfo     pduInfo[MAX_NUM_PDU];
+   uint8_t        numLc;
+   RlcBoStatus    boStatus[MAX_NUM_LC];     /*!< Buffer occupancy */
+}RlcDlData;
+
+typedef struct rlcUlData
+{
+   SlotTimingInfo slotInfo;     /*!< Timing info */
+   uint16_t       cellId;       /*!< CELL ID */
+   uint16_t       rnti;         /*!< Temporary CRNTI */
+   uint8_t        numPdu;       /*!< Number of RLC PDUs */
+   RlcPduInfo     pduInfo[MAX_NUM_PDU];
+}RlcUlData;
 
 /* Function pointers */
 typedef uint8_t (*RlcMacBoStatusFunc)(Pst* pst, RlcBoStatus  *boStatus);
 typedef uint8_t (*RlcMacSchedResultRptFunc)(Pst *pst, RlcSchedResultRpt *schRpt);
-typedef uint8_t (*RlcMacDlDataFunc)(Pst* pst, RlcData *dlData);
-typedef uint8_t (*RlcMacUlDataFunc)(Pst* pst, RlcData *ulData);
+typedef uint8_t (*RlcMacDlDataFunc)(Pst* pst, RlcDlData *dlData);
+typedef uint8_t (*RlcMacUlDataFunc)(Pst* pst, RlcUlData *ulData);
 
 /* Function declarations */
 uint8_t packRlcBoStatus(Pst* pst, RlcBoStatus*  boStatus);
@@ -91,12 +97,12 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus);
 uint8_t packRlcSchedResultRpt(Pst* pst, RlcSchedResultRpt *schRpt);
 uint8_t unpackSchedResultRpt(RlcMacSchedResultRptFunc func, Pst *pst, Buffer *mBuf);
 uint8_t RlcProcSchedResultRpt(Pst *pst, RlcSchedResultRpt *schRpt);
-uint8_t packRlcDlData(Pst* pst, RlcData *datReq);
+uint8_t packRlcDlData(Pst* pst, RlcDlData *datReq);
 uint8_t unpackRlcDlData(RlcMacDlDataFunc func, Pst *pst, Buffer *mBuf);
-uint8_t MacProcRlcDlData(Pst* pst, RlcData *dlData);
-uint8_t packRlcUlData(Pst* pst, RlcData *ulData);
+uint8_t MacProcRlcDlData(Pst* pst, RlcDlData *dlData);
+uint8_t packRlcUlData(Pst* pst, RlcUlData *ulData);
 uint8_t unpackRlcUlData(RlcMacUlDataFunc func, Pst *pst, Buffer *mBuf);
-uint8_t RlcProcUlData(Pst* pst, RlcData *ulData);
+uint8_t RlcProcUlData(Pst* pst, RlcUlData *ulData);
 
 /**********************************************************************
           End of file