Fix LTE build error
This commit is contained in:
@@ -335,6 +335,10 @@ else (CUDA_FOUND)
|
|||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if(NR)
|
||||||
|
add_definitions(-DNR=1)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (SANITIZE_ADDRESS)
|
if (SANITIZE_ADDRESS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-common")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-common")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-common")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-common")
|
||||||
|
|||||||
@@ -620,6 +620,7 @@ function main() {
|
|||||||
echo "set ( SKIP_SHARED_LIB_FLAG $SKIP_SHARED_LIB_FLAG )" >> $cmake_file
|
echo "set ( SKIP_SHARED_LIB_FLAG $SKIP_SHARED_LIB_FLAG )" >> $cmake_file
|
||||||
echo "set ( ITTI_SIM $ITTI_SIM )" >> $cmake_file
|
echo "set ( ITTI_SIM $ITTI_SIM )" >> $cmake_file
|
||||||
echo "set ( RFSIM_NAS $RFSIM_NAS )" >> $cmake_file
|
echo "set ( RFSIM_NAS $RFSIM_NAS )" >> $cmake_file
|
||||||
|
echo "set ( NR \"${NR}\" )" >> $cmake_file
|
||||||
echo "set ( SANITIZE_ADDRESS $SANITIZE_ADDRESS )" >> $cmake_file
|
echo "set ( SANITIZE_ADDRESS $SANITIZE_ADDRESS )" >> $cmake_file
|
||||||
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
||||||
cd $DIR/$build_dir/build
|
cd $DIR/$build_dir/build
|
||||||
|
|||||||
@@ -1256,7 +1256,6 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
RC.nrrrc[ctxt.module_id],
|
RC.nrrrc[ctxt.module_id],
|
||||||
ctxt.rnti);
|
ctxt.rnti);
|
||||||
|
|
||||||
gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
|
|
||||||
if (srb_id == 0) {
|
if (srb_id == 0) {
|
||||||
NR_DL_CCCH_Message_t* dl_ccch_msg=NULL;
|
NR_DL_CCCH_Message_t* dl_ccch_msg=NULL;
|
||||||
asn_dec_rval_t dec_rval;
|
asn_dec_rval_t dec_rval;
|
||||||
@@ -1300,7 +1299,10 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
rrcSetup_ies->masterCellGroup.size,0,0);
|
rrcSetup_ies->masterCellGroup.size,0,0);
|
||||||
AssertFatal(dec_rval.code == RC_OK, "could not decode masterCellGroup\n");
|
AssertFatal(dec_rval.code == RC_OK, "could not decode masterCellGroup\n");
|
||||||
|
|
||||||
// configure MAC
|
#if NR
|
||||||
|
gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
|
||||||
|
|
||||||
|
// configure MAC
|
||||||
rrc_mac_config_req_gNB(ctxt.module_id,
|
rrc_mac_config_req_gNB(ctxt.module_id,
|
||||||
rrc->carrier.ssb_SubcarrierOffset,
|
rrc->carrier.ssb_SubcarrierOffset,
|
||||||
rrc->carrier.pdsch_AntennaPorts,
|
rrc->carrier.pdsch_AntennaPorts,
|
||||||
@@ -1310,7 +1312,7 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
ue_context_p->ue_context.rnti,
|
ue_context_p->ue_context.rnti,
|
||||||
ue_context_p->ue_context.masterCellGroup
|
ue_context_p->ue_context.masterCellGroup
|
||||||
);
|
);
|
||||||
// rrc_rlc_config_asn1_req
|
// rrc_rlc_config_asn1_req
|
||||||
nr_rrc_rlc_config_asn1_req(&ctxt,
|
nr_rrc_rlc_config_asn1_req(&ctxt,
|
||||||
ue_context_p->ue_context.SRB_configList,
|
ue_context_p->ue_context.SRB_configList,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -1318,6 +1320,8 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
|
#endif
|
||||||
|
|
||||||
// This should be somewhere in the f1ap_cudu_ue_inst_t
|
// This should be somewhere in the f1ap_cudu_ue_inst_t
|
||||||
/*int macrlc_instance = 0;
|
/*int macrlc_instance = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user