X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgu.x;h=154087a6b0cf4d6b968e5241b47c597ed80071d8;hb=73da3ffdd36c5ade0c1cccbe7d2ad4d457897b2f;hp=d7eb2f067224c19c02ac74244927837b0fc051f2;hpb=d10b52519198632f93deae9574adc69c7ce12efa;p=o-du%2Fl2.git

diff --git a/src/cm/rgu.x b/src/cm/rgu.x
index d7eb2f067..154087a6b 100755
--- a/src/cm/rgu.x
+++ b/src/cm/rgu.x
@@ -49,7 +49,7 @@ extern "C" {
  */
 typedef struct rguPduInfo
 {
-   U8     numPdu;                 /*!< Number of PDUs */ 
+   uint8_t     numPdu;                 /*!< Number of PDUs */ 
    Buffer *mBuf[RGU_MAX_PDU];     /*!< numPdu data buffers */
 } RguPduInfo;
 
@@ -61,13 +61,13 @@ typedef struct rguDBoReport
 {
    S32  bo;                /*!< Buffer occupancy reported by RLC */
 #ifdef CCPU_OPT
-   U16  estRlcHdrSz;       /*!< Estimated RLC header size */
+   uint16_t  estRlcHdrSz;       /*!< Estimated RLC header size */
    Bool staPduPrsnt;       /*!< Indicates whether the BO includes
                                 a status PDU as well */
 #endif
-   U32  staPduBo;          /*!< Indicates the Status PDU BO. 
+   uint32_t  staPduBo;          /*!< Indicates the Status PDU BO. 
                                 This is included in bo */
-   U32  oldestSduArrTime;
+   uint32_t  oldestSduArrTime;
 } RguDBoReport;
 
 /**
@@ -78,9 +78,9 @@ typedef struct rguCDatReqInfo
    CmLteCellId     cellId;          /*!< CELL ID */
    CmLteLcId       lcId;            /*!< Logical channel ID */
    CmLteLcType     lcType;          /*!< Logical channel Type */
-   U32             transId;         /*!< Transaction ID */
+   uint32_t             transId;         /*!< Transaction ID */
 #ifdef EMTC_ENABLE
-   U8              pnb;            /*Paging narrowBand on which UE performs Paging*/
+   uint8_t              pnb;            /*Paging narrowBand on which UE performs Paging*/
 #endif
    union{
    CmLteTimingInfo timeToTx;        /*!< Actual time when PHY transmits
@@ -111,15 +111,15 @@ typedef struct rguLchDatReq
 typedef struct rguLchmapInfo
 {
    CmLteLcId lChId;                  /*!< Logical channel Id */
-   U16       snList[RGU_MAX_LC];     /*!< Set of sequence numbers */
+   uint16_t       snList[RGU_MAX_LC];     /*!< Set of sequence numbers */
 }RguLchMapInfo;
 /**
  * @brief Sequence Number mapping info per TB 
  * */
 typedef struct rguSnMapInfo
 {
-   U32            tbId;               /*!< TB id for which sn info map */
-   U8             numLch;             /*!< Number of Ded Logical Channels */
+   uint32_t            tbId;               /*!< TB id for which sn info map */
+   uint8_t             numLch;             /*!< Number of Ded Logical Channels */
    RguLchMapInfo  lchMap[RGU_MAX_LC]; /*!< LC to SN Mapping Info*/
 } RguSnMapInfo;
 
@@ -130,11 +130,11 @@ typedef struct rguHarqStatusInd
 {
    CmLteCellId   cellId;                    /*!< Cell Id*/
    CmLteRnti     ueId;                      /*!< ue Id*/
-   U8            numTbs;                    /*!< Number of Tbs present */
+   uint8_t            numTbs;                    /*!< Number of Tbs present */
  
-   U32           tbId[RGU_MAX_TB];          /*!< tbId provided by RLC in
+   uint32_t           tbId[RGU_MAX_TB];          /*!< tbId provided by RLC in
                                                  DatReq  */                                                                                 
-   U16           status[RGU_MAX_TB];        /*!< Status back to RLC ACK/NACK*/
+   uint16_t           status[RGU_MAX_TB];        /*!< Status back to RLC ACK/NACK*/
 } RguHarqStatusInd;
 
 /*
@@ -154,8 +154,8 @@ typedef struct rguL2MUlThrpMeasReqInfo
 {
    CmLteCellId   cellId;                    /*!< Cell Id*/
    CmLteRnti     rnti;                      /*!< UE Id*/
-   U8            numLcId;                   /*!< Number of LC Ids configured */
-   U8            lcId[RGU_MAX_LC];          /*!< LC ID indices that are 
+   uint8_t            numLcId;                   /*!< Number of LC Ids configured */
+   uint8_t            lcId[RGU_MAX_LC];          /*!< LC ID indices that are 
                                               configured */
    Bool          enbMeas;                   /*!< Indication to enable/disable 
                                                measurement for the LC ID*/
@@ -167,13 +167,13 @@ typedef struct rguL2MUlThrpMeasReqInfo
  */
 typedef struct rguDatReqTb
 {
-   U8           nmbLch;              /*!< Number of logical channels of a UE 
+   uint8_t           nmbLch;              /*!< Number of logical channels of a UE 
                                           that have data for this TB */
    RguLchDatReq lchData[RGU_MAX_LC]; /*!< Data Buffers and BO of  
                                           logical channels for this TB */
 /* rgu_x_001.main_3 - ADD - L2M Support */
 #ifdef LTE_L2_MEAS
-   U32          tbId;                /*!< RLC's internal tbId maintained
+   uint32_t          tbId;                /*!< RLC's internal tbId maintained
                                           per UE */  
 #endif /* LTE_L2_MEAS */
 }RguDatReqTb;
@@ -184,8 +184,8 @@ typedef struct rguDatReqTb
 typedef struct rguDDatReqPerUe
 {
    CmLteRnti     rnti;         /*!< UE ID */
-   U32           transId;      /*!< Transaction ID */
-   U8            nmbOfTbs;     /*!< Number of TBs. Relevant for MIMO */
+   uint32_t           transId;      /*!< Transaction ID */
+   uint8_t            nmbOfTbs;     /*!< Number of TBs. Relevant for MIMO */
    RguDatReqTb   datReqTb[2];  /*!< DatReq info for MAX 2 TBs */ 
 } RguDDatReqPerUe;
 
@@ -195,7 +195,7 @@ typedef struct rguDDatReqPerUe
 typedef struct rguDDatReqInfo
 {
    CmLteCellId        cellId;                        /*!< CELL ID */
-   U8                 nmbOfUeGrantPerTti;                 /*!< Number of TBs. Relevant for MIMO */
+   uint8_t                 nmbOfUeGrantPerTti;                 /*!< Number of TBs. Relevant for MIMO */
    RguDDatReqPerUe    datReq[RGU_MAX_NUM_UE_PER_TTI];    /*!< Pointer to DatReq for MAX UEs configured Per TTI */ 
 } RguDDatReqInfo;
 
@@ -235,7 +235,7 @@ typedef enum rguL2MUlThrpSegInd
  */
 typedef struct rgL2MeasUlThrpTimInfo 
 {
-   U32                 thrpTimeUl;      /*!< Difference in Timing values T1, T2 */
+   uint32_t                 thrpTimeUl;      /*!< Difference in Timing values T1, T2 */
    RguL2MUlThrpSegInd  firstLastSegInd;         /*!< Indication of Data Burst */
 }RgL2MeasUlThrpTimInfo;
 
@@ -257,12 +257,12 @@ typedef struct rguDDatIndInfo
 {
    CmLteCellId  cellId;              /*!< CELL ID */
    CmLteRnti    rnti;                /*!< UE ID */
-   U8           numLch;              /*!< Number of logical channels within
+   uint8_t           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 */
+   uint32_t          ttiCnt;              /*!< The Current TTI in the Cell */
+   uint8_t           burstInd;            /*!< Indicates the Burst Start or End */
 #endif
 } RguDDatIndInfo;
 
@@ -276,8 +276,8 @@ typedef struct rguCStaRspInfo
    CmLteLcType  lcType;         /*!< Logical channel type */
    S32 bo;                      /*!< Buffer occupancy reported by RLC */
 #ifdef EMTC_ENABLE
-   U8          emtcDiReason;   /*!< Reason for DI message to send. */
-   U8          pnb;            /*paging narrowBand on which UE will perform paging*/
+   uint8_t          emtcDiReason;   /*!< Reason for DI message to send. */
+   uint8_t          pnb;            /*paging narrowBand on which UE will perform paging*/
 #endif
    union                        /*!< lcType in the primitive is 
                                      the union selector */
@@ -307,7 +307,7 @@ typedef struct rguCStaIndInfo
 {
    CmLteCellId cellId;       /*!< CELL ID */
    CmLteLcId   lcId;         /*!< Logical channel ID */
-   U32         transId;      /*!< Transaction ID */
+   uint32_t         transId;      /*!< Transaction ID */
    CmLteRnti   rnti;         /*!< Temporary CRNTI */
 #ifdef EMTC_ENABLE
    Bool                isEmtcPaging;      /*!< To Identify whether Paging is EMTC or Lagecy */
@@ -330,13 +330,13 @@ typedef struct rguLchStaInd
  */
 typedef struct rguStaIndTb
 {
-   U8           nmbLch;               /*!< Number of logical channels scheduled
+   uint8_t           nmbLch;               /*!< Number of logical channels scheduled
                                            for this TB */
    RguLchStaInd lchStaInd[RGU_MAX_LC];/*!< Buffer size allocated for scheduled 
                                            logical channels for this TB */
 #ifdef LTE_L2_MEAS
-   U32          tbId;                /*!< RLC internal TB id */                                           
-   U16          status;              /*!< Status back to RLC ACK/NACK/RGU_NACK_LOSS */
+   uint32_t          tbId;                /*!< RLC internal TB id */                                           
+   uint16_t          status;              /*!< Status back to RLC ACK/NACK/RGU_NACK_LOSS */
 #endif
 }RguStaIndTb;
 /**
@@ -345,8 +345,8 @@ typedef struct rguStaIndTb
 typedef struct rguDStaIndPerUe
 {
    CmLteRnti     rnti;        /*!< UE ID */
-   U32           transId;     /*!< Transaction ID */
-   U8            nmbOfTbs;    /*!< Number of TBs. Relevant for MIMO */
+   uint32_t           transId;     /*!< Transaction ID */
+   uint8_t            nmbOfTbs;    /*!< Number of TBs. Relevant for MIMO */
    RguStaIndTb   staIndTb[2]; /*!< StaInd info for MAX 2 TBs */
    Bool          fillCtrlPdu; /*!< Flag to fill RLC control PDU */
 } RguDStaIndPerUe;
@@ -357,7 +357,7 @@ typedef struct rguDStaIndPerUe
 typedef struct rguDStaIndInfo
 {
    CmLteCellId      cellId;                       /*!< CELL ID */
-   U8               nmbOfUeGrantPerTti;                /*!< Number of TBs. Relevant for MIMO */
+   uint8_t               nmbOfUeGrantPerTti;                /*!< Number of TBs. Relevant for MIMO */
    RguDStaIndPerUe  staInd[RGU_MAX_NUM_UE_PER_TTI];   /*!< StaInd info for MAX number of UEs per TTI */
 } RguDStaIndInfo;
 
@@ -367,8 +367,8 @@ typedef struct rguDStaIndInfo
 typedef struct rguLcFlowCntrlInfo
 {
   CmLteLcId   lcId; 
-  U32         pktAdmitCnt; 
-  U32         maxBo4FlowCtrl; /*!< MAX BO of Queued SDUs at RLC beyond which Flow is Controlled */
+  uint32_t         pktAdmitCnt; 
+  uint32_t         maxBo4FlowCtrl; /*!< MAX BO of Queued SDUs at RLC beyond which Flow is Controlled */
 }RguLcFlowCntrlInfo;
 
 /**
@@ -377,7 +377,7 @@ typedef struct rguLcFlowCntrlInfo
 typedef struct rguUeFlowCntrlInfo 
 {
   CmLteRnti            ueId;
-  U32                  numLcs;
+  uint32_t                  numLcs;
   RguLcFlowCntrlInfo   lcInfo[RGU_MAX_LC];
 }RguUeFlowCntrlInfo;  
 
@@ -387,61 +387,16 @@ typedef struct rguUeFlowCntrlInfo
 typedef struct rguFlowCntrlInd
 {
    CmLteCellId         cellId;                       /*!< CELL ID */
-   U32                 numUes;
+   uint32_t                 numUes;
    RguUeFlowCntrlInfo  ueFlowCntrlInfo[RGU_MAX_NUM_UE_PER_TTI];
 }RguFlowCntrlInd;  
 typedef struct rguInfoRingElem 
 {
   SpId         spId;
-  U8           event;
+  uint8_t           event;
   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 */
-}RlcMacSchedRep;
-
-/* 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
  ***********************************************************************/
