X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcrg.x;h=fdc0e7e4068bf3b2e09dc496c702ed80ccb9a824;hb=c1a71fadad9bca810391ab3eb4963147ef6f0502;hp=66ca1ab76b374469dedc2f59cdc08f550dded4fd;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/cm/crg.x b/src/cm/crg.x index 66ca1ab76..fdc0e7e40 100755 --- a/src/cm/crg.x +++ b/src/cm/crg.x @@ -205,20 +205,6 @@ typedef struct crgLchCfg #endif /* LTE_L2_MEAS */ } CrgLchCfg; -/** - @brief Basic configuration information for MAC. */ -typedef struct crgCfg -{ - uint8_t cfgType; /*!< Indicates configuration type */ - union crgCfgU - { - CrgCellCfg cellCfg; /*!< Cell configuration */ - CrgUeCfg ueCfg; /*!< UE configuration */ - CrgLchCfg lchCfg; /*!< Logical channel configuration */ - } u; /*!< Union of Cell/UE/Lch configuration */ -} CrgCfg; - - /** @brief Activation time information. */ typedef struct crgActvTime @@ -321,19 +307,6 @@ typedef struct crgRst CmLteCellId cellId; /*!< Cell ID */ CmLteRnti crnti; /*!< UE ID: CRNTI tobe RESET */ } CrgRst; -/** - @brief Config/Reconfig/Delete information for MAC. */ -typedef struct crgCfgReqInfo -{ - uint8_t action; /*!< Determines cfg/recfg/del/reset */ - union cfgReqInfoU - { - CrgCfg cfgInfo; /*!< Configuration related infomation */ - CrgRecfg recfgInfo; /*!< Reconfiguration related information */ - CrgDel delInfo; /*!< Deletion related information */ - CrgRst rstInfo; /*!< Reset related information */ - } u; /*!< Union of config/re-config/delete information */ -} CrgCfgReqInfo; /* Function Prototypes @@ -354,13 +327,6 @@ typedef S16 (*CrgUbndReq) ARGS(( Pst* pst, SpId spId, Reason reason)); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -typedef S16 (*CrgCfgReq) ARGS(( - Pst* pst, - SpId spId, - CrgCfgTransId transId, - CrgCfgReqInfo * cfgReqInfo)); /** @brief Configuration Confirm from MAC to RRC. */ typedef S16 (*CrgCfgCfm) ARGS(( Pst* pst, @@ -369,34 +335,26 @@ typedef S16 (*CrgCfgCfm) ARGS(( uint8_t status)); /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 RgUiCrgBndReq ARGS(( +S16 RgUiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 RgUiCrgBndCfm ARGS(( +S16 RgUiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to Unbind the interface SAPs. */ -EXTERN S16 RgUiCrgUbndReq ARGS(( +S16 RgUiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -EXTERN S16 RgUiCrgCfgReq ARGS(( - Pst* pst, - SpId spId, - CrgCfgTransId transId, - CrgCfgReqInfo * cfgReqInfo -)); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 RgUiCrgCfgCfm ARGS(( +S16 RgUiCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, @@ -405,34 +363,26 @@ EXTERN S16 RgUiCrgCfgCfm ARGS(( #ifdef NH /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 NhLiCrgBndReq ARGS(( +S16 NhLiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 NhLiCrgBndCfm ARGS(( +S16 NhLiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to Unbind the interface SAPs. */ -EXTERN S16 NhLiCrgUbndReq ARGS(( +S16 NhLiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -EXTERN S16 NhLiCrgCfgReq ARGS(( - Pst* pst, - SpId spId, - CrgCfgTransId transId, - CrgCfgReqInfo * cfgReqInfo -)); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 NhLiCrgCfgCfm ARGS(( +S16 NhLiCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, @@ -442,265 +392,131 @@ EXTERN S16 NhLiCrgCfgCfm ARGS(( #ifdef LCCRG /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 cmPkCrgBndReq ARGS(( +S16 cmPkCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 cmUnpkCrgBndReq ARGS(( +S16 cmUnpkCrgBndReq ARGS(( CrgBndReq func, Pst* pst, Buffer *mBuf )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 cmPkCrgBndCfm ARGS(( +S16 cmPkCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 cmUnpkCrgBndCfm ARGS(( +S16 cmUnpkCrgBndCfm ARGS(( CrgBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 cmPkCrgUbndReq ARGS(( +S16 cmPkCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 cmUnpkCrgUbndReq ARGS(( +S16 cmUnpkCrgUbndReq ARGS(( CrgUbndReq func, Pst* pst, Buffer *mBuf )); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -EXTERN S16 cmPkCrgCfgReq ARGS(( - Pst* pst, - SpId spId, - CrgCfgTransId transId, - CrgCfgReqInfo * cfgReqInfo -)); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -EXTERN S16 cmUnpkCrgCfgReq ARGS(( - CrgCfgReq func, - Pst* pst, - Buffer *mBuf -)); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 cmPkCrgCfgCfm ARGS(( +S16 cmPkCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 cmUnpkCrgCfgCfm ARGS(( +S16 cmUnpkCrgCfgCfm ARGS(( CrgCfgCfm func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCrgCfgTransId ARGS(( +S16 cmPkCrgCfgTransId ARGS(( CrgCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCfgTransId ARGS(( +S16 cmUnpkCrgCfgTransId ARGS(( CrgCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgBwCfg ARGS(( +S16 cmPkCrgBwCfg ARGS(( CrgBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgBwCfg ARGS(( +S16 cmUnpkCrgBwCfg ARGS(( CrgBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgRachCfg ARGS(( +S16 cmPkCrgRachCfg ARGS(( CrgRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgRachCfg ARGS(( +S16 cmUnpkCrgRachCfg ARGS(( CrgRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCellCfg ARGS(( - CrgCellCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgCellCfg ARGS(( - CrgCellCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgUeUlHqCfg ARGS(( +S16 cmPkCrgUeUlHqCfg ARGS(( CrgUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeUlHqCfg ARGS(( +S16 cmUnpkCrgUeUlHqCfg ARGS(( CrgUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgUeCfg ARGS(( - CrgUeCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgUeCfg ARGS(( - CrgUeCfg *param, - Buffer *mBuf -)); #ifdef LTE_ADV -EXTERN S16 cmPkCrgUeSecCellInfo ARGS(( +S16 cmPkCrgUeSecCellInfo ARGS(( CrgUeSecCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeSecCellInfo ARGS(( +S16 cmUnpkCrgUeSecCellInfo ARGS(( CrgUeSecCellInfo *param, Buffer *mBuf )); #endif /* LTE_ADV */ -EXTERN S16 cmPkCrgDlLchCfg ARGS(( - CrgDlLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgDlLchCfg ARGS(( - CrgDlLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgUlLchCfg ARGS(( - CrgUlLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgUlLchCfg ARGS(( - CrgUlLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgLchCfg ARGS(( - CrgLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgLchCfg ARGS(( - CrgLchCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgCfg ARGS(( - CrgCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgCfg ARGS(( - CrgCfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgActvTime ARGS(( +S16 cmPkCrgActvTime ARGS(( CrgActvTime *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgActvTime ARGS(( +S16 cmUnpkCrgActvTime ARGS(( CrgActvTime *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCellRecfg ARGS(( - CrgCellRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgCellRecfg ARGS(( - CrgCellRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgUeRecfg ARGS(( - CrgUeRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgUeRecfg ARGS(( - CrgUeRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgLchRecfg ARGS(( - CrgLchRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgLchRecfg ARGS(( - CrgLchRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgRecfg ARGS(( - CrgRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgRecfg ARGS(( - CrgRecfg *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgDel ARGS(( - CrgDel *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgDel ARGS(( - CrgDel *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgRst ARGS(( - CrgRst *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgRst ARGS(( - CrgRst *param, - Buffer *mBuf -)); -EXTERN S16 cmPkCrgCfgReqInfo ARGS(( - CrgCfgReqInfo *param, - Buffer *mBuf -)); -EXTERN S16 cmUnpkCrgCfgReqInfo ARGS(( - CrgCfgReqInfo *param, - Buffer *mBuf -)); #endif #ifdef DM /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 DmUiCrgBndReq ARGS(( +S16 DmUiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 DmUiCrgBndCfm ARGS(( +S16 DmUiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 DmUiCrgUbndReq ARGS(( +S16 DmUiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -/** @brief Configuration Request from RRC to MAC for - * configuring Cell/Ue/Lch. */ -EXTERN S16 DmUiCrgCfgReq ARGS(( - Pst* pst, - SpId spId, - CrgCfgTransId transId, - CrgCfgReqInfo * cfgReqInfo -)); -/** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 DmUiCrgCfgCfm ARGS(( - Pst* pst, - SuId suId, - CrgCfgTransId transId, - uint8_t status -)); #endif #ifdef __cplusplus