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

diff --git a/src/cm/rgu.x b/src/cm/rgu.x
index 0338cee5a..fa724ed96 100755
--- a/src/cm/rgu.x
+++ b/src/cm/rgu.x
@@ -259,7 +259,7 @@ typedef struct rguDDatIndInfo
    CmLteRnti    rnti;                /*!< UE ID */
    U8           numLch;              /*!< Number of logical channels within
                                        the UE that has data */
-   RguLchDatInd lchData[RGU_MAX_LC]; /*!< Data buffers of logical channels */
+   RguLchDatInd lchData[MAX_NUM_LC]; /*!< Data buffers of logical channels */
 #ifdef LTE_L2_MEAS
    U32          ttiCnt;              /*!< The Current TTI in the Cell */
    U8           burstInd;            /*!< Indicates the Burst Start or End */
@@ -397,51 +397,6 @@ typedef struct rguInfoRingElem
   Void         *msg;
 }RguInfoRingElem;
 
-/* Buffer occupancy status information */
-typedef struct rlcMacBOStatus
-{
-   CmLteCellId  cellId;     /*!< CELL ID */
-   CmLteRnti    rnti;       /*!< UE ID */
-   Bool         commCh;     /*!< Common or Dedicated Channel */
-   CmLteLcId    lcId;       /*!< Logical channel ID */
-   S32          bo;         /*!< Buffer occupancy reported by RLC */
-}RlcMacBOStatus;
-
-/* Schedule result report from RLC to MAC */
-typedef struct rlcMacLchSta
-{
-   Bool         commCh;     /*!<Common or Dedicated Channel */
-   RguLchStaInd lchStaInd;  /*!<Buffer size allocated for logical channel */
-}RlcMacLchSta;
-
-typedef struct rlcMacSchedRep
-{
-   CmLteTimingInfo timeToTx;  /*!< Air interface time */
-   CmLteCellId  cellId;       /*!< CELL ID */
-   CmLteRnti    rnti;         /*!< Temporary CRNTI */
-   U8           nmbLch;       /*!< Number of logical channels scheduled */
-   RlcMacLchSta lchSta[RGU_MAX_LC];  /*!< Scheduled info of logical channels */
-}RlcMacSchedRepInfo;
-
-/* UL Data i.e. RLC PDU info from RLC to MAC */
-typedef struct rlcMacPduInfo
-{
-   Bool         commCh;   /*!<Common or Dedicated Channel */
-   CmLteLcId    lcId;     /*!< Logical channel ID */
-   MsgLen       pduLen;   /*!< PDU Length */
-   Buffer       *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 */
-   RlcMacPduInfo   pduInfo[RGU_MAX_PDU];
-}RlcMacData;
-
-
 /***********************************************************************
           type definitions for upper layer interface - RLC primitives
  ***********************************************************************/
@@ -474,10 +429,6 @@ typedef S16 (*RguDDatReq) ARGS((
    SpId                 spId,
    RguDDatReqInfo       *datReq));
 
-typedef uint16_t (*RlcMacDlData) ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacData           *dlData));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels */
 typedef S16 (*RguCDatInd) ARGS((
@@ -491,10 +442,6 @@ typedef S16 (*RguDDatInd) ARGS((
    SuId                 suId,
    RguDDatIndInfo       *datInd));
 
-typedef S16 (*RlcMacUlData) ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacData           *ulData));
 /** @brief Status Response from RLC to MAC to 
  * inform the BO report for common channels */
 typedef S16 (*RguCStaRsp) ARGS((
@@ -508,11 +455,6 @@ typedef S16 (*RguDStaRsp) ARGS((
    SpId                 spId,
    RguDStaRspInfo  *    staRsp));
 
-typedef uint16_t (*RlcMacBoStatus) ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacBOStatus       *boStatus));
-
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC */
 typedef S16 (*RguCStaInd) ARGS((
@@ -526,11 +468,6 @@ typedef S16 (*RguDStaInd) ARGS((
    SuId                 suId,
    RguDStaIndInfo *    staInd));
 
-typedef uint16_t (*RlcMacSchedRep) ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacSchedRepInfo       *schRep));
-
 typedef S16 (*RguFlowCntrlIndInfo) ARGS((
    Pst                  *pst,
    SuId                 suId,
@@ -594,8 +531,6 @@ EXTERN S16 RgUiRguCDatReq ARGS((Pst* pst,SpId spId,RguCDatReqInfo *datReq));
 */
 EXTERN S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo  *datReq));
 
-EXTERN uint16_t MacRlcProcDlData(Pst* pst, SpId spId, RlcMacData *dlData);
-
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels
  * @param pst Pointer to the post structure.
@@ -629,8 +564,6 @@ EXTERN S16 RgUiRguCStaRsp ARGS((Pst* pst,SpId spId,RguCStaRspInfo  *staRsp));
 */
 EXTERN S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo  *staRsp));
 
-EXTERN uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus);
-
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * @param pst Pointer to the post structure.
@@ -672,108 +605,45 @@ 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
 ));
