X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fcm%2Frgu.x;h=f43567d28780608921c8210200f219b0941e6fb7;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=0338cee5ae8bf9b985ac5b4543593b34a615e986;hpb=fe3e15254e67fd96dbfabec4bf7245c3b64ee415;p=o-du%2Fl2.git

diff --git a/src/cm/rgu.x b/src/cm/rgu.x
index 0338cee5a..f43567d28 100755
--- a/src/cm/rgu.x
+++ b/src/cm/rgu.x
@@ -429,15 +429,15 @@ typedef struct rlcMacPduInfo
    Bool         commCh;   /*!<Common or Dedicated Channel */
    CmLteLcId    lcId;     /*!< Logical channel ID */
    MsgLen       pduLen;   /*!< PDU Length */
-   Buffer       *pduBuf;  /*!< RLC PDU buffer */
+   uint8_t      *pduBuf;  /*!< RLC PDU buffer */
 }RlcMacPduInfo;
 
 typedef struct rlcMacData
 {  
-   CmLteTimingInfo timeToTx;  /*!< Air interface time */
    CmLteCellId     cellId;       /*!< CELL ID */
    CmLteRnti       rnti;         /*!< Temporary CRNTI */ 
-   U8              nmbPdu;       /*!< Number of RLC PDUs */
+   SlotIndInfo     slotInfo;     /*!< Timing info */
+   U8              numPdu;       /*!< Number of RLC PDUs */
    RlcMacPduInfo   pduInfo[RGU_MAX_PDU];
 }RlcMacData;
 
@@ -491,9 +491,8 @@ typedef S16 (*RguDDatInd) ARGS((
    SuId                 suId,
    RguDDatIndInfo       *datInd));
 
-typedef S16 (*RlcMacUlData) ARGS((
+typedef uint8_t (*RlcMacUlDataFunc) ARGS((
    Pst*                 pst,
-   SuId                 suId,
    RlcMacData           *ulData));
 /** @brief Status Response from RLC to MAC to 
  * inform the BO report for common channels */
@@ -672,27 +671,27 @@ RguL2MUlThrpMeasReqInfo  *l2mUlThrpMeasReq));
 
 #ifdef KW
 /** @brief Request from RLC to MAC to bind the interface saps */
-EXTERN S16 KwLiRguBndReq ARGS((
+EXTERN S16 RlcLiRguBndReq ARGS((
    Pst*                 pst,
    SuId                 suId,
    SpId                 spId
 ));
 /** @brief Request from RLC to MAC to Unbind the interface saps */
-EXTERN S16 KwLiRguUbndReq ARGS((
+EXTERN S16 RlcLiRguUbndReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    Reason               reason
 ));
 /** @brief Confirmation from MAC to RLC for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 KwLiRguBndCfm ARGS((
+EXTERN S16 RlcLiRguBndCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
    U8                   status
 ));
 /** @brief Request from RLC to MAC for forwarding SDUs on common
  * channel for transmission */
-EXTERN S16 KwLiRguCDatReq ARGS((
+EXTERN S16 RlcLiRguCDatReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguCDatReqInfo  *    datReq
@@ -708,29 +707,28 @@ EXTERN S16 RlcMacSendDlData ARGS((
 /** @brief Handler toprocess UL data from MAC and
  * forwarding to appropriate common/dedicated
  * channel's handler */
-EXTERN S16 RlcMacProcUlData ARGS((
+EXTERN uint8_t RlcProcUlData ARGS((
    Pst*           pst,
-   SuId           suId,
    RlcMacData   *ulData
 ));
 
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
-EXTERN S16 KwLiRguCDatInd ARGS((
+EXTERN S16 RlcLiRguCDatInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguCDatIndInfo  *    datInd
 ));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels*/
-EXTERN S16 KwLiRguDDatInd ARGS((
+EXTERN S16 RlcLiRguDDatInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguDDatIndInfo  *    datInd
 ));
 /** @brief Primitive invoked from RLC to MAC to 
  * inform the BO report for common channels*/
-EXTERN S16 KwLiRguCStaRsp ARGS((
+EXTERN S16 RlcLiRguCStaRsp ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguCStaRspInfo  *    staRsp
@@ -754,7 +752,7 @@ EXTERN uint16_t RlcMacProcSchedRep ARGS((
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on common channels. */
-EXTERN S16 KwLiRguCStaInd ARGS((
+EXTERN S16 RlcLiRguCStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguCStaIndInfo  *    staInd
@@ -763,7 +761,7 @@ EXTERN S16 KwLiRguCStaInd ARGS((
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
  * for the transmission on dedicated channels. */
-EXTERN S16 KwLiRguDStaInd ARGS((
+EXTERN S16 RlcLiRguDStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguDStaIndInfo  *    staInd
@@ -773,7 +771,7 @@ EXTERN S16 KwLiRguDStaInd ARGS((
 /** @brief HARQ Status Indication from MAC to RLC  
  * as a response to the Data Req from RLC.
  * Informs HARQ feedback for the PDU with sn. */
-EXTERN S16 KwLiRguHqStaInd ARGS((
+EXTERN S16 RlcLiRguHqStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguHarqStatusInd     *harqStatusInd));
@@ -782,7 +780,7 @@ EXTERN S16 KwLiRguHqStaInd ARGS((
 /** @brief Request for measuring the timing Info for a LC from RLC to MAC  
  * When the status is ON then Timing Info for data bursts 
  * shall be captured and provided to RLC on DDatInd. */
-EXTERN S16 KwLiRguL2MUlThrpMeasReq ARGS((
+EXTERN S16 RlcLiRguL2MUlThrpMeasReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq));
@@ -790,7 +788,7 @@ EXTERN S16 KwLiRguL2MUlThrpMeasReq ARGS((
 #endif /* LTE_L2_MEAS */
 
 /** @brief flowCntrl Indication from MAC to RLC  */
-EXTERN S16 KwLiRguFlowCntrlInd ARGS((
+EXTERN S16 RlcLiRguFlowCntrlInd ARGS((
 Pst              *pst, 
 SuId             suId, 
 RguFlowCntrlInd  *flowCntrlInd
@@ -880,15 +878,14 @@ EXTERN S16 cmUnpkRguCDatInd ARGS((
 ));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels*/
-EXTERN S16 packRcvdUlData ARGS((
+EXTERN uint8_t packRlcUlData ARGS((
    Pst*                 pst,
-   SuId                 suId,
    RlcMacData  *    ulData
 ));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels*/
-EXTERN S16 unpackRcvdUlData ARGS((
-   RlcMacUlData         func,
+EXTERN uint8_t unpackRcvdUlData ARGS((
+   RlcMacUlDataFunc     func,
    Pst*                 pst,
    Buffer               *mBuf
 ));