X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flkw.x;h=4a7a14db0af48347f779d5ab58cd82f483640940;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=8a03910c8c2f8eae51c130530422753dba6c0cb8;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/cm/lkw.x b/src/cm/lkw.x
index 8a03910c8..4a7a14db0 100755
--- a/src/cm/lkw.x
+++ b/src/cm/lkw.x
@@ -33,7 +33,7 @@
 #define __LKW_X__
 
 #ifdef __cplusplus
-EXTERN "C" {
+extern "C" {
 #endif  /* __cplusplus */
 
 
@@ -43,17 +43,17 @@ typedef struct rlcGenCfg
 {
    Pst               lmPst;         /*!< Post structure for communicating
                                       with LM. */
-   U32               maxUe;         /*!< Maximum number of UEs supported
+   uint32_t               maxUe;         /*!< Maximum number of UEs supported
                                       by RLC. */
-   U16               maxKwuSaps;    /*!< Maximum KWU SAPs. */
+   uint16_t               maxKwuSaps;    /*!< Maximum KWU SAPs. */
 /* Supported by SPLIT Architecture */
-   U16               maxUdxSaps;    /*!< Maximum Udx SAPs. */
+   uint16_t               maxUdxSaps;    /*!< Maximum Udx SAPs. */
 /* Supported by SPLIT Architecture ends */
    Ticks             timeRes;       /*!< Time resolution. */
 /* Supported by SPLIT Architecture */
-   U8                rlcMode;       /*!< RLC_DL or RLC_UL */
+   uint8_t                rlcMode;       /*!< RLC_DL or RLC_UL */
 /* Supported by SPLIT Architecture ends */
-   U16               maxRguSaps;    /*!< Maximum RGU SAPs. */
+   uint16_t               maxRguSaps;    /*!< Maximum RGU SAPs. */
 }RlcGenCfg;
 
 /** @brief
@@ -66,7 +66,7 @@ typedef struct rlcSapCfg
    Ent               ent;           /*!< Entity ID. */
    Inst              inst;          /*!< Instance ID. */
    SpId              sapId;         /*!< SAP ID. */
-   U16               bndTmrIntvl;   /*!< Bind timer interval. */
+   uint16_t               bndTmrIntvl;   /*!< Bind timer interval. */
    Priority          priority;      /*!< Priority. */
    Route             route;         /*!< Route. */
 }RlcSapCfg;
@@ -173,7 +173,7 @@ typedef struct rlcSSta
     Trace Control Structure */
 typedef struct rlcTrcCntrl
 {
-   U8                trcMask;       /*!< Trace mask. */
+   uint8_t                trcMask;       /*!< Trace mask. */
    S16               trcLen;        /*!< Trace length. */
 }RlcTrcCntrl;
 
@@ -181,7 +181,7 @@ typedef struct rlcTrcCntrl
     Debug Control Structure */
 typedef struct rlcDbgCntrl
 {
-   U32               dbgMask;       /*!< Debug mask. Assign non zero value to enable 
+   uint32_t               dbgMask;       /*!< Debug mask. Assign non zero value to enable 
                                          and zero to disable debug */
 }RlcDbgCntrl;
 
@@ -198,15 +198,15 @@ typedef struct rlcSapCntrl
 typedef struct rlcCntrl
 {
    DateTime          dt;            /*!< Date and Time structure. */
-   U8                action;        /*!< Action. */
-   U8                subAction;     /*!< Sub action. */
+   uint8_t                action;        /*!< Action. */
+   uint8_t                subAction;     /*!< Sub action. */
    union
    {
       RlcTrcCntrl     trcCntrl;      /*!< Trace Control Structure. */
       RlcDbgCntrl     dbgCntrl;      /*!< Debug Control Structure. */
       RlcSapCntrl     sapCntrl;      /*!< SAP Control Structure. */
 #ifdef SS_DIAG
-      U32            logMask;       /*!< Logging Control Structure. */
+      uint32_t            logMask;       /*!< Logging Control Structure. */
 #endif
    }s;
 }RlcCntrl;
@@ -218,10 +218,10 @@ typedef struct rlcUSta
    DateTime          dt;            /*!< Date and Time structure. */
    CmAlarm           alarm;         /*!< Alarm. */
    SuId              suId;          /*!< Service user ID. */
-   U32               ueId;          /*!< Urnti UE ID. */
+   uint32_t               ueId;          /*!< Urnti UE ID. */
   /* lkw_x_001.main_2, added support for L2 measurement */
 #ifdef LTE_L2_MEAS
-   U8                qci;           /*!< Qci value */
+   uint8_t                qci;           /*!< Qci value */
 #endif
 }RlcUSta;
 