-/** @brief Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission */
-EXTERN S16 RlcMacSendDlData ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacData  *    datReq
-));
-
-/** @brief Handler toprocess UL data from MAC and
- * forwarding to appropriate common/dedicated
- * channel's handler */
-EXTERN S16 RlcMacProcUlData 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((
-   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((
-   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
 ));
-/** @brief Primitive invoked from RLC to MAC to 
- * inform the BO report for dedicated channels*/
-EXTERN S16 RlcMacSendBOStatus ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacBOStatus*      boSta
-));
-
-/**@brief Primitive invoked from MAC to RLC to
- * inform scheduling result for logical channels */
-EXTERN uint16_t RlcMacProcSchedRep ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacSchedRepInfo       *schRep
-));
-/** @brief Status Indication from MAC to RLC  
- * 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((
-   Pst*                 pst,
-   SuId                 suId,
-   RguCStaIndInfo  *    staInd
-));
-/** @brief Status Indication from MAC to RLC  
- * 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((
-   Pst*                 pst,
-   SuId                 suId,
-   RguDStaIndInfo  *    staInd
-));
 
 #ifdef LTE_L2_MEAS
 /** @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 +652,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 +660,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
@@ -850,20 +720,7 @@ EXTERN S16 cmUnpkRguCDatReq ARGS((
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission */
-EXTERN uint16_t packDlData ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacData      *    datReq
-));
-/** @brief Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission */
-EXTERN S16 unpackDlData ARGS((
-   RlcMacDlData         func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
 EXTERN S16 cmPkRguCDatInd ARGS((
@@ -878,20 +735,7 @@ EXTERN S16 cmUnpkRguCDatInd ARGS((
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Data Indication from MAC to RLC to 
- * forward the data received for dedicated channels*/
-EXTERN S16 packRcvdUlData 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,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 /** @brief Primitive invoked from RLC to MAC to 
  * inform the BO report for common channels*/
 EXTERN S16 cmPkRguCStaRsp ARGS((
@@ -906,20 +750,7 @@ EXTERN S16 cmUnpkRguCStaRsp ARGS((
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Primitive invoked from RLC to MAC to 
- * inform the BO report for dedicated channels*/
-EXTERN uint16_t packBOStatus ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacBOStatus*      boStatus
-));
-/** @brief Primitive invoked from RLC to MAC to 
- * inform the BO report for dedicated channels*/
-EXTERN uint16_t unpackBOStatus ARGS((
-   RlcMacBoStatus       func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * Informs RLC of the totalBufferSize and Timing Info 
@@ -938,15 +769,7 @@ EXTERN S16 cmUnpkRguCStaInd ARGS((
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Status Indication from MAC to RLC  
- * 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 packSchedRep ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacSchedRepInfo   *staInd
-));
+
 EXTERN S16 cmPkRguFlowCntrlInfo ARGS((
 RguFlowCntrlInd *param, 
 Buffer           *mBuf
@@ -971,15 +794,7 @@ EXTERN S16 cmUnpkRguFlowCntrlInfo ARGS((
 RguFlowCntrlInd *param, 
 Buffer           *mBuf
 ));
-/** @brief Status Indication from MAC to RLC  
- * 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 unpackSchedRep ARGS((
-   RlcMacSchedRep       func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 EXTERN S16 cmPkRguPduInfo ARGS((
    RguPduInfo           *param,
    Buffer               *mBuf
@@ -1072,14 +887,6 @@ EXTERN S16 cmUnpkRguLchDatInd ARGS((
    RguLchDatInd         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 packRlcMacDataInfo ARGS((
-   RlcMacData         *param,
-   Buffer               *mBuf
-));
-EXTERN S16 unpackRlcMacDataInfo ARGS((
-   RlcMacData       *param,
-   Buffer               *mBuf
-));
 
 EXTERN S16 cmPkRguCStaRspInfo ARGS((
    RguCStaRspInfo       *param,
@@ -1089,14 +896,7 @@ EXTERN S16 cmUnpkRguCStaRspInfo ARGS((
    RguCStaRspInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 packBOStatusInfo ARGS((
-   RlcMacBOStatus       *param,
-   Buffer               *mBuf
-));
-EXTERN S16 unpackBOStatusInfo ARGS((
-   RlcMacBOStatus       *param,
-   Buffer               *mBuf
-));
+
 EXTERN S16 cmPkRguCStaIndInfo ARGS((
    RguCStaIndInfo       *param,
    Buffer               *mBuf
@@ -1113,15 +913,7 @@ EXTERN S16 cmUnpkRguLchStaInd ARGS((
    RguLchStaInd         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 packSchedRepInfo ARGS((
-   RlcMacSchedRepInfo   *param,
-   Buffer               *mBuf
-));
-EXTERN S16 unpackSchedRepInfo ARGS((
-   RlcMacSchedRepInfo   *param,
-   Buffer               *mBuf
-));
-  
+
 /*rgu_x_001.main_3 - ADD - L2M  & R9 Support */
 #ifdef LTE_L2_MEAS
 /** @brief Request from MAC to RLC for forwarding HARQ Status */