X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flkw.x;h=8a03910c8c2f8eae51c130530422753dba6c0cb8;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=ddaa3eeaaae8bfa689bd136bfc28b39788d60aa8;hpb=51e17cba646f833c1af8b1945248de43e0fdd50f;p=o-du%2Fl2.git diff --git a/src/cm/lkw.x b/src/cm/lkw.x index ddaa3eeaa..8a03910c8 100755 --- a/src/cm/lkw.x +++ b/src/cm/lkw.x @@ -39,7 +39,7 @@ EXTERN "C" { /** @brief General Configuration Structure. */ -typedef struct kwGenCfg +typedef struct rlcGenCfg { Pst lmPst; /*!< Post structure for communicating with LM. */ @@ -54,11 +54,11 @@ typedef struct kwGenCfg U8 rlcMode; /*!< RLC_DL or RLC_UL */ /* Supported by SPLIT Architecture ends */ U16 maxRguSaps; /*!< Maximum RGU SAPs. */ -}KwGenCfg; +}RlcGenCfg; /** @brief SAP Configuration Structure */ -typedef struct kwSapCfg +typedef struct rlcSapCfg { Selector selector; /*!< Selector for LC/TC. */ MemoryId mem; /*!< Region and pool. */ @@ -69,7 +69,7 @@ typedef struct kwSapCfg U16 bndTmrIntvl; /*!< Bind timer interval. */ Priority priority; /*!< Priority. */ Route route; /*!< Route. */ -}KwSapCfg; +}RlcSapCfg; /** @brief * Configuration Structure @@ -78,14 +78,14 @@ typedef struct rlcCfg { union { - KwGenCfg gen; /*!< General configuraton. */ - KwSapCfg sap; /*!< SAP configuration. */ + RlcGenCfg gen; /*!< General configuraton. */ + RlcSapCfg sap; /*!< SAP configuration. */ }s; }RlcCfg; /** @brief General Statistics Structure */ -typedef struct kwGenSts +typedef struct rlcGenSts { CntrSts numUe; /*!< Total number of UEs. */ CntrSts pdusRecv; /*!< Number of PDUs received. */ @@ -99,121 +99,121 @@ typedef struct kwGenSts to retransmission. */ CntrSts numOfRb; /*!< Total number of RBs in RLC. */ CntrSts numSduDisc; /*!< Number of SDUs discarded. */ -}KwGenSts; +}RlcGenSts; /** @brief RLC Upper SAP statistics */ -typedef struct kwKwuSapSts +typedef struct rlcKwuSapSts { /* lkw_x_001.main_2, changed from suId to spId */ SpId spId; /*!< Service Provider ID. */ CntrSts sduRx; /*!< Number of SDUs received. */ CntrSts sduTx; /*!< Number of tranxmitted SDUs. */ -}KwKwuSapSts; +}RlcKwuSapSts; /** @brief RRC Control SAP Statistics */ -typedef struct kwCkwCntSts +typedef struct rlcCkwCntSts { CntrSts statMsgs; /*!< Number of Status Messages send. */ -}KwCkwCntSts; +}RlcCkwCntSts; /** @brief Statistics Structure */ -typedef struct kwSts +typedef struct rlcSts { DateTime dt; /*!< Date and Time structure. */ union { - KwGenSts gen; /*!< General Statistics. */ - KwKwuSapSts kwuSap; /*!< RLC upper SAP statistics. */ - KwCkwCntSts ckwSap; /*!< RRC control SAP. */ + RlcGenSts gen; /*!< General Statistics. */ + RlcKwuSapSts rlckwuSap; /*!< RLC upper SAP statistics. */ + RlcCkwCntSts ckwSap; /*!< RRC control SAP. */ }s; -}KwSts; +}RlcSts; /** @brief MAC Upper SAP Status Structure */ -typedef struct kwRguSapSta +typedef struct rlcRguSapSta { SuId suId; /*!< Service user ID. */ State state; /*!< State of the SAP. */ -}KwRguSapSta; +}RlcRguSapSta; /** @brief RLC Upper SAP Status Structure */ -typedef struct kwKwuSapSta +typedef struct rlcKwuSapSta { SpId spId; /*!< Service provider ID. */ State state; /*!< State of the SAP. */ -}KwKwuSapSta; +}RlcKwuSapSta; /** @brief RRC Control SAP Status Structure */ -typedef struct kwCkwCntSapSta +typedef struct rlcCkwCntSapSta { SpId spId; /*!< Service provider ID. */ State state; /*!< State of the SAP. */ -}KwCkwCntSapSta; +}RlcCkwCntSapSta; /** @brief Status Structure */ -typedef struct kwSSta +typedef struct rlcSSta { DateTime dt; /*!< Date and Time structure. */ union { SystemId sysId; /*!< System ID. */ - KwRguSapSta rguSap; /*!< RLC lower SAP (MAC) status. */ - KwKwuSapSta kwuSap; /*!< RLC Upper SAP status. */ - KwCkwCntSapSta ckwSap; /*!< RRC Control SAP Status. */ + RlcRguSapSta rguSap; /*!< RLC lower SAP (MAC) status. */ + RlcKwuSapSta rlckwuSap; /*!< RLC Upper SAP status. */ + RlcCkwCntSapSta ckwSap; /*!< RRC Control SAP Status. */ }s; -}KwSSta; +}RlcSSta; /** @brief Trace Control Structure */ -typedef struct kwTrcCntrl +typedef struct rlcTrcCntrl { U8 trcMask; /*!< Trace mask. */ S16 trcLen; /*!< Trace length. */ -}KwTrcCntrl; +}RlcTrcCntrl; /** @brief Debug Control Structure */ -typedef struct kwDbgCntrl +typedef struct rlcDbgCntrl { U32 dbgMask; /*!< Debug mask. Assign non zero value to enable and zero to disable debug */ -}KwDbgCntrl; +}RlcDbgCntrl; /** @brief SAP Control Structure */ -typedef struct kwSapCntrl +typedef struct rlcSapCntrl { SuId suId; /*!< Service user ID. */ SpId spId; /*!< Service provider ID. */ -}KwSapCntrl; +}RlcSapCntrl; /** @brief Control Structure */ -typedef struct kwCntrl +typedef struct rlcCntrl { DateTime dt; /*!< Date and Time structure. */ U8 action; /*!< Action. */ U8 subAction; /*!< Sub action. */ union { - KwTrcCntrl trcCntrl; /*!< Trace Control Structure. */ - KwDbgCntrl dbgCntrl; /*!< Debug Control Structure. */ - KwSapCntrl sapCntrl; /*!< SAP Control Structure. */ + RlcTrcCntrl trcCntrl; /*!< Trace Control Structure. */ + RlcDbgCntrl dbgCntrl; /*!< Debug Control Structure. */ + RlcSapCntrl sapCntrl; /*!< SAP Control Structure. */ #ifdef SS_DIAG U32 logMask; /*!< Logging Control Structure. */ #endif }s; -}KwCntrl; +}RlcCntrl; /** @brief Unsolicited Status Structure */ -typedef struct kwUSta +typedef struct rlcUSta { DateTime dt; /*!< Date and Time structure. */ CmAlarm alarm; /*!< Alarm. */ @@ -223,39 +223,39 @@ typedef struct kwUSta #ifdef LTE_L2_MEAS U8 qci; /*!< Qci value */ #endif -}KwUSta; +}RlcUSta; /** @brief Trace Structure */ -typedef struct kwTrc +typedef struct rlcTrc { DateTime dt; /*!< Date and Time structure. */ U16 event; /*!< Event. Events defined in the differenct RLC interfaces are pssible values here.*/ -}KwTrc; +}RlcTrc; /** @brief Layer Management Structure */ -typedef struct _kwMngmt +typedef struct rlcMngmt { Header hdr; /*!< Common header. */ CmStatus cfm; /*!< Status of confirmation. */ union { RlcCfg cfg; /*!< General Configuration. */ - KwCntrl cntrl; /*!< Control Structure. */ - KwSts sts; /*!< Statistics. */ - KwSSta ssta; /*!< Status. */ - KwUSta usta; /*!< Unsolicited Status. */ - KwTrc trc; /*!< Trace Structre. */ + RlcCntrl cntrl; /*!< Control Structure. */ + RlcSts sts; /*!< Statistics. */ + RlcSSta ssta; /*!< Status. */ + RlcUSta usta; /*!< Unsolicited Status. */ + RlcTrc trc; /*!< Trace Structre. */ }t; -}KwMngmt; +}RlcMngmt; /* lkw_x_001.main_2, added support for L2 measurement */ #ifdef LTE_L2_MEAS /** @brief Measurement Request Params Structure. */ -typedef struct kwL2MeasReqInfo +typedef struct rlcL2MeasReqInfo { U8 measType; /*!< Measurement type, bit 1 to 4 (LSB nibble) will be used for non IP Throughput and @@ -283,18 +283,18 @@ typedef struct kwL2MeasReqInfo }ipThMeas; }val; -}KwL2MeasReqInfo; +}RlcL2MeasReqInfo; /** @brief Measurement Request Exvent Structure. */ -typedef struct kwL2MeasReqEvt +typedef struct rlcL2MeasReqEvt { U32 transId; /*!< Transaction Identifier */ U16 measPeriod; /*!< Measurement Period */ - KwL2MeasReqInfo measReq; /*!< Measurement request structure */ -}KwL2MeasReqEvt; + RlcL2MeasReqInfo measReq; /*!< Measurement request structure */ +}RlcL2MeasReqEvt; /** @brief Measurement Confirm Params Structure. */ -typedef struct kwL2MeasCfmInfo +typedef struct rlcL2MeasCfmInfo { U8 qci; /*!< QCI value */ union @@ -316,36 +316,36 @@ typedef struct kwL2MeasCfmInfo }ipThrput; }val; -}KwL2MeasCfmInfo; +}RlcL2MeasCfmInfo; -typedef struct kwL2MeasCfmUeInfoLst +typedef struct rlcL2MeasCfmUeInfoLst { CmLteRnti ueId; /*!< UE Id used for DL/UL Ipthroughput*/ CmLteCellId cellId; /*!< Cell Id used for DL/UL Ipthroughput*/ - KwL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Measurement confirm structure*/ + RlcL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Measurement confirm structure*/ U16 numCfm; /*!< Number of Measurement confirm*/ -}KwL2MeasCfmUeInfoLst; +}RlcL2MeasCfmUeInfoLst; -typedef struct kwL2MeasCfmIpThMeas +typedef struct rlcL2MeasCfmIpThMeas { U16 numUes; /*!< Number of Ue Info*/ - KwL2MeasCfmUeInfoLst ueInfoLst[LKW_MAX_UE]; /*!< UE info list*/ -}KwL2MeasCfmIpThMeas; + RlcL2MeasCfmUeInfoLst ueInfoLst[LKW_MAX_UE]; /*!< UE info list*/ +}RlcL2MeasCfmIpThMeas; -typedef struct kwL2MeasCfmNonIpThMeas +typedef struct rlcL2MeasCfmNonIpThMeas { U16 numCfm; /*!< Number of confirm */ - KwL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Confirmation info */ -}KwL2MeasCfmNonIpThMeas; + RlcL2MeasCfmInfo measCfm[LKW_MAX_QCI]; /*!< Confirmation info */ +}RlcL2MeasCfmNonIpThMeas; typedef union kwL2MeasCfmIpNonIp { - KwL2MeasCfmIpThMeas ipThMeas; /*!< Ip thrupt measurements*/ - KwL2MeasCfmNonIpThMeas nonIpThMeas; /*!< Non-Ip thrupt measurements*/ -}KwL2MeasCfmIpNonIp; + RlcL2MeasCfmIpThMeas ipThMeas; /*!< Ip thrupt measurements*/ + RlcL2MeasCfmNonIpThMeas nonIpThMeas; /*!< Non-Ip thrupt measurements*/ +}RlcL2MeasCfmIpNonIp; /** @brief Measurement Confirm Event Structure. */ -typedef struct kwL2MeasCfmEvt +typedef struct rlcL2MeasCfmEvt { U32 transId; /*!< Transaction id */ CmStatus status; /*!< Status is for all QCIs */ @@ -354,32 +354,32 @@ typedef struct kwL2MeasCfmEvt bit 5 and 6 will be used for DL and UL Ipthroughput respectively. It is same for all qci in this Cfm event. */ - KwL2MeasCfmIpNonIp val; -}KwL2MeasCfmEvt; + RlcL2MeasCfmIpNonIp val; +}RlcL2MeasCfmEvt; #endif /* LTE_L2_MEAS */ /* Control primitives towards LTE RLC */ /* Pointer functions to pack/unpack primitives */ -typedef S16 (*RlcConfigReq) ARGS((Pst *pst, KwMngmt *cfg)); -typedef S16 (*RlcConfigCfm) ARGS((Pst *pst, KwMngmt *cfgCfm)); +typedef S16 (*RlcConfigReq) ARGS((Pst *pst, RlcMngmt *cfg)); +typedef S16 (*RlcConfigCfm) ARGS((Pst *pst, RlcMngmt *cfgCfm)); -typedef S16 (*LkwCntrlReq) ARGS((Pst *pst, KwMngmt *cntl)); -typedef S16 (*LkwCntrlCfm) ARGS((Pst *pst, KwMngmt *cntlCfm)); +typedef S16 (*LkwCntrlReq) ARGS((Pst *pst, RlcMngmt *cntl)); +typedef S16 (*LkwCntrlCfm) ARGS((Pst *pst, RlcMngmt *cntlCfm)); -typedef S16 (*LkwStaInd) ARGS((Pst *pst, KwMngmt *staInd)); -typedef S16 (*LkwStaReq) ARGS((Pst *pst, KwMngmt *staReq)); -typedef S16 (*LkwStaCfm) ARGS((Pst *pst, KwMngmt *staCfm)); +typedef S16 (*LkwStaInd) ARGS((Pst *pst, RlcMngmt *staInd)); +typedef S16 (*LkwStaReq) ARGS((Pst *pst, RlcMngmt *staReq)); +typedef S16 (*LkwStaCfm) ARGS((Pst *pst, RlcMngmt *staCfm)); -typedef S16 (*LkwStsReq) ARGS((Pst *pst, Action, KwMngmt *sts)); -typedef S16 (*LkwStsCfm) ARGS((Pst *pst, Action, KwMngmt *stsCfm)); +typedef S16 (*LkwStsReq) ARGS((Pst *pst, Action, RlcMngmt *sts)); +typedef S16 (*LkwStsCfm) ARGS((Pst *pst, Action, RlcMngmt *stsCfm)); -typedef S16 (*LkwTrcInd) ARGS((Pst *pst, KwMngmt *trc, Buffer *mBuf)); +typedef S16 (*LkwTrcInd) ARGS((Pst *pst, RlcMngmt *trc, Buffer *mBuf)); /* lkw_x_001.main_2, added support for L2 measurement */ #ifdef LTE_L2_MEAS -typedef S16 (*LkwL2MeasReq) ARGS((Pst *pst, KwL2MeasReqEvt *measEvt)); -typedef S16 (*LkwL2MeasCfm) ARGS((Pst *pst, KwL2MeasCfmEvt *measEvt)); +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)); @@ -393,39 +393,39 @@ typedef S16 (*LkwL2MeasStopCfm) ARGS((Pst *pst, U8 measType,U8 status)); @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiRlcConfigReq ARGS((Pst *pst, KwMngmt *cfg)); +EXTERN S16 RlcMiRlcConfigReq ARGS((Pst *pst, RlcMngmt *cfg)); /** -@details This function is called by the KwMiRlcConfigReq function for responding to configuration requests.The cfm field in the KwMngmt structure contains the response value. +@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. @param[in] pst - Pointer to post structure @param[in] cfm - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiRlcConfigCfm ARGS((Pst *pst, KwMngmt *cfgCfm)); +EXTERN S16 RlcMiRlcConfigCfm ARGS((Pst *pst, RlcMngmt *cfgCfm)); /** @details The layer manager initiates and uses the management-control procedure to control -RLC elements.The RLC control request primitive (KwMiLkwCntrlReq) is called +RLC elements.The RLC control request primitive (RlcMiLkwCntrlReq) is called more than once and at any time after the management-configuration procedure.The -control request primitive is confirmed by a KwMiLkwCntrlCfm primitive. +control request primitive is confirmed by a RlcMiLkwCntrlCfm primitive. @param[in] pst - Pointer to post structure @param[in] cntl - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiLkwCntrlReq ARGS((Pst *pst, KwMngmt *cntl)); +EXTERN S16 RlcMiLkwCntrlReq ARGS((Pst *pst, RlcMngmt *cntl)); /** @details -This function is called by the KwMiLkwCntrlReq function to send a control confirm to the layer management module. +This function is called by the RlcMiLkwCntrlReq function to send a control confirm to the layer management module. @param[in] pst - Pointer to post structure @param[in] cfm - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiLkwCntrlCfm ARGS((Pst *pst, KwMngmt *cntlCfm)); +EXTERN S16 RlcMiLkwCntrlCfm ARGS((Pst *pst, RlcMngmt *cntlCfm)); /** @details @@ -436,18 +436,18 @@ P,KWSAP, or CKSAP. @param[in] cfg - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiLkwStaReq ARGS((Pst *pst, KwMngmt *staInd)); +EXTERN S16 RlcMiLkwStaReq ARGS((Pst *pst, RlcMngmt *staInd)); /** @details -This function is called by the KwMiLkwStaReq function to send the requested stat +This function is called by the RlcMiLkwStaReq function to send the requested stat us information to the layer manager. @param[in] pst - Pointer to post structure @param[in] stacfm - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiLkwStaCfm ARGS((Pst *pst, KwMngmt *staCfm)); +EXTERN S16 RlcMiLkwStaCfm ARGS((Pst *pst, RlcMngmt *staCfm)); /** @details @@ -458,10 +458,10 @@ 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 KwMiLkwStsReq ARGS((Pst *pst, Action, KwMngmt *sts)); +EXTERN S16 RlcMiLkwStsReq ARGS((Pst *pst, Action, RlcMngmt *sts)); /** @details -This function is called by the KwMiLkwStsReq function for responding to statisti +This function is called by the RlcMiLkwStsReq function for responding to statisti cs requests. @param[in] pst - Pointer to post structure @@ -469,7 +469,7 @@ cs requests. @param[in] cfg - Configuration management structure @return ROK if success , RFAILED if failure */ -EXTERN S16 KwMiLkwStsCfm ARGS((Pst *pst, Action action, KwMngmt *stsCfm)); +EXTERN 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 KwMiLkwTrcInd ARGS ((Pst *pst, KwMngmt *trc, Buffer *mBuf)); +EXTERN 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 KwMiLkwL2MeasReq ARGS((Pst *pst, KwL2MeasReqEvt *measEvt)); -EXTERN S16 KwMiLkwL2MeasStopReq ARGS((Pst *pst,U8 measType)); -EXTERN S16 KwMiLkwL2MeasSendReq ARGS((Pst *pst,U8 measType)); +EXTERN S16 RlcMiLkwL2MeasReq ARGS((Pst *pst, RlcL2MeasReqEvt *measEvt)); +EXTERN S16 RlcMiLkwL2MeasStopReq ARGS((Pst *pst,U8 measType)); +EXTERN S16 RlcMiLkwL2MeasSendReq ARGS((Pst *pst,U8 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,13 +510,13 @@ 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 KwMiLkwL2MeasCfm ARGS((Pst *pst, KwL2MeasCfmEvt *measCfm)); -EXTERN S16 KwMiLkwL2MeasStopCfm ARGS((Pst *pst, U8 measType, U8 status)); +EXTERN S16 RlcMiLkwL2MeasCfm ARGS((Pst *pst, RlcL2MeasCfmEvt *measCfm)); +EXTERN S16 RlcMiLkwL2MeasStopCfm ARGS((Pst *pst, U8 measType, U8 status)); #endif /* LTE_L2_MEAS */ -EXTERN S16 KwMiLkwStaInd ARGS((Pst *pst, KwMngmt *staReq)); +EXTERN S16 RlcMiLkwStaInd ARGS((Pst *pst, RlcMngmt *staReq)); -EXTERN Void kwSendLmAlarm ARGS (( +EXTERN Void rlcSendLmAlarm ARGS (( U16 category, U16 event, U16 cause, @@ -526,62 +526,62 @@ EXTERN Void kwSendLmAlarm ARGS (( #ifdef SM EXTERN S16 SmMiRlcConfigCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwCntrlCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwStaInd ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwStaCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwStsCfm ARGS(( Pst *, Action, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwTrcInd ARGS(( Pst *, - KwMngmt *, + RlcMngmt *, Buffer * )); EXTERN S16 SmMiLkwStsReq ARGS(( Pst *, Action, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwStaReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiLkwCntrlReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 SmMiRlcConfigReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); /* lkw_x_001.main_2, added support for L2 measurement */ #ifdef LTE_L2_MEAS EXTERN S16 SmMiLkwL2MeasReq ARGS(( Pst *, - KwL2MeasReqEvt * + RlcL2MeasReqEvt * )); EXTERN S16 SmMiLkwL2MeasStopReq ARGS(( Pst *pst, @@ -594,7 +594,7 @@ EXTERN S16 SmMiLkwL2MeasSendReq ARGS(( )); EXTERN S16 SmMiLkwL2MeasCfm ARGS(( Pst *, - KwL2MeasCfmEvt * + RlcL2MeasCfmEvt * )); EXTERN S16 SmMiLkwL2MeasStopCfm ARGS(( Pst *pst, @@ -611,55 +611,55 @@ EXTERN S16 smKwActvTsk ARGS((Pst *pst, Buffer *mBuf)); #ifdef LCLKW EXTERN S16 packRlcConfigReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 packRlcConfigCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwCntrlReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwCntrlCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwStaInd ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwStaReq ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwStaCfm ARGS(( Pst *, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwStsReq ARGS(( Pst *, Action, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwStsCfm ARGS(( Pst *, Action, - KwMngmt * + RlcMngmt * )); EXTERN S16 cmPkLkwTrcInd ARGS(( Pst *, - KwMngmt *, + RlcMngmt *, Buffer * )); @@ -726,7 +726,7 @@ EXTERN S16 cmUnpkLkwTrcInd ARGS(( #ifdef LTE_L2_MEAS EXTERN S16 cmPkLkwL2MeasReq ARGS(( Pst * pst, - KwL2MeasReqEvt * measReqEvt + RlcL2MeasReqEvt * measReqEvt )); EXTERN S16 cmUnpkLkwL2MeasReq ARGS(( LkwL2MeasReq func, @@ -735,28 +735,28 @@ EXTERN S16 cmUnpkLkwL2MeasReq ARGS(( )); EXTERN S16 cmPkLkwL2MeasCfm ARGS(( Pst * pst, - KwL2MeasCfmEvt *measCfmEvt + RlcL2MeasCfmEvt *measCfmEvt )); EXTERN S16 cmUnpkLkwL2MeasCfm ARGS(( LkwL2MeasCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkKwL2MeasReqInfo ARGS(( - KwL2MeasReqInfo * measReqInfo, +EXTERN S16 cmPkRlcL2MeasReqInfo ARGS(( + RlcL2MeasReqInfo * measReqInfo, Buffer *mBuf )); -EXTERN S16 cmUnpkKwL2MeasReqInfo ARGS(( - KwL2MeasReqInfo * measReqInfo, +EXTERN S16 cmUnpkRlcL2MeasReqInfo ARGS(( + RlcL2MeasReqInfo * measReqInfo, Buffer *mBuf )); -EXTERN S16 cmPkKwL2MeasCfmInfo ARGS(( - KwL2MeasCfmInfo * measCfmInfo, +EXTERN S16 cmPkRlcL2MeasCfmInfo ARGS(( + RlcL2MeasCfmInfo * measCfmInfo, Buffer *mBuf, U8 measType )); -EXTERN S16 cmUnpkKwL2MeasCfmInfo ARGS(( - KwL2MeasCfmInfo * measCfmInfo, +EXTERN S16 cmUnpkRlcL2MeasCfmInfo ARGS(( + RlcL2MeasCfmInfo * measCfmInfo, Buffer *mBuf, U8 measType ));