diff --git a/common/utils/ocp_itti/all_msg.h b/common/utils/ocp_itti/all_msg.h index f9e6831283..a298ba54d0 100644 --- a/common/utils/ocp_itti/all_msg.h +++ b/common/utils/ocp_itti/all_msg.h @@ -2,9 +2,7 @@ * SPDX-License-Identifier: LicenseRef-CSSL-1.0 */ -#include "openair2/COMMON/phy_messages_def.h" #include "openair2/COMMON/mac_messages_def.h" -#include "openair2/COMMON/rlc_messages_def.h" #include "openair2/COMMON/pdcp_messages_def.h" #include "openair2/COMMON/rrc_messages_def.h" #include "openair2/COMMON/nas_messages_def.h" @@ -13,7 +11,6 @@ #include "openair2/COMMON/m2ap_messages_def.h" #include "openair2/COMMON/m3ap_messages_def.h" #include "openair2/COMMON/sctp_messages_def.h" -#include "openair2/COMMON/udp_messages_def.h" #include "openair2/COMMON/gtpv1_u_messages_def.h" #include "openair2/COMMON/f1ap_messages_def.h" #include "openair2/COMMON/e1ap_messages_def.h" diff --git a/common/utils/ocp_itti/intertask_interface.h b/common/utils/ocp_itti/intertask_interface.h index 47d0ac216f..4bff203e08 100644 --- a/common/utils/ocp_itti/intertask_interface.h +++ b/common/utils/ocp_itti/intertask_interface.h @@ -53,9 +53,7 @@ typedef struct IttiMsgText_s { char text[]; } IttiMsgText; -#include #include -#include #include #include #include @@ -208,7 +206,6 @@ typedef struct IttiMsgText_s { #include #include #include -#include #include #include #include @@ -288,7 +285,6 @@ typedef struct { TASK_DEF(TASK_GNB_APP, 200) \ TASK_DEF(TASK_MCE_APP, 200) \ TASK_DEF(TASK_MME_APP, 200) \ - TASK_DEF(TASK_PHY_UE, 200) \ TASK_DEF(TASK_MAC_UE, 200) \ TASK_DEF(TASK_RLC_UE, 200) \ TASK_DEF(TASK_PDCP_UE, 200) \ diff --git a/doc/Doxyfile b/doc/Doxyfile index f89d2fd26f..a7af56eff3 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1797,34 +1797,27 @@ INPUT = \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_rrc_primitives.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/commonDef.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../common/platform_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/networkDef.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/openair_defs.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/as_message.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_types.h \ diff --git a/openair2/COMMON/mac_primitives.h b/openair2/COMMON/mac_primitives.h deleted file mode 100644 index 707521a0ce..0000000000 --- a/openair2/COMMON/mac_primitives.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef __MAC_PRIMITIVES_H__ -#define __MAC_PRIMITIVES_H__ - - - -//void ue_decode_chbch(unsigned char Node_id); -//void ue_scheduler(unsigned char Node_id); -//void nodeb_decode_ul_sach(); -#endif diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h deleted file mode 100644 index bdd590a53d..0000000000 --- a/openair2/COMMON/messages_def.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -// These messages files are mandatory and must always be placed in first position -#include "intertask_messages_def.h" -#include "timer_messages_def.h" - -// Messages files used between tasks -#include "phy_messages_def.h" -#include "mac_messages_def.h" -#include "rlc_messages_def.h" -#include "pdcp_messages_def.h" -#include "rrc_messages_def.h" -#include "nas_messages_def.h" -#include "s1ap_messages_def.h" -#include "f1ap_messages_def.h" -#include "x2ap_messages_def.h" -#include "m2ap_messages_def.h" -#include "m3ap_messages_def.h" -#include "sctp_messages_def.h" -#include "udp_messages_def.h" -#include "gtpv1_u_messages_def.h" -#include "e1ap_messages_def.h" diff --git a/openair2/COMMON/openair_defs.h b/openair2/COMMON/openair_defs.h deleted file mode 100644 index 1ba95df5b8..0000000000 --- a/openair2/COMMON/openair_defs.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef __openair_DEFS_H__ -#define __openair_DEFS_H__ - -#include -#include -#include -#endif // /*__openair_DEFS_H__ */ - diff --git a/openair2/COMMON/phy_messages_def.h b/openair2/COMMON/phy_messages_def.h deleted file mode 100644 index 2846351b0c..0000000000 --- a/openair2/COMMON/phy_messages_def.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -//-------------------------------------------------------------------------------------------// -// 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) - -MESSAGE_DEF(PHY_FIND_CELL_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyFindCellReq, phy_find_cell_req) -MESSAGE_DEF(PHY_FIND_NEXT_CELL_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyFindNextCellReq, phy_find_next_cell_req) -MESSAGE_DEF(PHY_MEAS_THRESHOLD_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyMeasThresholdReq, phy_meas_threshold_req) -// UE: PHY -> RRC messages -MESSAGE_DEF(PHY_FIND_CELL_IND, MESSAGE_PRIORITY_MED_PLUS, PhyFindCellInd, phy_find_cell_ind) -MESSAGE_DEF(PHY_MEAS_THRESHOLD_CONF, MESSAGE_PRIORITY_MED_PLUS, PhyMeasThresholdConf, phy_meas_threshold_conf) -MESSAGE_DEF(PHY_MEAS_REPORT_IND, MESSAGE_PRIORITY_MED_PLUS, PhyMeasReportInd, phy_meas_report_ind) diff --git a/openair2/COMMON/phy_messages_types.h b/openair2/COMMON/phy_messages_types.h deleted file mode 100644 index 9e758a92f7..0000000000 --- a/openair2/COMMON/phy_messages_types.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * phy_messages_types.h - */ - -#ifndef PHY_MESSAGES_TYPES_H_ -#define PHY_MESSAGES_TYPES_H_ - -#include "PHY/defs_common.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 -#define PHY_FIND_NEXT_CELL_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_find_next_cell_req - -#define PHY_FIND_CELL_IND(mSGpTR) (mSGpTR)->ittiMsg.phy_find_cell_ind - -#define PHY_MEAS_THRESHOLD_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_threshold_req -#define PHY_MEAS_THRESHOLD_CONF(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_threshold_conf -#define PHY_MEAS_REPORT_IND(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_report_ind -//-------------------------------------------------------------------------------------------// -#define MAX_REPORTED_CELL 10 - -/* Enhance absolute radio frequency channel number */ -typedef uint16_t Earfcn; - -/* Physical cell identity, valid value are from 0 to 503 */ -typedef int16_t PhyCellId; - -/* Reference signal received power, valid value are from 0 (rsrp < -140 dBm) to 97 (rsrp <= -44 dBm) */ -typedef int8_t Rsrp; - -/* Reference signal received quality, valid value are from 0 (rsrq < -19.50 dB) to 34 (rsrq <= -3 dB) */ -typedef int8_t Rsrq; - -typedef struct CellInfo_s { - Earfcn earfcn; - PhyCellId cell_id; - Rsrp rsrp; - Rsrq rsrq; -} CellInfo; - -//-------------------------------------------------------------------------------------------// -// eNB: ENB_APP -> PHY messages -typedef struct PhyConfigurationReq_s { - frame_type_t frame_type[MAX_NUM_CCs]; - lte_prefix_type_t prefix_type[MAX_NUM_CCs]; - uint32_t downlink_frequency[MAX_NUM_CCs]; - int32_t uplink_frequency_offset[MAX_NUM_CCs]; - int32_t nb_antennas_tx[MAX_NUM_CCs]; - int32_t nb_antennas_rx[MAX_NUM_CCs]; - int32_t tx_gain[MAX_NUM_CCs]; - int32_t rx_gain[MAX_NUM_CCs]; -} PhyConfigurationReq; - -// UE: RRC -> PHY messages -typedef struct PhyDeactivateReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyDeactivateReq; - -typedef struct PhyFindCellReq_s { - Earfcn earfcn_start; - Earfcn earfcn_end; -} PhyFindCellReq; - -typedef struct PhyFindNextCellReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyFindNextCellReq; - -typedef struct PhyMeasThresholdReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasThresholdReq; - -typedef struct PhyMeasReportInd_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasReportInd; - -// UE: PHY -> RRC messages -typedef struct PhyFindCellInd_s { - uint8_t cell_nb; - CellInfo cells[MAX_REPORTED_CELL]; -} PhyFindCellInd; - -typedef struct PhyMeasThresholdConf_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasThresholdConf; -#endif /* PHY_MESSAGES_TYPES_H_ */ diff --git a/openair2/COMMON/rlc_messages_def.h b/openair2/COMMON/rlc_messages_def.h deleted file mode 100644 index 7d86f5b56b..0000000000 --- a/openair2/COMMON/rlc_messages_def.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * rlc_messages_def.h - */ - -//-------------------------------------------------------------------------------------------// -// Messages for RLC logging - -#if defined(DISABLE_ITTI_XER_PRINT) - -#else -MESSAGE_DEF(RLC_AM_DATA_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_data_pdu_ind) -MESSAGE_DEF(RLC_AM_DATA_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_data_pdu_req) -MESSAGE_DEF(RLC_AM_STATUS_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_status_pdu_ind) -MESSAGE_DEF(RLC_AM_STATUS_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_status_pdu_req) -MESSAGE_DEF(RLC_AM_SDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_sdu_req) -MESSAGE_DEF(RLC_AM_SDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_sdu_ind) - -MESSAGE_DEF(RLC_UM_DATA_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_data_pdu_ind) -MESSAGE_DEF(RLC_UM_DATA_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_data_pdu_req) -MESSAGE_DEF(RLC_UM_SDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_sdu_req) -MESSAGE_DEF(RLC_UM_SDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_sdu_ind) -#endif diff --git a/openair2/COMMON/rlc_messages_types.h b/openair2/COMMON/rlc_messages_types.h deleted file mode 100644 index ab9483669a..0000000000 --- a/openair2/COMMON/rlc_messages_types.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * rlc_messages_types.h - */ - -#ifndef RLC_MESSAGES_TYPES_H_ -#define RLC_MESSAGES_TYPES_H_ - - - -#endif /* RLC_MESSAGES_TYPES_H_ */ diff --git a/openair2/COMMON/udp_messages_def.h b/openair2/COMMON/udp_messages_def.h deleted file mode 100644 index 03566ef09f..0000000000 --- a/openair2/COMMON/udp_messages_def.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -MESSAGE_DEF(UDP_INIT, MESSAGE_PRIORITY_MED, udp_init_t, udp_init) -MESSAGE_DEF(UDP_DATA_REQ, MESSAGE_PRIORITY_MED, udp_data_req_t, udp_data_req) -MESSAGE_DEF(UDP_DATA_IND, MESSAGE_PRIORITY_MED, udp_data_ind_t, udp_data_ind) diff --git a/openair2/COMMON/udp_messages_types.h b/openair2/COMMON/udp_messages_types.h deleted file mode 100644 index 9db6dc78d7..0000000000 --- a/openair2/COMMON/udp_messages_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef UDP_MESSAGES_TYPES_H_ -#define UDP_MESSAGES_TYPES_H_ - -#define UDP_INIT(mSGpTR) (mSGpTR)->ittiMsg.udp_init - -typedef struct { - uint32_t port; - char *address; -} udp_init_t; - -typedef struct { - uint8_t *buffer; - uint32_t buffer_length; - uint32_t buffer_offset; - uint32_t peer_address; - uint32_t peer_port; -} udp_data_req_t; - -typedef struct { - uint8_t *buffer; - uint32_t buffer_length; - uint32_t peer_address; - uint32_t peer_port; -} udp_data_ind_t; - -#endif /* UDP_MESSAGES_TYPES_H_ */ diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c index 3a7b453bd0..c2e326d9cb 100644 --- a/openair2/RRC/LTE/rrc_UE.c +++ b/openair2/RRC/LTE/rrc_UE.c @@ -2819,8 +2819,6 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index, UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIB1systemInfoValueTag = sib1->systemInfoValueTag; if (!IS_SOFTMODEM_NOS1) { - int cell_valid = 0; - if (sib1->cellAccessRelatedInfo.cellBarred == LTE_SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred) { /* Cell is not barred */ int plmn; @@ -2863,24 +2861,11 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index, NAS_CELL_SELECTION_CNF (msg_p).rsrq = rsrq; NAS_CELL_SELECTION_CNF (msg_p).rsrp = rsrp; itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p); - cell_valid = 1; UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity = plmn + 1; break; } } } - - if (cell_valid == 0) { - /* Cell can not be used, ask PHY to try the next one */ - MessageDef *msg_p; - msg_p = itti_alloc_new_message(TASK_RRC_UE, 0, PHY_FIND_NEXT_CELL_REQ); - itti_send_msg_to_task(TASK_PHY_UE, ctxt_pP->instance, msg_p); - LOG_E(RRC, - "Synched with a cell, but PLMN doesn't match our SIM " - "(selected_plmn_identity %d), the message PHY_FIND_NEXT_CELL_REQ " - "is sent but lost in current UE implementation!\n", - UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity); - } } VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_UE_DECODE_SIB1, VCD_FUNCTION_OUT ); @@ -4457,11 +4442,7 @@ void *rrc_ue_task( void *args_p ) { case RRC_STATE_IDLE: { /* Ask to layer 1 to find a cell matching the criterion */ - MessageDef *message_p; - message_p = itti_alloc_new_message(TASK_RRC_UE, 0, PHY_FIND_CELL_REQ); - PHY_FIND_CELL_REQ (message_p).earfcn_start = 1; - PHY_FIND_CELL_REQ (message_p).earfcn_end = 1; - itti_send_msg_to_task(TASK_PHY_UE, UE_MODULE_ID_TO_INSTANCE(ue_mod_id), message_p); + LOG_W(RRC, "PHY_FIND_CELL_REQ message to L1/PHY not implemented\n"); rrc_set_sub_state (ue_mod_id, RRC_SUB_STATE_IDLE_SEARCHING); break; } diff --git a/openair2/RRC/LTE/rrc_common.c b/openair2/RRC/LTE/rrc_common.c index 8ca158537f..e37c7a4da7 100644 --- a/openair2/RRC/LTE/rrc_common.c +++ b/openair2/RRC/LTE/rrc_common.c @@ -9,7 +9,6 @@ #include "rrc_defs.h" #include "rrc_extern.h" #include "LAYER2/MAC/mac_extern.h" -#include "COMMON/openair_defs.h" #include "common/platform_types.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" #include "LAYER2/RLC/rlc.h" diff --git a/openair2/RRC/LTE/utils.c b/openair2/RRC/LTE/utils.c deleted file mode 100644 index 016039cdf8..0000000000 --- a/openair2/RRC/LTE/utils.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#include "defs.h" -#include "extern.h" - - -//------------------------------------------------------------------------------------------------------------------// -uint16_t find_free_dtch_position(uint8_t Mod_id, uint16_t UE_CH_index) { - uint16_t i,j; - - if(UE_CH_index==0) { - j=0; - } else { - j=1; - } - - for(i=j; imacphy_exit("NO FREE DTCH LCHAN, exit"); - return 0; -} - -//-------------------------------------------------------------------------------------------// -uint8_t rrc_find_free_ue_index(uint8_t Mod_id) { - //-------------------------------------------------------------------------------------------// - uint16_t i; - - for(i=1; i<=NB_CNX_CH; i++) - if ( (CH_rrc_inst[Mod_id].Info.UE_info[i][0] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][1] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][2] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][3] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][4] == 0)) { - return i; - } - - return 0xff; -} - - -//-------------------------------------------------------------------------------------------// -unsigned short rrc_find_ue_index(unsigned char Mod_id, L2_ID Mac_id) { - //-------------------------------------------------------------------------------------------// - unsigned char i; - /* - for(i=0;i<=NB_CNX_CH;i++) - if( bcmp(Mac_id.L2_id,CH_rrc_inst[Mod_id].Info.UE_info[i].L2_id,sizeof(L2_ID))==0) - return i; - return i; - */ -} -//-------------------------------------------------------------------------------------------// -uint8_t rrc_is_node_isolated(uint8_t Mod_id) { - //-------------------------------------------------------------------------------------------// - /*uint8_t i; - for(i=0;iHeader->Rv_tb_idx=0; - // Rrc_buffer->W_idx=0; - //Rrc_buffer->R_idx=0; -} diff --git a/openair3/COMMON/messages_types.h b/openair3/COMMON/messages_types.h deleted file mode 100644 index de270ae027..0000000000 --- a/openair3/COMMON/messages_types.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef MESSAGES_TYPES_H_ -#define MESSAGES_TYPES_H_ - -#include "intertask_messages_types.h" -#include "timer_messages_types.h" - -#include "security_types.h" - -#include "gtpv1_u_messages_types.h" -#include "ip_forward_messages_types.h" -#include "s11_messages_types.h" -#include "s1ap_messages_types.h" -#include "nas_messages_types.h" -#include "s6a_messages_types.h" -#include "sctp_messages_types.h" -#include "sgw_lite_messages_types.h" -#include "udp_messages_types.h" -#include "mme_app_messages_types.h" -#include "m2ap_messages_types.h" -#include "ngap_messages_types.h" - - -#endif /* MESSAGES_TYPES_H_ */