diff --git a/openair2/COMMON/phy_messages_def.h b/openair2/COMMON/phy_messages_def.h index 6b1203f71e..ae7204f2a0 100644 --- a/openair2/COMMON/phy_messages_def.h +++ b/openair2/COMMON/phy_messages_def.h @@ -6,6 +6,9 @@ */ //-------------------------------------------------------------------------------------------// +// eNB: ENB_APP -> PHY messages +MESSAGE_DEF(PHY_CONFIGURATION_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyConfigurationReq, phy_configuration_req) + // UE: RRC -> PHY messages MESSAGE_DEF(PHY_DEACTIVATE_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyDeactivateReq, phy_deactivate_req) diff --git a/openair2/COMMON/phy_messages_types.h b/openair2/COMMON/phy_messages_types.h index fb0913b5c0..6ef5a62696 100644 --- a/openair2/COMMON/phy_messages_types.h +++ b/openair2/COMMON/phy_messages_types.h @@ -8,9 +8,12 @@ #ifndef PHY_MESSAGES_TYPES_H_ #define PHY_MESSAGES_TYPES_H_ +#include "PHY/impl_defs_lte.h" #include "ral_messages_types.h" //-------------------------------------------------------------------------------------------// // Defines to access message fields. +#define PHY_CONFIGURATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_configuration_req + #define PHY_DEACTIVATE_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_deactivate_req #define PHY_FIND_CELL_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_find_cell_req @@ -44,45 +47,52 @@ typedef struct CellInfo_s { } CellInfo; //-------------------------------------------------------------------------------------------// +// eNB: ENB_APP -> PHY messages +typedef struct PhyConfigurationReq_s { + lte_frame_type_t frame_type; + lte_prefix_type_t prefix_type; + uint32_t downlink_frequency; + int32_t uplink_frequency_offset; +} PhyConfigurationReq; + // UE: RRC -> PHY messages typedef struct PhyDeactivateReq_s { } PhyDeactivateReq; typedef struct PhyFindCellReq_s { //# if defined(ENABLE_RAL) - ral_transaction_id_t transaction_id; + ral_transaction_id_t transaction_id; //# endif - Earfcn earfcn_start; - Earfcn earfcn_end; + Earfcn earfcn_start; + Earfcn earfcn_end; } PhyFindCellReq; typedef struct PhyFindNextCellReq_s { } PhyFindNextCellReq; - typedef struct PhyMeasThresholdReq_s { - ral_transaction_id_t transaction_id; - ral_link_cfg_param_t cfg_param; + ral_transaction_id_t transaction_id; + ral_link_cfg_param_t cfg_param; } PhyMeasThresholdReq; typedef struct PhyMeasReportInd_s { - ral_threshold_t threshold; - ral_link_param_t link_param; + ral_threshold_t threshold; + ral_link_param_t link_param; } PhyMeasReportInd; // UE: PHY -> RRC messages typedef struct PhyFindCellInd_s { //# if defined(ENABLE_RAL) - ral_transaction_id_t transaction_id; + ral_transaction_id_t transaction_id; //# endif - uint8_t cell_nb; - CellInfo cells[MAX_REPORTED_CELL]; + uint8_t cell_nb; + CellInfo cells[MAX_REPORTED_CELL]; } PhyFindCellInd; typedef struct PhyMeasThresholdConf_s { - ral_transaction_id_t transaction_id; - ral_status_t status; - uint8_t num_link_cfg_params; - ral_link_cfg_status_t cfg_status[RAL_MAX_LINK_CFG_PARAMS]; + ral_transaction_id_t transaction_id; + ral_status_t status; + uint8_t num_link_cfg_params; + ral_link_cfg_status_t cfg_status[RAL_MAX_LINK_CFG_PARAMS]; }PhyMeasThresholdConf; #endif /* PHY_MESSAGES_TYPES_H_ */ diff --git a/targets/Makefile.common b/targets/Makefile.common index fee729ed3a..1f978e5e90 100644 --- a/targets/Makefile.common +++ b/targets/Makefile.common @@ -40,6 +40,7 @@ ENABLE_ITTI = 1 COMMON_CFLAGS += -DENABLE_ITTI COMMON_CFLAGS += -DUSER_MODE COMMON_CFLAGS += -DLOG_NO_THREAD +COMMON_CFLAGS += -I$(OPENAIR1_DIR) COMMON_CFLAGS += -I$(OPENAIR2_DIR)/NAS COMMON_CFLAGS += $(L2_incl) COMMON_CFLAGS += $(UTILS_incl)