From 597aa81ccfcd10f180614d66b58eae1734c603f3 Mon Sep 17 00:00:00 2001 From: winckel <winckel@eurecom.fr> Date: Fri, 6 Dec 2013 15:00:04 +0000 Subject: [PATCH] Updated UE NAS <-> RRC messages. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4630 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/COMMON/rrc_messages_def.h | 15 ++++++++++---- openair2/COMMON/rrc_messages_types.h | 31 ++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h index bdbd73b6097..bdc42adf4ed 100644 --- a/openair2/COMMON/rrc_messages_def.h +++ b/openair2/COMMON/rrc_messages_def.h @@ -19,9 +19,16 @@ MESSAGE_DEF(RRC_UL_DCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, RrcUlDcchMes #endif //-------------------------------------------------------------------------------------------// -// Messages between NAS and RRC layers -MESSAGE_DEF(NAS_DOWNLINK_DATA_IND, MESSAGE_PRIORITY_MED, NasDlDataInd, nas_dl_data_ind) - +// UE: NAS -> RRC messages +MESSAGE_DEF(NAS_CELL_SELECTION_REQ, MESSAGE_PRIORITY_MED, NasCellSelectionReq, nas_cell_selection_req) +MESSAGE_DEF(NAS_CONN_ESTABLI_REQ, MESSAGE_PRIORITY_MED, NasConnEstabliReq, nas_conn_establi_req) MESSAGE_DEF(NAS_UPLINK_DATA_REQ, MESSAGE_PRIORITY_MED, NasUlDataReq, nas_ul_data_req) + +// UE: RRC -> NAS messages +MESSAGE_DEF(NAS_CELL_SELECTION_CNF, MESSAGE_PRIORITY_MED, NasCellSelectionCnf, nas_cell_selection_cnf) +MESSAGE_DEF(NAS_CELL_SELECTION_IND, MESSAGE_PRIORITY_MED, NasCellSelectionInd, nas_cell_selection_ind) +MESSAGE_DEF(NAS_PAGING_IND, MESSAGE_PRIORITY_MED, NasPagingInd, nas_paging_ind) +MESSAGE_DEF(NAS_CONN_ESTABLI_CNF, MESSAGE_PRIORITY_MED, NasConnEstabCnf, nas_conn_establi_cnf) +MESSAGE_DEF(NAS_CONN_RELEASE_IND, MESSAGE_PRIORITY_MED, NasConnReleaseInd, nas_conn_release_ind) MESSAGE_DEF(NAS_UPLINK_DATA_CNF, MESSAGE_PRIORITY_MED, NasUlDataCnf, nas_ul_data_cnf) -MESSAGE_DEF(NAS_UPLINK_DATA_IND, MESSAGE_PRIORITY_MED, NasUlDataInd, nas_ul_data_ind) +MESSAGE_DEF(NAS_DOWNLINK_DATA_IND, MESSAGE_PRIORITY_MED, NasDlDataInd, nas_dl_data_ind) diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h index 252e71d3df2..3f485e413a4 100644 --- a/openair2/COMMON/rrc_messages_types.h +++ b/openair2/COMMON/rrc_messages_types.h @@ -30,18 +30,31 @@ typedef UL_DCCH_Message_t RrcUlDcchMessage; //-------------------------------------------------------------------------------------------// // Defines to access message fields. -#define NAS_DOWNLINK_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_ind - +#define NAS_CELL_SELECTION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_cell_selection_req +#define NAS_CONN_ESTABLI_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_establi_req #define NAS_UPLINK_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_req + +#define NAS_CELL_SELECTION_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_cell_selection_cnf +#define NAS_CELL_SELECTION_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_cell_selection_ind +#define NAS_PAGING_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_paging_ind +#define NAS_CONN_ESTABLI_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_establi_cnf +#define NAS_CONN_RELEASE_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_release_ind #define NAS_UPLINK_DATA_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_cnf -#define NAS_UPLINK_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_ind +#define NAS_DOWNLINK_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_ind //-------------------------------------------------------------------------------------------// -// Messages between NAS and RRC layers -typedef dl_info_transfer_ind_t NasDlDataInd; - -typedef ul_info_transfer_req_t NasUlDataReq; -typedef ul_info_transfer_cnf_t NasUlDataCnf; -typedef ul_info_transfer_ind_t NasUlDataInd; +// UE: NAS -> RRC messages +typedef cell_info_req_t NasCellSelectionReq; +typedef nas_establish_req_t NasConnEstabliReq; +typedef ul_info_transfer_req_t NasUlDataReq; + +// UE: RRC -> NAS messages +typedef cell_info_cnf_t NasCellSelectionCnf; +typedef cell_info_ind_t NasCellSelectionInd; +typedef paging_ind_t NasPagingInd; +typedef nas_establish_cnf_t NasConnEstabCnf; +typedef nas_release_ind_t NasConnReleaseInd; +typedef ul_info_transfer_cnf_t NasUlDataCnf; +typedef dl_info_transfer_ind_t NasDlDataInd; #endif /* RRC_MESSAGES_TYPES_H_ */ -- GitLab