@@ -460,7 +415,7 @@ typedef S16 (*RguUbndReq) ARGS((
 typedef S16 (*RguBndCfm) ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status));
+   uint8_t                   status));
 /** @brief Data Request from RLC to MAC for forwarding SDUs on common
  * channel for transmission */
 typedef S16 (*RguCDatReq) ARGS((
@@ -472,7 +427,8 @@ typedef S16 (*RguCDatReq) ARGS((
 typedef S16 (*RguDDatReq) ARGS((
    Pst*                 pst,
    SpId                 spId,
-   RguDDatReqInfo  *    datReq));
+   RguDDatReqInfo       *datReq));
+
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels */
 typedef S16 (*RguCDatInd) ARGS((
@@ -484,7 +440,8 @@ typedef S16 (*RguCDatInd) ARGS((
 typedef S16 (*RguDDatInd) ARGS((
    Pst*                 pst,
    SuId                 suId,
-   RguDDatIndInfo  *    datInd));
+   RguDDatIndInfo       *datInd));
+
 /** @brief Status Response from RLC to MAC to 
  * inform the BO report for common channels */
 typedef S16 (*RguCStaRsp) ARGS((
@@ -497,6 +454,7 @@ typedef S16 (*RguDStaRsp) ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguDStaRspInfo  *    staRsp));
+
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC */
 typedef S16 (*RguCStaInd) ARGS((
@@ -508,7 +466,7 @@ typedef S16 (*RguCStaInd) ARGS((
 typedef S16 (*RguDStaInd) ARGS((
    Pst*                 pst,
    SuId                 suId,
-   RguDStaIndInfo  *    staInd));
+   RguDStaIndInfo *    staInd));
 
 typedef S16 (*RguFlowCntrlIndInfo) ARGS((
    Pst                  *pst,
@@ -540,14 +498,14 @@ typedef S16 (*RguL2MUlThrpMeasReq) ARGS((
  * @param spId SAP ID of the service provider.
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguBndReq ARGS((Pst* pst,SuId suId,SpId spId));
+S16 RgUiRguBndReq ARGS((Pst* pst,SuId suId,SpId spId));
 /** @brief Unbind Request from RLC to MAC to unbind the interface SAPs 
  * @param pst Pointer to the post structure.
  * @param spId SAP ID of the service provider.
  * @param reason Reason for unbind request.
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason));
+S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason));
 /** @brief Bind Confirmation from MAC to RLC for the bind and unbind 
  * request for the interface SAPs 
  * @param pst Pointer to the post structure.
@@ -555,23 +513,8 @@ EXTERN S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason));
  * @param status Status of the bind request. 
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguBndCfm ARGS((Pst* pst,SuId suId,U8 status));
-/** @brief Data Request from RLC to MAC for forwarding SDUs on common
- * channel for transmission 
- * @param pst Pointer to the post structure.
- * @param spId SAP ID of the service provider.
- * @param datReq Data request for common channels (BCCH, PCCH and CCCH).
- * @return ROK/RFAILED
-*/
-EXTERN S16 RgUiRguCDatReq ARGS((Pst* pst,SpId spId,RguCDatReqInfo *datReq));
-/** @brief Data Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission 
- * @param pst Pointer to the post structure.
- * @param spId SAP ID of the service provider.
- * @param datReq Data request for dedicated channels (DCCH and DTCH).
- * @return ROK/RFAILED
-*/
-EXTERN S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo  *datReq));
+S16 RgUiRguBndCfm ARGS((Pst* pst,SuId suId,uint8_t status));
+
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels
  * @param pst Pointer to the post structure.
@@ -579,7 +522,7 @@ EXTERN S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo  *datReq));
  * @param datInd Data indication on CCCH.
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo  *datInd));
+S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo  *datInd));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for dedicated channels
  * @param pst Pointer to the post structure.
@@ -587,23 +530,8 @@ EXTERN S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo  *datInd));
  * @param datInd Data indication on dedicated channels (DCCH and DTCH).
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguDDatInd ARGS((Pst* pst,SuId suId,RguDDatIndInfo  *datInd));
-/** @brief Status Response from RLC to MAC to 
- * inform the BO report for common channels
- * @param pst Pointer to the post structure.
- * @param spId SAP ID of the service provider.
- * @param staRsp Status response for common channels (BCCH, PCCH and CCCH).
- * @return ROK/RFAILED
-*/
-EXTERN S16 RgUiRguCStaRsp ARGS((Pst* pst,SpId spId,RguCStaRspInfo  *staRsp));
-/** @brief Status Response from RLC to MAC to 
- * inform the BO report for dedicated channels
- * @param pst Pointer to the post structure.
- * @param spId SAP ID of the service provider.
- * @param staRsp Status response for dedicated channels (DCCH and DTCH).
- * @return ROK/RFAILED
-*/
-EXTERN S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo  *staRsp));
+S16 RgUiRguDDatInd ARGS((Pst* pst,SuId suId,RguDDatIndInfo  *datInd));
+
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * @param pst Pointer to the post structure.
@@ -611,7 +539,7 @@ EXTERN S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo  *staRsp));
  * @param staInd Status indication on common channels (BCCH, PCCH and CCCH).
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo  *staInd));
+S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo  *staInd));
 /** @brief Status Indication from MAC to RLC  
  * as a response to the staRsp primitive from RLC.
  * @param pst Pointer to the post structure.
@@ -619,16 +547,16 @@ EXTERN S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo  *staInd));
  * @param staInd Status indication on dedicated channels (DCCH and DTCH).
  * @return ROK/RFAILED
 */