@@ -230,7 +230,7 @@ typedef struct rlcUSta
 typedef struct rlcTrc
 {
    DateTime          dt;            /*!< Date and Time structure. */
-   U16               event;         /*!< Event. Events defined in the differenct RLC
+   uint16_t               event;         /*!< Event. Events defined in the differenct RLC
                                          interfaces are pssible values here.*/
 }RlcTrc;
 
@@ -257,7 +257,7 @@ typedef struct rlcMngmt
 /** @brief Measurement Request Params Structure. */
 typedef struct rlcL2MeasReqInfo
 {
-   U8        measType;          /*!< Measurement type, bit 1 to 4 (LSB nibble) 
+   uint8_t        measType;          /*!< Measurement type, bit 1 to 4 (LSB nibble) 
                                   will be used for non IP Throughput and 
                                   bit 5 and 6 will be used for DL and UL 
                                   Ipthroughput respectively */
@@ -265,18 +265,18 @@ typedef struct rlcL2MeasReqInfo
    {
       struct 
       {
-         U16          numSamples;       /*!<Sampling period: */
-         U8           numQci;           /*!<number of qCI to take measurement for */
-         U8           qci[LKW_MAX_QCI]; /*!<QCI for the measurement */
+         uint16_t          numSamples;       /*!<Sampling period: */
+         uint8_t           numQci;           /*!<number of qCI to take measurement for */
+         uint8_t           qci[LKW_MAX_QCI]; /*!<QCI for the measurement */
       }nonIpThMeas;
 
       struct 
       {
-         U16 numUes;
+         uint16_t numUes;
          struct 
          {
-            U8           numQci;           /*!<number of qCI to take measurement for */
-            U8           qci[LKW_MAX_QCI]; /*!<QCI for the measurement */
+            uint8_t           numQci;           /*!<number of qCI to take measurement for */
+            uint8_t           qci[LKW_MAX_QCI]; /*!<QCI for the measurement */
             CmLteRnti    ueId;             /*!< UE ID (Used only for IP Throughput in UL/DL */
             CmLteCellId  cellId;           /*!< Cell ID (Used only for IP Throughput in UL/DL */
          }ueInfoLst[LKW_MAX_UE];
@@ -288,25 +288,25 @@ typedef struct rlcL2MeasReqInfo
 /** @brief Measurement Request Exvent  Structure. */
 typedef struct rlcL2MeasReqEvt
 {
-   U32              transId;     /*!< Transaction Identifier */
-   U16              measPeriod;  /*!< Measurement Period */
+   uint32_t              transId;     /*!< Transaction Identifier */
+   uint16_t              measPeriod;  /*!< Measurement Period */
    RlcL2MeasReqInfo  measReq;     /*!< Measurement request structure */
 }RlcL2MeasReqEvt;
 
 /** @brief Measurement Confirm Params Structure. */
 typedef struct rlcL2MeasCfmInfo
 {
-   U8              qci;     /*!< QCI value */
+   uint8_t              qci;     /*!< QCI value */
    union
    {
       struct
       {
-         U32   numActUe;   /*!< num of Active UEs*/
-         U32   uuLoss;     /*!< Uu Loss Rate */
+         uint32_t   numActUe;   /*!< num of Active UEs*/
+         uint32_t   uuLoss;     /*!< Uu Loss Rate */
          /* Discard new changes starts */
-         U32   dlDiscRate; /*!< DL Discard rate to be reported */
+         uint32_t   dlDiscRate; /*!< DL Discard rate to be reported */
          /* Discard new changes ends */
-         U32  dlSduDelay;
+         uint32_t  dlSduDelay;
       }nonIpThrput;
 
       struct              /*!< Structure for IP throughput*/
@@ -323,18 +323,18 @@ typedef struct rlcL2MeasCfmUeInfoLst
    CmLteRnti       ueId;    /*!< UE Id used for DL/UL Ipthroughput*/
    CmLteCellId     cellId;  /*!< Cell Id used for DL/UL Ipthroughput*/
    RlcL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Measurement confirm structure*/
-   U16             numCfm; /*!< Number of Measurement confirm*/
+   uint16_t             numCfm; /*!< Number of Measurement confirm*/
 }RlcL2MeasCfmUeInfoLst;
 
 typedef struct rlcL2MeasCfmIpThMeas
 {
-   U16                  numUes; /*!< Number of Ue Info*/
+   uint16_t                  numUes; /*!< Number of Ue Info*/
    RlcL2MeasCfmUeInfoLst ueInfoLst[LKW_MAX_UE]; /*!< UE info list*/
 }RlcL2MeasCfmIpThMeas;
 
 typedef struct rlcL2MeasCfmNonIpThMeas
 {
-   U16             numCfm; /*!< Number of confirm */
+   uint16_t             numCfm; /*!< Number of confirm */
    RlcL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Confirmation info */
 }RlcL2MeasCfmNonIpThMeas;
 
@@ -347,9 +347,9 @@ typedef union kwL2MeasCfmIpNonIp
 /** @brief Measurement Confirm Event  Structure. */
 typedef struct rlcL2MeasCfmEvt
 {
-   U32             transId; /*!< Transaction id */
+   uint32_t             transId; /*!< Transaction id */
    CmStatus        status;  /*!< Status is for all QCIs */
-   U8              measType; /*!< Measurement type, bit 1 to 4 (LSB nibble) 
+   uint8_t              measType; /*!< Measurement type, bit 1 to 4 (LSB nibble) 
                                will be used for non IP Throughput and 
                                bit 5 and 6 will be used for DL and UL 
                                Ipthroughput respectively. It is same for
@@ -359,13 +359,13 @@ typedef struct rlcL2MeasCfmEvt
 
 #endif /* LTE_L2_MEAS */
 
-/* Control primitives towards LTE RLC */
+/* Control primitives towards NR RLC */
 /* Pointer functions to pack/unpack primitives */
-typedef S16 (*RlcConfigReq)   ARGS((Pst *pst, RlcMngmt *cfg));
-typedef S16 (*RlcConfigCfm)   ARGS((Pst *pst, RlcMngmt *cfgCfm));
+typedef uint8_t (*RlcConfigReq)   ARGS((Pst *pst, RlcMngmt *cfg));
+typedef uint8_t (*RlcConfigCfm)   ARGS((Pst *pst, RlcMngmt *cfgCfm));
 
-typedef S16 (*LkwCntrlReq) ARGS((Pst *pst, RlcMngmt *cntl));
-typedef S16 (*LkwCntrlCfm) ARGS((Pst *pst, RlcMngmt *cntlCfm));
+typedef uint8_t (*LkwCntrlReq) ARGS((Pst *pst, RlcMngmt *cntl));
+typedef uint8_t (*LkwCntrlCfm) ARGS((Pst *pst, RlcMngmt *cntlCfm));
 
 typedef S16 (*LkwStaInd)   ARGS((Pst *pst, RlcMngmt *staInd)); 
 typedef S16 (*LkwStaReq)   ARGS((Pst *pst, RlcMngmt *staReq));
@@ -380,9 +380,9 @@ typedef S16 (*LkwTrcInd)   ARGS((Pst *pst, RlcMngmt *trc, Buffer *mBuf));
 #ifdef LTE_L2_MEAS
 typedef S16 (*LkwL2MeasReq)   ARGS((Pst *pst, RlcL2MeasReqEvt *measEvt));
 typedef S16 (*LkwL2MeasCfm)   ARGS((Pst *pst, RlcL2MeasCfmEvt *measEvt));
-typedef S16 (*LkwL2MeasSendReq)   ARGS((Pst *pst, U8 measType));
-typedef S16 (*LkwL2MeasStopReq)   ARGS((Pst *pst, U8 measType));
-typedef S16 (*LkwL2MeasStopCfm)   ARGS((Pst *pst, U8 measType,U8 status));
+typedef S16 (*LkwL2MeasSendReq)   ARGS((Pst *pst, uint8_t measType));
+typedef S16 (*LkwL2MeasStopReq)   ARGS((Pst *pst, uint8_t measType));
+typedef S16 (*LkwL2MeasStopCfm)   ARGS((Pst *pst, uint8_t measType,uint8_t status));
 #endif /*  LTE_L2_MEAS */
 
 /* Layer primitives */
@@ -393,7 +393,7 @@ typedef S16 (*LkwL2MeasStopCfm)   ARGS((Pst *pst, U8 measType,U8 status));
 @return ROK if success , RFAILED if failure
 
 */
-EXTERN S16 RlcMiRlcConfigReq ARGS((Pst *pst, RlcMngmt *cfg));
+uint8_t RlcMiRlcConfigReq ARGS((Pst *pst, RlcMngmt *cfg));
 
 /**
 @details This function is called by the RlcMiRlcConfigReq function for responding to configuration requests.The cfm field in the RlcMngmt  structure contains the response value.
@@ -402,7 +402,7 @@ EXTERN S16 RlcMiRlcConfigReq ARGS((Pst *pst, RlcMngmt *cfg));
 @param[in] cfm  - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiRlcConfigCfm ARGS((Pst *pst, RlcMngmt *cfgCfm));
+S16 RlcMiRlcConfigCfm ARGS((Pst *pst, RlcMngmt *cfgCfm));
 
 /**
 @details
@@ -415,7 +415,7 @@ control request primitive is confirmed by a RlcMiLkwCntrlCfm primitive.
 @param[in] cntl - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwCntrlReq ARGS((Pst *pst, RlcMngmt *cntl));
+uint8_t RlcMiLkwCntrlReq ARGS((Pst *pst, RlcMngmt *cntl));
 
 /**
 @details
@@ -425,7 +425,7 @@ This function is called by the RlcMiLkwCntrlReq function to send a control confi
 @param[in] cfm  - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwCntrlCfm ARGS((Pst *pst, RlcMngmt *cntlCfm));
+S16 RlcMiLkwCntrlCfm ARGS((Pst *pst, RlcMngmt *cntlCfm));
 
 /**
 @details
@@ -436,7 +436,7 @@ P,KWSAP, or CKSAP.
 @param[in] cfg  - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwStaReq ARGS((Pst *pst, RlcMngmt *staInd));
+S16 RlcMiLkwStaReq ARGS((Pst *pst, RlcMngmt *staInd));
 
 /**
 @details
@@ -447,7 +447,7 @@ us information to the layer manager.
 @param[in] stacfm - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwStaCfm ARGS((Pst *pst, RlcMngmt *staCfm));
+S16 RlcMiLkwStaCfm ARGS((Pst *pst, RlcMngmt *staCfm));
 
 /**
 @details
@@ -458,7 +458,7 @@ This function processes statistics requests received from the layer manager. Aft
 @param[in] sts   - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwStsReq ARGS((Pst *pst, Action, RlcMngmt *sts));
+S16 RlcMiLkwStsReq ARGS((Pst *pst, Action, RlcMngmt *sts));
 /**
 @details
 This function is called by the RlcMiLkwStsReq function for responding to statisti
@@ -469,7 +469,7 @@ cs requests.
 @param[in] cfg  - Configuration management structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwStsCfm ARGS((Pst *pst, Action action, RlcMngmt *stsCfm));
+S16 RlcMiLkwStsCfm ARGS((Pst *pst, Action action, RlcMngmt *stsCfm));
 /**
 @details
 This function is used by RLC module to send unsolicited trace indications to
@@ -480,7 +480,7 @@ the layer manager, when tracing is enabled by the layer manager through a previo
 @param[in] buf  - buffer 
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwTrcInd ARGS ((Pst *pst, RlcMngmt *trc, Buffer *mBuf));
+S16 RlcMiLkwTrcInd ARGS ((Pst *pst, RlcMngmt *trc, Buffer *mBuf));
 
 /**
 @details This function is used by RLC to send unsolicited status information to the layer manager, when the unsolicited status flag is enabled by the layer manager through a previous control request.
@@ -499,9 +499,9 @@ for Measurement  responding to statisti cs requests.
 @param[in] measEvt - Measurement Request structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwL2MeasReq ARGS((Pst *pst, RlcL2MeasReqEvt *measEvt));
-EXTERN S16 RlcMiLkwL2MeasStopReq ARGS((Pst *pst,U8 measType));
-EXTERN S16 RlcMiLkwL2MeasSendReq ARGS((Pst *pst,U8 measType));
+S16 RlcMiLkwL2MeasReq ARGS((Pst *pst, RlcL2MeasReqEvt *measEvt));
+S16 RlcMiLkwL2MeasStopReq ARGS((Pst *pst,uint8_t measType));
+S16 RlcMiLkwL2MeasSendReq ARGS((Pst *pst,uint8_t measType));
 /**
 @details This function can be used by PDCP to send the measurement values
 after doing L2 measurement that was requested by the layer manager.
@@ -510,280 +510,280 @@ after doing L2 measurement that was requested by the layer manager.
 @param[in] measEvt - Measurement confirmation structure
 @return ROK if success , RFAILED if failure
 */
-EXTERN S16 RlcMiLkwL2MeasCfm ARGS((Pst *pst, RlcL2MeasCfmEvt *measCfm));
-EXTERN S16 RlcMiLkwL2MeasStopCfm ARGS((Pst *pst, U8 measType, U8 status));
+S16 RlcMiLkwL2MeasCfm ARGS((Pst *pst, RlcL2MeasCfmEvt *measCfm));
+S16 RlcMiLkwL2MeasStopCfm ARGS((Pst *pst, uint8_t measType, uint8_t status));
 #endif /*  LTE_L2_MEAS */
 
-EXTERN S16 RlcMiLkwStaInd ARGS((Pst *pst, RlcMngmt *staReq));
+S16 RlcMiLkwStaInd ARGS((Pst *pst, RlcMngmt *staReq));
 
-EXTERN Void rlcSendLmAlarm ARGS ((
-      U16 category,
-      U16  event,
-      U16 cause,
+Void rlcSendLmAlarm ARGS ((
+      uint16_t category,
+      uint16_t  event,
+      uint16_t cause,
       SuId suId,
-      U32 ueId));
+      uint32_t ueId));
 
 #ifdef SM
-EXTERN S16 SmMiRlcConfigCfm   ARGS((
+S16 SmMiRlcConfigCfm   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwCntrlCfm ARGS((
+S16 SmMiLkwCntrlCfm ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwStaInd   ARGS((
+S16 SmMiLkwStaInd   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwStaCfm   ARGS((
+S16 SmMiLkwStaCfm   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwStsCfm   ARGS((
+S16 SmMiLkwStsCfm   ARGS((
        Pst *,
        Action,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwTrcInd   ARGS((
+S16 SmMiLkwTrcInd   ARGS((
        Pst *,
        RlcMngmt *,
        Buffer *
        ));
 
-EXTERN S16 SmMiLkwStsReq   ARGS((
+S16 SmMiLkwStsReq   ARGS((
        Pst *,
        Action,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwStaReq   ARGS((
+S16 SmMiLkwStaReq   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiLkwCntrlReq ARGS((
+S16 SmMiLkwCntrlReq ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 SmMiRlcConfigReq   ARGS((
+S16 SmMiRlcConfigReq   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
 /* lkw_x_001.main_2, added support for L2 measurement */
 #ifdef LTE_L2_MEAS
-EXTERN S16 SmMiLkwL2MeasReq   ARGS((
+S16 SmMiLkwL2MeasReq   ARGS((
          Pst *,
          RlcL2MeasReqEvt *
          ));
-EXTERN S16 SmMiLkwL2MeasStopReq ARGS((
+S16 SmMiLkwL2MeasStopReq ARGS((
        Pst            *pst,
-       U8             measType
+       uint8_t             measType
       ));
 
-EXTERN S16 SmMiLkwL2MeasSendReq ARGS((
+S16 SmMiLkwL2MeasSendReq ARGS((
          Pst            *pst,
-         U8             measType
+         uint8_t             measType
          ));
-EXTERN S16 SmMiLkwL2MeasCfm   ARGS((
+S16 SmMiLkwL2MeasCfm   ARGS((
          Pst *,
          RlcL2MeasCfmEvt *
          ));
-EXTERN S16 SmMiLkwL2MeasStopCfm ARGS((
+S16 SmMiLkwL2MeasStopCfm ARGS((
          Pst     *pst,          
-         U8      measType,
-         U8      status
+         uint8_t      measType,
+         uint8_t      status
          ));
 #endif /*  LTE_L2_MEAS */
 #endif
 
-EXTERN S16 smKwActvInit    ARGS((Ent ent, Inst inst, Region region, Reason reason));
-EXTERN S16 smKwActvTsk     ARGS((Pst *pst, Buffer *mBuf));
+S16 smKwActvInit    ARGS((Ent ent, Inst inst, Region region, Reason reason));
+S16 smKwActvTsk     ARGS((Pst *pst, Buffer *mBuf));
 
 /* pack/unpack functions */
 #ifdef LCLKW 
-EXTERN S16 packRlcConfigReq     ARGS((
+S16 packRlcConfigReq     ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 packRlcConfigCfm     ARGS((
+uint8_t packRlcConfigCfm     ARGS((
        Pst *,
        RlcMngmt *
        ));
 
 
-EXTERN S16 cmPkLkwCntrlReq   ARGS((
+S16 cmPkLkwCntrlReq   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwCntrlCfm   ARGS((
+uint8_t cmPkLkwCntrlCfm   ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwStaInd     ARGS((
+S16 cmPkLkwStaInd     ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwStaReq     ARGS((
+S16 cmPkLkwStaReq     ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwStaCfm     ARGS((
+S16 cmPkLkwStaCfm     ARGS((
        Pst *,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwStsReq     ARGS((
+S16 cmPkLkwStsReq     ARGS((
        Pst *,
        Action,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwStsCfm     ARGS((
+S16 cmPkLkwStsCfm     ARGS((
        Pst *,
        Action,
        RlcMngmt *
        ));
 
-EXTERN S16 cmPkLkwTrcInd     ARGS((
+S16 cmPkLkwTrcInd     ARGS((
        Pst *,
        RlcMngmt *,
        Buffer *
        ));
 
-EXTERN S16 unpackRlcConfigReq   ARGS((
+uint8_t unpackRlcConfigReq   ARGS((
        RlcConfigReq,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 unpackRlcConfigCfm   ARGS((
+uint8_t unpackRlcConfigCfm   ARGS((
        RlcConfigCfm,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwCntrlReq ARGS((
+S16 cmUnpkLkwCntrlReq ARGS((
        RlcConfigReq,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwCntrlCfm ARGS((
+S16 cmUnpkLkwCntrlCfm ARGS((
        RlcConfigCfm,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwStaInd   ARGS((
+S16 cmUnpkLkwStaInd   ARGS((
        LkwStaInd,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwStaReq   ARGS((
+S16 cmUnpkLkwStaReq   ARGS((
        LkwStaReq,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwStaCfm   ARGS((
+S16 cmUnpkLkwStaCfm   ARGS((
        LkwStaCfm,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwStsReq   ARGS((
+S16 cmUnpkLkwStsReq   ARGS((
        LkwStsReq,
        Pst *,
        Buffer *
        ));
 
-EXTERN S16 cmUnpkLkwStsCfm   ARGS((
+S16 cmUnpkLkwStsCfm   ARGS((
        LkwStsCfm,
        Pst *, Buffer *
        ));
 
 
-EXTERN S16 cmUnpkLkwTrcInd   ARGS((
+S16 cmUnpkLkwTrcInd   ARGS((
        LkwTrcInd,
        Pst *,
        Buffer *));
 
 /* lkw_x_001.main_2, added support for L2 measurement */
 #ifdef LTE_L2_MEAS
-EXTERN S16 cmPkLkwL2MeasReq ARGS((
+S16 cmPkLkwL2MeasReq ARGS((
          Pst * pst,
          RlcL2MeasReqEvt * measReqEvt
          ));
-EXTERN S16 cmUnpkLkwL2MeasReq ARGS((
+S16 cmUnpkLkwL2MeasReq ARGS((
          LkwL2MeasReq func,
          Pst *pst,
          Buffer *mBuf
          ));
-EXTERN S16 cmPkLkwL2MeasCfm ARGS((
+S16 cmPkLkwL2MeasCfm ARGS((
          Pst * pst,
          RlcL2MeasCfmEvt *measCfmEvt
          ));
-EXTERN S16 cmUnpkLkwL2MeasCfm ARGS((
+S16 cmUnpkLkwL2MeasCfm ARGS((
          LkwL2MeasCfm func,
          Pst *pst,
          Buffer *mBuf
          ));
-EXTERN S16 cmPkRlcL2MeasReqInfo ARGS((
+S16 cmPkRlcL2MeasReqInfo ARGS((
          RlcL2MeasReqInfo * measReqInfo,
          Buffer *mBuf
          ));
-EXTERN S16 cmUnpkRlcL2MeasReqInfo ARGS((
+S16 cmUnpkRlcL2MeasReqInfo ARGS((
          RlcL2MeasReqInfo * measReqInfo,
          Buffer *mBuf
          ));
-EXTERN S16 cmPkRlcL2MeasCfmInfo ARGS((
+S16 cmPkRlcL2MeasCfmInfo ARGS((
          RlcL2MeasCfmInfo * measCfmInfo,
          Buffer *mBuf,
-         U8 measType
+         uint8_t measType
          ));
-EXTERN S16 cmUnpkRlcL2MeasCfmInfo ARGS((
+S16 cmUnpkRlcL2MeasCfmInfo ARGS((
          RlcL2MeasCfmInfo * measCfmInfo,
          Buffer *mBuf,
-         U8 measType
+         uint8_t measType
          ));
-EXTERN S16 cmPkLkwL2MeasStopReq ARGS((
+S16 cmPkLkwL2MeasStopReq ARGS((
          Pst * pst,
-         U8 measType
+         uint8_t measType
          ));
-EXTERN S16 cmUnpkLkwL2MeasStopReq ARGS((
+S16 cmUnpkLkwL2MeasStopReq ARGS((
          LkwL2MeasStopReq func,
          Pst *pst,
          Buffer *mBuf
          ));
-EXTERN S16 cmPkLkwL2MeasSendReq ARGS((
+S16 cmPkLkwL2MeasSendReq ARGS((
          Pst * pst,
-         U8 measType
+         uint8_t measType
          ));
-EXTERN S16 cmUnpkLkwL2MeasSendReq ARGS((
+S16 cmUnpkLkwL2MeasSendReq ARGS((
          LkwL2MeasSendReq func,
          Pst *pst,
          Buffer *mBuf
          ));
-EXTERN S16 cmPkLkwL2MeasStopCfm ARGS((
+S16 cmPkLkwL2MeasStopCfm ARGS((
          Pst * pst,
-         U8 measType,
-         U8 status
+         uint8_t measType,
+         uint8_t status
          ));
-EXTERN S16 cmUnpkLkwL2MeasStopCfm ARGS((
+S16 cmUnpkLkwL2MeasStopCfm ARGS((
          LkwL2MeasStopCfm func,
          Pst *pst,
          Buffer *mBuf