diff --git a/openair2/LAYER2/NR_MAC_UE/tests/CMakeLists.txt b/openair2/LAYER2/NR_MAC_UE/tests/CMakeLists.txt index 6dcad6fad8..406129c0aa 100644 --- a/openair2/LAYER2/NR_MAC_UE/tests/CMakeLists.txt +++ b/openair2/LAYER2/NR_MAC_UE/tests/CMakeLists.txt @@ -8,7 +8,7 @@ add_test(NAME test_nr_ue_power_procedures COMMAND ./test_nr_ue_power_procedures) add_executable(test_nr_ue_ra_procedures test_nr_ue_ra_procedures.cpp) -target_link_libraries(test_nr_ue_ra_procedures PRIVATE nr_ue_ra_procedures nr_ue_power_procedures GTest::gtest minimal_lib) +target_link_libraries(test_nr_ue_ra_procedures PRIVATE nr_ue_ra_procedures nr_ue_power_procedures GTest::gtest minimal_lib MAC_UE_NR) add_dependencies(tests test_nr_ue_ra_procedures) add_test(NAME test_nr_ue_ra_procedures COMMAND ./test_nr_ue_ra_procedures) diff --git a/openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp b/openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp index 47c7ad4027..ae79c87aee 100644 --- a/openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp +++ b/openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp @@ -6,6 +6,8 @@ extern "C" { #include "openair2/LAYER2/NR_MAC_UE/mac_proto.h" #include "executables/softmodem-common.h" +#include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h" +#include "common/utils/ocp_itti/intertask_interface.h" static softmodem_params_t softmodem_params; softmodem_params_t *get_softmodem_params(void) @@ -18,7 +20,13 @@ void nr_mac_rrc_ra_ind(const module_id_t mod_id, bool success) void nr_mac_rrc_msg3_ind(const module_id_t mod_id, const int rnti, bool prepare_payload) { } -tbs_size_t nr_mac_rlc_data_req(const module_id_t module_idP, +void nr_mac_rlc_status_ind(uint16_t ue_id, frame_t frame, int n_ch, const logical_chan_id_t *ch, mac_rlc_status_resp_t *ret) +{ +} +void nr_mac_rrc_inactivity_timer_ind(const module_id_t mod_id) +{ +} +tbs_size_t nr_mac_rlc_data_req(const module_id_t module_idP, const uint16_t ue_id, const bool gnb_flagP, const logical_chan_id_t channel_idP, @@ -27,32 +35,55 @@ tbs_size_t nr_mac_rlc_data_req(const module_id_t module_idP, { return 0; } -fapi_nr_ul_config_request_pdu_t *lockGet_ul_config(NR_UE_MAC_INST_t *mac, frame_t frame_tx, int slot_tx, uint8_t pdu_type) -{ - return nullptr; -} -void release_ul_config(fapi_nr_ul_config_request_pdu_t *configPerSlot, bool clearIt) +void nr_mac_rlc_data_ind(const module_id_t module_idP, + const uint16_t ue_id, + const bool gnb_flagP, + const nr_rlc_data_ind_t *data, + int num_data) { } -void remove_ul_config_last_item(fapi_nr_ul_config_request_pdu_t *pdu) + +bool nr_rlc_activate_srb0(int ue_id, + void *data, + void (*send_initial_ul_rrc_message)(int ue_id, const uint8_t *sdu, sdu_size_t sdu_len, void *data)) { + return true; } -int nr_ue_configure_pucch(NR_UE_MAC_INST_t *mac, - int slot, - frame_t frame, - uint16_t rnti, - PUCCH_sched_t *pucch, - fapi_nr_ul_config_pucch_pdu *pucch_pdu) +int nr_rlc_module_init(nr_rlc_op_mode_t mode) { return 0; } -NR_UE_DL_BWP_t *get_dl_bwp_structure(NR_UE_MAC_INST_t *mac, int bwp_id, bool setup) +MessageDef *itti_alloc_new_message(task_id_t origin_task_id, instance_t originInstance, MessagesIds message_id) { return NULL; } -NR_UE_UL_BWP_t *get_ul_bwp_structure(NR_UE_MAC_INST_t *mac, int bwp_id, bool setup) +int itti_send_msg_to_task(task_id_t task_id, instance_t instance, MessageDef *message) +{ + return 0; +} +typedef uint32_t channel_t; +int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, + const int CC_id, + const uint8_t gNB_index, + const int hfn, + const frame_t frame, + const int slot, + const rnti_t rnti, + const uint32_t cellid, + const long arfcn, + const channel_t channel, + const uint8_t *pduP, + const sdu_size_t pdu_len) +{ + return 0; +} +void nr_mac_rrc_meas_ind_ue(module_id_t module_id, + uint32_t gNB_index, + uint16_t Nid_cell, + bool csi_meas, + bool is_neighboring_cell, + int rsrp_dBm) { - return NULL; } } #include