From c5c883f71dc2a63f55d1a7e9f59dcc70e9b3b3cb Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Thu, 22 Feb 2024 13:15:54 +0100 Subject: [PATCH] small-bug-from-cdb18d38bfa6aee288a68d9e8881615a48addd83-and-one-gcc-warning --- cmake_targets/build_oai | 2 +- cmake_targets/nas_sim_tools/CMakeLists.txt | 3 ++- openair2/LAYER2/NR_MAC_gNB/config.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index 4fd7defd0c..ab0dd0cda9 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -521,7 +521,7 @@ function main() { mkdir -p $DIR/nas_sim_tools/build cd $DIR/nas_sim_tools/build - eval $CMAKE_CMD .. + ${CMAKE_CMD% *} .. compilations nas_sim_tools usim.txt usim compilations nas_sim_tools nvram.txt nvram compilations nas_sim_tools conf2uedata.txt conf2uedata diff --git a/cmake_targets/nas_sim_tools/CMakeLists.txt b/cmake_targets/nas_sim_tools/CMakeLists.txt index 55c981701b..4f0be81064 100755 --- a/cmake_targets/nas_sim_tools/CMakeLists.txt +++ b/cmake_targets/nas_sim_tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(NAS_SIM_TOOLS) @@ -6,6 +6,7 @@ include(FindPkgConfig) pkg_search_module(CONFIG libconfig REQUIRED) include_directories(${CONFIG_INCLUDE_DIRS}) add_definitions(-std=gnu99) +include("../macros.cmake") ENABLE_LANGUAGE(C) diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c index 9abb5ab748..d2cda44280 100644 --- a/openair2/LAYER2/NR_MAC_gNB/config.c +++ b/openair2/LAYER2/NR_MAC_gNB/config.c @@ -104,9 +104,9 @@ nfapi_nr_pm_list_t init_DL_MIMO_codebook(gNB_MAC_INST *gNB, nr_pdsch_AntennaPort nfapi_nr_pm_pdu_t *pmi_pdu = malloc16(mat.num_pm_idx * sizeof(*pmi_pdu)); AssertFatal(pmi_pdu != NULL, "out of memory\n"); mat.pmi_pdu = pmi_pdu; - AssertFatal(num_antenna_ports < 16, "Max number of antenna ports supported is currently 16\n"); // Generation of codebook Type1 with codebookMode 1 (num_antenna_ports < 16) + AssertFatal(num_antenna_ports < 16, "Max number of antenna ports supported is currently 16\n"); // Generate DFT vertical beams // ll: index of a vertical beams vector (represented by i1_1 in TS 38.214) const int max_l = N1 * O1 + (K1 - 1) * O1;