-EXTERN S16 RgUiRguDStaInd ARGS((Pst* pst,SuId suId,RguDStaIndInfo  *staInd));
+S16 RgUiRguDStaInd ARGS((Pst* pst,SuId suId,RguDStaIndInfo  *staInd));
 /** @brief flow control indication from MAC to RLC */  
-EXTERN S16 RgUiRguFlowCntrlInd ARGS((Pst *pst, SuId suId, 
+S16 RgUiRguFlowCntrlInd ARGS((Pst *pst, SuId suId, 
 RguFlowCntrlInd *flowCntrlInd)); 
 /*rgu_x_001.main_3 - ADD - L2M & R9 Support */
 #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 TB with sn mapping info. */
-EXTERN S16 RgUiRguHqStaInd ARGS((Pst* pst,SuId suId,
+S16 RgUiRguHqStaInd ARGS((Pst* pst,SuId suId,
 RguHarqStatusInd *harqStatusInd));
 
 
@@ -636,7 +564,7 @@ RguHarqStatusInd *harqStatusInd));
 /** @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 RgUiRguL2MUlThrpMeasReq ARGS((Pst* pst,SpId spId,
+S16 RgUiRguL2MUlThrpMeasReq ARGS((Pst* pst,SpId spId,
 RguL2MUlThrpMeasReqInfo  *l2mUlThrpMeasReq));
 
 #endif /* LTE_L2_MEAS */
@@ -645,108 +573,45 @@ RguL2MUlThrpMeasReqInfo  *l2mUlThrpMeasReq));
 
 #ifdef KW
 /** @brief Request from RLC to MAC to bind the interface saps */
