small-bug-from-cdb18d38bfa6aee288a68d9e8881615a48addd83-and-one-gcc-warning

This commit is contained in:
Laurent THOMAS
2024-03-06 15:44:56 +01:00
parent b99e856733
commit c5c883f71d
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -521,7 +521,7 @@ function main() {
mkdir -p $DIR/nas_sim_tools/build mkdir -p $DIR/nas_sim_tools/build
cd $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 usim.txt usim
compilations nas_sim_tools nvram.txt nvram compilations nas_sim_tools nvram.txt nvram
compilations nas_sim_tools conf2uedata.txt conf2uedata compilations nas_sim_tools conf2uedata.txt conf2uedata
+2 -1
View File
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.5)
project(NAS_SIM_TOOLS) project(NAS_SIM_TOOLS)
@@ -6,6 +6,7 @@ include(FindPkgConfig)
pkg_search_module(CONFIG libconfig REQUIRED) pkg_search_module(CONFIG libconfig REQUIRED)
include_directories(${CONFIG_INCLUDE_DIRS}) include_directories(${CONFIG_INCLUDE_DIRS})
add_definitions(-std=gnu99) add_definitions(-std=gnu99)
include("../macros.cmake")
ENABLE_LANGUAGE(C) ENABLE_LANGUAGE(C)
+1 -1
View File
@@ -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)); nfapi_nr_pm_pdu_t *pmi_pdu = malloc16(mat.num_pm_idx * sizeof(*pmi_pdu));
AssertFatal(pmi_pdu != NULL, "out of memory\n"); AssertFatal(pmi_pdu != NULL, "out of memory\n");
mat.pmi_pdu = pmi_pdu; 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) // 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 // Generate DFT vertical beams
// ll: index of a vertical beams vector (represented by i1_1 in TS 38.214) // ll: index of a vertical beams vector (represented by i1_1 in TS 38.214)
const int max_l = N1 * O1 + (K1 - 1) * O1; const int max_l = N1 * O1 + (K1 - 1) * O1;