-EXTERN S16 KwLiRguBndReq ARGS((
+S16 RlcLiRguBndReq ARGS((
    Pst*                 pst,
    SuId                 suId,
    SpId                 spId
 ));
 /** @brief Request from RLC to MAC to Unbind the interface saps */
-EXTERN S16 KwLiRguUbndReq ARGS((
+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((
+S16 RlcLiRguBndCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status
+   uint8_t                   status
 ));
 /** @brief Request from RLC to MAC for forwarding SDUs on common
  * channel for transmission */
-EXTERN S16 KwLiRguCDatReq ARGS((
+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((
+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 S16 RlcMacProcSchedRep ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacSchedRep       *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((
+S16 RlcLiRguHqStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguHarqStatusInd     *harqStatusInd));
@@ -755,7 +620,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((
+S16 RlcLiRguL2MUlThrpMeasReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq));
@@ -763,7 +628,7 @@ EXTERN S16 KwLiRguL2MUlThrpMeasReq ARGS((
 #endif /* LTE_L2_MEAS */
 
 /** @brief flowCntrl Indication from MAC to RLC  */
-EXTERN S16 KwLiRguFlowCntrlInd ARGS((
+S16 RlcLiRguFlowCntrlInd ARGS((
 Pst              *pst, 
 SuId             suId, 
 RguFlowCntrlInd  *flowCntrlInd
@@ -772,132 +637,93 @@ RguFlowCntrlInd  *flowCntrlInd
 
 #ifdef LCRGU
 /** @brief Request from RLC to MAC to bind the interface saps */
-EXTERN S16 cmPkRguBndReq ARGS((
+S16 cmPkRguBndReq ARGS((
    Pst*                 pst,
    SuId                 suId,
    SpId                 spId
 ));
 /** @brief Request from RLC to MAC to bind the interface saps */
-EXTERN S16 cmUnpkRguBndReq ARGS((
+S16 cmUnpkRguBndReq ARGS((
    RguBndReq            func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 /** @brief Request from RLC to MAC to Unbind the interface saps */
-EXTERN S16 cmPkRguUbndReq ARGS((
+S16 cmPkRguUbndReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    Reason               reason
 ));
 /** @brief Request from RLC to MAC to Unbind the interface saps */
-EXTERN S16 cmUnpkRguUbndReq ARGS((
+S16 cmUnpkRguUbndReq ARGS((
    RguUbndReq           func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 /** @brief Confirmation from MAC to RLC for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 cmPkRguBndCfm ARGS((
+S16 cmPkRguBndCfm ARGS((
    Pst*                 pst,
    SuId                 suId,
-   U8                   status
+   uint8_t                   status
 ));
 /** @brief Confirmation from MAC to RLC for the bind/Unbind 
  * request for the interface saps */
-EXTERN S16 cmUnpkRguBndCfm ARGS((
+S16 cmUnpkRguBndCfm ARGS((
    RguBndCfm            func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 /** @brief Request from RLC to MAC for forwarding SDUs on common
  * channel for transmission */
-EXTERN S16 cmPkRguCDatReq ARGS((
+S16 cmPkRguCDatReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguCDatReqInfo  *    datReq
 ));
 /** @brief Request from RLC to MAC for forwarding SDUs on common
  * channel for transmission */
-EXTERN S16 cmUnpkRguCDatReq ARGS((
+S16 cmUnpkRguCDatReq ARGS((
    RguCDatReq           func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission */
-EXTERN S16 packSendDlData ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacData      *    datReq
-));
-/** @brief Request from RLC to MAC for forwarding SDUs on 
- * dedicated channel for transmission */
-EXTERN S16 unpackSendDlData ARGS((
-   RguDDatReq           func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
-EXTERN S16 cmPkRguCDatInd ARGS((
+S16 cmPkRguCDatInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguCDatIndInfo  *    datInd
 ));
 /** @brief Data Indication from MAC to RLC to 
  * forward the data received for common channels*/
-EXTERN S16 cmUnpkRguCDatInd ARGS((
+S16 cmUnpkRguCDatInd ARGS((
    RguCDatInd           func,
    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((
-   RguDDatInd           func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
+
 /** @brief Primitive invoked from RLC to MAC to 
  * inform the BO report for common channels*/
-EXTERN S16 cmPkRguCStaRsp ARGS((
+S16 cmPkRguCStaRsp ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguCStaRspInfo  *    staRsp
 ));
 /** @brief Primitive invoked from RLC to MAC to 
  * inform the BO report for common channels*/
-EXTERN S16 cmUnpkRguCStaRsp ARGS((
+S16 cmUnpkRguCStaRsp ARGS((
    RguCStaRsp           func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
-/** @brief Primitive invoked from RLC to MAC to 
- * inform the BO report for dedicated channels*/
-EXTERN S16 packSendBOStatus ARGS((
-   Pst*                 pst,
-   SpId                 spId,
-   RlcMacBOStatus*      boStatus
-));
-/** @brief Primitive invoked from RLC to MAC to 
- * inform the BO report for dedicated channels*/
-EXTERN S16 unpackSendBOStatus ARGS((
-   RguDStaRsp           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 
  * for the transmission on common channels. */
-EXTERN S16 cmPkRguCStaInd ARGS((
+S16 cmPkRguCStaInd ARGS((
    Pst*                 pst,
    SuId                 suId,
    RguCStaIndInfo  *    staInd
@@ -906,206 +732,167 @@ EXTERN S16 cmPkRguCStaInd 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 cmUnpkRguCStaInd ARGS((
+S16 cmUnpkRguCStaInd ARGS((
    RguCStaInd           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 
- * for the transmission on dedicated channels. */
-EXTERN S16 packSchedRep ARGS((
-   Pst*                 pst,
-   SuId                 suId,
-   RlcMacSchedRep  *    staInd
-));
-EXTERN S16 cmPkRguFlowCntrlInfo ARGS((
+
+S16 cmPkRguFlowCntrlInfo ARGS((
 RguFlowCntrlInd *param, 
 Buffer           *mBuf
 ));
-EXTERN S16 cmPkRguUeFlowCntrlInfo ARGS((
+S16 cmPkRguUeFlowCntrlInfo ARGS((
 RguUeFlowCntrlInfo *param,
 Buffer           *mBuf
 ));
-EXTERN S16 cmPkRguLcFlowCntrlInfo ARGS((
+S16 cmPkRguLcFlowCntrlInfo ARGS((
 RguLcFlowCntrlInfo *param,
 Buffer           *mBuf
 ));
-EXTERN S16 cmUnpkRguLcFlowCntrlInfo ARGS((
+S16 cmUnpkRguLcFlowCntrlInfo ARGS((
 RguLcFlowCntrlInfo *param,
 Buffer           *mBuf
 ));
-EXTERN S16 cmUnpkRguUeFlowCntrlInfo ARGS((
+S16 cmUnpkRguUeFlowCntrlInfo ARGS((
 RguUeFlowCntrlInfo *param,
 Buffer           *mBuf
 ));
-EXTERN S16 cmUnpkRguFlowCntrlInfo ARGS((
+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((
-   RguDStaInd           func,
-   Pst*                 pst,
-   Buffer               *mBuf
-));
-EXTERN S16 cmPkRguPduInfo ARGS((
+
+S16 cmPkRguPduInfo ARGS((
    RguPduInfo           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguPduInfo ARGS((
+S16 cmUnpkRguPduInfo ARGS((
    RguPduInfo           *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguDBoReport ARGS((
+S16 cmPkRguDBoReport ARGS((
    RguDBoReport         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguDBoReport ARGS((
+S16 cmUnpkRguDBoReport ARGS((
    RguDBoReport         *param,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmPkRguCDatReqInfo ARGS((
+S16 cmPkRguCDatReqInfo ARGS((
    RguCDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguCDatReqInfo ARGS((
+S16 cmUnpkRguCDatReqInfo ARGS((
    RguCDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguLchDatReq ARGS((
+S16 cmPkRguLchDatReq ARGS((
    RguLchDatReq         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguLchDatReq ARGS((
+S16 cmUnpkRguLchDatReq ARGS((
    RguLchDatReq         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguDatReqTb ARGS((
+S16 cmPkRguDatReqTb ARGS((
    RguDatReqTb          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguStaIndTb ARGS((
+S16 cmPkRguStaIndTb ARGS((
    RguStaIndTb          *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguStaIndTb ARGS((
+S16 cmUnpkRguStaIndTb ARGS((
    RguStaIndTb          *param,
    Buffer               *mBuf
 ));
 /* rgu_x_001.main_3 - ADD - L2M Support */
 #ifdef LTE_L2_MEAS
-EXTERN S16 cmPkRguDDatReqInfo ARGS((
+S16 cmPkRguDDatReqInfo ARGS((
    Pst                  *pst,
    RguDDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguDDatReqInfo ARGS((
+S16 cmUnpkRguDDatReqInfo ARGS((
    Pst                  *pst,
    RguDDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguDatReqTb ARGS((
+S16 cmUnpkRguDatReqTb ARGS((
    Pst                  *pst,
    RguDatReqTb          *param,
    Buffer               *mBuf
 ));
 #else
-EXTERN S16 cmPkRguDDatReqInfo ARGS((
+S16 cmPkRguDDatReqInfo ARGS((
    RguDDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguDDatReqInfo ARGS((
+S16 cmUnpkRguDDatReqInfo ARGS((
    RguDDatReqInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguDatReqTb ARGS((
+S16 cmUnpkRguDatReqTb ARGS((
    RguDatReqTb          *param,
    Buffer               *mBuf
 ));
 #endif
-EXTERN S16 cmPkRguCDatIndInfo ARGS((
+S16 cmPkRguCDatIndInfo ARGS((
    RguCDatIndInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguCDatIndInfo ARGS((
+S16 cmUnpkRguCDatIndInfo ARGS((
    RguCDatIndInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguLchDatInd ARGS((
+S16 cmPkRguLchDatInd ARGS((
    RguLchDatInd         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguLchDatInd ARGS((
+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((
+S16 cmPkRguCStaRspInfo ARGS((
    RguCStaRspInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguCStaRspInfo ARGS((
+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((
+
+S16 cmPkRguCStaIndInfo ARGS((
    RguCStaIndInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguCStaIndInfo ARGS((
+S16 cmUnpkRguCStaIndInfo ARGS((
    RguCStaIndInfo       *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmPkRguLchStaInd ARGS((
+S16 cmPkRguLchStaInd ARGS((
    RguLchStaInd         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 cmUnpkRguLchStaInd ARGS((
+S16 cmUnpkRguLchStaInd ARGS((
    RguLchStaInd         *param,
    Buffer               *mBuf
 ));
-EXTERN S16 packSchedRepInfo ARGS((
-   RlcMacSchedRep       *param,
-   Buffer               *mBuf
-));
-EXTERN S16 unpackSchedRepInfo ARGS((
-   RlcMacSchedRep       *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 */
 
-EXTERN S16 cmPkRguHqStaInd ARGS((
+S16 cmPkRguHqStaInd ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguHarqStatusInd     *harqStatusInd));
 
 /** @brief Request from MAC to RLC forwarding HARQ status  */
-EXTERN S16 cmUnpkRguHqStaInd ARGS((
+S16 cmUnpkRguHqStaInd ARGS((
    RguHqStaInd          func,
    Pst*                 pst,
    Buffer               *mBuf
@@ -1113,7 +900,7 @@ EXTERN S16 cmUnpkRguHqStaInd ARGS((
 
 /** @brief Primitive invoked from RLC to MAC to 
  *  * inform the On/Off Status of LC Id*/
-EXTERN S16 cmPkRguL2MUlThrpMeasReq ARGS((
+S16 cmPkRguL2MUlThrpMeasReq ARGS((
    Pst*                 pst,
    SpId                 spId,
    RguL2MUlThrpMeasReqInfo*    measReq
@@ -1121,30 +908,30 @@ EXTERN S16 cmPkRguL2MUlThrpMeasReq ARGS((
 
 /** @brief Primitive invoked from RLC to MAC to 
  *  * inform the On/Off Status of LC Id*/
-EXTERN S16 cmUnpkRguL2MUlThrpMeasReq ARGS((
+S16 cmUnpkRguL2MUlThrpMeasReq ARGS((
    RguL2MUlThrpMeasReq  func,
    Pst*                 pst,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmPkRguL2MUlThrpMeasReqInfo ARGS((
+S16 cmPkRguL2MUlThrpMeasReqInfo ARGS((
    RguL2MUlThrpMeasReqInfo *param,
    Buffer               *mBuf
 ));
 
-EXTERN S16 cmUnpkRguL2MUlThrpMeasReqInfo ARGS((
+S16 cmUnpkRguL2MUlThrpMeasReqInfo ARGS((
    RguL2MUlThrpMeasReqInfo       *param,
    Buffer               *mBuf
 ));
 
 #endif /* LTE_L2_MEAS */
-EXTERN S16 cmUnpkRguFlowCntrlInd ARGS((
+S16 cmUnpkRguFlowCntrlInd ARGS((
    RguFlowCntrlIndInfo  func,
    Pst                  *pst,
    Buffer               *mBuf
  ));
 
-EXTERN S16 cmPkRguFlowCntrlInd ARGS((
+S16 cmPkRguFlowCntrlInd ARGS((
    Pst* pst,
    SuId suId,
    RguFlowCntrlInd  *flowCntrlInd