diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 03ee12cb821af3b88020d000e75f3f763076b44e..616adf3a82dadc9fc2eb55c30d19f252517d2cb4 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -966,6 +966,7 @@ set(SCHED_SRC
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_eNb.c
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+ ${OPENAIR1_DIR}/SCHED/prach_procedures.c
${OPENAIR1_DIR}/SCHED/ru_procedures.c
# ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
${OPENAIR1_DIR}/SCHED/pucch_pc.c
@@ -974,6 +975,17 @@ set(SCHED_SRC
)
add_library(SCHED_LIB ${SCHED_SRC})
+set(SCHED_SRC_UE
+ ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
+ ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+ ${OPENAIR1_DIR}/SCHED/ru_procedures.c
+ ${OPENAIR1_DIR}/SCHED/prach_procedures.c
+ ${OPENAIR1_DIR}/SCHED/pucch_pc.c
+ ${OPENAIR1_DIR}/SCHED/pusch_pc.c
+ ${OPENAIR1_DIR}/SCHED/srs_pc.c
+)
+add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
+
# nFAPI
#################################
set(NFAPI_COMMON_SRC
@@ -1104,6 +1116,103 @@ set(PHY_SRC
${OPENAIR1_DIR}/PHY/CODING/viterbi.c
${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
${OPENAIR1_DIR}/PHY/INIT/lte_init.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
+ ${OPENAIR1_DIR}/PHY/INIT/init_top.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_parms.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_param_init.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/cdot_prod.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
+ ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
+ )
+
+set(PHY_SRC_UE
+ # depend on code generation from asn1c
+ ${RRC_FULL_DIR}/asn1_constants.h
+ # actual source
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/power_control.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_decoding.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_scrambling.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pch.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/group_hopping.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/srs_modulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/drs_modulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_modulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_coding.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/rar_tools.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/print_stats.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/initial_sync.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
+ ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/ofdm_mod.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
+ ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
+ ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/adjust_gain.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_uespec.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold_mbsfn.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_mbsfn.c
+ ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_ul_ref.c
+ ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
+ ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
+ ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
+ ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
+ ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
+ ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
+ ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
+ ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
+ ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
+ ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
+ ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
+ ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
+ ${OPENAIR1_DIR}/PHY/INIT/init_top.c
${OPENAIR1_DIR}/PHY/INIT/lte_parms.c
${OPENAIR1_DIR}/PHY/INIT/lte_param_init.c
${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
@@ -1119,15 +1228,18 @@ set(PHY_SRC
${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
${OPENAIR1_DIR}/PHY/TOOLS/lut.c
)
+
if (${SMBV})
set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
endif (${SMBV})
if (${COMPILATION_AVX2} STREQUAL "True")
set(PHY_SRC ${PHY_SRC} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
+ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
endif ()
add_library(PHY ${PHY_SRC})
+add_library(PHY_UE ${PHY_SRC_UE})
#Layer 2 library
#####################
@@ -1181,14 +1293,61 @@ set(L2_SRC
${RRC_DIR}/rrc_eNB_UE_context.c
${RRC_DIR}/rrc_common.c
${RRC_DIR}/L2_interface.c
+ ${RRC_DIR}/L2_interface_common.c
+ ${RRC_DIR}/L2_interface_ue.c
)
+
+set(L2_SRC_UE
+ ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
+ ${PDCP_DIR}/pdcp.c
+ ${PDCP_DIR}/pdcp_fifo.c
+ ${PDCP_DIR}/pdcp_sequence_manager.c
+ ${PDCP_DIR}/pdcp_primitives.c
+ ${PDCP_DIR}/pdcp_util.c
+ ${PDCP_DIR}/pdcp_security.c
+ ${PDCP_DIR}/pdcp_netlink.c
+ ${RLC_AM_DIR}/rlc_am.c
+ ${RLC_AM_DIR}/rlc_am_init.c
+ ${RLC_AM_DIR}/rlc_am_timer_poll_retransmit.c
+ ${RLC_AM_DIR}/rlc_am_timer_reordering.c
+ ${RLC_AM_DIR}/rlc_am_timer_status_prohibit.c
+ ${RLC_AM_DIR}/rlc_am_segment.c
+ ${RLC_AM_DIR}/rlc_am_segments_holes.c
+ ${RLC_AM_DIR}/rlc_am_in_sdu.c
+ ${RLC_AM_DIR}/rlc_am_receiver.c
+ ${RLC_AM_DIR}/rlc_am_retransmit.c
+ ${RLC_AM_DIR}/rlc_am_windows.c
+ ${RLC_AM_DIR}/rlc_am_rx_list.c
+ ${RLC_AM_DIR}/rlc_am_reassembly.c
+ ${RLC_AM_DIR}/rlc_am_status_report.c
+ ${RLC_TM_DIR}/rlc_tm.c
+ ${RLC_TM_DIR}/rlc_tm_init.c
+ ${RLC_UM_DIR}/rlc_um.c
+ ${RLC_UM_DIR}/rlc_um_fsm.c
+ ${RLC_UM_DIR}/rlc_um_control_primitives.c
+ ${RLC_UM_DIR}/rlc_um_segment.c
+ ${RLC_UM_DIR}/rlc_um_reassembly.c
+ ${RLC_UM_DIR}/rlc_um_receiver.c
+ ${RLC_UM_DIR}/rlc_um_dar.c
+ ${RLC_DIR}/rlc_mac.c
+ ${RLC_DIR}/rlc.c
+ ${RLC_DIR}/rlc_rrc.c
+ ${RLC_DIR}/rlc_mpls.c
+ ${RRC_DIR}/rrc_UE.c
+ ${RRC_DIR}/rrc_common.c
+ ${RRC_DIR}/L2_interface_common.c
+ ${RRC_DIR}/L2_interface_ue.c
+ )
+
set (MAC_SRC
${PHY_INTERFACE_DIR}/IF_Module.c
${MAC_DIR}/main.c
+ ${MAC_DIR}/main_ue.c
${MAC_DIR}/ue_procedures.c
${MAC_DIR}/ra_procedures.c
${MAC_DIR}/l1_helpers.c
${MAC_DIR}/rar_tools.c
+ ${MAC_DIR}/rar_tools_ue.c
${MAC_DIR}/eNB_scheduler.c
${MAC_DIR}/eNB_scheduler_dlsch.c
${MAC_DIR}/eNB_scheduler_ulsch.c
@@ -1198,8 +1357,19 @@ set (MAC_SRC
${MAC_DIR}/eNB_scheduler_RA.c
${MAC_DIR}/pre_processor.c
${MAC_DIR}/config.c
+ ${MAC_DIR}/config_ue.c
+ )
+
+set (MAC_SRC_UE
+ ${MAC_DIR}/main_ue.c
+ ${MAC_DIR}/ue_procedures.c
+ ${MAC_DIR}/ra_procedures.c
+ ${MAC_DIR}/l1_helpers.c
+ ${MAC_DIR}/rar_tools_ue.c
+ ${MAC_DIR}/config_ue.c
)
+
if (FLEXRAN_AGENT_SB_IF)
set (MAC_SRC ${MAC_SRC}
@@ -1221,6 +1391,12 @@ add_library(L2
${ENB_APP_SRC})
# ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
+add_library(L2_UE
+ ${L2_SRC_UE}
+ ${MAC_SRC_UE}
+)
+
+
include_directories(${NFAPI_USER_DIR})
if (FLEXRAN_AGENT_SB_IF)
@@ -1774,6 +1950,7 @@ add_executable(lte-softmodem
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
${OPENAIR_TARGETS}/COMMON/create_tasks.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
@@ -1813,6 +1990,7 @@ add_executable(lte-softmodem-nos1
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
${OPENAIR_TARGETS}/COMMON/create_tasks.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
@@ -1826,11 +2004,13 @@ add_executable(lte-softmodem-nos1
)
target_link_libraries (lte-softmodem-nos1
-Wl,--start-group
- RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
- -Wl,--end-group )
+ RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+ NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
+ NFAPI_USER_LIB
+ -Wl,--end-group z dl )
target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
target_link_libraries (lte-softmodem-nos1 ${LIB_LMS_LIBRARIES})
target_link_libraries (lte-softmodem-nos1 ${T_LIB})
@@ -1886,7 +2066,7 @@ add_executable(oaisim
${OPENAIR_DIR}/common/utils/utils.c
${OPENAIR_DIR}/common/utils/system.c
${GTPU_need_ITTI}
- ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
${XFORMS_SOURCE}
${T_SOURCE}
${CONFIG_SOURCES}
@@ -1897,10 +2077,10 @@ add_executable(oaisim
target_include_directories(oaisim PUBLIC ${OPENAIR_TARGETS}/SIMU/USER)
target_link_libraries (oaisim
-Wl,-ldl,--start-group
- RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}
+ RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_UE_LIB PHY_UE LFDS L2 ${MSC_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB} ${MIH_LIB}
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
NFAPI_USER_LIB
- -Wl,--end-group )
+ -Wl,--end-group z dl)
target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp z
@@ -1919,7 +2099,6 @@ add_executable(oaisim_nos1
${OPENAIR_BIN_DIR}/messages_xml.h
${OPENAIR_TARGETS}/RT/USER/lte-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
- ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1932,7 +2111,7 @@ add_executable(oaisim_nos1
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
- ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
${OPENAIR_DIR}/common/utils/system.c
${XFORMS_SOURCE}
${T_SOURCE}
@@ -1942,8 +2121,8 @@ add_executable(oaisim_nos1
target_include_directories(oaisim_nos1 PUBLIC ${OPENAIR_TARGETS}/SIMU/USER)
target_link_libraries (oaisim_nos1
-Wl,--start-group
- RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SECU_OSA ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
- -Wl,--end-group )
+ RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_UE_LIB PHY_UE LFDS ${MSC_LIB} ${ITTI_LIB} SIMU L2_UE ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
+ -Wl,--end-group z dl )
target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index e0f100ca0af9128c153a5748ea0cb1280b16bc26..bc416cff55fef58c4a19492585c07addd4f60115 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -30,7 +30,7 @@ set ( MESSAGE_CHART_GENERATOR_RLC_MAC False )
set ( MESSAGE_CHART_GENERATOR_PHY False )
set ( MSG_PRINT False )
set ( MU_RECEIVER False )
-set ( NAS_ADDRESS_FIX True )
+set ( NAS_ADDRESS_FIX False )
set ( NAS_BUILT_IN_UE False)
set ( NAS_MME False )
set ( NAS_UE False )
diff --git a/cmake_targets/tools/init_nas_nos1 b/cmake_targets/tools/init_nas_nos1
index 9bcaa0afb5bd8d0961315443620aa7d643374df8..f7347e55083c19c85e7a51f5b159a389808d2afa 100755
--- a/cmake_targets/tools/init_nas_nos1
+++ b/cmake_targets/tools/init_nas_nos1
@@ -44,11 +44,11 @@ load_module $OPENAIR_DIR/targets/bin/nasmesh.ko
if [ "$1" = "eNB" ]; then
echo "bring up oai0 interface for enb"
sudo ifconfig oai0 10.0.1.1 netmask 255.255.255.0 broadcast 10.0.1.255
- $OPENAIR_DIR/targets/bin/rb_tool -a -c0 -i0 -z0 -s 10.0.1.1 -t 10.0.1.9 -r 1
+ $OPENAIR_DIR/targets/bin/rb_tool -a -c0 -i0 -z0 -s 10.0.1.1 -t 10.0.1.2 -r 1
else
if [ "$1" = "UE" ]; then
echo "bring up oai0 interface for UE"
sudo ifconfig oai0 10.0.1.9 netmask 255.255.255.0 broadcast 10.0.1.255
- $OPENAIR_DIR/targets/bin/rb_tool -a -c0 -i0 -z0 -s 10.0.1.9 -t 10.0.1.1 -r 1
+ $OPENAIR_DIR/targets/bin/rb_tool -a -c0 -i0 -z0 -s 10.0.1.2 -t 10.0.1.1 -r 1
fi
fi
diff --git a/openair1/PHY/INIT/init_top.c b/openair1/PHY/INIT/init_top.c
index 218beb4faf825c9a024c24155b9abdb342a7a19b..43f2de92d764719d330949c4c7685eaf54901dd9 100644
--- a/openair1/PHY/INIT/init_top.c
+++ b/openair1/PHY/INIT/init_top.c
@@ -22,19 +22,42 @@
/*!\brief Initilization and reconfiguration routines for LTE PHY */
#include "defs.h"
#include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
-//#include "ARCH/CBMIMO1/DEVICE_DRIVER/extern.h"
-/*!
-* @addtogroup _PHY_STRUCTURES_
-* Memory Initializaion and Cleanup for LTE MODEM.
-* @{
-\section _Memory_init_ Memory Initialization for LTE MODEM
+void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms)
+{
-*/
+ crcTableInit();
-//#define DEBUG_PHY
-t
+ ccodedot11_init();
+ ccodedot11_init_inv();
+
+ ccodelte_init();
+ ccodelte_init_inv();
+
+ treillis_table_init();
+
+ phy_generate_viterbi_tables();
+ phy_generate_viterbi_tables_lte();
+ init_td8();
+ init_td16();
+#ifdef __AVX2__
+ init_td16avx2();
+#endif
+ lte_sync_time_init(frame_parms);
+
+ generate_ul_ref_sigs();
+ generate_ul_ref_sigs_rx();
+
+ generate_64qam_table();
+ generate_16qam_table();
+ generate_RIV_tables();
+
+ init_unscrambling_lut();
+ init_scrambling_lut();
+ //set_taus_seed(1328);
+
+
+}
/*
diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index 93ea87e4c05f9439cc61e813609d82dd100de8df..377a235da67c775740dcc70b3bdc2cbd43c41808 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -325,24 +325,6 @@ void phy_config_request(PHY_Config_t *phy_config) {
LOG_I(PHY,"eNB %d/%d configured\n",Mod_id,CC_id);
}
-void phy_config_sib1_ue(uint8_t Mod_id,int CC_id,
- uint8_t eNB_id,
- TDD_Config_t *tdd_Config,
- uint8_t SIwindowsize,
- uint16_t SIperiod)
-{
-
- LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
-
- if (tdd_Config) {
- fp->tdd_config = tdd_Config->subframeAssignment;
- fp->tdd_config_S = tdd_Config->specialSubframePatterns;
- }
-
- fp->SIwindowsize = SIwindowsize;
- fp->SIPeriod = SIperiod;
-}
-
/*
void phy_config_sib2_eNB(uint8_t Mod_id,
int CC_id,
@@ -486,149 +468,6 @@ void phy_config_sib2_eNB(uint8_t Mod_id,
}
*/
-void phy_config_sib2_ue(uint8_t Mod_id,int CC_id,
- uint8_t eNB_id,
- RadioResourceConfigCommonSIB_t *radioResourceConfigCommon,
- ARFCN_ValueEUTRA_t *ul_CarrierFreq,
- long *ul_Bandwidth,
- AdditionalSpectrumEmission_t *additionalSpectrumEmission,
- struct MBSFN_SubframeConfigList *mbsfn_SubframeConfigList)
-{
-
- PHY_VARS_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
- LTE_DL_FRAME_PARMS *fp = &ue->frame_parms;
- int i;
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_CONFIG_SIB2, VCD_FUNCTION_IN);
-
- LOG_I(PHY,"[UE%d] Applying radioResourceConfigCommon from eNB%d\n",Mod_id,eNB_id);
-
- fp->prach_config_common.rootSequenceIndex =radioResourceConfigCommon->prach_Config.rootSequenceIndex;
-
- fp->prach_config_common.prach_Config_enabled=1;
- fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.prach_ConfigIndex;
- fp->prach_config_common.prach_ConfigInfo.highSpeedFlag =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.highSpeedFlag;
- fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
- fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.prach_FreqOffset;
-
- compute_prach_seq(fp->prach_config_common.rootSequenceIndex,
- fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
- fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
- fp->prach_config_common.prach_ConfigInfo.highSpeedFlag,
- fp->frame_type,ue->X_u);
-
-
-
- fp->pucch_config_common.deltaPUCCH_Shift = 1+radioResourceConfigCommon->pucch_ConfigCommon.deltaPUCCH_Shift;
- fp->pucch_config_common.nRB_CQI = radioResourceConfigCommon->pucch_ConfigCommon.nRB_CQI;
- fp->pucch_config_common.nCS_AN = radioResourceConfigCommon->pucch_ConfigCommon.nCS_AN;
- fp->pucch_config_common.n1PUCCH_AN = radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN;
-
-
-
- fp->pdsch_config_common.referenceSignalPower = radioResourceConfigCommon->pdsch_ConfigCommon.referenceSignalPower;
- fp->pdsch_config_common.p_b = radioResourceConfigCommon->pdsch_ConfigCommon.p_b;
-
-
- fp->pusch_config_common.n_SB = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
- fp->pusch_config_common.hoppingMode = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
- fp->pusch_config_common.pusch_HoppingOffset = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
- fp->pusch_config_common.enable64QAM = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = dmrs1_tab[radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift];
-
-
- init_ul_hopping(fp);
- fp->soundingrs_ul_config_common.enabled_flag = 0;
-
- if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon.present==SoundingRS_UL_ConfigCommon_PR_setup) {
- fp->soundingrs_ul_config_common.enabled_flag = 1;
- fp->soundingrs_ul_config_common.srs_BandwidthConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_BandwidthConfig;
- fp->soundingrs_ul_config_common.srs_SubframeConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_SubframeConfig;
- fp->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
-
- if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_MaxUpPts)
- fp->soundingrs_ul_config_common.srs_MaxUpPts = 1;
- else
- fp->soundingrs_ul_config_common.srs_MaxUpPts = 0;
- }
-
-
-
- fp->ul_power_control_config_common.p0_NominalPUSCH = radioResourceConfigCommon->uplinkPowerControlCommon.p0_NominalPUSCH;
- fp->ul_power_control_config_common.alpha = radioResourceConfigCommon->uplinkPowerControlCommon.alpha;
- fp->ul_power_control_config_common.p0_NominalPUCCH = radioResourceConfigCommon->uplinkPowerControlCommon.p0_NominalPUCCH;
- fp->ul_power_control_config_common.deltaPreambleMsg3 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaPreambleMsg3;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format1 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format1;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format1b = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format1b;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2a = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2a;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2b = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2b;
-
- fp->maxHARQ_Msg3Tx = radioResourceConfigCommon->rach_ConfigCommon.maxHARQ_Msg3Tx;
-
- // Now configure some of the Physical Channels
-
- // PUCCH
- init_ncs_cell(fp,ue->ncs_cell);
-
- init_ul_hopping(fp);
-
- // PCH
- init_ue_paging_info(ue,radioResourceConfigCommon->pcch_Config.defaultPagingCycle,radioResourceConfigCommon->pcch_Config.nB);
-
- // MBSFN
-
- if (mbsfn_SubframeConfigList != NULL) {
- fp->num_MBSFN_config = mbsfn_SubframeConfigList->list.count;
-
- for (i=0; i<mbsfn_SubframeConfigList->list.count; i++) {
- fp->MBSFN_config[i].radioframeAllocationPeriod = mbsfn_SubframeConfigList->list.array[i]->radioframeAllocationPeriod;
- fp->MBSFN_config[i].radioframeAllocationOffset = mbsfn_SubframeConfigList->list.array[i]->radioframeAllocationOffset;
-
- if (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.present == MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame) {
- fp->MBSFN_config[i].fourFrames_flag = 0;
- fp->MBSFN_config[i].mbsfn_SubframeConfig = mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[0]; // 6-bit subframe configuration
- LOG_I(PHY, "[CONFIG] MBSFN_SubframeConfig[%d] pattern is %d\n", i,
- fp->MBSFN_config[i].mbsfn_SubframeConfig);
- } else if (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.present == MBSFN_SubframeConfig__subframeAllocation_PR_fourFrames) { // 24-bit subframe configuration
- fp->MBSFN_config[i].fourFrames_flag = 1;
- fp->MBSFN_config[i].mbsfn_SubframeConfig =
- mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[0]|
- (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[1]<<8)|
- (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[2]<<16);
-
- LOG_I(PHY, "[CONFIG] MBSFN_SubframeConfig[%d] pattern is %d\n", i,
- fp->MBSFN_config[i].mbsfn_SubframeConfig);
- }
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_CONFIG_SIB2, VCD_FUNCTION_OUT);
-
-}
-
-void phy_config_sib13_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,int mbsfn_Area_idx,
- long mbsfn_AreaId_r9)
-{
-
- LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
-
-
- LOG_I(PHY,"[UE%d] Applying MBSFN_Area_id %ld for index %d\n",Mod_id,mbsfn_AreaId_r9,mbsfn_Area_idx);
-
- if (mbsfn_Area_idx == 0) {
- fp->Nid_cell_mbsfn = (uint16_t)mbsfn_AreaId_r9;
- LOG_N(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
- }
-
- lte_gold_mbsfn(fp,PHY_vars_UE_g[Mod_id][CC_id]->lte_gold_mbsfn_table,fp->Nid_cell_mbsfn);
-
-}
-
-
void phy_config_sib13_eNB(uint8_t Mod_id,int CC_id,int mbsfn_Area_idx,
long mbsfn_AreaId_r9)
{
@@ -767,150 +606,6 @@ void phy_config_dedicated_eNB_step2(PHY_VARS_eNB *eNB)
}
}
-/*
- * Configures UE MAC and PHY with radioResourceCommon received in mobilityControlInfo IE during Handover
- */
-void phy_config_afterHO_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_id, MobilityControlInfo_t *mobilityControlInfo, uint8_t ho_failed)
-{
-
- if(mobilityControlInfo!=NULL) {
- RadioResourceConfigCommon_t *radioResourceConfigCommon = &mobilityControlInfo->radioResourceConfigCommon;
- LOG_I(PHY,"radioResourceConfigCommon %p\n", radioResourceConfigCommon);
- memcpy((void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms_before_ho,
- (void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,
- sizeof(LTE_DL_FRAME_PARMS));
- PHY_vars_UE_g[Mod_id][CC_id]->ho_triggered = 1;
- //PHY_vars_UE_g[UE_id]->UE_mode[0] = PRACH;
-
- LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
- // int N_ZC;
- // uint8_t prach_fmt;
- // int u;
-
- LOG_I(PHY,"[UE%d] Handover triggered: Applying radioResourceConfigCommon from eNB %d\n",
- Mod_id,eNB_id);
-
- fp->prach_config_common.rootSequenceIndex =radioResourceConfigCommon->prach_Config.rootSequenceIndex;
- fp->prach_config_common.prach_Config_enabled=1;
- fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_ConfigIndex;
- fp->prach_config_common.prach_ConfigInfo.highSpeedFlag =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->highSpeedFlag;
- fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->zeroCorrelationZoneConfig;
- fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_FreqOffset;
-
- // prach_fmt = get_prach_fmt(radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_ConfigIndex,fp->frame_type);
- // N_ZC = (prach_fmt <4)?839:139;
- // u = (prach_fmt < 4) ? prach_root_sequence_map0_3[fp->prach_config_common.rootSequenceIndex] :
- // prach_root_sequence_map4[fp->prach_config_common.rootSequenceIndex];
-
- //compute_prach_seq(u,N_ZC, PHY_vars_UE_g[Mod_id]->X_u);
- compute_prach_seq(PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.rootSequenceIndex,
- PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
- PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
- PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.highSpeedFlag,
- fp->frame_type,
- PHY_vars_UE_g[Mod_id][CC_id]->X_u);
-
-
- fp->pucch_config_common.deltaPUCCH_Shift = 1+radioResourceConfigCommon->pucch_ConfigCommon->deltaPUCCH_Shift;
- fp->pucch_config_common.nRB_CQI = radioResourceConfigCommon->pucch_ConfigCommon->nRB_CQI;
- fp->pucch_config_common.nCS_AN = radioResourceConfigCommon->pucch_ConfigCommon->nCS_AN;
- fp->pucch_config_common.n1PUCCH_AN = radioResourceConfigCommon->pucch_ConfigCommon->n1PUCCH_AN;
- fp->pdsch_config_common.referenceSignalPower = radioResourceConfigCommon->pdsch_ConfigCommon->referenceSignalPower;
- fp->pdsch_config_common.p_b = radioResourceConfigCommon->pdsch_ConfigCommon->p_b;
-
-
- fp->pusch_config_common.n_SB = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
- fp->pusch_config_common.hoppingMode = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
- fp->pusch_config_common.pusch_HoppingOffset = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
- fp->pusch_config_common.enable64QAM = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled;
- fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift;
-
- init_ul_hopping(fp);
- fp->soundingrs_ul_config_common.enabled_flag = 0;
-
- if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon->present==SoundingRS_UL_ConfigCommon_PR_setup) {
- fp->soundingrs_ul_config_common.enabled_flag = 1;
- fp->soundingrs_ul_config_common.srs_BandwidthConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_BandwidthConfig;
- fp->soundingrs_ul_config_common.srs_SubframeConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_SubframeConfig;
- fp->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.ackNackSRS_SimultaneousTransmission;
-
- if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_MaxUpPts)
- fp->soundingrs_ul_config_common.srs_MaxUpPts = 1;
- else
- fp->soundingrs_ul_config_common.srs_MaxUpPts = 0;
- }
-
- fp->ul_power_control_config_common.p0_NominalPUSCH = radioResourceConfigCommon->uplinkPowerControlCommon->p0_NominalPUSCH;
- fp->ul_power_control_config_common.alpha = radioResourceConfigCommon->uplinkPowerControlCommon->alpha;
- fp->ul_power_control_config_common.p0_NominalPUCCH = radioResourceConfigCommon->uplinkPowerControlCommon->p0_NominalPUCCH;
- fp->ul_power_control_config_common.deltaPreambleMsg3 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaPreambleMsg3;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format1 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format1;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format1b = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format1b;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2a = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2a;
- fp->ul_power_control_config_common.deltaF_PUCCH_Format2b = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2b;
-
- fp->maxHARQ_Msg3Tx = radioResourceConfigCommon->rach_ConfigCommon->maxHARQ_Msg3Tx;
-
- // Now configure some of the Physical Channels
- if (radioResourceConfigCommon->antennaInfoCommon)
- fp->nb_antennas_tx = (1<<radioResourceConfigCommon->antennaInfoCommon->antennaPortsCount);
- else
- fp->nb_antennas_tx = 1;
-
- //PHICH
- if (radioResourceConfigCommon->antennaInfoCommon) {
- fp->phich_config_common.phich_resource = radioResourceConfigCommon->phich_Config->phich_Resource;
- fp->phich_config_common.phich_duration = radioResourceConfigCommon->phich_Config->phich_Duration;
- }
-
- //Target CellId
- fp->Nid_cell = mobilityControlInfo->targetPhysCellId;
- fp->nushift = fp->Nid_cell%6;
-
- // PUCCH
- init_ncs_cell(fp,PHY_vars_UE_g[Mod_id][CC_id]->ncs_cell);
-
- init_ul_hopping(fp);
-
- // RNTI
-
-
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
-
- LOG_I(PHY,"SET C-RNTI %x %x\n",PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti,
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti);
- }
-
- if(ho_failed) {
- LOG_D(PHY,"[UE%d] Handover failed, triggering RACH procedure\n",Mod_id);
- memcpy((void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,(void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms_before_ho, sizeof(LTE_DL_FRAME_PARMS));
- PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_id] = PRACH;
- }
-}
-
-void phy_config_meas_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index,uint8_t n_adj_cells,unsigned int *adj_cell_id)
-{
-
- PHY_MEASUREMENTS *phy_meas = &PHY_vars_UE_g[Mod_id][CC_id]->measurements;
- int i;
-
- LOG_I(PHY,"Configuring inter-cell measurements for %d cells, ids: \n",n_adj_cells);
-
- for (i=0; i<n_adj_cells; i++) {
- LOG_I(PHY,"%d\n",adj_cell_id[i]);
- lte_gold(&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,PHY_vars_UE_g[Mod_id][CC_id]->lte_gold_table[i+1],adj_cell_id[i]);
- }
-
- phy_meas->n_adj_cells = n_adj_cells;
- memcpy((void*)phy_meas->adj_cell_id,(void *)adj_cell_id,n_adj_cells*sizeof(unsigned int));
-
-}
-
/*
void phy_config_dedicated_eNB(uint8_t Mod_id,
int CC_id,
@@ -975,14 +670,6 @@ void phy_config_dedicated_eNB(uint8_t Mod_id,
}
*/
-#if defined(Rel10) || defined(Rel14)
-void phy_config_dedicated_scell_ue(uint8_t Mod_id,
- uint8_t eNB_index,
- SCellToAddMod_r10_t *sCellToAddMod_r10,
- int CC_id)
-{
-
-}
/*
void phy_config_dedicated_scell_eNB(uint8_t Mod_id,
uint16_t rnti,
@@ -1032,231 +719,7 @@ void phy_config_dedicated_scell_eNB(uint8_t Mod_id,
}
*/
-#endif
-
-
-void phy_config_harq_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
- uint16_t max_harq_tx )
-{
-
- PHY_VARS_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id];
- phy_vars_ue->ulsch[eNB_id]->Mlimit = max_harq_tx;
-}
-
-extern uint16_t beta_cqi[16];
-
-void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
- struct PhysicalConfigDedicated *physicalConfigDedicated )
-{
-
- static uint8_t first_dedicated_configuration = 0;
- PHY_VARS_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id];
-
- phy_vars_ue->total_TBS[eNB_id]=0;
- phy_vars_ue->total_TBS_last[eNB_id]=0;
- phy_vars_ue->bitrate[eNB_id]=0;
- phy_vars_ue->total_received_bits[eNB_id]=0;
- phy_vars_ue->dlsch_errors[eNB_id]=0;
- phy_vars_ue->dlsch_errors_last[eNB_id]=0;
- phy_vars_ue->dlsch_received[eNB_id]=0;
- phy_vars_ue->dlsch_received_last[eNB_id]=0;
- phy_vars_ue->dlsch_fer[eNB_id]=0;
-
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = -1;
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = -1;
-
- if (physicalConfigDedicated) {
- LOG_D(PHY,"[UE %d] Received physicalConfigDedicated from eNB %d\n",Mod_id, eNB_id);
- LOG_D(PHY,"------------------------------------------------------------------------\n");
-
- if (physicalConfigDedicated->pdsch_ConfigDedicated) {
- phy_vars_ue->pdsch_config_dedicated[eNB_id].p_a=physicalConfigDedicated->pdsch_ConfigDedicated->p_a;
- LOG_D(PHY,"pdsch_config_dedicated.p_a %d\n",phy_vars_ue->pdsch_config_dedicated[eNB_id].p_a);
- LOG_D(PHY,"\n");
- }
-
- if (physicalConfigDedicated->pucch_ConfigDedicated) {
- if (physicalConfigDedicated->pucch_ConfigDedicated->ackNackRepetition.present==PUCCH_ConfigDedicated__ackNackRepetition_PR_release)
- phy_vars_ue->pucch_config_dedicated[eNB_id].ackNackRepetition=0;
- else {
- phy_vars_ue->pucch_config_dedicated[eNB_id].ackNackRepetition=1;
- }
-
- if (physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode)
- phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode = *physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode;
- else
- phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode = bundling;
-
- if ( phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode == multiplexing)
- LOG_D(PHY,"pucch_config_dedicated.tdd_AckNackFeedbackMode = multiplexing\n");
- else
- LOG_D(PHY,"pucch_config_dedicated.tdd_AckNackFeedbackMode = bundling\n");
- }
-
- if (physicalConfigDedicated->pusch_ConfigDedicated) {
- phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_ACK_Index;
- phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_RI_Index;
- phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_CQI_Index;
-
-
- LOG_D(PHY,"pusch_config_dedicated.betaOffset_ACK_Index %d\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index);
- LOG_D(PHY,"pusch_config_dedicated.betaOffset_RI_Index %d\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index);
- LOG_D(PHY,"pusch_config_dedicated.betaOffset_CQI_Index %d => %d)\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index,beta_cqi[phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index]);
- LOG_D(PHY,"\n");
-
-
- }
-
- if (physicalConfigDedicated->uplinkPowerControlDedicated) {
-
- phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUSCH = physicalConfigDedicated->uplinkPowerControlDedicated->p0_UE_PUSCH;
- phy_vars_ue->ul_power_control_dedicated[eNB_id].deltaMCS_Enabled= physicalConfigDedicated->uplinkPowerControlDedicated->deltaMCS_Enabled;
- phy_vars_ue->ul_power_control_dedicated[eNB_id].accumulationEnabled= physicalConfigDedicated->uplinkPowerControlDedicated->accumulationEnabled;
- phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUCCH= physicalConfigDedicated->uplinkPowerControlDedicated->p0_UE_PUCCH;
- phy_vars_ue->ul_power_control_dedicated[eNB_id].pSRS_Offset= physicalConfigDedicated->uplinkPowerControlDedicated->pSRS_Offset;
- phy_vars_ue->ul_power_control_dedicated[eNB_id].filterCoefficient= *physicalConfigDedicated->uplinkPowerControlDedicated->filterCoefficient;
- LOG_D(PHY,"ul_power_control_dedicated.p0_UE_PUSCH %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUSCH);
- LOG_D(PHY,"ul_power_control_dedicated.deltaMCS_Enabled %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].deltaMCS_Enabled);
- LOG_D(PHY,"ul_power_control_dedicated.accumulationEnabled %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].accumulationEnabled);
- LOG_D(PHY,"ul_power_control_dedicated.p0_UE_PUCCH %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUCCH);
- LOG_D(PHY,"ul_power_control_dedicated.pSRS_Offset %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].pSRS_Offset);
- LOG_D(PHY,"ul_power_control_dedicated.filterCoefficient %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].filterCoefficient);
- LOG_D(PHY,"\n");
- }
-
- if (physicalConfigDedicated->antennaInfo) {
- phy_vars_ue->transmission_mode[eNB_id] = 1+(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode);
- LOG_I(PHY,"Transmission Mode %d\n",phy_vars_ue->transmission_mode[eNB_id]);
- switch(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode) {
- case AntennaInfoDedicated__transmissionMode_tm1:
- phy_vars_ue->transmission_mode[eNB_id] = 1;
- break;
- case AntennaInfoDedicated__transmissionMode_tm2:
- phy_vars_ue->transmission_mode[eNB_id] = 2;
- break;
- case AntennaInfoDedicated__transmissionMode_tm3:
- phy_vars_ue->transmission_mode[eNB_id] = 3;
- break;
- case AntennaInfoDedicated__transmissionMode_tm4:
- phy_vars_ue->transmission_mode[eNB_id] = 4;
- break;
- case AntennaInfoDedicated__transmissionMode_tm5:
- phy_vars_ue->transmission_mode[eNB_id] = 5;
- break;
- case AntennaInfoDedicated__transmissionMode_tm6:
- phy_vars_ue->transmission_mode[eNB_id] = 6;
- break;
- case AntennaInfoDedicated__transmissionMode_tm7:
- lte_gold_ue_spec_port5(phy_vars_ue->lte_gold_uespec_port5_table, phy_vars_ue->frame_parms.Nid_cell, phy_vars_ue->pdcch_vars[0][eNB_id]->crnti);
- phy_vars_ue->transmission_mode[eNB_id] = 7;
- break;
- default:
- LOG_E(PHY,"Unknown transmission mode!\n");
- break;
- }
- } else {
- LOG_D(PHY,"[UE %d] Received NULL physicalConfigDedicated->antennaInfo from eNB %d\n",Mod_id, eNB_id);
- }
-
- if (physicalConfigDedicated->schedulingRequestConfig) {
- if (physicalConfigDedicated->schedulingRequestConfig->present == SchedulingRequestConfig_PR_setup) {
- phy_vars_ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex = physicalConfigDedicated->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex;
- phy_vars_ue->scheduling_request_config[eNB_id].sr_ConfigIndex=physicalConfigDedicated->schedulingRequestConfig->choice.setup.sr_ConfigIndex;
- phy_vars_ue->scheduling_request_config[eNB_id].dsr_TransMax=physicalConfigDedicated->schedulingRequestConfig->choice.setup.dsr_TransMax;
-
- LOG_D(PHY,"scheduling_request_config.sr_PUCCH_ResourceIndex %d\n",phy_vars_ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
- LOG_D(PHY,"scheduling_request_config.sr_ConfigIndex %d\n",phy_vars_ue->scheduling_request_config[eNB_id].sr_ConfigIndex);
- LOG_D(PHY,"scheduling_request_config.dsr_TransMax %d\n",phy_vars_ue->scheduling_request_config[eNB_id].dsr_TransMax);
- }
-
- LOG_D(PHY,"------------------------------------------------------------\n");
-
- }
-
- if (physicalConfigDedicated->soundingRS_UL_ConfigDedicated) {
-
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srsConfigDedicatedSetup = 0;
- if (physicalConfigDedicated->soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) {
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srsConfigDedicatedSetup = 1;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].duration = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.duration;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].cyclicShift = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].freqDomainPosition = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_Bandwidth = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_ConfigIndex = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_HoppingBandwidth = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth;
- phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].transmissionComb = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb;
-
-
- LOG_D(PHY,"soundingrs_ul_config_dedicated.srs_ConfigIndex %d\n",phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_ConfigIndex);
- }
-
- LOG_D(PHY,"------------------------------------------------------------\n");
-
- }
-
-
- if (physicalConfigDedicated->cqi_ReportConfig) {
- if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic) {
- // configure PUSCH CQI reporting
- phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic = *physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic;
- if ((phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm12) &&
- (phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm30) &&
- (phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm31))
- LOG_E(PHY,"Unsupported Aperiodic CQI Feedback Mode : %d\n",phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic);
- }
- if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic) {
- if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_setup) {
- // configure PUCCH CQI reporting
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PUCCH_ResourceIndex = physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex;
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex;
- if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex)
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = *physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex;
- }
- else if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_release) {
- // handle release
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = -1;
- phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = -1;
- }
- }
- }
-
-#ifdef CBA
-
- if (physicalConfigDedicated->pusch_CBAConfigDedicated_vlola) {
- phy_vars_ue->pusch_ca_config_dedicated[eNB_id].betaOffset_CA_Index = (uint16_t) *physicalConfigDedicated->pusch_CBAConfigDedicated_vlola->betaOffset_CBA_Index;
- phy_vars_ue->pusch_ca_config_dedicated[eNB_id].cShift = (uint16_t) *physicalConfigDedicated->pusch_CBAConfigDedicated_vlola->cShift_CBA;
- LOG_D(PHY,"[UE %d ] physicalConfigDedicated pusch CBA config dedicated: beta offset %d cshift %d \n",Mod_id,
- phy_vars_ue->pusch_ca_config_dedicated[eNB_id].betaOffset_CA_Index,
- phy_vars_ue->pusch_ca_config_dedicated[eNB_id].cShift);
- }
-
-#endif
- } else {
- LOG_D(PHY,"[PHY][UE %d] Received NULL radioResourceConfigDedicated from eNB %d\n",Mod_id,eNB_id);
- return;
- }
-
- // fill cqi parameters for periodic CQI reporting
- get_cqipmiri_params(phy_vars_ue,eNB_id);
-
- // disable MIB SIB decoding once we are on connected mode
- first_dedicated_configuration ++;
- if(first_dedicated_configuration > 1)
- {
- LOG_I(PHY,"Disable SIB MIB decoding \n");
- phy_vars_ue->decode_SIB = 0;
- phy_vars_ue->decode_MIB = 0;
- }
- //phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
- if(phy_vars_ue->pdcch_vars[0][eNB_id]->crnti == 0x1234)
- phy_vars_ue->pdcch_vars[0][eNB_id]->crnti = phy_vars_ue->pdcch_vars[1][eNB_id]->crnti;
- else
- phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
-
- LOG_I(PHY,"C-RNTI %x %x \n", phy_vars_ue->pdcch_vars[0][eNB_id]->crnti,
- phy_vars_ue->pdcch_vars[1][eNB_id]->crnti);
-}
void phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uint8_t index, rnti_t cba_rnti, uint8_t cba_group_id, uint8_t num_active_cba_groups)
{
@@ -1275,546 +738,6 @@ void phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uin
}
}
-void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms)
-{
-
- crcTableInit();
-
- ccodedot11_init();
- ccodedot11_init_inv();
-
- ccodelte_init();
- ccodelte_init_inv();
-
- treillis_table_init();
-
- phy_generate_viterbi_tables();
- phy_generate_viterbi_tables_lte();
- init_td8();
- init_td16();
-#ifdef __AVX2__
- init_td16avx2();
-#endif
- lte_sync_time_init(frame_parms);
-
- generate_ul_ref_sigs();
- generate_ul_ref_sigs_rx();
-
- generate_64qam_table();
- generate_16qam_table();
- generate_RIV_tables();
-
- init_unscrambling_lut();
- init_scrambling_lut();
- //set_taus_seed(1328);
-
-
-}
-
-/*! \brief Helper function to allocate memory for DLSCH data structures.
- * \param[out] pdsch Pointer to the LTE_UE_PDSCH structure to initialize.
- * \param[in] frame_parms LTE_DL_FRAME_PARMS structure.
- * \note This function is optimistic in that it expects malloc() to succeed.
- */
-void phy_init_lte_ue__PDSCH( LTE_UE_PDSCH* const pdsch, const LTE_DL_FRAME_PARMS* const fp )
-{
- AssertFatal( pdsch, "pdsch==0" );
-
- pdsch->pmi_ext = (uint8_t*)malloc16_clear( fp->N_RB_DL );
- pdsch->llr[0] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
- pdsch->llr128 = (int16_t**)malloc16_clear( sizeof(int16_t*) );
- // FIXME! no further allocation for (int16_t*)pdsch->llr128 !!! expect SIGSEGV
- // FK, 11-3-2015: this is only as a temporary pointer, no memory is stored there
-
-
- pdsch->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->rxdataF_uespec_pilots = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->rxdataF_comp0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->rho = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
- pdsch->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->dl_bf_ch_estimates = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->dl_bf_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- //pdsch->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- //pdsch->dl_ch_rho2_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->dl_ch_mag0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdsch->dl_ch_magb0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-
- // the allocated memory size is fixed:
- AssertFatal( fp->nb_antennas_rx <= 2, "nb_antennas_rx > 2" );
-
- for (int i=0; i<fp->nb_antennas_rx; i++) {
- pdsch->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
-
- for (int j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
- const int idx = (j<<1)+i;
- const size_t num = 7*2*fp->N_RB_DL*12;
- pdsch->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdsch->rxdataF_uespec_pilots[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * fp->N_RB_DL*12);
- pdsch->rxdataF_comp0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdsch->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdsch->dl_bf_ch_estimates[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * fp->ofdm_symbol_size*7*2);
- pdsch->dl_bf_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- //pdsch->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- //pdsch->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdsch->dl_ch_mag0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdsch->dl_ch_magb0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- }
- }
-}
-
-int init_lte_ue_signal(PHY_VARS_UE *ue,
- int nb_connected_eNB,
- uint8_t abstraction_flag)
-{
-
- // create shortcuts
- LTE_DL_FRAME_PARMS* const fp = &ue->frame_parms;
- LTE_UE_COMMON* const common_vars = &ue->common_vars;
- LTE_UE_PDSCH** const pdsch_vars_SI = ue->pdsch_vars_SI;
- LTE_UE_PDSCH** const pdsch_vars_ra = ue->pdsch_vars_ra;
- LTE_UE_PDSCH** const pdsch_vars_p = ue->pdsch_vars_p;
- LTE_UE_PDSCH** const pdsch_vars_mch = ue->pdsch_vars_MCH;
- LTE_UE_PDSCH* (*pdsch_vars_th)[][NUMBER_OF_CONNECTED_eNB_MAX+1] = &ue->pdsch_vars;
- LTE_UE_PDCCH* (*pdcch_vars_th)[][NUMBER_OF_CONNECTED_eNB_MAX] = &ue->pdcch_vars;
- LTE_UE_PBCH** const pbch_vars = ue->pbch_vars;
- LTE_UE_PRACH** const prach_vars = ue->prach_vars;
-
-
-
- int i,j,k,l;
- int eNB_id;
- int th_id;
-
- LOG_D(PHY,"Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
- LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
-
-
-
- init_frame_parms(&ue->frame_parms,1);
- init_lte_top(&ue->frame_parms);
- init_ul_hopping(&ue->frame_parms);
-
-
- // many memory allocation sizes are hard coded
- AssertFatal( fp->nb_antennas_rx <= 2, "hard coded allocation for ue_common_vars->dl_ch_estimates[eNB_id]" );
- AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" );
- // init phy_vars_ue
-
- for (i=0; i<4; i++) {
- ue->rx_gain_max[i] = 135;
- ue->rx_gain_med[i] = 128;
- ue->rx_gain_byp[i] = 120;
- }
-
- ue->n_connected_eNB = nb_connected_eNB;
-
- for(eNB_id = 0; eNB_id < ue->n_connected_eNB; eNB_id++) {
- ue->total_TBS[eNB_id] = 0;
- ue->total_TBS_last[eNB_id] = 0;
- ue->bitrate[eNB_id] = 0;
- ue->total_received_bits[eNB_id] = 0;
- }
-
- for (i=0;i<10;i++)
- ue->tx_power_dBm[i]=-127;
-
-
-
- // init TX buffers
-
- common_vars->txdata = (int32_t**)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
- common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
-
- for (i=0; i<fp->nb_antennas_tx; i++) {
-
- common_vars->txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
- common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
- }
-
- // init RX buffers
-
- common_vars->rxdata = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- common_vars->common_vars_rx_data_per_thread[0].rxdataF = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- common_vars->common_vars_rx_data_per_thread[1].rxdataF = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-
- for (i=0; i<fp->nb_antennas_rx; i++) {
- common_vars->rxdata[i] = (int32_t*) malloc16_clear( (fp->samples_per_tti*10+2048)*sizeof(int32_t) );
- common_vars->common_vars_rx_data_per_thread[0].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
- common_vars->common_vars_rx_data_per_thread[1].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
- }
-
-
- // Channel estimates
- for (eNB_id=0; eNB_id<7; eNB_id++) {
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates[eNB_id] = (int32_t**)malloc16_clear(8*sizeof(int32_t*));
- common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates_time[eNB_id] = (int32_t**)malloc16_clear(8*sizeof(int32_t*));
- }
-
- for (i=0; i<fp->nb_antennas_rx; i++)
- for (j=0; j<4; j++) {
- int idx = (j<<1) + i;
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates[eNB_id][idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->symbols_per_tti*(fp->ofdm_symbol_size+LTE_CE_FILTER_LENGTH) );
- common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates_time[eNB_id][idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
- }
- }
- }
-
- // DLSCH
- for (eNB_id=0; eNB_id<ue->n_connected_eNB; eNB_id++) {
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- }
-
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id] = (LTE_UE_PDCCH *)malloc16_clear(sizeof(LTE_UE_PDCCH));
- }
-
- pdsch_vars_SI[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- pdsch_vars_ra[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- pdsch_vars_p[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- pdsch_vars_mch[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- prach_vars[eNB_id] = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH));
- pbch_vars[eNB_id] = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH));
-
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
- }
-
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->llr_shifts = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
- (*pdsch_vars_th)[th_id][eNB_id]->llr_shifts_p = (*pdsch_vars_th)[0][eNB_id]->llr_shifts;
- (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
- (*pdsch_vars_th)[th_id][eNB_id]->llr128_2ndstream = (int16_t**)malloc16_clear( sizeof(int16_t*) );
- (*pdsch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
- }
-
- for (int i=0; i<fp->nb_antennas_rx; i++){
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
- }
-
- }
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho2_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- }
-
- for (i=0; i<fp->nb_antennas_rx; i++)
- for (j=0; j<4; j++) {
- const int idx = (j<<1)+i;
- const size_t num = 7*2*fp->N_RB_DL*12+4;
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- }
-
- }
-
- //const size_t num = 7*2*fp->N_RB_DL*12+4;
- for (k=0;k<8;k++) { //harq_pid
- for (l=0;l<8;l++) { //round
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- }
-
-
- for (int i=0; i<fp->nb_antennas_rx; i++)
- for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
- const int idx = (j<<1)+i;
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
- (*pdsch_vars_th)[th_id][eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
- (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
- }
-
- }
- }
- }
- phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_p[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
-
- // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
-
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- }
-
- for (i=0; i<fp->nb_antennas_rx; i++) {
- //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
- }
-
- for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
- int idx = (j<<1)+i;
- // size_t num = 7*2*fp->N_RB_DL*12;
- size_t num = 4*100*12; // 4 symbols, 100 PRBs, 12 REs per PRB
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- }
- }
- }
- phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_p[eNB_id], fp );
- phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
-
- // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- (*pdcch_vars_th)[th_id][eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
-
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- }
-
- for (i=0; i<fp->nb_antennas_rx; i++) {
- //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
-
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
- }
-
- for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
- int idx = (j<<1)+i;
- // size_t num = 7*2*fp->N_RB_DL*12;
- size_t num = 4*100*12; // 4 symbols, 100 PRBs, 12 REs per PRB
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- }
- }
- }
-
- // PBCH
- pbch_vars[eNB_id]->rxdataF_ext = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- pbch_vars[eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pbch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pbch_vars[eNB_id]->llr = (int8_t*)malloc16_clear( 1920 );
- prach_vars[eNB_id]->prachF = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
- prach_vars[eNB_id]->prach = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
-
- for (i=0; i<fp->nb_antennas_rx; i++) {
- pbch_vars[eNB_id]->rxdataF_ext[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
-
- for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
- int idx = (j<<1)+i;
- pbch_vars[eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
- pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
- }
- }
-
-
- pbch_vars[eNB_id]->decoded_output = (uint8_t*)malloc16_clear( 64 );
- }
-
- // initialization for the last instance of pdsch_vars (used for MU-MIMO)
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- (*pdsch_vars_th)[th_id][eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
- }
-
- pdsch_vars_SI[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
- pdsch_vars_ra[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
- pdsch_vars_p[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
-
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
- (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
- }
-
-
- ue->sinr_CQI_dB = (double*) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
-
- ue->init_averaging = 1;
- // default value until overwritten by RRCConnectionReconfiguration
- if (fp->nb_antenna_ports_eNB==2)
- ue->pdsch_config_dedicated->p_a = dBm3;
- else
- ue->pdsch_config_dedicated->p_a = dB0;
-
- // set channel estimation to do linear interpolation in time
- ue->high_speed_flag = 1;
- ue->ch_est_alpha = 24576;
-
- // enable MIB/SIB decoding by default
- ue->decode_MIB = 1;
- ue->decode_SIB = 1;
-
- init_prach_tables(839);
-
-
- return 0;
-}
-
-void init_lte_ue_transport(PHY_VARS_UE *ue,int abstraction_flag) {
-
- int i,j,k;
-
- for (i=0; i<NUMBER_OF_CONNECTED_eNB_MAX; i++) {
- for (j=0; j<2; j++) {
- for (k=0; k<2; k++) {
- AssertFatal((ue->dlsch[k][i][j] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag))!=NULL,"Can't get ue dlsch structures\n");
-
- LOG_D(PHY,"dlsch[%d][%d][%d] => %p\n",k,i,j,ue->dlsch[i][j]);
- }
- }
-
- AssertFatal((ue->ulsch[i] = new_ue_ulsch(ue->frame_parms.N_RB_UL, abstraction_flag))!=NULL,"Can't get ue ulsch structures\n");
-
- ue->dlsch_SI[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
- ue->dlsch_ra[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
-
- ue->transmission_mode[i] = ue->frame_parms.nb_antenna_ports_eNB==1 ? 1 : 2;
- }
-
- ue->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
-
- ue->dlsch_MCH[0] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL,0);
-
-}
-
-int phy_init_RU(RU_t *ru) {
-
- LTE_DL_FRAME_PARMS *fp = &ru->frame_parms;
- int i,j;
- int p;
- int re;
-
- LOG_I(PHY,"Initializing RU signal buffers (if_south %s) nb_tx %d\n",ru_if_types[ru->if_south],ru->nb_tx);
-
- if (ru->if_south <= REMOTE_IF5) { // this means REMOTE_IF5 or LOCAL_RF, so allocate memory for time-domain signals
- // Time-domain signals
- ru->common.txdata = (int32_t**)malloc16(ru->nb_tx*sizeof(int32_t*));
- ru->common.rxdata = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
-
-
- for (i=0; i<ru->nb_tx; i++) {
- // Allocate 10 subframes of I/Q TX signal data (time) if not
- ru->common.txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
-
- LOG_I(PHY,"[INIT] common.txdata[%d] = %p (%lu bytes)\n",i,ru->common.txdata[i],
- fp->samples_per_tti*10*sizeof(int32_t));
-
- }
- for (i=0;i<ru->nb_rx;i++) {
- ru->common.rxdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
- }
- } // IF5 or local RF
- else {
- LOG_I(PHY,"No rxdata/txdata for RU\n");
- ru->common.txdata = (int32_t**)NULL;
- ru->common.rxdata = (int32_t**)NULL;
-
- }
- if (ru->function != NGFI_RRU_IF5) { // we need to do RX/TX RU processing
- LOG_I(PHY,"nb_tx %d\n",ru->nb_tx);
- ru->common.rxdata_7_5kHz = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
- for (i=0;i<ru->nb_rx;i++) {
- ru->common.rxdata_7_5kHz[i] = (int32_t*)malloc16_clear( 2*fp->samples_per_tti*2*sizeof(int32_t) );
- LOG_I(PHY,"rxdata_7_5kHz[%d] %p for RU %d\n",i,ru->common.rxdata_7_5kHz[i],ru->idx);
- }
-
-
- // allocate IFFT input buffers (TX)
- ru->common.txdataF_BF = (int32_t **)malloc16(ru->nb_tx*sizeof(int32_t*));
- LOG_I(PHY,"[INIT] common.txdata_BF= %p (%lu bytes)\n",ru->common.txdataF_BF,
- ru->nb_tx*sizeof(int32_t*));
- for (i=0; i<ru->nb_tx; i++) {
- ru->common.txdataF_BF[i] = (int32_t*)malloc16_clear(fp->symbols_per_tti*fp->ofdm_symbol_size*sizeof(int32_t) );
- LOG_I(PHY,"txdataF_BF[%d] %p for RU %d\n",i,ru->common.txdataF_BF[i],ru->idx);
- }
- // allocate FFT output buffers (RX)
- ru->common.rxdataF = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
- for (i=0; i<ru->nb_rx; i++) {
- // allocate 2 subframes of I/Q signal data (frequency)
- ru->common.rxdataF[i] = (int32_t*)malloc16_clear(sizeof(int32_t)*(2*fp->ofdm_symbol_size*fp->symbols_per_tti) );
- LOG_I(PHY,"rxdataF[%d] %p for RU %d\n",i,ru->common.rxdataF[i],ru->idx);
- }
-
- /* number of elements of an array X is computed as sizeof(X) / sizeof(X[0]) */
- AssertFatal(ru->nb_rx <= sizeof(ru->prach_rxsigF) / sizeof(ru->prach_rxsigF[0]),
- "nb_antennas_rx too large");
- ru->prach_rxsigF = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
- for (j=0;j<4;j++) ru->prach_rxsigF_br[j] = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
-
- for (i=0; i<ru->nb_rx; i++) {
- ru->prach_rxsigF[i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
- LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,ru->prach_rxsigF[i]);
-#ifdef Rel14
- for (j=0;j<4;j++) {
- ru->prach_rxsigF_br[j][i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
- LOG_D(PHY,"[INIT] prach_vars_br->rxsigF[%d] = %p\n",i,ru->prach_rxsigF_br[j][i]);
- }
-#endif
- }
-
- AssertFatal(RC.nb_L1_inst <= NUMBER_OF_eNB_MAX,"eNB instances %d > %d\n",
- RC.nb_L1_inst,NUMBER_OF_eNB_MAX);
-
- LOG_E(PHY,"[INIT] %s() RC.nb_L1_inst:%d \n", __FUNCTION__, RC.nb_L1_inst);
-
- for (i=0; i<RC.nb_L1_inst; i++) {
- for (p=0;p<15;p++) {
- LOG_D(PHY,"[INIT] %s() nb_antenna_ports_eNB:%d \n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB);
- if (p<ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB || p==5) {
- LOG_D(PHY,"[INIT] %s() DO BEAM WEIGHTS nb_antenna_ports_eNB:%d nb_tx:%d\n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB, ru->nb_tx);
- ru->beam_weights[i][p] = (int32_t **)malloc16_clear(ru->nb_tx*sizeof(int32_t*));
- for (j=0; j<ru->nb_tx; j++) {
- ru->beam_weights[i][p][j] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*sizeof(int32_t));
- // antenna ports 0-3 are mapped on antennas 0-3
- // antenna port 4 is mapped on antenna 0
- // antenna ports 5-14 are mapped on all antennas
- if (((p<4) && (p==j)) || ((p==4) && (j==0))) {
- for (re=0; re<fp->ofdm_symbol_size; re++)
- {
- ru->beam_weights[i][p][j][re] = 0x00007fff;
-
- //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d][%d][%d] = %d\n", i,p,j,re,ru->beam_weights[i][p][j][re]);
- }
- }
- else if (p>4) {
- for (re=0; re<fp->ofdm_symbol_size; re++)
- {
- ru->beam_weights[i][p][j][re] = 0x00007fff/ru->nb_tx;
- //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d][%d][%d] = %d\n", i,p,j,re,ru->beam_weights[i][p][j][re]);
- }
- }
- //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d] = %p (%lu bytes)\n", i,j,ru->beam_weights[i][p][j], fp->ofdm_symbol_size*sizeof(int32_t));
- }
- }
- }
- }
- }
- ru->common.sync_corr = (uint32_t*)malloc16_clear( LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(uint32_t)*fp->samples_per_tti );
-
- return(0);
-}
-
int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
unsigned char is_secondary_eNB,
unsigned char abstraction_flag)
diff --git a/openair1/PHY/INIT/lte_init_ru.c b/openair1/PHY/INIT/lte_init_ru.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d139e0afafcba2c2f72555744c74b5e3cd61e24
--- /dev/null
+++ b/openair1/PHY/INIT/lte_init_ru.c
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "defs.h"
+#include "SCHED/defs.h"
+#include "PHY/extern.h"
+#include "SIMULATION/TOOLS/defs.h"
+#include "RadioResourceConfigCommonSIB.h"
+#include "RadioResourceConfigDedicated.h"
+#include "TDD-Config.h"
+#include "LAYER2/MAC/extern.h"
+#include "MBSFN-SubframeConfigList.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "assertions.h"
+#include <math.h>
+
+int phy_init_RU(RU_t *ru) {
+
+ LTE_DL_FRAME_PARMS *fp = &ru->frame_parms;
+ int i,j;
+ int p;
+ int re;
+
+ LOG_I(PHY,"Initializing RU signal buffers (if_south %s) nb_tx %d\n",ru_if_types[ru->if_south],ru->nb_tx);
+
+ if (ru->if_south <= REMOTE_IF5) { // this means REMOTE_IF5 or LOCAL_RF, so allocate memory for time-domain signals
+ // Time-domain signals
+ ru->common.txdata = (int32_t**)malloc16(ru->nb_tx*sizeof(int32_t*));
+ ru->common.rxdata = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
+
+
+ for (i=0; i<ru->nb_tx; i++) {
+ // Allocate 10 subframes of I/Q TX signal data (time) if not
+ ru->common.txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
+
+ LOG_I(PHY,"[INIT] common.txdata[%d] = %p (%lu bytes)\n",i,ru->common.txdata[i],
+ fp->samples_per_tti*10*sizeof(int32_t));
+
+ }
+ for (i=0;i<ru->nb_rx;i++) {
+ ru->common.rxdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
+ }
+ } // IF5 or local RF
+ else {
+ LOG_I(PHY,"No rxdata/txdata for RU\n");
+ ru->common.txdata = (int32_t**)NULL;
+ ru->common.rxdata = (int32_t**)NULL;
+
+ }
+ if (ru->function != NGFI_RRU_IF5) { // we need to do RX/TX RU processing
+ LOG_I(PHY,"nb_tx %d\n",ru->nb_tx);
+ ru->common.rxdata_7_5kHz = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
+ for (i=0;i<ru->nb_rx;i++) {
+ ru->common.rxdata_7_5kHz[i] = (int32_t*)malloc16_clear( 2*fp->samples_per_tti*2*sizeof(int32_t) );
+ LOG_I(PHY,"rxdata_7_5kHz[%d] %p for RU %d\n",i,ru->common.rxdata_7_5kHz[i],ru->idx);
+ }
+
+
+ // allocate IFFT input buffers (TX)
+ ru->common.txdataF_BF = (int32_t **)malloc16(ru->nb_tx*sizeof(int32_t*));
+ LOG_I(PHY,"[INIT] common.txdata_BF= %p (%lu bytes)\n",ru->common.txdataF_BF,
+ ru->nb_tx*sizeof(int32_t*));
+ for (i=0; i<ru->nb_tx; i++) {
+ ru->common.txdataF_BF[i] = (int32_t*)malloc16_clear(fp->symbols_per_tti*fp->ofdm_symbol_size*sizeof(int32_t) );
+ LOG_I(PHY,"txdataF_BF[%d] %p for RU %d\n",i,ru->common.txdataF_BF[i],ru->idx);
+ }
+ // allocate FFT output buffers (RX)
+ ru->common.rxdataF = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );
+ for (i=0; i<ru->nb_rx; i++) {
+ // allocate 2 subframes of I/Q signal data (frequency)
+ ru->common.rxdataF[i] = (int32_t*)malloc16_clear(sizeof(int32_t)*(2*fp->ofdm_symbol_size*fp->symbols_per_tti) );
+ LOG_I(PHY,"rxdataF[%d] %p for RU %d\n",i,ru->common.rxdataF[i],ru->idx);
+ }
+
+ /* number of elements of an array X is computed as sizeof(X) / sizeof(X[0]) */
+ AssertFatal(ru->nb_rx <= sizeof(ru->prach_rxsigF) / sizeof(ru->prach_rxsigF[0]),
+ "nb_antennas_rx too large");
+ ru->prach_rxsigF = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
+ for (j=0;j<4;j++) ru->prach_rxsigF_br[j] = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
+
+ for (i=0; i<ru->nb_rx; i++) {
+ ru->prach_rxsigF[i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
+ LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,ru->prach_rxsigF[i]);
+#ifdef Rel14
+ for (j=0;j<4;j++) {
+ ru->prach_rxsigF_br[j][i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
+ LOG_D(PHY,"[INIT] prach_vars_br->rxsigF[%d] = %p\n",i,ru->prach_rxsigF_br[j][i]);
+ }
+#endif
+ }
+
+ AssertFatal(RC.nb_L1_inst <= NUMBER_OF_eNB_MAX,"eNB instances %d > %d\n",
+ RC.nb_L1_inst,NUMBER_OF_eNB_MAX);
+
+ LOG_E(PHY,"[INIT] %s() RC.nb_L1_inst:%d \n", __FUNCTION__, RC.nb_L1_inst);
+
+ for (i=0; i<RC.nb_L1_inst; i++) {
+ for (p=0;p<15;p++) {
+ LOG_D(PHY,"[INIT] %s() nb_antenna_ports_eNB:%d \n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB);
+ if (p<ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB || p==5) {
+ LOG_D(PHY,"[INIT] %s() DO BEAM WEIGHTS nb_antenna_ports_eNB:%d nb_tx:%d\n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB, ru->nb_tx);
+ ru->beam_weights[i][p] = (int32_t **)malloc16_clear(ru->nb_tx*sizeof(int32_t*));
+ for (j=0; j<ru->nb_tx; j++) {
+ ru->beam_weights[i][p][j] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*sizeof(int32_t));
+ // antenna ports 0-3 are mapped on antennas 0-3
+ // antenna port 4 is mapped on antenna 0
+ // antenna ports 5-14 are mapped on all antennas
+ if (((p<4) && (p==j)) || ((p==4) && (j==0))) {
+ for (re=0; re<fp->ofdm_symbol_size; re++)
+ {
+ ru->beam_weights[i][p][j][re] = 0x00007fff;
+
+ //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d][%d][%d] = %d\n", i,p,j,re,ru->beam_weights[i][p][j][re]);
+ }
+ }
+ else if (p>4) {
+ for (re=0; re<fp->ofdm_symbol_size; re++)
+ {
+ ru->beam_weights[i][p][j][re] = 0x00007fff/ru->nb_tx;
+ //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d][%d][%d] = %d\n", i,p,j,re,ru->beam_weights[i][p][j][re]);
+ }
+ }
+ //LOG_D(PHY,"[INIT] lte_common_vars->beam_weights[%d][%d] = %p (%lu bytes)\n", i,j,ru->beam_weights[i][p][j], fp->ofdm_symbol_size*sizeof(int32_t));
+ } // for (j=0
+ } // if (p<ru
+ } // for p
+ } //for i
+ } // !=IF5
+ ru->common.sync_corr = (uint32_t*)malloc16_clear( LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(uint32_t)*fp->samples_per_tti );
+
+ return(0);
+}
diff --git a/openair1/PHY/INIT/lte_init_ue.c b/openair1/PHY/INIT/lte_init_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..16274d687841098c06042d9c471f2add19900fcb
--- /dev/null
+++ b/openair1/PHY/INIT/lte_init_ue.c
@@ -0,0 +1,963 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "defs.h"
+#include "SCHED/defs.h"
+#include "PHY/extern.h"
+#include "SIMULATION/TOOLS/defs.h"
+#include "RadioResourceConfigCommonSIB.h"
+#include "RadioResourceConfigDedicated.h"
+#include "TDD-Config.h"
+#include "LAYER2/MAC/extern.h"
+#include "MBSFN-SubframeConfigList.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "assertions.h"
+#include <math.h>
+
+
+uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
+
+void phy_config_sib1_ue(uint8_t Mod_id,int CC_id,
+ uint8_t eNB_id,
+ TDD_Config_t *tdd_Config,
+ uint8_t SIwindowsize,
+ uint16_t SIperiod)
+{
+
+ LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
+
+ if (tdd_Config) {
+ fp->tdd_config = tdd_Config->subframeAssignment;
+ fp->tdd_config_S = tdd_Config->specialSubframePatterns;
+ }
+
+ fp->SIwindowsize = SIwindowsize;
+ fp->SIPeriod = SIperiod;
+}
+
+void phy_config_sib2_ue(uint8_t Mod_id,int CC_id,
+ uint8_t eNB_id,
+ RadioResourceConfigCommonSIB_t *radioResourceConfigCommon,
+ ARFCN_ValueEUTRA_t *ul_CarrierFreq,
+ long *ul_Bandwidth,
+ AdditionalSpectrumEmission_t *additionalSpectrumEmission,
+ struct MBSFN_SubframeConfigList *mbsfn_SubframeConfigList)
+{
+
+ PHY_VARS_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
+ LTE_DL_FRAME_PARMS *fp = &ue->frame_parms;
+ int i;
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_CONFIG_SIB2, VCD_FUNCTION_IN);
+
+ LOG_I(PHY,"[UE%d] Applying radioResourceConfigCommon from eNB%d\n",Mod_id,eNB_id);
+
+ fp->prach_config_common.rootSequenceIndex =radioResourceConfigCommon->prach_Config.rootSequenceIndex;
+
+ fp->prach_config_common.prach_Config_enabled=1;
+ fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.prach_ConfigIndex;
+ fp->prach_config_common.prach_ConfigInfo.highSpeedFlag =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.highSpeedFlag;
+ fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
+ fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset =radioResourceConfigCommon->prach_Config.prach_ConfigInfo.prach_FreqOffset;
+
+ compute_prach_seq(fp->prach_config_common.rootSequenceIndex,
+ fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
+ fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
+ fp->prach_config_common.prach_ConfigInfo.highSpeedFlag,
+ fp->frame_type,ue->X_u);
+
+
+
+ fp->pucch_config_common.deltaPUCCH_Shift = 1+radioResourceConfigCommon->pucch_ConfigCommon.deltaPUCCH_Shift;
+ fp->pucch_config_common.nRB_CQI = radioResourceConfigCommon->pucch_ConfigCommon.nRB_CQI;
+ fp->pucch_config_common.nCS_AN = radioResourceConfigCommon->pucch_ConfigCommon.nCS_AN;
+ fp->pucch_config_common.n1PUCCH_AN = radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN;
+
+
+
+ fp->pdsch_config_common.referenceSignalPower = radioResourceConfigCommon->pdsch_ConfigCommon.referenceSignalPower;
+ fp->pdsch_config_common.p_b = radioResourceConfigCommon->pdsch_ConfigCommon.p_b;
+
+
+ fp->pusch_config_common.n_SB = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
+ fp->pusch_config_common.hoppingMode = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
+ fp->pusch_config_common.pusch_HoppingOffset = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
+ fp->pusch_config_common.enable64QAM = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = dmrs1_tab_ue[radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift];
+
+
+ init_ul_hopping(fp);
+ fp->soundingrs_ul_config_common.enabled_flag = 0;
+
+ if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon.present==SoundingRS_UL_ConfigCommon_PR_setup) {
+ fp->soundingrs_ul_config_common.enabled_flag = 1;
+ fp->soundingrs_ul_config_common.srs_BandwidthConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_BandwidthConfig;
+ fp->soundingrs_ul_config_common.srs_SubframeConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_SubframeConfig;
+ fp->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission = radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
+
+ if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon.choice.setup.srs_MaxUpPts)
+ fp->soundingrs_ul_config_common.srs_MaxUpPts = 1;
+ else
+ fp->soundingrs_ul_config_common.srs_MaxUpPts = 0;
+ }
+
+
+
+ fp->ul_power_control_config_common.p0_NominalPUSCH = radioResourceConfigCommon->uplinkPowerControlCommon.p0_NominalPUSCH;
+ fp->ul_power_control_config_common.alpha = radioResourceConfigCommon->uplinkPowerControlCommon.alpha;
+ fp->ul_power_control_config_common.p0_NominalPUCCH = radioResourceConfigCommon->uplinkPowerControlCommon.p0_NominalPUCCH;
+ fp->ul_power_control_config_common.deltaPreambleMsg3 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaPreambleMsg3;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format1 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format1;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format1b = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format1b;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2 = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2a = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2a;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2b = radioResourceConfigCommon->uplinkPowerControlCommon.deltaFList_PUCCH.deltaF_PUCCH_Format2b;
+
+ fp->maxHARQ_Msg3Tx = radioResourceConfigCommon->rach_ConfigCommon.maxHARQ_Msg3Tx;
+
+ // Now configure some of the Physical Channels
+
+ // PUCCH
+ init_ncs_cell(fp,ue->ncs_cell);
+
+ init_ul_hopping(fp);
+
+ // PCH
+ init_ue_paging_info(ue,radioResourceConfigCommon->pcch_Config.defaultPagingCycle,radioResourceConfigCommon->pcch_Config.nB);
+
+ // MBSFN
+
+ if (mbsfn_SubframeConfigList != NULL) {
+ fp->num_MBSFN_config = mbsfn_SubframeConfigList->list.count;
+
+ for (i=0; i<mbsfn_SubframeConfigList->list.count; i++) {
+ fp->MBSFN_config[i].radioframeAllocationPeriod = mbsfn_SubframeConfigList->list.array[i]->radioframeAllocationPeriod;
+ fp->MBSFN_config[i].radioframeAllocationOffset = mbsfn_SubframeConfigList->list.array[i]->radioframeAllocationOffset;
+
+ if (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.present == MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame) {
+ fp->MBSFN_config[i].fourFrames_flag = 0;
+ fp->MBSFN_config[i].mbsfn_SubframeConfig = mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[0]; // 6-bit subframe configuration
+ LOG_I(PHY, "[CONFIG] MBSFN_SubframeConfig[%d] pattern is %d\n", i,
+ fp->MBSFN_config[i].mbsfn_SubframeConfig);
+ } else if (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.present == MBSFN_SubframeConfig__subframeAllocation_PR_fourFrames) { // 24-bit subframe configuration
+ fp->MBSFN_config[i].fourFrames_flag = 1;
+ fp->MBSFN_config[i].mbsfn_SubframeConfig =
+ mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[0]|
+ (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[1]<<8)|
+ (mbsfn_SubframeConfigList->list.array[i]->subframeAllocation.choice.oneFrame.buf[2]<<16);
+
+ LOG_I(PHY, "[CONFIG] MBSFN_SubframeConfig[%d] pattern is %d\n", i,
+ fp->MBSFN_config[i].mbsfn_SubframeConfig);
+ }
+ }
+ }
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_CONFIG_SIB2, VCD_FUNCTION_OUT);
+
+}
+
+void phy_config_sib13_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,int mbsfn_Area_idx,
+ long mbsfn_AreaId_r9)
+{
+
+ LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
+
+
+ LOG_I(PHY,"[UE%d] Applying MBSFN_Area_id %ld for index %d\n",Mod_id,mbsfn_AreaId_r9,mbsfn_Area_idx);
+
+ if (mbsfn_Area_idx == 0) {
+ fp->Nid_cell_mbsfn = (uint16_t)mbsfn_AreaId_r9;
+ LOG_N(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
+ }
+
+ lte_gold_mbsfn(fp,PHY_vars_UE_g[Mod_id][CC_id]->lte_gold_mbsfn_table,fp->Nid_cell_mbsfn);
+
+}
+
+
+/*
+ * Configures UE MAC and PHY with radioResourceCommon received in mobilityControlInfo IE during Handover
+ */
+void phy_config_afterHO_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_id, MobilityControlInfo_t *mobilityControlInfo, uint8_t ho_failed)
+{
+
+ if(mobilityControlInfo!=NULL) {
+ RadioResourceConfigCommon_t *radioResourceConfigCommon = &mobilityControlInfo->radioResourceConfigCommon;
+ LOG_I(PHY,"radioResourceConfigCommon %p\n", radioResourceConfigCommon);
+ memcpy((void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms_before_ho,
+ (void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,
+ sizeof(LTE_DL_FRAME_PARMS));
+ PHY_vars_UE_g[Mod_id][CC_id]->ho_triggered = 1;
+ //PHY_vars_UE_g[UE_id]->UE_mode[0] = PRACH;
+
+ LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][CC_id]->frame_parms;
+ // int N_ZC;
+ // uint8_t prach_fmt;
+ // int u;
+
+ LOG_I(PHY,"[UE%d] Handover triggered: Applying radioResourceConfigCommon from eNB %d\n",
+ Mod_id,eNB_id);
+
+ fp->prach_config_common.rootSequenceIndex =radioResourceConfigCommon->prach_Config.rootSequenceIndex;
+ fp->prach_config_common.prach_Config_enabled=1;
+ fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_ConfigIndex;
+ fp->prach_config_common.prach_ConfigInfo.highSpeedFlag =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->highSpeedFlag;
+ fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->zeroCorrelationZoneConfig;
+ fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset =radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_FreqOffset;
+
+ // prach_fmt = get_prach_fmt(radioResourceConfigCommon->prach_Config.prach_ConfigInfo->prach_ConfigIndex,fp->frame_type);
+ // N_ZC = (prach_fmt <4)?839:139;
+ // u = (prach_fmt < 4) ? prach_root_sequence_map0_3[fp->prach_config_common.rootSequenceIndex] :
+ // prach_root_sequence_map4[fp->prach_config_common.rootSequenceIndex];
+
+ //compute_prach_seq(u,N_ZC, PHY_vars_UE_g[Mod_id]->X_u);
+ compute_prach_seq(PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.rootSequenceIndex,
+ PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
+ PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
+ PHY_vars_UE_g[Mod_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.highSpeedFlag,
+ fp->frame_type,
+ PHY_vars_UE_g[Mod_id][CC_id]->X_u);
+
+
+ fp->pucch_config_common.deltaPUCCH_Shift = 1+radioResourceConfigCommon->pucch_ConfigCommon->deltaPUCCH_Shift;
+ fp->pucch_config_common.nRB_CQI = radioResourceConfigCommon->pucch_ConfigCommon->nRB_CQI;
+ fp->pucch_config_common.nCS_AN = radioResourceConfigCommon->pucch_ConfigCommon->nCS_AN;
+ fp->pucch_config_common.n1PUCCH_AN = radioResourceConfigCommon->pucch_ConfigCommon->n1PUCCH_AN;
+ fp->pdsch_config_common.referenceSignalPower = radioResourceConfigCommon->pdsch_ConfigCommon->referenceSignalPower;
+ fp->pdsch_config_common.p_b = radioResourceConfigCommon->pdsch_ConfigCommon->p_b;
+
+
+ fp->pusch_config_common.n_SB = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
+ fp->pusch_config_common.hoppingMode = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
+ fp->pusch_config_common.pusch_HoppingOffset = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
+ fp->pusch_config_common.enable64QAM = radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled;
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = radioResourceConfigCommon->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift;
+
+ init_ul_hopping(fp);
+ fp->soundingrs_ul_config_common.enabled_flag = 0;
+
+ if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon->present==SoundingRS_UL_ConfigCommon_PR_setup) {
+ fp->soundingrs_ul_config_common.enabled_flag = 1;
+ fp->soundingrs_ul_config_common.srs_BandwidthConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_BandwidthConfig;
+ fp->soundingrs_ul_config_common.srs_SubframeConfig = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_SubframeConfig;
+ fp->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission = radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.ackNackSRS_SimultaneousTransmission;
+
+ if (radioResourceConfigCommon->soundingRS_UL_ConfigCommon->choice.setup.srs_MaxUpPts)
+ fp->soundingrs_ul_config_common.srs_MaxUpPts = 1;
+ else
+ fp->soundingrs_ul_config_common.srs_MaxUpPts = 0;
+ }
+
+ fp->ul_power_control_config_common.p0_NominalPUSCH = radioResourceConfigCommon->uplinkPowerControlCommon->p0_NominalPUSCH;
+ fp->ul_power_control_config_common.alpha = radioResourceConfigCommon->uplinkPowerControlCommon->alpha;
+ fp->ul_power_control_config_common.p0_NominalPUCCH = radioResourceConfigCommon->uplinkPowerControlCommon->p0_NominalPUCCH;
+ fp->ul_power_control_config_common.deltaPreambleMsg3 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaPreambleMsg3;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format1 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format1;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format1b = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format1b;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2 = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2a = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2a;
+ fp->ul_power_control_config_common.deltaF_PUCCH_Format2b = radioResourceConfigCommon->uplinkPowerControlCommon->deltaFList_PUCCH.deltaF_PUCCH_Format2b;
+
+ fp->maxHARQ_Msg3Tx = radioResourceConfigCommon->rach_ConfigCommon->maxHARQ_Msg3Tx;
+
+ // Now configure some of the Physical Channels
+ if (radioResourceConfigCommon->antennaInfoCommon)
+ fp->nb_antennas_tx = (1<<radioResourceConfigCommon->antennaInfoCommon->antennaPortsCount);
+ else
+ fp->nb_antennas_tx = 1;
+
+ //PHICH
+ if (radioResourceConfigCommon->antennaInfoCommon) {
+ fp->phich_config_common.phich_resource = radioResourceConfigCommon->phich_Config->phich_Resource;
+ fp->phich_config_common.phich_duration = radioResourceConfigCommon->phich_Config->phich_Duration;
+ }
+
+ //Target CellId
+ fp->Nid_cell = mobilityControlInfo->targetPhysCellId;
+ fp->nushift = fp->Nid_cell%6;
+
+ // PUCCH
+ init_ncs_cell(fp,PHY_vars_UE_g[Mod_id][CC_id]->ncs_cell);
+
+ init_ul_hopping(fp);
+
+ // RNTI
+
+
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
+
+ LOG_I(PHY,"SET C-RNTI %x %x\n",PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti,
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti);
+ }
+
+ if(ho_failed) {
+ LOG_D(PHY,"[UE%d] Handover failed, triggering RACH procedure\n",Mod_id);
+ memcpy((void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,(void *)&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms_before_ho, sizeof(LTE_DL_FRAME_PARMS));
+ PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_id] = PRACH;
+ }
+}
+
+void phy_config_meas_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index,uint8_t n_adj_cells,unsigned int *adj_cell_id)
+{
+
+ PHY_MEASUREMENTS *phy_meas = &PHY_vars_UE_g[Mod_id][CC_id]->measurements;
+ int i;
+
+ LOG_I(PHY,"Configuring inter-cell measurements for %d cells, ids: \n",n_adj_cells);
+
+ for (i=0; i<n_adj_cells; i++) {
+ LOG_I(PHY,"%d\n",adj_cell_id[i]);
+ lte_gold(&PHY_vars_UE_g[Mod_id][CC_id]->frame_parms,PHY_vars_UE_g[Mod_id][CC_id]->lte_gold_table[i+1],adj_cell_id[i]);
+ }
+
+ phy_meas->n_adj_cells = n_adj_cells;
+ memcpy((void*)phy_meas->adj_cell_id,(void *)adj_cell_id,n_adj_cells*sizeof(unsigned int));
+
+}
+
+#if defined(Rel10) || defined(Rel14)
+void phy_config_dedicated_scell_ue(uint8_t Mod_id,
+ uint8_t eNB_index,
+ SCellToAddMod_r10_t *sCellToAddMod_r10,
+ int CC_id)
+{
+
+}
+#endif
+
+
+void phy_config_harq_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
+ uint16_t max_harq_tx )
+{
+
+ PHY_VARS_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id];
+ phy_vars_ue->ulsch[eNB_id]->Mlimit = max_harq_tx;
+}
+
+extern uint16_t beta_cqi[16];
+
+void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
+ struct PhysicalConfigDedicated *physicalConfigDedicated )
+{
+
+ static uint8_t first_dedicated_configuration = 0;
+ PHY_VARS_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id];
+
+ phy_vars_ue->total_TBS[eNB_id]=0;
+ phy_vars_ue->total_TBS_last[eNB_id]=0;
+ phy_vars_ue->bitrate[eNB_id]=0;
+ phy_vars_ue->total_received_bits[eNB_id]=0;
+ phy_vars_ue->dlsch_errors[eNB_id]=0;
+ phy_vars_ue->dlsch_errors_last[eNB_id]=0;
+ phy_vars_ue->dlsch_received[eNB_id]=0;
+ phy_vars_ue->dlsch_received_last[eNB_id]=0;
+ phy_vars_ue->dlsch_fer[eNB_id]=0;
+
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = -1;
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = -1;
+
+ if (physicalConfigDedicated) {
+ LOG_D(PHY,"[UE %d] Received physicalConfigDedicated from eNB %d\n",Mod_id, eNB_id);
+ LOG_D(PHY,"------------------------------------------------------------------------\n");
+
+ if (physicalConfigDedicated->pdsch_ConfigDedicated) {
+ phy_vars_ue->pdsch_config_dedicated[eNB_id].p_a=physicalConfigDedicated->pdsch_ConfigDedicated->p_a;
+ LOG_D(PHY,"pdsch_config_dedicated.p_a %d\n",phy_vars_ue->pdsch_config_dedicated[eNB_id].p_a);
+ LOG_D(PHY,"\n");
+ }
+
+ if (physicalConfigDedicated->pucch_ConfigDedicated) {
+ if (physicalConfigDedicated->pucch_ConfigDedicated->ackNackRepetition.present==PUCCH_ConfigDedicated__ackNackRepetition_PR_release)
+ phy_vars_ue->pucch_config_dedicated[eNB_id].ackNackRepetition=0;
+ else {
+ phy_vars_ue->pucch_config_dedicated[eNB_id].ackNackRepetition=1;
+ }
+
+ if (physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode)
+ phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode = *physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode;
+ else
+ phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode = bundling;
+
+ if ( phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode == multiplexing)
+ LOG_D(PHY,"pucch_config_dedicated.tdd_AckNackFeedbackMode = multiplexing\n");
+ else
+ LOG_D(PHY,"pucch_config_dedicated.tdd_AckNackFeedbackMode = bundling\n");
+ }
+
+ if (physicalConfigDedicated->pusch_ConfigDedicated) {
+ phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_ACK_Index;
+ phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_RI_Index;
+ phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_CQI_Index;
+
+
+ LOG_D(PHY,"pusch_config_dedicated.betaOffset_ACK_Index %d\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index);
+ LOG_D(PHY,"pusch_config_dedicated.betaOffset_RI_Index %d\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index);
+ LOG_D(PHY,"pusch_config_dedicated.betaOffset_CQI_Index %d => %d)\n",phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index,beta_cqi[phy_vars_ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index]);
+ LOG_D(PHY,"\n");
+
+
+ }
+
+ if (physicalConfigDedicated->uplinkPowerControlDedicated) {
+
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUSCH = physicalConfigDedicated->uplinkPowerControlDedicated->p0_UE_PUSCH;
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].deltaMCS_Enabled= physicalConfigDedicated->uplinkPowerControlDedicated->deltaMCS_Enabled;
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].accumulationEnabled= physicalConfigDedicated->uplinkPowerControlDedicated->accumulationEnabled;
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUCCH= physicalConfigDedicated->uplinkPowerControlDedicated->p0_UE_PUCCH;
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].pSRS_Offset= physicalConfigDedicated->uplinkPowerControlDedicated->pSRS_Offset;
+ phy_vars_ue->ul_power_control_dedicated[eNB_id].filterCoefficient= *physicalConfigDedicated->uplinkPowerControlDedicated->filterCoefficient;
+ LOG_D(PHY,"ul_power_control_dedicated.p0_UE_PUSCH %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUSCH);
+ LOG_D(PHY,"ul_power_control_dedicated.deltaMCS_Enabled %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].deltaMCS_Enabled);
+ LOG_D(PHY,"ul_power_control_dedicated.accumulationEnabled %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].accumulationEnabled);
+ LOG_D(PHY,"ul_power_control_dedicated.p0_UE_PUCCH %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].p0_UE_PUCCH);
+ LOG_D(PHY,"ul_power_control_dedicated.pSRS_Offset %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].pSRS_Offset);
+ LOG_D(PHY,"ul_power_control_dedicated.filterCoefficient %d\n",phy_vars_ue->ul_power_control_dedicated[eNB_id].filterCoefficient);
+ LOG_D(PHY,"\n");
+ }
+
+ if (physicalConfigDedicated->antennaInfo) {
+ phy_vars_ue->transmission_mode[eNB_id] = 1+(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode);
+ LOG_I(PHY,"Transmission Mode %d\n",phy_vars_ue->transmission_mode[eNB_id]);
+ switch(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode) {
+ case AntennaInfoDedicated__transmissionMode_tm1:
+ phy_vars_ue->transmission_mode[eNB_id] = 1;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm2:
+ phy_vars_ue->transmission_mode[eNB_id] = 2;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm3:
+ phy_vars_ue->transmission_mode[eNB_id] = 3;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm4:
+ phy_vars_ue->transmission_mode[eNB_id] = 4;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm5:
+ phy_vars_ue->transmission_mode[eNB_id] = 5;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm6:
+ phy_vars_ue->transmission_mode[eNB_id] = 6;
+ break;
+ case AntennaInfoDedicated__transmissionMode_tm7:
+ lte_gold_ue_spec_port5(phy_vars_ue->lte_gold_uespec_port5_table, phy_vars_ue->frame_parms.Nid_cell, phy_vars_ue->pdcch_vars[0][eNB_id]->crnti);
+ phy_vars_ue->transmission_mode[eNB_id] = 7;
+ break;
+ default:
+ LOG_E(PHY,"Unknown transmission mode!\n");
+ break;
+ }
+ } else {
+ LOG_D(PHY,"[UE %d] Received NULL physicalConfigDedicated->antennaInfo from eNB %d\n",Mod_id, eNB_id);
+ }
+
+ if (physicalConfigDedicated->schedulingRequestConfig) {
+ if (physicalConfigDedicated->schedulingRequestConfig->present == SchedulingRequestConfig_PR_setup) {
+ phy_vars_ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex = physicalConfigDedicated->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex;
+ phy_vars_ue->scheduling_request_config[eNB_id].sr_ConfigIndex=physicalConfigDedicated->schedulingRequestConfig->choice.setup.sr_ConfigIndex;
+ phy_vars_ue->scheduling_request_config[eNB_id].dsr_TransMax=physicalConfigDedicated->schedulingRequestConfig->choice.setup.dsr_TransMax;
+
+ LOG_D(PHY,"scheduling_request_config.sr_PUCCH_ResourceIndex %d\n",phy_vars_ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
+ LOG_D(PHY,"scheduling_request_config.sr_ConfigIndex %d\n",phy_vars_ue->scheduling_request_config[eNB_id].sr_ConfigIndex);
+ LOG_D(PHY,"scheduling_request_config.dsr_TransMax %d\n",phy_vars_ue->scheduling_request_config[eNB_id].dsr_TransMax);
+ }
+
+ LOG_D(PHY,"------------------------------------------------------------\n");
+
+ }
+
+ if (physicalConfigDedicated->soundingRS_UL_ConfigDedicated) {
+
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srsConfigDedicatedSetup = 0;
+ if (physicalConfigDedicated->soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) {
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srsConfigDedicatedSetup = 1;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].duration = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.duration;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].cyclicShift = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].freqDomainPosition = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_Bandwidth = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_ConfigIndex = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_HoppingBandwidth = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth;
+ phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].transmissionComb = physicalConfigDedicated->soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb;
+
+
+ LOG_D(PHY,"soundingrs_ul_config_dedicated.srs_ConfigIndex %d\n",phy_vars_ue->soundingrs_ul_config_dedicated[eNB_id].srs_ConfigIndex);
+ }
+
+ LOG_D(PHY,"------------------------------------------------------------\n");
+
+ }
+
+
+ if (physicalConfigDedicated->cqi_ReportConfig) {
+ if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic) {
+ // configure PUSCH CQI reporting
+ phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic = *physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic;
+ if ((phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm12) &&
+ (phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm30) &&
+ (phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic != rm31))
+ LOG_E(PHY,"Unsupported Aperiodic CQI Feedback Mode : %d\n",phy_vars_ue->cqi_report_config[eNB_id].cqi_ReportModeAperiodic);
+ }
+ if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic) {
+ if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_setup) {
+ // configure PUCCH CQI reporting
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PUCCH_ResourceIndex = physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex;
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex;
+ if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex)
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = *physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex;
+ }
+ else if (physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_release) {
+ // handle release
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.ri_ConfigIndex = -1;
+ phy_vars_ue->cqi_report_config[eNB_id].CQI_ReportPeriodic.cqi_PMI_ConfigIndex = -1;
+ }
+ }
+ }
+
+#ifdef CBA
+
+ if (physicalConfigDedicated->pusch_CBAConfigDedicated_vlola) {
+ phy_vars_ue->pusch_ca_config_dedicated[eNB_id].betaOffset_CA_Index = (uint16_t) *physicalConfigDedicated->pusch_CBAConfigDedicated_vlola->betaOffset_CBA_Index;
+ phy_vars_ue->pusch_ca_config_dedicated[eNB_id].cShift = (uint16_t) *physicalConfigDedicated->pusch_CBAConfigDedicated_vlola->cShift_CBA;
+ LOG_D(PHY,"[UE %d ] physicalConfigDedicated pusch CBA config dedicated: beta offset %d cshift %d \n",Mod_id,
+ phy_vars_ue->pusch_ca_config_dedicated[eNB_id].betaOffset_CA_Index,
+ phy_vars_ue->pusch_ca_config_dedicated[eNB_id].cShift);
+ }
+
+#endif
+ } else {
+ LOG_D(PHY,"[PHY][UE %d] Received NULL radioResourceConfigDedicated from eNB %d\n",Mod_id,eNB_id);
+ return;
+ }
+
+ // fill cqi parameters for periodic CQI reporting
+ get_cqipmiri_params(phy_vars_ue,eNB_id);
+
+ // disable MIB SIB decoding once we are on connected mode
+ first_dedicated_configuration ++;
+ if(first_dedicated_configuration > 1)
+ {
+ LOG_I(PHY,"Disable SIB MIB decoding \n");
+ phy_vars_ue->decode_SIB = 0;
+ phy_vars_ue->decode_MIB = 0;
+ }
+ //phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
+ if(phy_vars_ue->pdcch_vars[0][eNB_id]->crnti == 0x1234)
+ phy_vars_ue->pdcch_vars[0][eNB_id]->crnti = phy_vars_ue->pdcch_vars[1][eNB_id]->crnti;
+ else
+ phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
+
+ LOG_I(PHY,"C-RNTI %x %x \n", phy_vars_ue->pdcch_vars[0][eNB_id]->crnti,
+ phy_vars_ue->pdcch_vars[1][eNB_id]->crnti);
+
+
+}
+
+/*! \brief Helper function to allocate memory for DLSCH data structures.
+ * \param[out] pdsch Pointer to the LTE_UE_PDSCH structure to initialize.
+ * \param[in] frame_parms LTE_DL_FRAME_PARMS structure.
+ * \note This function is optimistic in that it expects malloc() to succeed.
+ */
+void phy_init_lte_ue__PDSCH( LTE_UE_PDSCH* const pdsch, const LTE_DL_FRAME_PARMS* const fp )
+{
+ AssertFatal( pdsch, "pdsch==0" );
+
+ pdsch->pmi_ext = (uint8_t*)malloc16_clear( fp->N_RB_DL );
+ pdsch->llr[0] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+ pdsch->llr128 = (int16_t**)malloc16_clear( sizeof(int16_t*) );
+ // FIXME! no further allocation for (int16_t*)pdsch->llr128 !!! expect SIGSEGV
+ // FK, 11-3-2015: this is only as a temporary pointer, no memory is stored there
+
+
+ pdsch->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->rxdataF_uespec_pilots = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->rxdataF_comp0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->rho = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
+ pdsch->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->dl_bf_ch_estimates = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->dl_bf_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ //pdsch->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ //pdsch->dl_ch_rho2_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->dl_ch_mag0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdsch->dl_ch_magb0 = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+
+
+ // the allocated memory size is fixed:
+ AssertFatal( fp->nb_antennas_rx <= 2, "nb_antennas_rx > 2" );
+
+ for (int i=0; i<fp->nb_antennas_rx; i++) {
+ pdsch->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
+
+ for (int j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
+ const int idx = (j<<1)+i;
+ const size_t num = 7*2*fp->N_RB_DL*12;
+ pdsch->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdsch->rxdataF_uespec_pilots[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * fp->N_RB_DL*12);
+ pdsch->rxdataF_comp0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdsch->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdsch->dl_bf_ch_estimates[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * fp->ofdm_symbol_size*7*2);
+ pdsch->dl_bf_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ //pdsch->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ //pdsch->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdsch->dl_ch_mag0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdsch->dl_ch_magb0[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ }
+ }
+}
+
+int init_lte_ue_signal(PHY_VARS_UE *ue,
+ int nb_connected_eNB,
+ uint8_t abstraction_flag)
+{
+
+ // create shortcuts
+ LTE_DL_FRAME_PARMS* const fp = &ue->frame_parms;
+ LTE_UE_COMMON* const common_vars = &ue->common_vars;
+ LTE_UE_PDSCH** const pdsch_vars_SI = ue->pdsch_vars_SI;
+ LTE_UE_PDSCH** const pdsch_vars_ra = ue->pdsch_vars_ra;
+ LTE_UE_PDSCH** const pdsch_vars_p = ue->pdsch_vars_p;
+ LTE_UE_PDSCH** const pdsch_vars_mch = ue->pdsch_vars_MCH;
+ LTE_UE_PDSCH* (*pdsch_vars_th)[][NUMBER_OF_CONNECTED_eNB_MAX+1] = &ue->pdsch_vars;
+ LTE_UE_PDCCH* (*pdcch_vars_th)[][NUMBER_OF_CONNECTED_eNB_MAX] = &ue->pdcch_vars;
+ LTE_UE_PBCH** const pbch_vars = ue->pbch_vars;
+ LTE_UE_PRACH** const prach_vars = ue->prach_vars;
+
+
+
+ int i,j,k,l;
+ int eNB_id;
+ int th_id;
+
+ LOG_D(PHY,"Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
+ LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
+
+
+
+ init_frame_parms(&ue->frame_parms,1);
+ init_lte_top(&ue->frame_parms);
+ init_ul_hopping(&ue->frame_parms);
+
+
+ // many memory allocation sizes are hard coded
+ AssertFatal( fp->nb_antennas_rx <= 2, "hard coded allocation for ue_common_vars->dl_ch_estimates[eNB_id]" );
+ AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" );
+ // init phy_vars_ue
+
+ for (i=0; i<4; i++) {
+ ue->rx_gain_max[i] = 135;
+ ue->rx_gain_med[i] = 128;
+ ue->rx_gain_byp[i] = 120;
+ }
+
+ ue->n_connected_eNB = nb_connected_eNB;
+
+ for(eNB_id = 0; eNB_id < ue->n_connected_eNB; eNB_id++) {
+ ue->total_TBS[eNB_id] = 0;
+ ue->total_TBS_last[eNB_id] = 0;
+ ue->bitrate[eNB_id] = 0;
+ ue->total_received_bits[eNB_id] = 0;
+ }
+
+ for (i=0;i<10;i++)
+ ue->tx_power_dBm[i]=-127;
+
+
+
+ // init TX buffers
+
+ common_vars->txdata = (int32_t**)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
+ common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
+
+ for (i=0; i<fp->nb_antennas_tx; i++) {
+
+ common_vars->txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
+ common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
+ }
+
+ // init RX buffers
+
+ common_vars->rxdata = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ common_vars->common_vars_rx_data_per_thread[0].rxdataF = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ common_vars->common_vars_rx_data_per_thread[1].rxdataF = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ common_vars->rxdata[i] = (int32_t*) malloc16_clear( (fp->samples_per_tti*10+2048)*sizeof(int32_t) );
+ common_vars->common_vars_rx_data_per_thread[0].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
+ common_vars->common_vars_rx_data_per_thread[1].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
+ }
+
+
+ // Channel estimates
+ for (eNB_id=0; eNB_id<7; eNB_id++) {
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates[eNB_id] = (int32_t**)malloc16_clear(8*sizeof(int32_t*));
+ common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates_time[eNB_id] = (int32_t**)malloc16_clear(8*sizeof(int32_t*));
+ }
+
+ for (i=0; i<fp->nb_antennas_rx; i++)
+ for (j=0; j<4; j++) {
+ int idx = (j<<1) + i;
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates[eNB_id][idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->symbols_per_tti*(fp->ofdm_symbol_size+LTE_CE_FILTER_LENGTH) );
+ common_vars->common_vars_rx_data_per_thread[th_id].dl_ch_estimates_time[eNB_id][idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
+ }
+ }
+ }
+
+ // DLSCH
+ for (eNB_id=0; eNB_id<ue->n_connected_eNB; eNB_id++) {
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
+ }
+
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id] = (LTE_UE_PDCCH *)malloc16_clear(sizeof(LTE_UE_PDCCH));
+ }
+
+ pdsch_vars_SI[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
+ pdsch_vars_ra[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
+ pdsch_vars_p[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
+ pdsch_vars_mch[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
+ prach_vars[eNB_id] = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH));
+ pbch_vars[eNB_id] = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH));
+
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
+ }
+
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->llr_shifts = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
+ (*pdsch_vars_th)[th_id][eNB_id]->llr_shifts_p = (*pdsch_vars_th)[0][eNB_id]->llr_shifts;
+ (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+ (*pdsch_vars_th)[th_id][eNB_id]->llr128_2ndstream = (int16_t**)malloc16_clear( sizeof(int16_t*) );
+ (*pdsch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
+ }
+
+ for (int i=0; i<fp->nb_antennas_rx; i++){
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+ }
+
+ }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho2_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ }
+
+ for (i=0; i<fp->nb_antennas_rx; i++)
+ for (j=0; j<4; j++) {
+ const int idx = (j<<1)+i;
+ const size_t num = 7*2*fp->N_RB_DL*12+4;
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ }
+
+ }
+
+ //const size_t num = 7*2*fp->N_RB_DL*12+4;
+ for (k=0;k<8;k++) { //harq_pid
+ for (l=0;l<8;l++) { //round
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ }
+
+
+ for (int i=0; i<fp->nb_antennas_rx; i++)
+ for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
+ const int idx = (j<<1)+i;
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+ (*pdsch_vars_th)[th_id][eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+ (*pdsch_vars_th)[th_id][eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+ }
+
+ }
+ }
+ }
+ phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_p[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
+
+ // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
+
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ }
+
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+ }
+
+ for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
+ int idx = (j<<1)+i;
+ // size_t num = 7*2*fp->N_RB_DL*12;
+ size_t num = 4*100*12; // 4 symbols, 100 PRBs, 12 REs per PRB
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ }
+ }
+ }
+ phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_p[eNB_id], fp );
+ phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
+
+ // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ (*pdcch_vars_th)[th_id][eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
+
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ }
+
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
+
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+ }
+
+ for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
+ int idx = (j<<1)+i;
+ // size_t num = 7*2*fp->N_RB_DL*12;
+ size_t num = 4*100*12; // 4 symbols, 100 PRBs, 12 REs per PRB
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ (*pdcch_vars_th)[th_id][eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ }
+ }
+ }
+
+ // PBCH
+ pbch_vars[eNB_id]->rxdataF_ext = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ pbch_vars[eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pbch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pbch_vars[eNB_id]->llr = (int8_t*)malloc16_clear( 1920 );
+ prach_vars[eNB_id]->prachF = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+ prach_vars[eNB_id]->prach = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ pbch_vars[eNB_id]->rxdataF_ext[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+
+ for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
+ int idx = (j<<1)+i;
+ pbch_vars[eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+ pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+ }
+ }
+
+
+ pbch_vars[eNB_id]->decoded_output = (uint8_t*)malloc16_clear( 64 );
+ }
+
+ // initialization for the last instance of pdsch_vars (used for MU-MIMO)
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ (*pdsch_vars_th)[th_id][eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
+ }
+
+ pdsch_vars_SI[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
+ pdsch_vars_ra[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
+ pdsch_vars_p[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
+
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
+ (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+ }
+
+
+ ue->sinr_CQI_dB = (double*) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
+
+ ue->init_averaging = 1;
+ // default value until overwritten by RRCConnectionReconfiguration
+ if (fp->nb_antenna_ports_eNB==2)
+ ue->pdsch_config_dedicated->p_a = dBm3;
+ else
+ ue->pdsch_config_dedicated->p_a = dB0;
+
+ // set channel estimation to do linear interpolation in time
+ ue->high_speed_flag = 1;
+ ue->ch_est_alpha = 24576;
+
+ // enable MIB/SIB decoding by default
+ ue->decode_MIB = 1;
+ ue->decode_SIB = 1;
+
+ init_prach_tables(839);
+
+
+ return 0;
+}
+
+void init_lte_ue_transport(PHY_VARS_UE *ue,int abstraction_flag) {
+
+ int i,j,k;
+
+ for (i=0; i<NUMBER_OF_CONNECTED_eNB_MAX; i++) {
+ for (j=0; j<2; j++) {
+ for (k=0; k<2; k++) {
+ AssertFatal((ue->dlsch[k][i][j] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag))!=NULL,"Can't get ue dlsch structures\n");
+
+ LOG_D(PHY,"dlsch[%d][%d][%d] => %p\n",k,i,j,ue->dlsch[i][j]);
+ }
+ }
+
+ AssertFatal((ue->ulsch[i] = new_ue_ulsch(ue->frame_parms.N_RB_UL, abstraction_flag))!=NULL,"Can't get ue ulsch structures\n");
+
+ ue->dlsch_SI[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
+ ue->dlsch_ra[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
+
+ ue->transmission_mode[i] = ue->frame_parms.nb_antenna_ports_eNB==1 ? 1 : 2;
+ }
+
+ ue->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
+
+ ue->dlsch_MCH[0] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL,0);
+
+}
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
index 2525f19b0df9f2c74575133a1e0d732e895e2132..21e33cf1c0ce5325168e1d06b6beaaf047ecb149 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
@@ -465,7 +465,7 @@ int lte_sync_time(int **rxdata, ///rx data in time domain
*eNB_id = sync_source;
- LOG_D(PHY,"[UE] lte_sync_time: Sync source = %d, Peak found at pos %d, val = %d (%d dB)\n",sync_source,peak_pos,peak_val,dB_fixed(peak_val)/2);
+ LOG_I(PHY,"[UE] lte_sync_time: Sync source = %d, Peak found at pos %d, val = %d (%d dB)\n",sync_source,peak_pos,peak_val,dB_fixed(peak_val)/2);
#ifdef DEBUG_PHY
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index 39e61c601d16bcbcf38c8b611d76c562ee58fd6a..18860d729c0059e9e73e641b3725de328b302eac 100755
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -2260,7 +2260,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
y[0] = &yseq0[0];
y[1] = &yseq1[0];
-#if 0
+#if 1
// reset all bits to <NIL>, here we set <NIL> elements as 2
// memset(e, 2, DCI_BITS_MAX);
// here we interpret NIL as a random QPSK sequence. That makes power estimation easier.
@@ -2271,7 +2271,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
/* clear all bits, the above code may generate too much false detections
* (not sure about this, to be checked somehow)
*/
- memset(e, 0, DCI_BITS_MAX);
+ // memset(e, 0, DCI_BITS_MAX);
e_ptr = e;
@@ -3125,8 +3125,8 @@ uint16_t dci_CRNTI_decoding_procedure(PHY_VARS_UE *ue,
mi,
((ue->decode_SIB == 1) ? SI_RNTI : 0),
ra_rnti,
- P_RNTI,
- agregationLevel,
+ P_RNTI,
+ agregationLevel,
format1A,
format1A,
format1A,
@@ -3144,7 +3144,7 @@ uint16_t dci_CRNTI_decoding_procedure(PHY_VARS_UE *ue,
((format0_found==1)&&(format_c_found==1)))
return(dci_cnt);
- if (DCIFormat == 1)
+ if (DCIFormat == format1)
{
if ((tmode < 3) || (tmode == 7)) {
//printf("Crnti decoding frame param agregation %d DCI %d \n",agregationLevel,DCIFormat);
@@ -3187,14 +3187,14 @@ uint16_t dci_CRNTI_decoding_procedure(PHY_VARS_UE *ue,
//printf("Crnti 1 decoding frame param agregation %d DCI %d \n",agregationLevel,DCIFormat);
}
- else
+ else if (DCIFormat == format1A)
{
AssertFatal(0,"Other Transmission mode not yet coded\n");
}
}
else
{
- AssertFatal(0,"DCI format %d not yet implemented \n",DCIFormat);
+ LOG_W(PHY,"DCI format %d wrong or not yet implemented \n",DCIFormat);
}
return(dci_cnt);
@@ -3418,7 +3418,7 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
if (do_common == 1) {
#ifdef DEBUG_DCI_DECODING
- printf("[DCI search] doing common search/format0 aggregation 4\n");
+ printf("[DCI search] subframe %d: doing common search/format0 aggregation 4\n",subframe);
#endif
if (ue->prach_resources[eNB_id])
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index bf63d5abbefb8857d02c0cafe74ee523ce38895b..c6c13225042f65637608c8b3e060d2e0b16830ea 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -5056,10 +5056,10 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
if(symbol < (frame_parms->symbols_per_tti-1))
pdsch_vars->llr_offset[symbol+1] = pdsch_vars->llr_offset[symbol] + llr_offset;
- //LOG_I(PHY,"Granted Re subframe %d / symbol %d => %d (%d RBs)\n", subframe, symbol_mod, granted_re,dlsch0_harq->nb_rb);
- //LOG_I(PHY,"Pbch/PSS/SSS Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, pbch_pss_sss_re);
- //LOG_I(PHY,"CRS Re Per PRB subframe %d / symbol %d => %d \n", subframe, symbol_mod, crs_re);
- //LOG_I(PHY,"Data Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, data_re);
+ // LOG_I(PHY,"Granted Re subframe %d / symbol %d => %d (%d RBs)\n", subframe, symbol_mod, granted_re,dlsch0_harq->nb_rb);
+ // LOG_I(PHY,"Pbch/PSS/SSS Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, pbch_pss_sss_re);
+ // LOG_I(PHY,"CRS Re Per PRB subframe %d / symbol %d => %d \n", subframe, symbol_mod, crs_re);
+ // LOG_I(PHY,"Data Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, data_re);
@@ -5096,7 +5096,6 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
uint8_t NPRB = 0;
uint8_t NPRB4TBS = 0;
- uint8_t nb_rb_alloc = 0;
if(dci_format == format1A)
{
@@ -5138,14 +5137,12 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
}
*/
- nb_rb_alloc = NPRB;
}
}
else // format1
{
NPRB = conv_nprb(rah, rballoc, N_RB_DL);
NPRB4TBS=NPRB;
- nb_rb_alloc = NPRB;
}
pdlsch0->current_harq_pid = harq_pid;
@@ -5246,7 +5243,6 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
pdlsch0_harq->rb_alloc_even[1] = localRIV2alloc_LUT50_1[rballoc];
pdlsch0_harq->rb_alloc_odd[0] = localRIV2alloc_LUT50_0[rballoc];
pdlsch0_harq->rb_alloc_odd[1] = localRIV2alloc_LUT50_1[rballoc];
- printf("rballoc: %08x.%08x\n",pdlsch0_harq->rb_alloc_even[0],pdlsch0_harq->rb_alloc_even[1]);
} else { // DISTRIBUTED
if ((rballoc&(1<<10)) == 0) {
rballoc = rballoc&(~(1<<10));
@@ -5328,7 +5324,7 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
pdcch_vars,
pdsch_vars,
pdlsch0_harq,
- nb_rb_alloc,
+ NPRB,
subframe);
}
@@ -6560,7 +6556,7 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
else
ul_subframe = ((n+4)%10);
- if ((subframe_select(frame_parms,ul_subframe) != SF_UL) && (frame_parms->frame_type == TDD)) return(255);
+ // AssertFatal(frame_parms->frame_type == FDD || subframe_select(frame_parms,ul_subframe) == SF_UL,"illegal ul_subframe %d (n %d)\n",ul_subframe,n);
LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe);
return ul_subframe;
@@ -7261,6 +7257,10 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
harq_pid = subframe2harq_pid(frame_parms,
pdcch_alloc2ul_frame(frame_parms,proc->frame_rx,subframe),
pdcch_alloc2ul_subframe(frame_parms,subframe));
+ LOG_D(PHY,"Frame %d, Subframe %d: Programming ULSCH for (%d.%d) => harq_pid %d\n",
+ proc->frame_rx,subframe,
+ pdcch_alloc2ul_frame(frame_parms,proc->frame_rx,subframe),
+ pdcch_alloc2ul_subframe(frame_parms,subframe), harq_pid);
if (harq_pid == 255) {
LOG_E(PHY, "frame %d, subframe %d, rnti %x, format %d: illegal harq_pid!\n",
@@ -8053,7 +8053,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
dlsch[0]->harq_ack[subframe].vDAI_UL = dai+1;
- /*LOG_I(PHY, "[PUSCH %d] Format0 DCI %s, CQI_req=%d, cshift=%d, TPC=%d, DAI=%d, vDAI_UL[sf#%d]=%d, NDI=%d, MCS=%d, RBalloc=%d, first_rb=%d, harq_pid=%d, nb_rb=%d, subframe_scheduling_flag=%d"
+ LOG_D(PHY, "[PUSCH %d] Format0 DCI %s, CQI_req=%d, cshift=%d, TPC=%d, DAI=%d, vDAI_UL[sf#%d]=%d, NDI=%d, MCS=%d, RBalloc=%d, first_rb=%d, harq_pid=%d, nb_rb=%d, subframe_scheduling_flag=%d"
" ulsch->bundling %d, O_ACK %d \n",
harq_pid,
(frame_parms->frame_type == TDD? "TDD" : "FDD"),
@@ -8061,7 +8061,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
ulsch->harq_processes[harq_pid]->first_rb, harq_pid, ulsch->harq_processes[harq_pid]->nb_rb,
ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,
ulsch->bundling,
- ulsch->harq_processes[harq_pid]->O_ACK);*/
+ ulsch->harq_processes[harq_pid]->O_ACK);
+
LOG_D(PHY,"Setting beta_offset_cqi_times8 to %d, index %d\n",
beta_cqi[ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index],
ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index);
@@ -8118,7 +8119,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
#ifdef UE_DEBUG_TRACE
- LOG_I(PHY,"Format 0 DCI : ulsch (ue): AbsSubframe %d.%d\n",proc->frame_rx%1024,subframe);
+ LOG_D(PHY,"Format 0 DCI : ulsch (ue): AbsSubframe %d.%d\n",proc->frame_rx%1024,subframe);
LOG_D(PHY,"Format 0 DCI : ulsch (ue): NBRB %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
LOG_D(PHY,"Format 0 DCI :ulsch (ue): first_rb %d\n",ulsch->harq_processes[harq_pid]->first_rb);
LOG_D(PHY,"Format 0 DCI :ulsch (ue): rballoc %d\n",rballoc);
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index 1bd0076e1428bb656941cd1cc8bf965d4a1b694a..c805d9408f20781e88d0a07c1181c3465c9e3bbb 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -845,18 +845,20 @@ int rx_pdsch(PHY_VARS_UE *ue,
pllr_symbol_cw1 = (int8_t*)pdsch_vars[eNB_id]->llr[1];
pllr_symbol_cw0 += llr_offset_symbol;
pllr_symbol_cw1 += llr_offset_symbol;
-
- /*LOG_I(PHY,"compute LLRs [AbsSubframe %d.%d-%d] NbRB %d Qm %d LLRs-Length %d LLR-Offset %d @LLR Buff %x @LLR Buff(symb) %x\n",
- proc->frame_rx, proc->subframe_rx,symbol,
+ /*
+ LOG_I(PHY,"compute LLRs [AbsSubframe %d.%d-%d] NbRB %d Qm %d LLRs-Length %d LLR-Offset %d @LLR Buff %x @LLR Buff(symb) %x\n",
+ frame, subframe,symbol,
nb_rb,dlsch0_harq->Qm,
pdsch_vars[eNB_id]->llr_length[symbol],
pdsch_vars[eNB_id]->llr_offset[symbol],
(int16_t*)pdsch_vars[eNB_id]->llr[0],
- pllr_symbol);*/
-
+ pllr_symbol_cw0);
+ */
switch (dlsch0_harq->Qm) {
case 2 :
if ((rx_type==rx_standard) || (codeword_TB1 == -1)) {
+
+
dlsch_qpsk_llr(frame_parms,
pdsch_vars[eNB_id]->rxdataF_comp0,
(int16_t*)pllr_symbol_cw0,
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
index 8ea922b85c7ea13725aab5d113cdceecc1adaaef..46689a9aaa0473a14cda15cedea92db8896c9a65 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
@@ -672,14 +672,14 @@ int dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
}
- //printf("dlsch_qpsk_llr: symbol %d,nb_rb %d, len %d,pbch_pss_sss_adjust %d\n",symbol,nb_rb,len,pbch_pss_sss_adjust);
- /*LOG_I(PHY,"dlsch_qpsk_llr: [symb %d / FirstSym %d / Length %d]: @LLR Buff %x, @LLR Buff(symb) %x \n",
+ /*
+ LOG_I(PHY,"dlsch_qpsk_llr: [symb %d / FirstSym %d / Length %d]: @LLR Buff %x, @LLR Buff(symb) %x \n",
symbol,
first_symbol_flag,
len,
dlsch_llr,
- llr32);*/
-
+ llr32);
+ */
//printf("ll32p=%p , dlsch_llr=%p, symbol=%d, flag=%d \n", llr32, dlsch_llr, symbol, first_symbol_flag);
for (i=0; i<len; i++) {
*llr32 = *rxF;
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index 38ced5d717bd1eabf527d5d7c956c9868097eb9d..88312e4a4611af3cab61f73476e003429fc4e073 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -105,7 +105,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
if ((ru->ifdevice.trx_write_func(&ru->ifdevice,
symbol_id,
&tx_buffer,
- db_fulllength,
+ db_fulllength,
1,
IF4p5_PDLFFT)) < 0) {
perror("ETHERNET write for IF4p5_PDLFFT\n");
@@ -138,19 +138,18 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
if (packet_type == IF4p5_PULFFT) {
- uint16_t *rx0 = (uint16_t*) &rxdataF[0][blockoffsetF];
- uint16_t *rx1 = (uint16_t*) &rxdataF[0][slotoffsetF];
+ for (symbol_id=fp->symbols_per_tti-nsym; symbol_id<fp->symbols_per_tti; symbol_id++) {
+ uint32_t *rx0 = (uint32_t*) &rxdataF[0][blockoffsetF];
+ uint32_t *rx1 = (uint32_t*) &rxdataF[0][slotoffsetF];
- for (symbol_id=fp->symbols_per_tti-nsym; symbol_id<fp->symbols_per_tti; symbol_id++) {
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF4_SYMBOL, symbol_id );
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF4_SYMBOL, symbol_id );
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 1 );
-
start_meas(&ru->compression);
- for (element_id=0; element_id<db_halflength; element_id+=8) {
- i = (uint16_t*) &rx0[element_id];
+ for (element_id=0; element_id<db_halflength; element_id+=8) {
+ i = (uint16_t*) &rx0[element_id];
d = (uint16_t*) &data_block[element_id];
d[0] = ((uint16_t) lin2alaw_if4p5[i[0]]) | ((uint16_t)(lin2alaw_if4p5[i[1]]<<8));
d[1] = ((uint16_t) lin2alaw_if4p5[i[2]]) | ((uint16_t)(lin2alaw_if4p5[i[3]]<<8));
@@ -176,10 +175,10 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
stop_meas(&ru->compression);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 0 );
- packet_header->frame_status &= ~(0x000f<<26);
- packet_header->frame_status |= (symbol_id&0x000f)<<26;
+ packet_header->frame_status &= ~(0x000f<<26);
+ packet_header->frame_status |= (symbol_id&0x000f)<<26;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 1 );
- start_meas(&ru->transport);
+ start_meas(&ru->transport);
if ((ru->ifdevice.trx_write_func(&ru->ifdevice,
symbol_id,
&tx_buffer,
@@ -188,7 +187,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
IF4p5_PULFFT)) < 0) {
perror("ETHERNET write for IF4p5_PULFFT\n");
}
- stop_meas(&ru->transport);
+ stop_meas(&ru->transport);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 0 );
slotoffsetF += fp->ofdm_symbol_size;
blockoffsetF += fp->ofdm_symbol_size;
@@ -351,6 +350,9 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
//if (element_id==0) LOG_I(PHY,"recv_if4p5: symbol %d rxdata0 = (%u,%u)\n",*symbol_number,*i,*(i+1));
}
+ LOG_D(PHY,"PULFFT_IF4p5: CC_id %d : frame %d, subframe %d (symbol %d)=> %d dB\n",ru->idx,*frame,*subframe,*symbol_number,
+ dB_fixed(signal_energy((int*)&rxdataF[0][slotoffsetF],db_halflength)+
+ signal_energy((int*)&rxdataF[0][blockoffsetF],db_halflength)));
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_DECOMPR_IF, 0 );
} else if (*packet_type >= IF4p5_PRACH &&
*packet_type <= IF4p5_PRACH + 4) {
diff --git a/openair1/SCHED/fapi_l1.c b/openair1/SCHED/fapi_l1.c
index 7c6ded9ba9a8352ed68d52d4aff396eee3b76ea2..2fa9c9c2cd2164146ab84d799a701564298dc407 100644
--- a/openair1/SCHED/fapi_l1.c
+++ b/openair1/SCHED/fapi_l1.c
@@ -614,9 +614,14 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
AssertFatal(RC.eNB[Mod_id]!=NULL,"RC.eNB[%d] is null\n",Mod_id);
AssertFatal(RC.eNB[Mod_id][CC_id]!=NULL,"RC.eNB[%d][%d] is null\n",Mod_id,CC_id);
+
+
eNB = RC.eNB[Mod_id][CC_id];
fp = &eNB->frame_parms;
proc = &eNB->proc.proc_rxtx[0];
+
+ if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)==SF_UL)) return;
+
ul_subframe = pdcch_alloc2ul_subframe(fp,subframe);
ul_frame = pdcch_alloc2ul_frame(fp,frame,subframe);
@@ -650,9 +655,10 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
int do_oai =0;
int dont_send =0;
+ if ((ul_subframe<10)&&
+ (subframe_select(fp,ul_subframe)==SF_UL)) { // This means that there is an ul_subframe that can be configured here
+ LOG_D(PHY,"NFAPI: Clearing dci allocations for potential UL subframe %d\n",ul_subframe);
- if (ul_subframe<10) { // This means that there is an ul_subframe that can be configured here
- LOG_D(PHY,"NFAPI: Clearing dci allocations for potential UL\n");
harq_pid = subframe2harq_pid(fp,ul_frame,ul_subframe);
// clear DCI allocation maps for new subframe
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index e426c31110df84e3d0306f36e0dd1fb633462140..2ae79b53b6d9bb688105355e51864e2f2bdbb26b 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -416,6 +416,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
int offset = eNB->CC_id;//proc == &eNB->proc.proc_rxtx[0] ? 0 : 1;
+
if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)==SF_UL)) return;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+offset,1);
@@ -451,7 +452,8 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
}
/* save old HARQ information needed for PHICH generation */
- if (ul_subframe < 10) { // This means that there is a potential UL subframe that will be scheduled here
+ if ((ul_subframe < 10)&&
+ (subframe_select(fp,ul_subframe)==SF_UL)) { // This means that there is a potential UL subframe that will be scheduled here
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
harq_pid = subframe2harq_pid(fp,ul_frame,ul_subframe);
if (eNB->ulsch[i]) {
@@ -576,181 +578,6 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
}
-#ifdef Rel14
-void prach_procedures(PHY_VARS_eNB *eNB,
- int br_flag) {
-#else
-void prach_procedures(PHY_VARS_eNB *eNB) {
-#endif
- uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4];
- uint16_t i;
- int frame,subframe;
-
-#ifdef Rel14
- if (br_flag==1) {
- subframe = eNB->proc.subframe_prach_br;
- frame = eNB->proc.frame_prach_br;
- pthread_mutex_lock(&eNB->UL_INFO_mutex);
- eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles=0;
- pthread_mutex_unlock(&eNB->UL_INFO_mutex);
- }
- else
-#endif
- {
- pthread_mutex_lock(&eNB->UL_INFO_mutex);
- eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles=0;
- pthread_mutex_unlock(&eNB->UL_INFO_mutex);
- subframe = eNB->proc.subframe_prach;
- frame = eNB->proc.frame_prach;
- }
- RU_t *ru;
- int aa=0;
- int ru_aa;
-
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,1);
-
-
-
- for (i=0;i<eNB->num_RU;i++) {
- ru=eNB->RU_list[i];
- for (ru_aa=0,aa=0;ru_aa<ru->nb_rx;ru_aa++,aa++) {
- eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
-#ifdef Rel14
- int ce_level;
-
- if (br_flag==1)
- for (ce_level=0;ce_level<4;ce_level++) eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
-#endif
- }
- }
-
- rx_prach(eNB,
- eNB->RU_list[0],
- &max_preamble[0],
- &max_preamble_energy[0],
- &max_preamble_delay[0],
- frame,
- 0
-#ifdef Rel14
- ,br_flag
-#endif
- );
-
- //#ifdef DEBUG_PHY_PROC
- LOG_D(PHY,"[RAPROC] Frame %d, subframe %d : Most likely preamble %d, energy %d dB delay %d\n",
- frame,subframe,
- max_preamble[0],
- max_preamble_energy[0]/10,
- max_preamble_delay[0]);
- //q#endif
-
-#ifdef Rel14
- if (br_flag==1) {
-
- int prach_mask;
-
- prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
-
- eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
- int ind=0;
- int ce_level=0;
- /* Save for later, it doesn't work
- for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
-
- if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
- (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
- (eNB->prach_vars_br.repetition_number[ce_level]==
- eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
- */
- if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0]==1){
- if ((eNB->prach_energy_counter == 100) &&
- (max_preamble_energy[0] > eNB->measurements.prach_I0 + 100)) {
- eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
-
- eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind];//
- eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
- // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
- eNB->preamble_list_br[ind].preamble_rel8.rnti = 1+subframe+(eNB->prach_vars_br.first_frame[ce_level]%40);
- eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
- eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1+ce_level; // CE Level
- LOG_D(PHY,"Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
- ind,
- ce_level,
- prach_mask,
- eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
- eNB->preamble_list_br[ind].preamble_rel8.preamble,
- eNB->preamble_list_br[ind].preamble_rel8.rnti,
- eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
- }
- /*
- ind++;
- }
- } */// ce_level
- }
- }
- else
-#endif
-
- {
- if ((eNB->prach_energy_counter == 100) &&
- (max_preamble_energy[0] > eNB->measurements.prach_I0+100)) {
-
- LOG_D(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
- eNB->Mod_id,
- eNB->CC_id,
- frame,
- subframe,
- max_preamble[0],
- max_preamble_energy[0]/10,
- max_preamble_energy[0]%10,
- max_preamble_delay[0]);
-
- T(T_ENB_PHY_INITIATE_RA_PROCEDURE, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe),
- T_INT(max_preamble[0]), T_INT(max_preamble_energy[0]), T_INT(max_preamble_delay[0]));
-
- pthread_mutex_lock(&eNB->UL_INFO_mutex);
-
- eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 1;
- eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list = &eNB->preamble_list[0];
- eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag = NFAPI_RACH_INDICATION_BODY_TAG;
- eNB->UL_INFO.rach_ind.header.message_id = NFAPI_RACH_INDICATION;
- eNB->UL_INFO.rach_ind.sfn_sf = frame<<4 | subframe;
-
- eNB->preamble_list[0].preamble_rel8.tl.tag = NFAPI_PREAMBLE_REL8_TAG;
- eNB->preamble_list[0].preamble_rel8.timing_advance = max_preamble_delay[0];
- eNB->preamble_list[0].preamble_rel8.preamble = max_preamble[0];
- eNB->preamble_list[0].preamble_rel8.rnti = 1+subframe; // note: fid is implicitly 0 here
- eNB->preamble_list[0].preamble_rel13.rach_resource_type = 0;
- eNB->preamble_list[0].instance_length = 0; //don't know exactly what this is
-
- if (nfapi_mode == 1) { // If NFAPI PNF then we need to send the message to the VNF
-
- LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
- NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
- eNB->preamble_list[0].preamble_rel8.timing_advance,
- eNB->preamble_list[0].preamble_rel8.preamble,
- eNB->preamble_list[0].preamble_rel8.rnti,
- eNB->preamble_list[0].preamble_rel13.rach_resource_type);
-
- oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
-
- eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
- }
-
- pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-
- } // max_preamble_energy > prach_I0 + 100
- else {
- eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((max_preamble_energy[0]*124)>>10);
- if (frame==0) LOG_I(PHY,"prach_I0 = %d.%d dB\n",eNB->measurements.prach_I0/10,eNB->measurements.prach_I0%10);
- if (eNB->prach_energy_counter < 100) eNB->prach_energy_counter++;
- }
- } // else br_flag
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,0);
-}
-
void srs_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
@@ -1434,6 +1261,7 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
ulsch->Mlimit,
ulsch_harq->o_ACK[0],
ulsch_harq->o_ACK[1]);
+
if (ulsch_harq->round >= 3) {
ulsch_harq->status = SCH_IDLE;
ulsch_harq->handled = 0;
@@ -2073,7 +1901,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
eNB->first_run_I0_measurements);
int min_I0=1000,max_I0=0;
- if ((frame==0) && (subframe==6)) {
+ if ((frame==0) && (subframe==4)) {
for (int i=0;i<eNB->frame_parms.N_RB_UL;i++) {
if (i==(eNB->frame_parms.N_RB_UL>>1) - 1) i+=2;
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index f57e6c1806bfc100dab0d7f6b8f2b65a63d4e63b..2e6bdc8a14c9b39637c9d7c179c05a2431548596 100644
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -81,6 +81,7 @@ extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
#endif
+#define DEBUG_UE_TRACE 1
void dump_dlsch(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe,uint8_t harq_pid)
{
@@ -1444,38 +1445,36 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
ue->tx_power_dBm[subframe_tx],
dB_fixed(prach_power),
ue->prach_vars[eNB_id]->amp);
- } else {
- UE_transport_info[ue->Mod_id][ue->CC_id].cntl.prach_flag=1;
- UE_transport_info[ue->Mod_id][ue->CC_id].cntl.prach_id=ue->prach_resources[eNB_id]->ra_PreambleIndex;
- }
+
- if (ue->mac_enabled==1){
- Msg1_transmitted(ue->Mod_id,
- ue->CC_id,
- frame_tx,
- eNB_id);
- }
- LOG_I(PHY,"[UE %d][RAPROC] Frame %d, subframe %d: Generating PRACH (eNB %d) preamble index %d for UL, TX power %d dBm (PL %d dB), l3msg \n",
- ue->Mod_id,frame_tx,subframe_tx,eNB_id,
- ue->prach_resources[eNB_id]->ra_PreambleIndex,
- ue->prach_resources[eNB_id]->ra_PREAMBLE_RECEIVED_TARGET_POWER+get_PL(ue->Mod_id,ue->CC_id,eNB_id),
- get_PL(ue->Mod_id,ue->CC_id,eNB_id));
-
-
-
- // if we're calibrating the PRACH kill the pointer to its resources so that the RA protocol doesn't continue
- if (mode == calib_prach_tx)
- ue->prach_resources[eNB_id]=NULL;
-
- LOG_D(PHY,"[UE %d] frame %d subframe %d : generate_prach %d, prach_cnt %d\n",
- ue->Mod_id,frame_tx,subframe_tx,ue->generate_prach,ue->prach_cnt);
+ if (ue->mac_enabled==1){
+ Msg1_transmitted(ue->Mod_id,
+ ue->CC_id,
+ frame_tx,
+ eNB_id);
+ }
+
+ LOG_I(PHY,"[UE %d][RAPROC] Frame %d, subframe %d: Generating PRACH (eNB %d) preamble index %d for UL, TX power %d dBm (PL %d dB), l3msg \n",
+ ue->Mod_id,frame_tx,subframe_tx,eNB_id,
+ ue->prach_resources[eNB_id]->ra_PreambleIndex,
+ ue->prach_resources[eNB_id]->ra_PREAMBLE_RECEIVED_TARGET_POWER+get_PL(ue->Mod_id,ue->CC_id,eNB_id),
+ get_PL(ue->Mod_id,ue->CC_id,eNB_id));
+
+
+
+ // if we're calibrating the PRACH kill the pointer to its resources so that the RA protocol doesn't continue
+ if (mode == calib_prach_tx)
+ ue->prach_resources[eNB_id]=NULL;
- ue->prach_cnt++;
+ LOG_D(PHY,"[UE %d] frame %d subframe %d : generate_prach %d, prach_cnt %d\n",
+ ue->Mod_id,frame_tx,subframe_tx,ue->generate_prach,ue->prach_cnt);
- if (ue->prach_cnt==3)
- ue->generate_prach=0;
+ ue->prach_cnt++;
+ if (ue->prach_cnt==3)
+ ue->generate_prach=0;
+ }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH, VCD_FUNCTION_OUT);
}
@@ -1507,18 +1506,21 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
frame_tx,
subframe_tx);
+ LOG_D(PHY,"Frame %d, Subframe %d : ue_uespec_procedures, harq_pid %d => subframe_scheduling %d\n",
+ frame_tx,subframe_tx,harq_pid,
+ ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag);
if (ue->mac_enabled == 1) {
- if ((ue->ulsch_Msg3_active[eNB_id] == 1) &&
- (ue->ulsch_Msg3_frame[eNB_id] == frame_tx) &&
- (ue->ulsch_Msg3_subframe[eNB_id] == subframe_tx)) { // Initial Transmission of Msg3
+ if ((ue->ulsch_Msg3_active[eNB_id] == 1) &&
+ (ue->ulsch_Msg3_frame[eNB_id] == frame_tx) &&
+ (ue->ulsch_Msg3_subframe[eNB_id] == subframe_tx)) { // Initial Transmission of Msg3
ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
if (ue->ulsch[eNB_id]->harq_processes[harq_pid]->round==0)
- generate_ue_ulsch_params_from_rar(ue,
- proc,
- eNB_id);
+ generate_ue_ulsch_params_from_rar(ue,
+ proc,
+ eNB_id);
ue->ulsch[eNB_id]->power_offset = 14;
LOG_D(PHY,"[UE %d][RAPROC] Frame %d: Setting Msg3_flag in subframe %d, for harq_pid %d\n",
@@ -1661,7 +1663,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#ifdef UE_DEBUG_TRACE
- LOG_I(PHY,
+ LOG_D(PHY,
"[UE %d][PUSCH %d] AbsSubframe %d.%d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, "
"cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, ack_status_cw0 %d ack_status_cw1 %d bundling %d, Nbundled %d, CQI %d, RI %d\n",
Mod_id,harq_pid,frame_tx%1024,subframe_tx,
@@ -1720,7 +1722,6 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
stop_meas(&ue->phy_proc_tx);
printf("------FULL TX PROC : %5.2f ------\n",ue->phy_proc_tx.p_time/(cpuf*1000.0));
#endif
- return;
#if UE_TIMING_TRACE
stop_meas(&ue->ulsch_encoding_stats);
@@ -1825,7 +1826,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
T_INT(tx_amp),T_INT(ue->ulsch[eNB_id]->f_pusch),T_INT(get_PL(Mod_id,0,eNB_id)),T_INT(nb_rb));
#ifdef UE_DEBUG_TRACE
- LOG_I(PHY,"[UE %d][PUSCH %d] AbsSubFrame %d.%d, generating PUSCH, Po_PUSCH: %d dBm (max %d dBm), amp %d\n",
+ LOG_D(PHY,"[UE %d][PUSCH %d] AbsSubFrame %d.%d, generating PUSCH, Po_PUSCH: %d dBm (max %d dBm), amp %d\n",
Mod_id,harq_pid,frame_tx%1024,subframe_tx,ue->tx_power_dBm[subframe_tx],ue->tx_power_max_dBm, tx_amp);
#endif
#if UE_TIMING_TRACE
@@ -1850,6 +1851,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#if UE_TIMING_TRACE
stop_meas(&ue->ulsch_modulation_stats);
#endif
+
}
if (abstraction_flag==1) {
@@ -2186,20 +2188,20 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
#ifdef UE_DEBUG_TRACE
if(format == pucch_format1)
- {
- LOG_I(PHY,"[UE %d][SR %x] AbsSubframe %d.%d Generating PUCCH 1 (SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH %d\n",
- Mod_id,
- ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti,
- frame_tx%1024, subframe_tx,
- frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission,
- isShortenPucch,
- ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex,
- Po_PUCCH);
+ {
+ LOG_D(PHY,"[UE %d][SR %x] AbsSubframe %d.%d Generating PUCCH 1 (SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH %d\n",
+ Mod_id,
+ ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti,
+ frame_tx%1024, subframe_tx,
+ frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission,
+ isShortenPucch,
+ ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex,
+ Po_PUCCH);
}
else
{
if (SR_payload>0) {
- LOG_I(PHY,"[UE %d][SR %x] AbsSubFrame %d.%d Generating PUCCH %s payload %d,%d (with SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH %d, amp %d\n",
+ LOG_D(PHY,"[UE %d][SR %x] AbsSubFrame %d.%d Generating PUCCH %s payload %d,%d (with SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH %d, amp %d\n",
Mod_id,
ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti,
frame_tx % 1024, subframe_tx,
@@ -2212,7 +2214,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
Po_PUCCH,
tx_amp);
} else {
- LOG_I(PHY,"[UE %d][PDSCH %x] AbsSubFrame %d.%d rx_offset_diff: %d, Generating PUCCH %s, an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, b[0]=%d,b[1]=%d (SR_Payload %d), Po_PUCCH %d, amp %d\n",
+ LOG_D(PHY,"[UE %d][PDSCH %x] AbsSubFrame %d.%d rx_offset_diff: %d, Generating PUCCH %s, an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, b[0]=%d,b[1]=%d (SR_Payload %d), Po_PUCCH %d, amp %d\n",
Mod_id,
ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti,
frame_tx%1024, subframe_tx,ue->rx_offset_diff,
@@ -2279,7 +2281,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
T_INT(tx_amp),T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->g_pucch),T_INT(get_PL(ue->Mod_id,ue->CC_id,eNB_id)));
#endif
#ifdef UE_DEBUG_TRACE
- LOG_I(PHY,"[UE %d][RNTI %x] AbsSubFrame %d.%d Generating PUCCH 2 (RI or CQI), Po_PUCCH %d, isShortenPucch %d, amp %d\n",
+ LOG_D(PHY,"[UE %d][RNTI %x] AbsSubFrame %d.%d Generating PUCCH 2 (RI or CQI), Po_PUCCH %d, isShortenPucch %d, amp %d\n",
Mod_id,
ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti,
frame_tx%1024, subframe_tx,
@@ -2365,6 +2367,8 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
ue_ulsch_uespec_procedures(ue,proc,eNB_id,abstraction_flag);
+ LOG_D(PHY,"ULPOWERS After ulsch_uespec_procedures : ue->tx_power_dBm[%d]=%d, NPRB %d\n",
+ subframe_tx,ue->tx_power_dBm[subframe_tx],ue->tx_total_RE[subframe_tx]);
}
if (ue->UE_mode[eNB_id] == PUSCH) {
@@ -2883,7 +2887,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
// we received a CRNTI, so we're in PUSCH
if (ue->UE_mode[eNB_id] != PUSCH) {
#ifdef DEBUG_PHY_PROC
- LOG_I(PHY,"[UE %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
+ LOG_D(PHY,"[UE %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
#endif
//dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
@@ -2900,7 +2904,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
#ifdef DEBUG_PHY_PROC
- LOG_I(PHY,"[UE %d] subframe %d: Found rnti %x, format 1%s, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,dci_alloc_rx[i].format==format1A?"A":"C",i);
+ LOG_D(PHY,"[UE %d] subframe %d: Found rnti %x, format 1%s, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,dci_alloc_rx[i].format==format1A?"A":"C",i);
#endif
if (generate_ue_dlsch_params_from_dci(frame_rx,
@@ -2921,7 +2925,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
ue->dlsch_SI_received[eNB_id]++;
- LOG_I(PHY,"[UE %d] Frame %d, subframe %d : Generate UE DLSCH SI_RNTI format 1%s\n",ue->Mod_id,frame_rx,subframe_rx,dci_alloc_rx[i].format==format1A?"A":"C");
+ LOG_D(PHY,"[UE %d] Frame %d, subframe %d : Generate UE DLSCH SI_RNTI format 1%s\n",ue->Mod_id,frame_rx,subframe_rx,dci_alloc_rx[i].format==format1A?"A":"C");
//dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
}
@@ -2931,7 +2935,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
((dci_alloc_rx[i].format == format1A) || (dci_alloc_rx[i].format == format1C))) {
#ifdef DEBUG_PHY_PROC
- LOG_I(PHY,"[UE %d] subframe %d: Found rnti %x, format 1%s, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,dci_alloc_rx[i].format==format1A?"A":"C",i);
+ LOG_D(PHY,"[UE %d] subframe %d: Found rnti %x, format 1%s, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,dci_alloc_rx[i].format==format1A?"A":"C",i);
#endif
@@ -2963,7 +2967,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
(dci_alloc_rx[i].format == format1A)) {
#ifdef DEBUG_PHY_PROC
- LOG_I(PHY,"[UE %d][RAPROC] subframe %d: Found RA rnti %x, format 1A, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,i);
+ LOG_D(PHY,"[UE %d][RAPROC] subframe %d: Found RA rnti %x, format 1A, dci_cnt %d\n",ue->Mod_id,subframe_rx,dci_alloc_rx[i].rnti,i);
#endif
@@ -3029,7 +3033,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
T_INT(ue->ulsch[eNB_id]->harq_processes[harq_pid]->TBS));
#endif
#ifdef DEBUG_PHY_PROC
- LOG_D(PHY,"[UE %d] Generate UE ULSCH C_RNTI format 0 (subframe %d)\n",ue->Mod_id,subframe_rx);
+ LOG_D(PHY,"[UE %d] Generate UE ULSCH C_RNTI format 0 (subframe %d)\n",ue->Mod_id,subframe_rx);
#endif
}
@@ -3072,7 +3076,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
else {
#ifdef DEBUG_PHY_PROC
- LOG_I(PHY,"[UE %d] frame %d, subframe %d: received DCI %d with RNTI=%x (C-RNTI:%x, CBA_RNTI %x) and format %d!\n",ue->Mod_id,frame_rx,subframe_rx,i,dci_alloc_rx[i].rnti,
+ LOG_D(PHY,"[UE %d] frame %d, subframe %d: received DCI %d with RNTI=%x (C-RNTI:%x, CBA_RNTI %x) and format %d!\n",ue->Mod_id,frame_rx,subframe_rx,i,dci_alloc_rx[i].rnti,
ue->pdcch_vars[ue->current_thread_id[subframe_rx]][eNB_id]->crnti,
ue->ulsch[eNB_id]->cba_rnti[0],
dci_alloc_rx[i].format);
@@ -3760,7 +3764,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
if(is_cw1_active)
{
if (ret1 == (1+dlsch0->max_turbo_iterations)) {
- LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d DLSCH CW1 in error (rv %d,mcs %d,TBS %d)\n",
+ LOG_D(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d DLSCH CW1 in error (rv %d,mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
@@ -3768,7 +3772,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
dlsch0->harq_processes[harq_pid]->TBS);
} else {
- LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d: Received DLSCH CW1 (rv %d,mcs %d,TBS %d)\n",
+ LOG_D(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d: Received DLSCH CW1 (rv %d,mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
@@ -4150,7 +4154,7 @@ int phy_procedures_slot_parallelization_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *pr
// start timers
#ifdef UE_DEBUG_TRACE
- LOG_I(PHY," ****** start RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, subframe_rx);
+ LOG_D(PHY," ****** start RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, subframe_rx);
#endif
#if UE_TIMING_TRACE
diff --git a/openair1/SCHED/prach_procedures.c b/openair1/SCHED/prach_procedures.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8c65850744d19ae2b99ee44d4be703d81cb07e2
--- /dev/null
+++ b/openair1/SCHED/prach_procedures.c
@@ -0,0 +1,226 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file phy_procedures_lte_eNB.c
+ * \brief Implementation of eNB procedures from 36.213 LTE specifications
+ * \author R. Knopp, F. Kaltenberger, N. Nikaein, X. Foukas
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr,navid.nikaein@eurecom.fr, x.foukas@sms.ed.ac.uk
+ * \note
+ * \warning
+ */
+
+#include "PHY/defs.h"
+#include "PHY/extern.h"
+#include "SCHED/defs.h"
+#include "SCHED/extern.h"
+#include "nfapi_interface.h"
+#include "fapi_l1.h"
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+#include "T.h"
+
+#include "assertions.h"
+#include "msc.h"
+
+#include <time.h>
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+extern uint32_t nfapi_mode;
+
+void prach_procedures(PHY_VARS_eNB *eNB,
+#ifdef Rel14
+ int br_flag
+#endif
+ ) {
+ uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4];
+ uint16_t i;
+ int frame,subframe;
+
+#ifdef Rel14
+ if (br_flag==1) {
+ subframe = eNB->proc.subframe_prach_br;
+ frame = eNB->proc.frame_prach_br;
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles=0;
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ }
+ else
+#endif
+ {
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles=0;
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ subframe = eNB->proc.subframe_prach;
+ frame = eNB->proc.frame_prach;
+ }
+ RU_t *ru;
+ int aa=0;
+ int ru_aa;
+
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,1);
+
+
+
+ for (i=0;i<eNB->num_RU;i++) {
+ ru=eNB->RU_list[i];
+ for (ru_aa=0,aa=0;ru_aa<ru->nb_rx;ru_aa++,aa++) {
+ eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
+#ifdef Rel14
+ int ce_level;
+
+ if (br_flag==1)
+ for (ce_level=0;ce_level<4;ce_level++) eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
+#endif
+ }
+ }
+
+ rx_prach(eNB,
+ eNB->RU_list[0],
+ &max_preamble[0],
+ &max_preamble_energy[0],
+ &max_preamble_delay[0],
+ frame,
+ 0
+#ifdef Rel14
+ ,br_flag
+#endif
+ );
+
+ LOG_D(PHY,"[RAPROC] Frame %d, subframe %d : Most likely preamble %d, energy %d dB delay %d (prach_energy counter %d)\n",
+ frame,subframe,
+ max_preamble[0],
+ max_preamble_energy[0]/10,
+ max_preamble_delay[0],
+ eNB->prach_energy_counter);
+
+#ifdef Rel14
+ if (br_flag==1) {
+
+ int prach_mask;
+
+ prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
+
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
+ int ind=0;
+ int ce_level=0;
+ /* Save for later, it doesn't work
+ for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
+
+ if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
+ (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
+ (eNB->prach_vars_br.repetition_number[ce_level]==
+ eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
+ */
+ if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0]==1){
+ if ((eNB->prach_energy_counter == 100) &&
+ (max_preamble_energy[0] > eNB->measurements.prach_I0 + 100)) {
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
+
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind];//
+ eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
+ // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
+ eNB->preamble_list_br[ind].preamble_rel8.rnti = 1+subframe+(eNB->prach_vars_br.first_frame[ce_level]%40);
+ eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
+ eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1+ce_level; // CE Level
+ LOG_D(PHY,"Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ ind,
+ ce_level,
+ prach_mask,
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
+ eNB->preamble_list_br[ind].preamble_rel8.preamble,
+ eNB->preamble_list_br[ind].preamble_rel8.rnti,
+ eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
+ }
+ /*
+ ind++;
+ }
+ } */// ce_level
+ }
+ }
+ else
+#endif
+
+ {
+ if ((eNB->prach_energy_counter == 100) &&
+ (max_preamble_energy[0] > eNB->measurements.prach_I0+100)) {
+
+ LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
+ eNB->Mod_id,
+ eNB->CC_id,
+ frame,
+ subframe,
+ max_preamble[0],
+ max_preamble_energy[0]/10,
+ max_preamble_energy[0]%10,
+ max_preamble_delay[0]);
+
+ T(T_ENB_PHY_INITIATE_RA_PROCEDURE, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe),
+ T_INT(max_preamble[0]), T_INT(max_preamble_energy[0]), T_INT(max_preamble_delay[0]));
+
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 1;
+ eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list = &eNB->preamble_list[0];
+ eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag = NFAPI_RACH_INDICATION_BODY_TAG;
+ eNB->UL_INFO.rach_ind.header.message_id = NFAPI_RACH_INDICATION;
+ eNB->UL_INFO.rach_ind.sfn_sf = frame<<4 | subframe;
+
+ eNB->preamble_list[0].preamble_rel8.tl.tag = NFAPI_PREAMBLE_REL8_TAG;
+ eNB->preamble_list[0].preamble_rel8.timing_advance = max_preamble_delay[0];
+ eNB->preamble_list[0].preamble_rel8.preamble = max_preamble[0];
+ eNB->preamble_list[0].preamble_rel8.rnti = 1+subframe; // note: fid is implicitly 0 here
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type = 0;
+ eNB->preamble_list[0].instance_length = 0; //don't know exactly what this is
+
+ if (nfapi_mode == 1) { // If NFAPI PNF then we need to send the message to the VNF
+
+ LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
+ eNB->preamble_list[0].preamble_rel8.timing_advance,
+ eNB->preamble_list[0].preamble_rel8.preamble,
+ eNB->preamble_list[0].preamble_rel8.rnti,
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type);
+
+ oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
+
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
+ }
+
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+
+ } // max_preamble_energy > prach_I0 + 100
+ else {
+ eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((max_preamble_energy[0]*124)>>10);
+ if (frame==0) LOG_I(PHY,"prach_I0 = %d.%d dB\n",eNB->measurements.prach_I0/10,eNB->measurements.prach_I0%10);
+ if (eNB->prach_energy_counter < 100) eNB->prach_energy_counter++;
+ }
+ } // else br_flag
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,0);
+}
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index eb01c3bd05646d1b6c5be0e026794d120552638a..8caa4a17dc3894c13482cc742196fb28a711babd 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -98,138 +98,6 @@ static int enb_check_band_frequencies(char* lib_config_file_name_pP,
return errors;
}
-
-/* --------------------------------------------------------*/
-/* from here function to use configuration module */
-void RCconfig_RU(void) {
-
- int j = 0;
- int i = 0;
-
-
- paramdef_t RUParams[] = RUPARAMS_DESC;
- paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
-
-
- config_getlist( &RUParamList,RUParams,sizeof(RUParams)/sizeof(paramdef_t), NULL);
-
-
- if ( RUParamList.numelt > 0) {
-
- RC.ru = (RU_t**)malloc(RC.nb_RU*sizeof(RU_t*));
-
-
-
-
- RC.ru_mask=(1<<NB_RU) - 1;
- printf("Set RU mask to %lx\n",RC.ru_mask);
-
- for (j = 0; j < RC.nb_RU; j++) {
-
- RC.ru[j] = (RU_t*)malloc(sizeof(RU_t));
- memset((void*)RC.ru[j],0,sizeof(RU_t));
- RC.ru[j]->idx = j;
-
- printf("Creating RC.ru[%d]:%p\n", j, RC.ru[j]);
-
- RC.ru[j]->if_timing = synch_to_ext_device;
- if (RC.nb_L1_inst >0)
- RC.ru[j]->num_eNB = RUParamList.paramarray[j][RU_ENB_LIST_IDX].numelt;
- else
- RC.ru[j]->num_eNB = 0;
- for (i=0;i<RC.ru[j]->num_eNB;i++) RC.ru[j]->eNB_list[i] = RC.eNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]][0];
-
-
- if (strcmp(*(RUParamList.paramarray[j][RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
- if ( !(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX)) ) {
- RC.ru[j]->if_south = LOCAL_RF;
- RC.ru[j]->function = eNodeB_3GPP;
- printf("Setting function for RU %d to eNodeB_3GPP\n",j);
- }
- else {
- RC.ru[j]->eth_params.local_if_name = strdup(*(RUParamList.paramarray[j][RU_LOCAL_IF_NAME_IDX].strptr));
- RC.ru[j]->eth_params.my_addr = strdup(*(RUParamList.paramarray[j][RU_LOCAL_ADDRESS_IDX].strptr));
- RC.ru[j]->eth_params.remote_addr = strdup(*(RUParamList.paramarray[j][RU_REMOTE_ADDRESS_IDX].strptr));
- RC.ru[j]->eth_params.my_portc = *(RUParamList.paramarray[j][RU_LOCAL_PORTC_IDX].uptr);
- RC.ru[j]->eth_params.remote_portc = *(RUParamList.paramarray[j][RU_REMOTE_PORTC_IDX].uptr);
- RC.ru[j]->eth_params.my_portd = *(RUParamList.paramarray[j][RU_LOCAL_PORTD_IDX].uptr);
- RC.ru[j]->eth_params.remote_portd = *(RUParamList.paramarray[j][RU_REMOTE_PORTD_IDX].uptr);
-
- if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp") == 0) {
- RC.ru[j]->if_south = LOCAL_RF;
- RC.ru[j]->function = NGFI_RRU_IF5;
- RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
- printf("Setting function for RU %d to NGFI_RRU_IF5 (udp)\n",j);
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw") == 0) {
- RC.ru[j]->if_south = LOCAL_RF;
- RC.ru[j]->function = NGFI_RRU_IF5;
- RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
- printf("Setting function for RU %d to NGFI_RRU_IF5 (raw)\n",j);
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp_if4p5") == 0) {
- RC.ru[j]->if_south = LOCAL_RF;
- RC.ru[j]->function = NGFI_RRU_IF4p5;
- RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
- printf("Setting function for RU %d to NGFI_RRU_IF4p5 (udp)\n",j);
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if4p5") == 0) {
- RC.ru[j]->if_south = LOCAL_RF;
- RC.ru[j]->function = NGFI_RRU_IF4p5;
- RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
- printf("Setting function for RU %d to NGFI_RRU_IF4p5 (raw)\n",j);
- }
- }
- RC.ru[j]->max_pdschReferenceSignalPower = *(RUParamList.paramarray[j][RU_MAX_RS_EPRE_IDX].uptr);;
- RC.ru[j]->max_rxgain = *(RUParamList.paramarray[j][RU_MAX_RXGAIN_IDX].uptr);
- RC.ru[j]->num_bands = RUParamList.paramarray[j][RU_BAND_LIST_IDX].numelt;
- for (i=0;i<RC.ru[j]->num_bands;i++) RC.ru[j]->band[i] = RUParamList.paramarray[j][RU_BAND_LIST_IDX].iptr[i];
- } //strcmp(local_rf, "yes") == 0
- else {
- printf("RU %d: Transport %s\n",j,*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr));
-
- RC.ru[j]->eth_params.local_if_name = strdup(*(RUParamList.paramarray[j][RU_LOCAL_IF_NAME_IDX].strptr));
- RC.ru[j]->eth_params.my_addr = strdup(*(RUParamList.paramarray[j][RU_LOCAL_ADDRESS_IDX].strptr));
- RC.ru[j]->eth_params.remote_addr = strdup(*(RUParamList.paramarray[j][RU_REMOTE_ADDRESS_IDX].strptr));
- RC.ru[j]->eth_params.my_portc = *(RUParamList.paramarray[j][RU_LOCAL_PORTC_IDX].uptr);
- RC.ru[j]->eth_params.remote_portc = *(RUParamList.paramarray[j][RU_REMOTE_PORTC_IDX].uptr);
- RC.ru[j]->eth_params.my_portd = *(RUParamList.paramarray[j][RU_LOCAL_PORTD_IDX].uptr);
- RC.ru[j]->eth_params.remote_portd = *(RUParamList.paramarray[j][RU_REMOTE_PORTD_IDX].uptr);
- if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp") == 0) {
- RC.ru[j]->if_south = REMOTE_IF5;
- RC.ru[j]->function = NGFI_RAU_IF5;
- RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw") == 0) {
- RC.ru[j]->if_south = REMOTE_IF5;
- RC.ru[j]->function = NGFI_RAU_IF5;
- RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp_if4p5") == 0) {
- RC.ru[j]->if_south = REMOTE_IF4p5;
- RC.ru[j]->function = NGFI_RAU_IF4p5;
- RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if4p5") == 0) {
- RC.ru[j]->if_south = REMOTE_IF4p5;
- RC.ru[j]->function = NGFI_RAU_IF4p5;
- RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
- } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if5_mobipass") == 0) {
- RC.ru[j]->if_south = REMOTE_IF5;
- RC.ru[j]->function = NGFI_RAU_IF5;
- RC.ru[j]->if_timing = synch_to_other;
- RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
- }
- RC.ru[j]->att_tx = *(RUParamList.paramarray[j][RU_ATT_TX_IDX].uptr);
- RC.ru[j]->att_rx = *(RUParamList.paramarray[j][RU_ATT_TX_IDX].uptr);
- } /* strcmp(local_rf, "yes") != 0 */
-
- RC.ru[j]->nb_tx = *(RUParamList.paramarray[j][RU_NB_TX_IDX].uptr);
- RC.ru[j]->nb_rx = *(RUParamList.paramarray[j][RU_NB_RX_IDX].uptr);
-
- }// j=0..num_rus
- } else {
- RC.nb_RU = 0;
- } // setting != NULL
-
- return;
-
-}
-
void RCconfig_L1(void) {
int i,j;
paramdef_t L1_Params[] = L1PARAMS_DESC;
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index 1aa3a8563686bf90ebbda590bbc29d356ea2af48..d5a09bef857e867fc3d516078e75cdce085d1f89 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -61,161 +61,125 @@ extern RAN_CONTEXT_t RC;
extern int l2_init_eNB(void);
extern void mac_top_init_eNB(void);
extern void mac_init_cell_params(int Mod_idP,int CC_idP);
-extern void phy_reset_ue(module_id_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
extern uint8_t nfapi_mode;
-/* sec 5.9, 36.321: MAC Reset Procedure */
-void ue_mac_reset(module_id_t module_idP, uint8_t eNB_index)
-{
-
- //Resetting Bj
- UE_mac_inst[module_idP].scheduling_info.Bj[0] = 0;
- UE_mac_inst[module_idP].scheduling_info.Bj[1] = 0;
- UE_mac_inst[module_idP].scheduling_info.Bj[2] = 0;
-
- //Stopping all timers
-
- //timeAlignmentTimer expires
-
- // PHY changes for UE MAC reset
- phy_reset_ue(module_idP, 0, eNB_index);
-
- // notify RRC to relase PUCCH/SRS
- // cancel all pending SRs
- UE_mac_inst[module_idP].scheduling_info.SR_pending = 0;
- UE_mac_inst[module_idP].scheduling_info.SR_COUNTER = 0;
-
-//Set BSR Trigger Bmp and remove timer flags
- UE_mac_inst[module_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
-
- // stop ongoing RACH procedure
-
- // discard explicitly signaled ra_PreambleIndex and ra_RACH_MaskIndex, if any
- UE_mac_inst[module_idP].RA_prach_resources.ra_PreambleIndex = 0; // check!
- UE_mac_inst[module_idP].RA_prach_resources.ra_RACH_MaskIndex = 0;
-
-
- ue_init_mac(module_idP); //This will hopefully do the rest of the MAC reset procedure
-
-}
-
int32_t **rxdata;
int32_t **txdata;
typedef struct eutra_bandentry_s {
- int16_t band;
- uint32_t ul_min;
- uint32_t ul_max;
- uint32_t dl_min;
- uint32_t dl_max;
- uint32_t N_OFFs_DL;
+ int16_t band;
+ uint32_t ul_min;
+ uint32_t ul_max;
+ uint32_t dl_min;
+ uint32_t dl_max;
+ uint32_t N_OFFs_DL;
} eutra_bandentry_t;
typedef struct band_info_s {
- int nbands;
- eutra_bandentry_t band_info[100];
+ int nbands;
+ eutra_bandentry_t band_info[100];
} band_info_t;
static const eutra_bandentry_t eutra_bandtable[] = {
- {1, 19200, 19800, 21100, 21700, 0},
- {2, 18500, 19100, 19300, 19900, 6000},
- {3, 17100, 17850, 18050, 18800, 12000},
- {4, 17100, 17550, 21100, 21550, 19500},
- {5, 8240, 8490, 8690, 8940, 24000},
- {6, 8300, 8400, 8750, 8850, 26500},
- {7, 25000, 25700, 26200, 26900, 27500},
- {8, 8800, 9150, 9250, 9600, 34500},
- {9, 17499, 17849, 18449, 18799, 38000},
- {10, 17100, 17700, 21100, 21700, 41500},
- {11, 14279, 14529, 14759, 15009, 47500},
- {12, 6980, 7160, 7280, 7460, 50100},
- {13, 7770, 7870, 7460, 7560, 51800},
- {14, 7880, 7980, 7580, 7680, 52800},
- {17, 7040, 7160, 7340, 7460, 57300},
- {18, 8150, 9650, 8600, 10100, 58500},
- {19, 8300, 8450, 8750, 8900, 60000},
- {20, 8320, 8620, 7910, 8210, 61500},
- {21, 14479, 14629, 14959, 15109, 64500},
- {22, 34100, 34900, 35100, 35900, 66000},
- {23, 20000, 20200, 21800, 22000, 75000},
- {24, 16126, 16605, 15250, 15590, 77000},
- {25, 18500, 19150, 19300, 19950, 80400},
- {26, 8140, 8490, 8590, 8940, 86900},
- {27, 8070, 8240, 8520, 8690, 90400},
- {28, 7030, 7580, 7580, 8130, 92100},
- {29, 0, 0, 7170, 7280, 96600},
- {30, 23050, 23250, 23500, 23600, 97700},
- {31, 45250, 34900, 46250, 35900, 98700},
- {32, 0, 0, 14520, 14960, 99200},
- {33, 19000, 19200, 19000, 19200, 36000},
- {34, 20100, 20250, 20100, 20250, 36200},
- {35, 18500, 19100, 18500, 19100, 36350},
- {36, 19300, 19900, 19300, 19900, 36950},
- {37, 19100, 19300, 19100, 19300, 37550},
- {38, 25700, 26200, 25700, 26300, 37750},
- {39, 18800, 19200, 18800, 19200, 38250},
- {40, 23000, 24000, 23000, 24000, 38650},
- {41, 24960, 26900, 24960, 26900, 39650},
- {42, 34000, 36000, 34000, 36000, 41590},
- {43, 36000, 38000, 36000, 38000, 43590},
- {44, 7030, 8030, 7030, 8030, 45590},
- {45, 14470, 14670, 14470, 14670, 46590},
- {46, 51500, 59250, 51500, 59250, 46790},
- {65, 19200, 20100, 21100, 22000, 65536},
- {66, 17100, 18000, 21100, 22000, 66436},
- {67, 0, 0, 7380, 7580, 67336},
- {68, 6980, 7280, 7530, 7830, 67536}
+ {1, 19200, 19800, 21100, 21700, 0},
+ {2, 18500, 19100, 19300, 19900, 6000},
+ {3, 17100, 17850, 18050, 18800, 12000},
+ {4, 17100, 17550, 21100, 21550, 19500},
+ {5, 8240, 8490, 8690, 8940, 24000},
+ {6, 8300, 8400, 8750, 8850, 26500},
+ {7, 25000, 25700, 26200, 26900, 27500},
+ {8, 8800, 9150, 9250, 9600, 34500},
+ {9, 17499, 17849, 18449, 18799, 38000},
+ {10, 17100, 17700, 21100, 21700, 41500},
+ {11, 14279, 14529, 14759, 15009, 47500},
+ {12, 6980, 7160, 7280, 7460, 50100},
+ {13, 7770, 7870, 7460, 7560, 51800},
+ {14, 7880, 7980, 7580, 7680, 52800},
+ {17, 7040, 7160, 7340, 7460, 57300},
+ {18, 8150, 9650, 8600, 10100, 58500},
+ {19, 8300, 8450, 8750, 8900, 60000},
+ {20, 8320, 8620, 7910, 8210, 61500},
+ {21, 14479, 14629, 14959, 15109, 64500},
+ {22, 34100, 34900, 35100, 35900, 66000},
+ {23, 20000, 20200, 21800, 22000, 75000},
+ {24, 16126, 16605, 15250, 15590, 77000},
+ {25, 18500, 19150, 19300, 19950, 80400},
+ {26, 8140, 8490, 8590, 8940, 86900},
+ {27, 8070, 8240, 8520, 8690, 90400},
+ {28, 7030, 7580, 7580, 8130, 92100},
+ {29, 0, 0, 7170, 7280, 96600},
+ {30, 23050, 23250, 23500, 23600, 97700},
+ {31, 45250, 34900, 46250, 35900, 98700},
+ {32, 0, 0, 14520, 14960, 99200},
+ {33, 19000, 19200, 19000, 19200, 36000},
+ {34, 20100, 20250, 20100, 20250, 36200},
+ {35, 18500, 19100, 18500, 19100, 36350},
+ {36, 19300, 19900, 19300, 19900, 36950},
+ {37, 19100, 19300, 19100, 19300, 37550},
+ {38, 25700, 26200, 25700, 26300, 37750},
+ {39, 18800, 19200, 18800, 19200, 38250},
+ {40, 23000, 24000, 23000, 24000, 38650},
+ {41, 24960, 26900, 24960, 26900, 39650},
+ {42, 34000, 36000, 34000, 36000, 41590},
+ {43, 36000, 38000, 36000, 38000, 43590},
+ {44, 7030, 8030, 7030, 8030, 45590},
+ {45, 14470, 14670, 14470, 14670, 46590},
+ {46, 51500, 59250, 51500, 59250, 46790},
+ {65, 19200, 20100, 21100, 22000, 65536},
+ {66, 17100, 18000, 21100, 22000, 66436},
+ {67, 0, 0, 7380, 7580, 67336},
+ {68, 6980, 7280, 7530, 7830, 67536}
};
uint32_t to_earfcn(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw)
{
- uint32_t dl_CarrierFreq_by_100k = dl_CarrierFreq / 100000;
- int bw_by_100 = bw / 100;
+ uint32_t dl_CarrierFreq_by_100k = dl_CarrierFreq / 100000;
+ int bw_by_100 = bw / 100;
- int i;
+ int i;
- AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- AssertFatal(dl_CarrierFreq_by_100k >= eutra_bandtable[i].dl_min,
- "Band %d, bw %u : DL carrier frequency %u Hz < %u\n",
- eutra_bandP, bw, dl_CarrierFreq,
- eutra_bandtable[i].dl_min);
- AssertFatal(dl_CarrierFreq_by_100k <=
- (eutra_bandtable[i].dl_max - bw_by_100),
- "Band %d, bw %u: DL carrier frequency %u Hz > %d\n",
- eutra_bandP, bw, dl_CarrierFreq,
- eutra_bandtable[i].dl_max - bw_by_100);
+ AssertFatal(dl_CarrierFreq_by_100k >= eutra_bandtable[i].dl_min,
+ "Band %d, bw %u : DL carrier frequency %u Hz < %u\n",
+ eutra_bandP, bw, dl_CarrierFreq,
+ eutra_bandtable[i].dl_min);
+ AssertFatal(dl_CarrierFreq_by_100k <=
+ (eutra_bandtable[i].dl_max - bw_by_100),
+ "Band %d, bw %u: DL carrier frequency %u Hz > %d\n",
+ eutra_bandP, bw, dl_CarrierFreq,
+ eutra_bandtable[i].dl_max - bw_by_100);
- return (dl_CarrierFreq_by_100k - eutra_bandtable[i].dl_min +
- (eutra_bandtable[i].N_OFFs_DL / 10));
+ return (dl_CarrierFreq_by_100k - eutra_bandtable[i].dl_min +
+ (eutra_bandtable[i].N_OFFs_DL / 10));
}
uint32_t from_earfcn(int eutra_bandP, uint32_t dl_earfcn)
{
- int i;
+ int i;
- AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- return (eutra_bandtable[i].dl_min +
- (dl_earfcn - (eutra_bandtable[i].N_OFFs_DL / 10))) * 100000;
+ return (eutra_bandtable[i].dl_min +
+ (dl_earfcn - (eutra_bandtable[i].N_OFFs_DL / 10))) * 100000;
}
int32_t get_uldl_offset(int eutra_bandP)
{
- int i;
+ int i;
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- return (eutra_bandtable[i].dl_min - eutra_bandtable[i].ul_min);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ return (eutra_bandtable[i].dl_min - eutra_bandtable[i].ul_min);
}
uint32_t bw_table[6] = {6*180,15*180,25*180,50*180,75*180,100*180};
@@ -469,220 +433,156 @@ config_sib2(int Mod_idP,
cfg->srs_config.srs_acknack_srs_simultaneous_transmission.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
cfg->srs_config.srs_acknack_srs_simultaneous_transmission.tl.tag = NFAPI_SRS_CONFIG_SRS_ACKNACK_SRS_SIMULTANEOUS_TRANSMISSION_TAG;
cfg->num_tlv++;
-
-
- if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_MaxUpPts) {
- cfg->srs_config.max_up_pts.value = 1;
- }
- else {
- cfg->srs_config.max_up_pts.value = 0;
+
+
+ nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
+
+ cfg->subframe_config.pb.value = radioResourceConfigCommonP->pdsch_ConfigCommon.p_b;
+ cfg->rf_config.reference_signal_power.value = radioResourceConfigCommonP->pdsch_ConfigCommon.referenceSignalPower;
+ cfg->nfapi_config.max_transmit_power.value = cfg->rf_config.reference_signal_power.value +
+ power_off_dB[cfg->rf_config.dl_channel_bandwidth.value];
+
+ cfg->prach_config.configuration_index.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.prach_ConfigIndex;
+ cfg->prach_config.root_sequence_index.value = radioResourceConfigCommonP->prach_Config.rootSequenceIndex;
+ cfg->prach_config.zero_correlation_zone_configuration.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
+ cfg->prach_config.high_speed_flag.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.highSpeedFlag;
+ cfg->prach_config.frequency_offset.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.prach_FreqOffset;
+
+ cfg->pusch_config.hopping_mode.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
+ cfg->pusch_config.number_of_subbands.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
+ cfg->pusch_config.hopping_offset.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
+
+ cfg->pucch_config.delta_pucch_shift.value = radioResourceConfigCommonP->pucch_ConfigCommon.deltaPUCCH_Shift;
+ cfg->pucch_config.n_cqi_rb.value = radioResourceConfigCommonP->pucch_ConfigCommon.nRB_CQI;
+ cfg->pucch_config.n_an_cs.value = radioResourceConfigCommonP->pucch_ConfigCommon.nCS_AN;
+ cfg->pucch_config.n1_pucch_an.value = radioResourceConfigCommonP->pucch_ConfigCommon.n1PUCCH_AN;
+
+ if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled == true)
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 1;
+ else if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled == true)
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 2;
+ else // No hopping
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 0;
+
+ cfg->uplink_reference_signal_config.group_assignment.value = radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
+ cfg->uplink_reference_signal_config.cyclic_shift_1_for_drms.value = radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift;
+
+ // how to enable/disable SRS?
+ if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.present == SoundingRS_UL_ConfigCommon_PR_setup) {
+ cfg->srs_config.bandwidth_configuration.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_BandwidthConfig;
+ cfg->srs_config.srs_subframe_configuration.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_SubframeConfig;
+ cfg->srs_config.srs_acknack_srs_simultaneous_transmission.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
+
+ if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_MaxUpPts)
+ cfg->srs_config.max_up_pts.value = 1;
+ else
+ cfg->srs_config.max_up_pts.value = 0;
}
- cfg->srs_config.max_up_pts.tl.tag = NFAPI_SRS_CONFIG_MAX_UP_PTS_TAG;
- cfg->num_tlv++;
}
-
#ifdef Rel14
- if (RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.schedulingInfoSIB1_BR_r13>0) {
- AssertFatal(radioResourceConfigCommon_BRP!=NULL,"radioResource rou is missing\n");
- AssertFatal(radioResourceConfigCommon_BRP->ext4!=NULL,"ext4 is missing\n");
- cfg->emtc_config.prach_catm_root_sequence_index.value = radioResourceConfigCommon_BRP->prach_Config.rootSequenceIndex;
- cfg->emtc_config.prach_catm_root_sequence_index.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CATM_ROOT_SEQUENCE_INDEX_TAG;
- cfg->num_tlv++;
-
+ if (RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.schedulingInfoSIB1_BR_r13 > 0) {
+ AssertFatal(radioResourceConfigCommon_BRP != NULL,
+ "radioResource rou is missing\n");
+ AssertFatal(radioResourceConfigCommon_BRP->ext4 != NULL,
+ "ext4 is missing\n");
+ cfg->emtc_config.prach_catm_root_sequence_index.value = radioResourceConfigCommon_BRP->prach_Config.rootSequenceIndex;
cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
- cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CATM_ZERO_CORRELATION_ZONE_CONFIGURATION_TAG;
- cfg->num_tlv++;
+ cfg->emtc_config.prach_catm_high_speed_flag.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.highSpeedFlag;
- cfg->emtc_config.prach_catm_high_speed_flag.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.highSpeedFlag;
- cfg->emtc_config.prach_catm_high_speed_flag.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CATM_HIGH_SPEED_FLAG;
- cfg->num_tlv++;
-
- struct PRACH_ConfigSIB_v1310 *ext4_prach=radioResourceConfigCommon_BRP->ext4->prach_ConfigCommon_v1310;
+ struct PRACH_ConfigSIB_v1310 *ext4_prach = radioResourceConfigCommon_BRP->ext4->prach_ConfigCommon_v1310;
- PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+ PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
PRACH_ParametersCE_r13_t *p;
- cfg->emtc_config.prach_ce_level_0_enable.value=0;
- cfg->emtc_config.prach_ce_level_0_enable.tl.tag=NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_1_enable.value=0;
- cfg->emtc_config.prach_ce_level_1_enable.tl.tag=NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_2_enable.value=0;
- cfg->emtc_config.prach_ce_level_2_enable.tl.tag=NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_3_enable.value=0;
- cfg->emtc_config.prach_ce_level_3_enable.tl.tag=NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_ENABLE_TAG;
- cfg->num_tlv++;
-
+ cfg->emtc_config.prach_ce_level_0_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_1_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_2_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_3_enable.value = 0;
switch (prach_ParametersListCE_r13->list.count) {
case 4:
- p=prach_ParametersListCE_r13->list.array[3];
- cfg->emtc_config.prach_ce_level_3_enable.value = 1;
- cfg->emtc_config.prach_ce_level_3_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_ENABLE_TAG;
- cfg->num_tlv++;
-
+ p = prach_ParametersListCE_r13->list.array[3];
+ cfg->emtc_config.prach_ce_level_3_enable.value = 1;
cfg->emtc_config.prach_ce_level_3_configuration_index.value = p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_3_configuration_index.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_CONFIGURATION_INDEX_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_3_frequency_offset.value = p->prach_FreqOffset_r13;
- cfg->emtc_config.prach_ce_level_3_frequency_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_FREQUENCY_OFFSET_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
- cfg->emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_NUMBER_OF_REPETITIONS_PER_ATTEMPT_TAG;
- cfg->num_tlv++;
-
- if (p->prach_StartingSubframe_r13) {
+ if (p->prach_StartingSubframe_r13)
cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_STARTING_SUBFRAME_PERIODICITY_TAG;
- cfg->num_tlv++;
- }
-
cfg->emtc_config.prach_ce_level_3_hopping_enable.value = p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_3_hopping_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_HOPPING_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_3_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value-6;
- cfg->emtc_config.prach_ce_level_3_hopping_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_3_HOPPING_OFFSET_TAG;
- cfg->num_tlv++;
-
+ cfg->emtc_config.prach_ce_level_3_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
case 3:
- p=prach_ParametersListCE_r13->list.array[2];
- cfg->emtc_config.prach_ce_level_2_enable.value = 1;
- cfg->emtc_config.prach_ce_level_2_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_ENABLE_TAG;
- cfg->num_tlv++;
-
+ p = prach_ParametersListCE_r13->list.array[2];
+ cfg->emtc_config.prach_ce_level_2_enable.value = 1;
cfg->emtc_config.prach_ce_level_2_configuration_index.value = p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_2_configuration_index.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_CONFIGURATION_INDEX_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_2_frequency_offset.value = p->prach_FreqOffset_r13;
- cfg->emtc_config.prach_ce_level_2_frequency_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_FREQUENCY_OFFSET_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
- cfg->emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_NUMBER_OF_REPETITIONS_PER_ATTEMPT_TAG;
- cfg->num_tlv++;
-
- if (p->prach_StartingSubframe_r13) {
+ if (p->prach_StartingSubframe_r13)
cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_STARTING_SUBFRAME_PERIODICITY_TAG;
- cfg->num_tlv++;
- }
-
cfg->emtc_config.prach_ce_level_2_hopping_enable.value = p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_2_hopping_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_HOPPING_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_2_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value-6;
- cfg->emtc_config.prach_ce_level_2_hopping_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_2_HOPPING_OFFSET_TAG;
- cfg->num_tlv++;
-
+ cfg->emtc_config.prach_ce_level_2_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
case 2:
- p=prach_ParametersListCE_r13->list.array[1];
- cfg->emtc_config.prach_ce_level_1_enable.value = 1;
- cfg->emtc_config.prach_ce_level_1_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_ENABLE_TAG;
- cfg->num_tlv++;
-
+ p = prach_ParametersListCE_r13->list.array[1];
+ cfg->emtc_config.prach_ce_level_1_enable.value = 1;
cfg->emtc_config.prach_ce_level_1_configuration_index.value = p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_1_configuration_index.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_CONFIGURATION_INDEX_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_1_frequency_offset.value = p->prach_FreqOffset_r13;
- cfg->emtc_config.prach_ce_level_1_frequency_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_FREQUENCY_OFFSET_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
- cfg->emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_NUMBER_OF_REPETITIONS_PER_ATTEMPT_TAG;
- cfg->num_tlv++;
-
- if (p->prach_StartingSubframe_r13) {
+ if (p->prach_StartingSubframe_r13)
cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_STARTING_SUBFRAME_PERIODICITY_TAG;
- cfg->num_tlv++;
- }
-
cfg->emtc_config.prach_ce_level_1_hopping_enable.value = p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_1_hopping_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_HOPPING_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_1_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value-6;
- cfg->emtc_config.prach_ce_level_1_hopping_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_1_HOPPING_OFFSET_TAG;
- cfg->num_tlv++;
-
+ cfg->emtc_config.prach_ce_level_1_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
case 1:
- p=prach_ParametersListCE_r13->list.array[0];
+ p = prach_ParametersListCE_r13->list.array[0];
cfg->emtc_config.prach_ce_level_0_enable.value = 1;
- cfg->emtc_config.prach_ce_level_0_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_ENABLE_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_0_configuration_index.value = p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_0_configuration_index.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_CONFIGURATION_INDEX_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_0_frequency_offset.value = p->prach_FreqOffset_r13;
- cfg->emtc_config.prach_ce_level_0_frequency_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_FREQUENCY_OFFSET_TAG;
- cfg->num_tlv++;
-
cfg->emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
- cfg->emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_NUMBER_OF_REPETITIONS_PER_ATTEMPT_TAG;
- cfg->num_tlv++;
-
- if (p->prach_StartingSubframe_r13) {
+ if (p->prach_StartingSubframe_r13)
cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_STARTING_SUBFRAME_PERIODICITY_TAG;
- cfg->num_tlv++;
- }
-
cfg->emtc_config.prach_ce_level_0_hopping_enable.value = p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_0_hopping_enable.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_HOPPING_ENABLE_TAG;
- cfg->num_tlv++;
-
- cfg->emtc_config.prach_ce_level_0_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value-6;
- cfg->emtc_config.prach_ce_level_0_hopping_offset.tl.tag = NFAPI_EMTC_CONFIG_PRACH_CE_LEVEL_0_HOPPING_OFFSET_TAG;
- cfg->num_tlv++;
+ cfg->emtc_config.prach_ce_level_0_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
}
struct FreqHoppingParameters_r13 *ext4_freqHoppingParameters = radioResourceConfigCommonP->ext4->freqHoppingParameters_r13;
- if ((ext4_freqHoppingParameters) &&
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13)){
- switch(ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->present) {
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_NOTHING: /* No components present */
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13:
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.value = ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->choice.interval_FDD_r13;
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.tl.tag = NFAPI_EMTC_CONFIG_PUCCH_INTERVAL_ULHOPPINGCONFIGCOMMONMODEA_TAG;
- cfg->num_tlv++;
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_TDD_r13:
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.value = ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->choice.interval_TDD_r13;
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.tl.tag = NFAPI_EMTC_CONFIG_PUCCH_INTERVAL_ULHOPPINGCONFIGCOMMONMODEA_TAG;
- cfg->num_tlv++;
- break;
+ if ((ext4_freqHoppingParameters)&&
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13))
+ {
+ switch (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->present) {
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_NOTHING: /* No components present */
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13:
+ cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
+ choice.interval_FDD_r13;
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_TDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodea.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
+ choice.interval_TDD_r13;
+ break;
+ }
}
- }
- if ((ext4_freqHoppingParameters) &&
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13)){
- switch(ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->present) {
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_NOTHING: /* No components present */
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_FDD_r13:
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodeb.value = ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->choice.interval_FDD_r13;
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodeb.tl.tag = NFAPI_EMTC_CONFIG_PUCCH_INTERVAL_ULHOPPINGCONFIGCOMMONMODEB_TAG;
- cfg->num_tlv++;
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_TDD_r13:
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodeb.value = ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->choice.interval_TDD_r13;
- cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodeb.tl.tag = NFAPI_EMTC_CONFIG_PUCCH_INTERVAL_ULHOPPINGCONFIGCOMMONMODEB_TAG;
- cfg->num_tlv++;
- break;
+ if ((ext4_freqHoppingParameters) &&
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13))
+ {
+ switch
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ present) {
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_NOTHING: /* No components present */
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_FDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodeb.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ choice.interval_FDD_r13;
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_TDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodeb.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ choice.interval_TDD_r13;
+ break;
+ }
}
- }
}
#endif
@@ -705,6 +605,7 @@ config_dedicated_scell(int Mod_idP,
}
+
int
rrc_mac_config_req_eNB(module_id_t Mod_idP,
int CC_idP,
@@ -799,10 +700,11 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
dl_CarrierFreq,
ul_CarrierFreq
#ifdef Rel14
- , pbch_repetition
+ , pbch_repetition
#endif
);
+
mac_init_cell_params(Mod_idP,CC_idP);
if (schedulingInfoList!=NULL) {
@@ -815,62 +717,62 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
RC.mac[Mod_idP]->common_channels[CC_idP].sib1_v13ext = sib1_v13ext;
}
#endif
- if (radioResourceConfigCommon != NULL) {
- LOG_I(MAC, "[CONFIG]SIB2/3 Contents (partial)\n");
- LOG_I(MAC, "[CONFIG]pusch_config_common.n_SB = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.n_SB);
- LOG_I(MAC, "[CONFIG]pusch_config_common.hoppingMode = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset);
- LOG_I(MAC, "[CONFIG]pusch_config_common.enable64QAM = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.groupHoppingEnabled = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- groupHoppingEnabled);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- groupAssignmentPUSCH);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- sequenceHoppingEnabled);
- LOG_I(MAC, "[CONFIG]pusch_config_common.cyclicShift = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift);
-
- AssertFatal(radioResourceConfigCommon->
- rach_ConfigCommon.maxHARQ_Msg3Tx > 0,
- "radioResourceconfigCommon %d == 0\n",
- (int) radioResourceConfigCommon->
- rach_ConfigCommon.maxHARQ_Msg3Tx);
-
- RC.mac[Mod_idP]->common_channels[CC_idP].
- radioResourceConfigCommon = radioResourceConfigCommon;
- if (ul_CarrierFreq > 0)
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_CarrierFreq =
- ul_CarrierFreq;
- if (ul_Bandwidth)
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
- *ul_Bandwidth;
- else
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
- RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.
- dl_Bandwidth;
-
- config_sib2(Mod_idP, CC_idP, radioResourceConfigCommon,
+ if (radioResourceConfigCommon != NULL) {
+ LOG_I(MAC, "[CONFIG]SIB2/3 Contents (partial)\n");
+ LOG_I(MAC, "[CONFIG]pusch_config_common.n_SB = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.n_SB);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.hoppingMode = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.enable64QAM = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.groupHoppingEnabled = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ groupHoppingEnabled);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ groupAssignmentPUSCH);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ sequenceHoppingEnabled);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.cyclicShift = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift);
+
+ AssertFatal(radioResourceConfigCommon->
+ rach_ConfigCommon.maxHARQ_Msg3Tx > 0,
+ "radioResourceconfigCommon %d == 0\n",
+ (int) radioResourceConfigCommon->
+ rach_ConfigCommon.maxHARQ_Msg3Tx);
+
+ RC.mac[Mod_idP]->common_channels[CC_idP].
+ radioResourceConfigCommon = radioResourceConfigCommon;
+ if (ul_CarrierFreq > 0)
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_CarrierFreq =
+ ul_CarrierFreq;
+ if (ul_Bandwidth)
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
+ *ul_Bandwidth;
+ else
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
+ RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.
+ dl_Bandwidth;
+
+ config_sib2(Mod_idP, CC_idP, radioResourceConfigCommon,
#ifdef Rel14
- radioResourceConfigCommon_BR,
+ radioResourceConfigCommon_BR,
#endif
NULL, ul_Bandwidth, additionalSpectrumEmission,
mbsfn_SubframeConfigList);
@@ -919,35 +821,34 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
__LINE__, __FUNCTION__);
else
config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
-
}
#endif
- if (mbsfn_SubframeConfigList != NULL) {
- LOG_I(MAC,
- "[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
- Mod_idP, mbsfn_SubframeConfigList->list.count);
- RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern =
- mbsfn_SubframeConfigList->list.count;
-
- for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
- RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] =
- mbsfn_SubframeConfigList->list.array[i];
- LOG_I(MAC,
- "[eNB %d][CONFIG] MBSFN_SubframeConfig[%d] pattern is %x\n",
- Mod_idP, i,
- RC.mac[Mod_idP]->
- common_channels[0].mbsfn_SubframeConfig[i]->
- subframeAllocation.choice.oneFrame.buf[0]);
- }
+ if (mbsfn_SubframeConfigList != NULL) {
+ LOG_I(MAC,
+ "[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
+ Mod_idP, mbsfn_SubframeConfigList->list.count);
+ RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern =
+ mbsfn_SubframeConfigList->list.count;
+
+ for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
+ RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] =
+ mbsfn_SubframeConfigList->list.array[i];
+ LOG_I(MAC,
+ "[eNB %d][CONFIG] MBSFN_SubframeConfig[%d] pattern is %x\n",
+ Mod_idP, i,
+ RC.mac[Mod_idP]->
+ common_channels[0].mbsfn_SubframeConfig[i]->
+ subframeAllocation.choice.oneFrame.buf[0]);
+ }
#ifdef Rel10
- RC.mac[Mod_idP]->common_channels[0].MBMS_flag = MBMS_Flag;
+ RC.mac[Mod_idP]->common_channels[0].MBMS_flag = MBMS_Flag;
#endif
- }
+ }
#if defined(Rel10) || defined(Rel14)
if (mbsfn_AreaInfoList != NULL) {
@@ -963,40 +864,41 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
}
}
- if (pmch_InfoList != NULL) {
-
- // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
-
- LOG_I(MAC, "[CONFIG] Number of PMCH in this MBSFN Area %d\n",
- pmch_InfoList->list.count);
-
- for (i = 0; i < pmch_InfoList->list.count; i++) {
- RC.mac[Mod_idP]->common_channels[0].pmch_Config[i] =
- &pmch_InfoList->list.array[i]->pmch_Config_r9;
-
- LOG_I(MAC,
- "[CONFIG] PMCH[%d]: This PMCH stop (sf_AllocEnd_r9) at subframe %ldth\n",
- i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->sf_AllocEnd_r9);
- LOG_I(MAC, "[CONFIG] PMCH[%d]: mch_Scheduling_Period = %ld\n",
- i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->mch_SchedulingPeriod_r9);
- LOG_I(MAC, "[CONFIG] PMCH[%d]: dataMCS = %ld\n", i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->dataMCS_r9);
-
- // MBMS session info list in each MCH
- RC.mac[Mod_idP]->common_channels[0].mbms_SessionList[i] =
- &pmch_InfoList->list.array[i]->mbms_SessionInfoList_r9;
- LOG_I(MAC, "PMCH[%d] Number of session (MTCH) is: %d\n", i,
- RC.mac[Mod_idP]->common_channels[0].
+ if (pmch_InfoList != NULL) {
+
+ // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
+
+ LOG_I(MAC, "[CONFIG] Number of PMCH in this MBSFN Area %d\n",
+ pmch_InfoList->list.count);
+
+ for (i = 0; i < pmch_InfoList->list.count; i++) {
+ RC.mac[Mod_idP]->common_channels[0].pmch_Config[i] =
+ &pmch_InfoList->list.array[i]->pmch_Config_r9;
+
+ LOG_I(MAC,
+ "[CONFIG] PMCH[%d]: This PMCH stop (sf_AllocEnd_r9) at subframe %ldth\n",
+ i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->sf_AllocEnd_r9);
+ LOG_I(MAC, "[CONFIG] PMCH[%d]: mch_Scheduling_Period = %ld\n",
+ i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->mch_SchedulingPeriod_r9);
+ LOG_I(MAC, "[CONFIG] PMCH[%d]: dataMCS = %ld\n", i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->dataMCS_r9);
+
+ // MBMS session info list in each MCH
+ RC.mac[Mod_idP]->common_channels[0].mbms_SessionList[i] =
+ &pmch_InfoList->list.array[i]->mbms_SessionInfoList_r9;
+ LOG_I(MAC, "PMCH[%d] Number of session (MTCH) is: %d\n", i,
+ RC.mac[Mod_idP]->common_channels[0].
mbms_SessionList[i]->list.count);
- }
}
-#endif
+ }
+#endif
+
LOG_E(MAC, "%s() %s:%d RC.mac[Mod_idP]->if_inst->PHY_config_req:%p\n", __FUNCTION__, __FILE__, __LINE__, RC.mac[Mod_idP]->if_inst->PHY_config_req);
// if in nFAPI mode
@@ -1024,486 +926,3 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
return(0);
}
-
-int
-rrc_mac_config_req_ue(module_id_t Mod_idP,
- int CC_idP,
- uint8_t eNB_index,
- RadioResourceConfigCommonSIB_t *
- radioResourceConfigCommon,
- struct PhysicalConfigDedicated
- *physicalConfigDedicated,
-#if defined(Rel10) || defined(Rel14)
- SCellToAddMod_r10_t * sCellToAddMod_r10,
- //struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10,
-#endif
- MeasObjectToAddMod_t ** measObj,
- MAC_MainConfig_t * mac_MainConfig,
- long logicalChannelIdentity,
- LogicalChannelConfig_t * logicalChannelConfig,
- MeasGapConfig_t * measGapConfig,
- TDD_Config_t * tdd_Config,
- MobilityControlInfo_t * mobilityControlInfo,
- uint8_t * SIwindowsize,
- uint16_t * SIperiod,
- ARFCN_ValueEUTRA_t * ul_CarrierFreq,
- long *ul_Bandwidth,
- AdditionalSpectrumEmission_t *
- additionalSpectrumEmission,
- struct MBSFN_SubframeConfigList
- *mbsfn_SubframeConfigList
-#if defined(Rel10) || defined(Rel14)
- , uint8_t MBMS_Flag,
- MBSFN_AreaInfoList_r9_t * mbsfn_AreaInfoList,
- PMCH_InfoList_r9_t * pmch_InfoList
-#endif
-#ifdef CBA
- , uint8_t num_active_cba_groups, uint16_t cba_rnti
-#endif
- )
-{
-
- int i;
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
-
- LOG_I(MAC, "[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",
- Mod_idP, eNB_index);
-
- if (tdd_Config != NULL) {
- UE_mac_inst[Mod_idP].tdd_Config = tdd_Config;
- }
-
-
- if (tdd_Config && SIwindowsize && SIperiod) {
- phy_config_sib1_ue(Mod_idP, 0, eNB_index, tdd_Config,
- *SIwindowsize, *SIperiod);
- }
-
- if (radioResourceConfigCommon != NULL) {
- UE_mac_inst[Mod_idP].radioResourceConfigCommon =
- radioResourceConfigCommon;
- phy_config_sib2_ue(Mod_idP, 0, eNB_index,
- radioResourceConfigCommon, ul_CarrierFreq,
- ul_Bandwidth, additionalSpectrumEmission,
- mbsfn_SubframeConfigList);
- }
- // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
- if (logicalChannelConfig != NULL) {
- LOG_I(MAC,
- "[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",
- Mod_idP, eNB_index);
- UE_mac_inst[Mod_idP].logicalChannelConfig[logicalChannelIdentity] =
- logicalChannelConfig;
- UE_mac_inst[Mod_idP].scheduling_info.Bj[logicalChannelIdentity] = 0; // initilize the bucket for this lcid
-
- AssertFatal(logicalChannelConfig->ul_SpecificParameters != NULL,
- "[UE %d] LCID %ld NULL ul_SpecificParameters\n",
- Mod_idP, logicalChannelIdentity);
- UE_mac_inst[Mod_idP].scheduling_info.bucket_size[logicalChannelIdentity] = logicalChannelConfig->ul_SpecificParameters->prioritisedBitRate * logicalChannelConfig->ul_SpecificParameters->bucketSizeDuration; // set the max bucket size
- if (logicalChannelConfig->ul_SpecificParameters->
- logicalChannelGroup != NULL) {
- UE_mac_inst[Mod_idP].scheduling_info.
- LCGID[logicalChannelIdentity] =
- *logicalChannelConfig->ul_SpecificParameters->
- logicalChannelGroup;
- LOG_D(MAC,
- "[CONFIG][UE %d] LCID %ld is attached to the LCGID %ld\n",
- Mod_idP, logicalChannelIdentity,
- *logicalChannelConfig->
- ul_SpecificParameters->logicalChannelGroup);
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.
- LCGID[logicalChannelIdentity] = MAX_NUM_LCGID;
- }
- UE_mac_inst[Mod_idP].
- scheduling_info.LCID_buffer_remain[logicalChannelIdentity] = 0;
- }
-
- if (mac_MainConfig != NULL) {
- LOG_I(MAC,
- "[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",
- Mod_idP, eNB_index);
- UE_mac_inst[Mod_idP].macConfig = mac_MainConfig;
- UE_mac_inst[Mod_idP].measGapConfig = measGapConfig;
-
- if (mac_MainConfig->ul_SCH_Config) {
-
- if (mac_MainConfig->ul_SCH_Config->periodicBSR_Timer) {
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
- (uint16_t) *
- mac_MainConfig->ul_SCH_Config->periodicBSR_Timer;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
-#ifndef Rel14
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_infinity
-#else
- (uint16_t) PeriodicBSR_Timer_r12_infinity;
-#endif
- ;
- }
-
- if (mac_MainConfig->ul_SCH_Config->maxHARQ_Tx) {
- UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
- (uint16_t) * mac_MainConfig->ul_SCH_Config->maxHARQ_Tx;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
- }
- phy_config_harq_ue(Mod_idP, 0, eNB_index,
- UE_mac_inst[Mod_idP].
- scheduling_info.maxHARQ_Tx);
-
- if (mac_MainConfig->ul_SCH_Config->retxBSR_Timer) {
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t) mac_MainConfig->ul_SCH_Config->
- retxBSR_Timer;
- } else {
-#ifndef Rel14
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf2560;
-#else
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t) RetxBSR_Timer_r12_sf2560;
-#endif
- }
- }
-#if defined(Rel10) || defined(Rel14)
-
- if (mac_MainConfig->ext1
- && mac_MainConfig->ext1->sr_ProhibitTimer_r9) {
- UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer =
- (uint16_t) * mac_MainConfig->ext1->sr_ProhibitTimer_r9;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer = 0;
- }
-
- if (mac_MainConfig->ext2
- && mac_MainConfig->ext2->mac_MainConfig_v1020) {
- if (mac_MainConfig->ext2->
- mac_MainConfig_v1020->extendedBSR_Sizes_r10) {
- UE_mac_inst[Mod_idP].scheduling_info.
- extendedBSR_Sizes_r10 =
- (uint16_t) *
- mac_MainConfig->ext2->
- mac_MainConfig_v1020->extendedBSR_Sizes_r10;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.
- extendedBSR_Sizes_r10 = (uint16_t) 0;
- }
- if (mac_MainConfig->ext2->mac_MainConfig_v1020->
- extendedPHR_r10) {
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) *
- mac_MainConfig->ext2->mac_MainConfig_v1020->
- extendedPHR_r10;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) 0;
- }
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.extendedBSR_Sizes_r10 =
- (uint16_t) 0;
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) 0;
- }
-#endif
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF =
- MAC_UE_BSR_TIMER_NOT_RUNNING;
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF =
- MAC_UE_BSR_TIMER_NOT_RUNNING;
-
- UE_mac_inst[Mod_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
-
- LOG_D(MAC, "[UE %d]: periodic BSR %d (SF), retx BSR %d (SF)\n",
- Mod_idP,
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF);
-
- UE_mac_inst[Mod_idP].scheduling_info.drx_config =
- mac_MainConfig->drx_Config;
- UE_mac_inst[Mod_idP].scheduling_info.phr_config =
- mac_MainConfig->phr_Config;
-
- if (mac_MainConfig->phr_Config) {
- UE_mac_inst[Mod_idP].PHR_state =
- mac_MainConfig->phr_Config->present;
- UE_mac_inst[Mod_idP].PHR_reconfigured = 1;
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
- mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer;
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
- mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer;
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
- mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange;
- } else {
- UE_mac_inst[Mod_idP].PHR_reconfigured = 0;
- UE_mac_inst[Mod_idP].PHR_state =
- MAC_MainConfig__phr_Config_PR_setup;
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
- MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
- MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
- MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;
- }
-
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF =
- get_sf_perioidicPHR_Timer(UE_mac_inst[Mod_idP].
- scheduling_info.periodicPHR_Timer);
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF =
- get_sf_prohibitPHR_Timer(UE_mac_inst[Mod_idP].
- scheduling_info.prohibitPHR_Timer);
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db =
- get_db_dl_PathlossChange(UE_mac_inst[Mod_idP].
- scheduling_info.PathlossChange);
- UE_mac_inst[Mod_idP].PHR_reporting_active = 0;
- LOG_D(MAC,
- "[UE %d] config PHR (%d): periodic %d (SF) prohibit %d (SF) pathlosschange %d (db) \n",
- Mod_idP,
- (mac_MainConfig->phr_Config) ? mac_MainConfig->
- phr_Config->present : -1,
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db);
- }
-
-
- if (physicalConfigDedicated != NULL) {
- phy_config_dedicated_ue(Mod_idP, 0, eNB_index,
- physicalConfigDedicated);
- UE_mac_inst[Mod_idP].physicalConfigDedicated = physicalConfigDedicated; // for SR proc
- }
-#if defined(Rel10) || defined(Rel14)
-
- if (sCellToAddMod_r10 != NULL) {
-
-
- phy_config_dedicated_scell_ue(Mod_idP, eNB_index,
- sCellToAddMod_r10, 1);
- UE_mac_inst[Mod_idP].physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10; // using SCell index 0
- }
-#endif
-
- if (measObj != NULL) {
- if (measObj[0] != NULL) {
- UE_mac_inst[Mod_idP].n_adj_cells =
- measObj[0]->measObject.choice.
- measObjectEUTRA.cellsToAddModList->list.count;
- LOG_I(MAC, "Number of adjacent cells %d\n",
- UE_mac_inst[Mod_idP].n_adj_cells);
-
- for (i = 0; i < UE_mac_inst[Mod_idP].n_adj_cells; i++) {
- UE_mac_inst[Mod_idP].adj_cell_id[i] =
- measObj[0]->measObject.choice.
- measObjectEUTRA.cellsToAddModList->list.array[i]->
- physCellId;
- LOG_I(MAC, "Cell %d : Nid_cell %d\n", i,
- UE_mac_inst[Mod_idP].adj_cell_id[i]);
- }
-
- phy_config_meas_ue(Mod_idP, 0, eNB_index,
- UE_mac_inst[Mod_idP].n_adj_cells,
- UE_mac_inst[Mod_idP].adj_cell_id);
- }
- }
-
-
- if (mobilityControlInfo != NULL) {
-
- LOG_D(MAC, "[UE%d] MAC Reset procedure triggered by RRC eNB %d \n",
- Mod_idP, eNB_index);
- ue_mac_reset(Mod_idP, eNB_index);
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- rach_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- rach_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.rach_ConfigCommon,
- sizeof(RACH_ConfigCommon_t));
- }
-
- memcpy((void *) &UE_mac_inst[Mod_idP].
- radioResourceConfigCommon->prach_Config.prach_ConfigInfo,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
- sizeof(PRACH_ConfigInfo_t));
- UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- prach_Config.rootSequenceIndex =
- mobilityControlInfo->radioResourceConfigCommon.
- prach_Config.rootSequenceIndex;
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- pdsch_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- pdsch_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.pdsch_ConfigCommon,
- sizeof(PDSCH_ConfigCommon_t));
- }
- // not a pointer: mobilityControlInfo->radioResourceConfigCommon.pusch_ConfigCommon
- memcpy((void *) &UE_mac_inst[Mod_idP].
- radioResourceConfigCommon->pusch_ConfigCommon,
- (void *) &mobilityControlInfo->
- radioResourceConfigCommon.pusch_ConfigCommon,
- sizeof(PUSCH_ConfigCommon_t));
-
- if (mobilityControlInfo->radioResourceConfigCommon.phich_Config) {
- /* memcpy((void *)&UE_mac_inst[Mod_idP].radioResourceConfigCommon->phich_Config,
- (void *)mobilityControlInfo->radioResourceConfigCommon.phich_Config,
- sizeof(PHICH_Config_t)); */
- }
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- pucch_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- pucch_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.pucch_ConfigCommon,
- sizeof(PUCCH_ConfigCommon_t));
- }
-
- if (mobilityControlInfo->
- radioResourceConfigCommon.soundingRS_UL_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- soundingRS_UL_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
- sizeof(SoundingRS_UL_ConfigCommon_t));
- }
-
- if (mobilityControlInfo->
- radioResourceConfigCommon.uplinkPowerControlCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- uplinkPowerControlCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.uplinkPowerControlCommon,
- sizeof(UplinkPowerControlCommon_t));
- }
- //configure antennaInfoCommon somewhere here..
- if (mobilityControlInfo->radioResourceConfigCommon.p_Max) {
- //to be configured
- }
-
- if (mobilityControlInfo->radioResourceConfigCommon.tdd_Config) {
- UE_mac_inst[Mod_idP].tdd_Config =
- mobilityControlInfo->radioResourceConfigCommon.tdd_Config;
- }
-
- if (mobilityControlInfo->
- radioResourceConfigCommon.ul_CyclicPrefixLength) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- ul_CyclicPrefixLength,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.ul_CyclicPrefixLength,
- sizeof(UL_CyclicPrefixLength_t));
- }
- // store the previous rnti in case of failure, and set thenew rnti
- UE_mac_inst[Mod_idP].crnti_before_ho = UE_mac_inst[Mod_idP].crnti;
- UE_mac_inst[Mod_idP].crnti =
- ((mobilityControlInfo->
- newUE_Identity.buf[0]) | (mobilityControlInfo->
- newUE_Identity.buf[1] << 8));
- LOG_I(MAC, "[UE %d] Received new identity %x from %d\n", Mod_idP,
- UE_mac_inst[Mod_idP].crnti, eNB_index);
- UE_mac_inst[Mod_idP].rach_ConfigDedicated =
- malloc(sizeof(*mobilityControlInfo->rach_ConfigDedicated));
-
- if (mobilityControlInfo->rach_ConfigDedicated) {
- memcpy((void *) UE_mac_inst[Mod_idP].rach_ConfigDedicated,
- (void *) mobilityControlInfo->rach_ConfigDedicated,
- sizeof(*mobilityControlInfo->rach_ConfigDedicated));
- }
-
- phy_config_afterHO_ue(Mod_idP, 0, eNB_index, mobilityControlInfo,
- 0);
- }
-
-
- if (mbsfn_SubframeConfigList != NULL) {
- LOG_I(MAC,
- "[UE %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
- Mod_idP, mbsfn_SubframeConfigList->list.count);
- UE_mac_inst[Mod_idP].num_sf_allocation_pattern =
- mbsfn_SubframeConfigList->list.count;
-
- for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
- LOG_I(MAC,
- "[UE %d] Configuring MBSFN_SubframeConfig %d from received SIB2 \n",
- Mod_idP, i);
- UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i] =
- mbsfn_SubframeConfigList->list.array[i];
- // LOG_I("[UE %d] MBSFN_SubframeConfig[%d] pattern is %ld\n", Mod_idP,
- // UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i]->subframeAllocation.choice.oneFrame.buf[0]);
- }
- }
-#if defined(Rel10) || defined(Rel14)
-
- if (mbsfn_AreaInfoList != NULL) {
- LOG_I(MAC, "[UE %d][CONFIG] Received %d MBSFN Area Info\n",
- Mod_idP, mbsfn_AreaInfoList->list.count);
- UE_mac_inst[Mod_idP].num_active_mbsfn_area =
- mbsfn_AreaInfoList->list.count;
-
- for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
- UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i] =
- mbsfn_AreaInfoList->list.array[i];
- LOG_I(MAC,
- "[UE %d] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
- Mod_idP, i,
- UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i]->
- mcch_Config_r9.mcch_RepetitionPeriod_r9);
- phy_config_sib13_ue(Mod_idP, 0, eNB_index, i,
- UE_mac_inst[Mod_idP].
- mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
- }
- }
-
- if (pmch_InfoList != NULL) {
-
- // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
-
- LOG_I(MAC, "[UE %d] Configuring PMCH_config from MCCH MESSAGE \n",
- Mod_idP);
-
- for (i = 0; i < pmch_InfoList->list.count; i++) {
- UE_mac_inst[Mod_idP].pmch_Config[i] =
- &pmch_InfoList->list.array[i]->pmch_Config_r9;
- LOG_I(MAC, "[UE %d] PMCH[%d]: MCH_Scheduling_Period = %ld\n",
- Mod_idP, i,
- UE_mac_inst[Mod_idP].
- pmch_Config[i]->mch_SchedulingPeriod_r9);
- }
-
- UE_mac_inst[Mod_idP].mcch_status = 1;
- }
-#endif
-#ifdef CBA
-
- if (cba_rnti) {
- UE_mac_inst[Mod_idP].cba_rnti[num_active_cba_groups - 1] =
- cba_rnti;
- LOG_D(MAC,
- "[UE %d] configure CBA group %d RNTI %x for eNB %d (total active cba group %d)\n",
- Mod_idP, Mod_idP % num_active_cba_groups, cba_rnti,
- eNB_index, num_active_cba_groups);
- phy_config_cba_rnti(Mod_idP, CC_idP, eNB_flagP, eNB_index,
- cba_rnti, num_active_cba_groups - 1,
- num_active_cba_groups);
- }
-#endif
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
-
- return (0);
-}
diff --git a/openair2/LAYER2/MAC/config_ue.c b/openair2/LAYER2/MAC/config_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ef18f5bdad0c2b4917d943824c9cae3f1c90430
--- /dev/null
+++ b/openair2/LAYER2/MAC/config_ue.c
@@ -0,0 +1,584 @@
+
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file config.c
+ * \brief UE and eNB configuration performed by RRC or as a consequence of RRC procedures
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \version 0.1
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
+
+ */
+
+#include "COMMON/platform_types.h"
+#include "COMMON/platform_constants.h"
+#include "SCHED/defs.h"
+#include "SystemInformationBlockType2.h"
+//#include "RadioResourceConfigCommonSIB.h"
+#include "RadioResourceConfigDedicated.h"
+#ifdef Rel14
+#include "PRACH-ConfigSIB-v1310.h"
+#endif
+#include "MeasGapConfig.h"
+#include "MeasObjectToAddModList.h"
+#include "TDD-Config.h"
+#include "MAC-MainConfig.h"
+#include "defs.h"
+#include "proto.h"
+#include "extern.h"
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+#include "common/ran_context.h"
+#if defined(Rel10) || defined(Rel14)
+#include "MBSFN-AreaInfoList-r9.h"
+#include "MBSFN-AreaInfo-r9.h"
+#include "MBSFN-SubframeConfigList.h"
+#include "PMCH-InfoList-r9.h"
+#endif
+
+extern void mac_init_cell_params(int Mod_idP,int CC_idP);
+extern void phy_reset_ue(module_id_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
+
+
+/* sec 5.9, 36.321: MAC Reset Procedure */
+void ue_mac_reset(module_id_t module_idP, uint8_t eNB_index)
+{
+
+ //Resetting Bj
+ UE_mac_inst[module_idP].scheduling_info.Bj[0] = 0;
+ UE_mac_inst[module_idP].scheduling_info.Bj[1] = 0;
+ UE_mac_inst[module_idP].scheduling_info.Bj[2] = 0;
+
+ //Stopping all timers
+
+ //timeAlignmentTimer expires
+
+ // PHY changes for UE MAC reset
+ phy_reset_ue(module_idP, 0, eNB_index);
+
+ // notify RRC to relase PUCCH/SRS
+ // cancel all pending SRs
+ UE_mac_inst[module_idP].scheduling_info.SR_pending = 0;
+ UE_mac_inst[module_idP].scheduling_info.SR_COUNTER = 0;
+
+ //Set BSR Trigger Bmp and remove timer flags
+ UE_mac_inst[module_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
+
+ // stop ongoing RACH procedure
+
+ // discard explicitly signaled ra_PreambleIndex and ra_RACH_MaskIndex, if any
+ UE_mac_inst[module_idP].RA_prach_resources.ra_PreambleIndex = 0; // check!
+ UE_mac_inst[module_idP].RA_prach_resources.ra_RACH_MaskIndex = 0;
+
+
+ ue_init_mac(module_idP); //This will hopefully do the rest of the MAC reset procedure
+
+}
+
+int32_t **rxdata;
+int32_t **txdata;
+
+
+int
+rrc_mac_config_req_ue(module_id_t Mod_idP,
+ int CC_idP,
+ uint8_t eNB_index,
+ RadioResourceConfigCommonSIB_t *
+ radioResourceConfigCommon,
+ struct PhysicalConfigDedicated
+ *physicalConfigDedicated,
+#if defined(Rel10) || defined(Rel14)
+ SCellToAddMod_r10_t * sCellToAddMod_r10,
+ //struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10,
+#endif
+ MeasObjectToAddMod_t ** measObj,
+ MAC_MainConfig_t * mac_MainConfig,
+ long logicalChannelIdentity,
+ LogicalChannelConfig_t * logicalChannelConfig,
+ MeasGapConfig_t * measGapConfig,
+ TDD_Config_t * tdd_Config,
+ MobilityControlInfo_t * mobilityControlInfo,
+ uint8_t * SIwindowsize,
+ uint16_t * SIperiod,
+ ARFCN_ValueEUTRA_t * ul_CarrierFreq,
+ long *ul_Bandwidth,
+ AdditionalSpectrumEmission_t *
+ additionalSpectrumEmission,
+ struct MBSFN_SubframeConfigList
+ *mbsfn_SubframeConfigList
+#if defined(Rel10) || defined(Rel14)
+ , uint8_t MBMS_Flag,
+ MBSFN_AreaInfoList_r9_t * mbsfn_AreaInfoList,
+ PMCH_InfoList_r9_t * pmch_InfoList
+#endif
+#ifdef CBA
+ , uint8_t num_active_cba_groups, uint16_t cba_rnti
+#endif
+ )
+{
+
+ int i;
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
+
+ LOG_I(MAC, "[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",
+ Mod_idP, eNB_index);
+
+ if (tdd_Config != NULL) {
+ UE_mac_inst[Mod_idP].tdd_Config = tdd_Config;
+ }
+
+
+ if (tdd_Config && SIwindowsize && SIperiod) {
+ phy_config_sib1_ue(Mod_idP, 0, eNB_index, tdd_Config,
+ *SIwindowsize, *SIperiod);
+ }
+
+ if (radioResourceConfigCommon != NULL) {
+ UE_mac_inst[Mod_idP].radioResourceConfigCommon =
+ radioResourceConfigCommon;
+ phy_config_sib2_ue(Mod_idP, 0, eNB_index,
+ radioResourceConfigCommon, ul_CarrierFreq,
+ ul_Bandwidth, additionalSpectrumEmission,
+ mbsfn_SubframeConfigList);
+ }
+ // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
+ if (logicalChannelConfig != NULL) {
+ LOG_I(MAC,
+ "[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",
+ Mod_idP, eNB_index);
+ UE_mac_inst[Mod_idP].logicalChannelConfig[logicalChannelIdentity] =
+ logicalChannelConfig;
+ UE_mac_inst[Mod_idP].scheduling_info.Bj[logicalChannelIdentity] = 0; // initilize the bucket for this lcid
+
+ AssertFatal(logicalChannelConfig->ul_SpecificParameters != NULL,
+ "[UE %d] LCID %ld NULL ul_SpecificParameters\n",
+ Mod_idP, logicalChannelIdentity);
+ UE_mac_inst[Mod_idP].scheduling_info.bucket_size[logicalChannelIdentity] = logicalChannelConfig->ul_SpecificParameters->prioritisedBitRate * logicalChannelConfig->ul_SpecificParameters->bucketSizeDuration; // set the max bucket size
+ if (logicalChannelConfig->ul_SpecificParameters->
+ logicalChannelGroup != NULL) {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ LCGID[logicalChannelIdentity] =
+ *logicalChannelConfig->ul_SpecificParameters->
+ logicalChannelGroup;
+ LOG_D(MAC,
+ "[CONFIG][UE %d] LCID %ld is attached to the LCGID %ld\n",
+ Mod_idP, logicalChannelIdentity,
+ *logicalChannelConfig->
+ ul_SpecificParameters->logicalChannelGroup);
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ LCGID[logicalChannelIdentity] = MAX_NUM_LCGID;
+ }
+ UE_mac_inst[Mod_idP].
+ scheduling_info.LCID_buffer_remain[logicalChannelIdentity] = 0;
+ }
+
+ if (mac_MainConfig != NULL) {
+ LOG_I(MAC,
+ "[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",
+ Mod_idP, eNB_index);
+ UE_mac_inst[Mod_idP].macConfig = mac_MainConfig;
+ UE_mac_inst[Mod_idP].measGapConfig = measGapConfig;
+
+ if (mac_MainConfig->ul_SCH_Config) {
+
+ if (mac_MainConfig->ul_SCH_Config->periodicBSR_Timer) {
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
+ (uint16_t) *
+ mac_MainConfig->ul_SCH_Config->periodicBSR_Timer;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
+#ifndef Rel14
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_infinity
+#else
+ (uint16_t) PeriodicBSR_Timer_r12_infinity;
+#endif
+ ;
+ }
+
+ if (mac_MainConfig->ul_SCH_Config->maxHARQ_Tx) {
+ UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
+ (uint16_t) * mac_MainConfig->ul_SCH_Config->maxHARQ_Tx;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
+ }
+ phy_config_harq_ue(Mod_idP, 0, eNB_index,
+ UE_mac_inst[Mod_idP].
+ scheduling_info.maxHARQ_Tx);
+
+ if (mac_MainConfig->ul_SCH_Config->retxBSR_Timer) {
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t) mac_MainConfig->ul_SCH_Config->
+ retxBSR_Timer;
+ } else {
+#ifndef Rel14
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf2560;
+#else
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t) RetxBSR_Timer_r12_sf2560;
+#endif
+ }
+ }
+#if defined(Rel10) || defined(Rel14)
+
+ if (mac_MainConfig->ext1
+ && mac_MainConfig->ext1->sr_ProhibitTimer_r9) {
+ UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer =
+ (uint16_t) * mac_MainConfig->ext1->sr_ProhibitTimer_r9;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer = 0;
+ }
+
+ if (mac_MainConfig->ext2
+ && mac_MainConfig->ext2->mac_MainConfig_v1020) {
+ if (mac_MainConfig->ext2->
+ mac_MainConfig_v1020->extendedBSR_Sizes_r10) {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ extendedBSR_Sizes_r10 =
+ (uint16_t) *
+ mac_MainConfig->ext2->
+ mac_MainConfig_v1020->extendedBSR_Sizes_r10;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ extendedBSR_Sizes_r10 = (uint16_t) 0;
+ }
+ if (mac_MainConfig->ext2->mac_MainConfig_v1020->
+ extendedPHR_r10) {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) *
+ mac_MainConfig->ext2->mac_MainConfig_v1020->
+ extendedPHR_r10;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) 0;
+ }
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedBSR_Sizes_r10 =
+ (uint16_t) 0;
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) 0;
+ }
+#endif
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF =
+ MAC_UE_BSR_TIMER_NOT_RUNNING;
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF =
+ MAC_UE_BSR_TIMER_NOT_RUNNING;
+
+ UE_mac_inst[Mod_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
+
+ LOG_D(MAC, "[UE %d]: periodic BSR %d (SF), retx BSR %d (SF)\n",
+ Mod_idP,
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF);
+
+ UE_mac_inst[Mod_idP].scheduling_info.drx_config =
+ mac_MainConfig->drx_Config;
+ UE_mac_inst[Mod_idP].scheduling_info.phr_config =
+ mac_MainConfig->phr_Config;
+
+ if (mac_MainConfig->phr_Config) {
+ UE_mac_inst[Mod_idP].PHR_state =
+ mac_MainConfig->phr_Config->present;
+ UE_mac_inst[Mod_idP].PHR_reconfigured = 1;
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
+ mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer;
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
+ mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer;
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
+ mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange;
+ } else {
+ UE_mac_inst[Mod_idP].PHR_reconfigured = 0;
+ UE_mac_inst[Mod_idP].PHR_state =
+ MAC_MainConfig__phr_Config_PR_setup;
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
+ MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
+ MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
+ MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;
+ }
+
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF =
+ get_sf_perioidicPHR_Timer(UE_mac_inst[Mod_idP].
+ scheduling_info.periodicPHR_Timer);
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF =
+ get_sf_prohibitPHR_Timer(UE_mac_inst[Mod_idP].
+ scheduling_info.prohibitPHR_Timer);
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db =
+ get_db_dl_PathlossChange(UE_mac_inst[Mod_idP].
+ scheduling_info.PathlossChange);
+ UE_mac_inst[Mod_idP].PHR_reporting_active = 0;
+ LOG_D(MAC,
+ "[UE %d] config PHR (%d): periodic %d (SF) prohibit %d (SF) pathlosschange %d (db) \n",
+ Mod_idP,
+ (mac_MainConfig->phr_Config) ? mac_MainConfig->
+ phr_Config->present : -1,
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db);
+ }
+
+
+ if (physicalConfigDedicated != NULL) {
+ phy_config_dedicated_ue(Mod_idP, 0, eNB_index,
+ physicalConfigDedicated);
+ UE_mac_inst[Mod_idP].physicalConfigDedicated = physicalConfigDedicated; // for SR proc
+ }
+#if defined(Rel10) || defined(Rel14)
+
+ if (sCellToAddMod_r10 != NULL) {
+
+
+ phy_config_dedicated_scell_ue(Mod_idP, eNB_index,
+ sCellToAddMod_r10, 1);
+ UE_mac_inst[Mod_idP].physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10; // using SCell index 0
+ }
+#endif
+
+ if (measObj != NULL) {
+ if (measObj[0] != NULL) {
+ UE_mac_inst[Mod_idP].n_adj_cells =
+ measObj[0]->measObject.choice.
+ measObjectEUTRA.cellsToAddModList->list.count;
+ LOG_I(MAC, "Number of adjacent cells %d\n",
+ UE_mac_inst[Mod_idP].n_adj_cells);
+
+ for (i = 0; i < UE_mac_inst[Mod_idP].n_adj_cells; i++) {
+ UE_mac_inst[Mod_idP].adj_cell_id[i] =
+ measObj[0]->measObject.choice.
+ measObjectEUTRA.cellsToAddModList->list.array[i]->
+ physCellId;
+ LOG_I(MAC, "Cell %d : Nid_cell %d\n", i,
+ UE_mac_inst[Mod_idP].adj_cell_id[i]);
+ }
+
+ phy_config_meas_ue(Mod_idP, 0, eNB_index,
+ UE_mac_inst[Mod_idP].n_adj_cells,
+ UE_mac_inst[Mod_idP].adj_cell_id);
+ }
+ }
+
+
+ if (mobilityControlInfo != NULL) {
+
+ LOG_D(MAC, "[UE%d] MAC Reset procedure triggered by RRC eNB %d \n",
+ Mod_idP, eNB_index);
+ ue_mac_reset(Mod_idP, eNB_index);
+
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ rach_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ rach_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.rach_ConfigCommon,
+ sizeof(RACH_ConfigCommon_t));
+ }
+
+ memcpy((void *) &UE_mac_inst[Mod_idP].
+ radioResourceConfigCommon->prach_Config.prach_ConfigInfo,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
+ sizeof(PRACH_ConfigInfo_t));
+ UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ prach_Config.rootSequenceIndex =
+ mobilityControlInfo->radioResourceConfigCommon.
+ prach_Config.rootSequenceIndex;
+
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ pdsch_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ pdsch_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.pdsch_ConfigCommon,
+ sizeof(PDSCH_ConfigCommon_t));
+ }
+ // not a pointer: mobilityControlInfo->radioResourceConfigCommon.pusch_ConfigCommon
+ memcpy((void *) &UE_mac_inst[Mod_idP].
+ radioResourceConfigCommon->pusch_ConfigCommon,
+ (void *) &mobilityControlInfo->
+ radioResourceConfigCommon.pusch_ConfigCommon,
+ sizeof(PUSCH_ConfigCommon_t));
+
+ if (mobilityControlInfo->radioResourceConfigCommon.phich_Config) {
+ /* memcpy((void *)&UE_mac_inst[Mod_idP].radioResourceConfigCommon->phich_Config,
+ (void *)mobilityControlInfo->radioResourceConfigCommon.phich_Config,
+ sizeof(PHICH_Config_t)); */
+ }
+
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ pucch_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ pucch_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.pucch_ConfigCommon,
+ sizeof(PUCCH_ConfigCommon_t));
+ }
+
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.soundingRS_UL_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ soundingRS_UL_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
+ sizeof(SoundingRS_UL_ConfigCommon_t));
+ }
+
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.uplinkPowerControlCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ uplinkPowerControlCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.uplinkPowerControlCommon,
+ sizeof(UplinkPowerControlCommon_t));
+ }
+ //configure antennaInfoCommon somewhere here..
+ if (mobilityControlInfo->radioResourceConfigCommon.p_Max) {
+ //to be configured
+ }
+
+ if (mobilityControlInfo->radioResourceConfigCommon.tdd_Config) {
+ UE_mac_inst[Mod_idP].tdd_Config =
+ mobilityControlInfo->radioResourceConfigCommon.tdd_Config;
+ }
+
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.ul_CyclicPrefixLength) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ ul_CyclicPrefixLength,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.ul_CyclicPrefixLength,
+ sizeof(UL_CyclicPrefixLength_t));
+ }
+ // store the previous rnti in case of failure, and set thenew rnti
+ UE_mac_inst[Mod_idP].crnti_before_ho = UE_mac_inst[Mod_idP].crnti;
+ UE_mac_inst[Mod_idP].crnti =
+ ((mobilityControlInfo->
+ newUE_Identity.buf[0]) | (mobilityControlInfo->
+ newUE_Identity.buf[1] << 8));
+ LOG_I(MAC, "[UE %d] Received new identity %x from %d\n", Mod_idP,
+ UE_mac_inst[Mod_idP].crnti, eNB_index);
+ UE_mac_inst[Mod_idP].rach_ConfigDedicated =
+ malloc(sizeof(*mobilityControlInfo->rach_ConfigDedicated));
+
+ if (mobilityControlInfo->rach_ConfigDedicated) {
+ memcpy((void *) UE_mac_inst[Mod_idP].rach_ConfigDedicated,
+ (void *) mobilityControlInfo->rach_ConfigDedicated,
+ sizeof(*mobilityControlInfo->rach_ConfigDedicated));
+ }
+
+ phy_config_afterHO_ue(Mod_idP, 0, eNB_index, mobilityControlInfo,
+ 0);
+ }
+
+
+ if (mbsfn_SubframeConfigList != NULL) {
+ LOG_I(MAC,
+ "[UE %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
+ Mod_idP, mbsfn_SubframeConfigList->list.count);
+ UE_mac_inst[Mod_idP].num_sf_allocation_pattern =
+ mbsfn_SubframeConfigList->list.count;
+
+ for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
+ LOG_I(MAC,
+ "[UE %d] Configuring MBSFN_SubframeConfig %d from received SIB2 \n",
+ Mod_idP, i);
+ UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i] =
+ mbsfn_SubframeConfigList->list.array[i];
+ // LOG_I("[UE %d] MBSFN_SubframeConfig[%d] pattern is %ld\n", Mod_idP,
+ // UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i]->subframeAllocation.choice.oneFrame.buf[0]);
+ }
+ }
+#if defined(Rel10) || defined(Rel14)
+
+ if (mbsfn_AreaInfoList != NULL) {
+ LOG_I(MAC, "[UE %d][CONFIG] Received %d MBSFN Area Info\n",
+ Mod_idP, mbsfn_AreaInfoList->list.count);
+ UE_mac_inst[Mod_idP].num_active_mbsfn_area =
+ mbsfn_AreaInfoList->list.count;
+
+ for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
+ UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i] =
+ mbsfn_AreaInfoList->list.array[i];
+ LOG_I(MAC,
+ "[UE %d] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
+ Mod_idP, i,
+ UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i]->
+ mcch_Config_r9.mcch_RepetitionPeriod_r9);
+ phy_config_sib13_ue(Mod_idP, 0, eNB_index, i,
+ UE_mac_inst[Mod_idP].
+ mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
+ }
+ }
+
+ if (pmch_InfoList != NULL) {
+
+ // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
+
+ LOG_I(MAC, "[UE %d] Configuring PMCH_config from MCCH MESSAGE \n",
+ Mod_idP);
+
+ for (i = 0; i < pmch_InfoList->list.count; i++) {
+ UE_mac_inst[Mod_idP].pmch_Config[i] =
+ &pmch_InfoList->list.array[i]->pmch_Config_r9;
+ LOG_I(MAC, "[UE %d] PMCH[%d]: MCH_Scheduling_Period = %ld\n",
+ Mod_idP, i,
+ UE_mac_inst[Mod_idP].
+ pmch_Config[i]->mch_SchedulingPeriod_r9);
+ }
+
+ UE_mac_inst[Mod_idP].mcch_status = 1;
+ }
+#endif
+#ifdef CBA
+
+ if (cba_rnti) {
+ UE_mac_inst[Mod_idP].cba_rnti[num_active_cba_groups - 1] =
+ cba_rnti;
+ LOG_D(MAC,
+ "[UE %d] configure CBA group %d RNTI %x for eNB %d (total active cba group %d)\n",
+ Mod_idP, Mod_idP % num_active_cba_groups, cba_rnti,
+ eNB_index, num_active_cba_groups);
+ phy_config_cba_rnti(Mod_idP, CC_idP, eNB_flagP, eNB_index,
+ cba_rnti, num_active_cba_groups - 1,
+ num_active_cba_groups);
+ }
+#endif
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
+
+ return (0);
+}
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index e5fd8d941eab7e1c9b23885df1fba16f32c60f7b..bfde1700eec2db19c1c0f500ef05d5c5b6a358a9 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -764,8 +764,7 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP,
module_idP);
pdcp_run(&ctxt);
- rrc_rx_tx(&ctxt, 0, // eNB index, unused in eNB
- CC_id);
+ rrc_rx_tx(&ctxt, CC_id);
#if defined(Rel10) || defined(Rel14)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index 7b45401b06aae382d2265fb772a444494c1fd64d..4bf96d3bce0afb5a8fa23ec555c9a4f3ca1f835b 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -843,7 +843,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
// Get RRCConnectionSetup for Piggyback
rrc_sdu_length = mac_rrc_data_req(module_idP, CC_idP, frameP, CCCH, 1, // 1 transport block
- &cc[CC_idP].CCCH_pdu.payload[0], ENB_FLAG_YES, module_idP, 0); // not used in this case
+ &cc[CC_idP].CCCH_pdu.payload[0], 0); // not used in this case
AssertFatal(rrc_sdu_length > 0,
"[MAC][eNB Scheduler] CCCH not allocated\n");
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_bch.c b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
index 5b0fc58bb70eb678c6f7a325cc7c1fd361f0f8a2..9a1046ff26a160e08da9e0fd7252476ebb0b1c12 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_bch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
@@ -197,7 +197,7 @@ schedule_SIB1_BR(module_id_t module_idP,
n_NB = Sj[((cc->physCellId % N_S_NB) + (i * N_S_NB / m)) % N_S_NB];
- bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH_SIB1_BR, 1, &cc->BCCH_BR_pdu[0].payload[0], 1, module_idP, 0); // not used in this case
+ bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH_SIB1_BR, 1, &cc->BCCH_BR_pdu[0].payload[0], 0); // not used in this case
AssertFatal(cc->mib->message.schedulingInfoSIB1_BR_r13 < 19,
"schedulingInfoSIB1_BR_r13 %d > 18\n",
@@ -424,7 +424,7 @@ schedule_SI_BR(module_id_t module_idP, frame_t frameP,
if ((sf_mod_period < si_WindowLength_BR_r13)
&& ((frameP & (((1 << si_RepetitionPattern_r13) - 1))) == 0)) { // this SIB is to be scheduled
- bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH_SI_BR + i, 1, &cc->BCCH_BR_pdu[i + 1].payload[0], 1, module_idP, 0); // not used in this case
+ bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH_SI_BR + i, 1, &cc->BCCH_BR_pdu[i + 1].payload[0], 0); // not used in this case
AssertFatal(bcch_sdu_length > 0,
"RRC returned 0 bytes for SI-BR %d\n", i);
@@ -606,7 +606,7 @@ schedule_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
dl_req = &dl_config_request->dl_config_request_body;
cc = &eNB->common_channels[CC_id];
- mib_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, MIBCH, 1, &cc->MIB_pdu.payload[0], 1, module_idP, 0); // not used in this case
+ mib_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, MIBCH, 1, &cc->MIB_pdu.payload[0], 0); // not used in this case
LOG_D(MAC, "Frame %d, subframe %d: BCH PDU length %d\n", frameP, subframeP, mib_sdu_length);
@@ -692,7 +692,7 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
dl_req = &eNB->DL_req[CC_id].dl_config_request_body;
- bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH, 1, &cc->BCCH_pdu.payload[0], 1, module_idP, 0); // not used in this case
+ bcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, BCCH, 1, &cc->BCCH_pdu.payload[0], 0); // not used in this case
if (bcch_sdu_length > 0) {
LOG_D(MAC, "[eNB %d] Frame %d : BCCH->DLSCH CC_id %d, Received %d bytes \n", module_idP, frameP, CC_id, bcch_sdu_length);
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index 31ef50feaeb77280b3d2830a339599ebe39c4ee7..9f2ab1cba85e4df4be60d55c9e24849be5d13629 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -925,8 +925,8 @@ schedule_ue_spec(module_id_t module_idP,
if (rlc_status.bytes_in_buffer > 0) { // There is DCCH to transmit
LOG_D(MAC,
- "[eNB %d] Frame %d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
- module_idP, frameP, CC_id,
+ "[eNB %d] SFN/SF %d.%d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
+ module_idP, frameP, subframeP, CC_id,
TBS - header_len_dcch);
sdu_lengths[0] = mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH, TBS, //not used
(char *)
@@ -1830,8 +1830,6 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
frameP,
PCCH,1,
&cc->PCCH_pdu.payload[0],
- 1,
- module_idP,
i); // used for ue index
if (pcch_sdu_length == 0) {
LOG_D(MAC,"[eNB %d] Frame %d subframe %d: PCCH not active(size = 0 byte)\n", module_idP,frameP, subframeP);
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_mch.c b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
index 7ce5a5b12c3e4f737de710c27dada2c647ab5ced..37b13d2de71936b52dec051274b91e4c73bdd3fe 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_mch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
@@ -545,8 +545,7 @@ schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
"[eNB %d] CC_id %d Frame %d Subframe %d: Schedule MCCH MESSAGE (area %d, sfAlloc %d)\n",
module_idP, CC_id, frameP, subframeP, i, j);
- mcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, MCCH, 1, &cc->MCCH_pdu.payload[0], 1, // this is eNB
- module_idP, // index
+ mcch_sdu_length = mac_rrc_data_req(module_idP, CC_id, frameP, MCCH, 1, &cc->MCCH_pdu.payload[0],
i); // this is the mbsfn sync area index
if (mcch_sdu_length > 0) {
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index dbae220301dea309b4f085a89b521d5e287f6890..f841d9d55ae23724c3be73ba12214ddd89adea65 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -614,7 +614,7 @@ rx_sdu(const module_id_t enb_mod_idP,
CCCH,
(uint8_t *) payload_ptr,
rx_lengths[i],
- ENB_FLAG_YES, enb_mod_idP, 0);
+ 0);
if (num_ce > 0) { // handle msg3 which is not RRCConnectionRequest
@@ -1192,8 +1192,8 @@ schedule_ulsch_rnti(module_id_t module_idP,
AssertFatal(round < 8, "round %d > 7 for UE %d/%x\n", round,
UE_id, rnti);
LOG_D(MAC,
- "[eNB %d] frame %d subframe %d,Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
- module_idP, frameP, subframeP, harq_pid, UE_id, rnti,
+ "[eNB %d] frame %d subframe %d (sched_frame %d, sched_subframe %d), Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
+ module_idP, frameP, subframeP, sched_frame, sched_subframeP, harq_pid, UE_id, rnti,
CC_id, aggregation, N_RB_UL);
RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP *
diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c
index 2ad3e6a038beb82b26e41deb647add79ed44317c..afee1632031a2da102c39c739aa18bc3dd260640 100644
--- a/openair2/LAYER2/MAC/main.c
+++ b/openair2/LAYER2/MAC/main.c
@@ -47,76 +47,6 @@
#include "common/ran_context.h"
extern RAN_CONTEXT_t RC;
-extern void openair_rrc_top_init_ue( int eMBMS_active, char* uecap_xer, uint8_t cba_group_active, uint8_t HO_active);
-
-void dl_phy_sync_success(module_id_t module_idP, frame_t frameP, unsigned char eNB_index, uint8_t first_sync) //init as MR
-{
- LOG_D(MAC, "[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n",
- module_idP, frameP, eNB_index);
-#if defined(ENABLE_USE_MME)
- int mme_enabled = 1;
-#else
- int mme_enabled = 0;
-#endif
-
- if (first_sync == 1 && !(mme_enabled == 1)) {
- //layer2_init_UE(module_idP);
- openair_rrc_ue_init(module_idP, eNB_index);
- } else {
- rrc_in_sync_ind(module_idP, frameP, eNB_index);
- }
-}
-
-void
-mac_UE_out_of_sync_ind(module_id_t module_idP, frame_t frameP,
- uint16_t eNB_index)
-{
-
- // Mac_rlc_xface->mac_out_of_sync_ind(Mod_id, frameP, eNB_index);
-}
-
-
-int
-mac_top_init_ue(int eMBMS_active, char *uecap_xer,
- uint8_t cba_group_active, uint8_t HO_active)
-{
-
- int i;
-
- LOG_I(MAC, "[MAIN] Init function start:Nb_UE_INST=%d\n", NB_UE_INST);
-
- if (NB_UE_INST > 0) {
- UE_mac_inst =
- (UE_MAC_INST *) malloc16(NB_UE_INST * sizeof(UE_MAC_INST));
-
- AssertFatal(UE_mac_inst != NULL,
- "[MAIN] Can't ALLOCATE %zu Bytes for %d UE_MAC_INST with size %zu \n",
- NB_UE_INST * sizeof(UE_MAC_INST), NB_UE_INST,
- sizeof(UE_MAC_INST));
-
- LOG_D(MAC, "[MAIN] ALLOCATE %zu Bytes for %d UE_MAC_INST @ %p\n",
- NB_UE_INST * sizeof(UE_MAC_INST), NB_UE_INST, UE_mac_inst);
-
- bzero(UE_mac_inst, NB_UE_INST * sizeof(UE_MAC_INST));
-
- for (i = 0; i < NB_UE_INST; i++) {
- ue_init_mac(i);
- }
- } else {
- UE_mac_inst = NULL;
- }
-
-
- LOG_I(MAC, "[MAIN] calling RRC\n");
- openair_rrc_top_init_ue(eMBMS_active, uecap_xer, cba_group_active,
- HO_active);
-
-
- LOG_I(MAC, "[MAIN][INIT] Init function finished\n");
-
- return (0);
-
-}
void mac_top_init_eNB(void)
@@ -258,20 +188,6 @@ void mac_top_cleanup(void)
}
-int
-l2_init_ue(int eMBMS_active, char *uecap_xer, uint8_t cba_group_active,
- uint8_t HO_active)
-{
- LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
- // NB_NODE=2;
- // NB_INST=2;
-
- rlcmac_init_global_param();
- LOG_I(MAC, "[MAIN] init UE MAC functions \n");
- mac_top_init_ue(eMBMS_active, uecap_xer, cba_group_active, HO_active);
- return (1);
-}
-
int l2_init_eNB(void)
{
diff --git a/openair2/LAYER2/MAC/main_ue.c b/openair2/LAYER2/MAC/main_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..64326dec614dc9ea452c7ce7bebf73692050167b
--- /dev/null
+++ b/openair2/LAYER2/MAC/main_ue.c
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file main.c
+ * \brief top init of Layer 2
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \version 1.0
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
+
+ */
+
+#include "defs.h"
+#include "proto.h"
+#include "extern.h"
+#include "assertions.h"
+#include "PHY_INTERFACE/extern.h"
+#include "PHY/defs.h"
+#include "SCHED/defs.h"
+#include "LAYER2/PDCP_v10.1.0/pdcp.h"
+#include "RRC/LITE/defs.h"
+#include "UTIL/LOG/log.h"
+#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
+
+#include "SCHED/defs.h"
+
+
+#include "common/ran_context.h"
+
+extern void openair_rrc_top_init_ue( int eMBMS_active, char* uecap_xer, uint8_t cba_group_active, uint8_t HO_active);
+
+void dl_phy_sync_success(module_id_t module_idP, frame_t frameP, unsigned char eNB_index, uint8_t first_sync) //init as MR
+{
+ LOG_D(MAC, "[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n",
+ module_idP, frameP, eNB_index);
+#if defined(ENABLE_USE_MME)
+ int mme_enabled = 1;
+#else
+ int mme_enabled = 0;
+#endif
+
+ if (first_sync == 1 && !(mme_enabled == 1)) {
+ //layer2_init_UE(module_idP);
+ openair_rrc_ue_init(module_idP, eNB_index);
+ } else {
+ rrc_in_sync_ind(module_idP, frameP, eNB_index);
+ }
+}
+
+void
+mac_UE_out_of_sync_ind(module_id_t module_idP, frame_t frameP,
+ uint16_t eNB_index)
+{
+
+ // Mac_rlc_xface->mac_out_of_sync_ind(Mod_id, frameP, eNB_index);
+}
+
+
+int
+mac_top_init_ue(int eMBMS_active, char *uecap_xer,
+ uint8_t cba_group_active, uint8_t HO_active)
+{
+
+ int i;
+
+ LOG_I(MAC, "[MAIN] Init function start:Nb_UE_INST=%d\n", NB_UE_INST);
+
+ if (NB_UE_INST > 0) {
+ UE_mac_inst =
+ (UE_MAC_INST *) malloc16(NB_UE_INST * sizeof(UE_MAC_INST));
+
+ AssertFatal(UE_mac_inst != NULL,
+ "[MAIN] Can't ALLOCATE %zu Bytes for %d UE_MAC_INST with size %zu \n",
+ NB_UE_INST * sizeof(UE_MAC_INST), NB_UE_INST,
+ sizeof(UE_MAC_INST));
+
+ LOG_D(MAC, "[MAIN] ALLOCATE %zu Bytes for %d UE_MAC_INST @ %p\n",
+ NB_UE_INST * sizeof(UE_MAC_INST), NB_UE_INST, UE_mac_inst);
+
+ bzero(UE_mac_inst, NB_UE_INST * sizeof(UE_MAC_INST));
+
+ for (i = 0; i < NB_UE_INST; i++) {
+ ue_init_mac(i);
+ }
+ } else {
+ UE_mac_inst = NULL;
+ }
+
+
+ LOG_I(MAC, "[MAIN] calling RRC\n");
+ openair_rrc_top_init_ue(eMBMS_active, uecap_xer, cba_group_active,
+ HO_active);
+
+
+ LOG_I(MAC, "[MAIN][INIT] Init function finished\n");
+
+ return (0);
+
+}
+
+int rlcmac_init_global_param_ue(void)
+{
+
+
+ LOG_I(MAC, "[MAIN] CALLING RLC_MODULE_INIT...\n");
+
+ if (rlc_module_init() != 0) {
+ return (-1);
+ }
+
+ pdcp_layer_init();
+
+ LOG_I(MAC, "[MAIN] Init Global Param Done\n");
+
+ return 0;
+}
+
+int
+l2_init_ue(int eMBMS_active, char *uecap_xer, uint8_t cba_group_active,
+ uint8_t HO_active)
+{
+ LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
+ // NB_NODE=2;
+ // NB_INST=2;
+
+ rlcmac_init_global_param_ue();
+ LOG_I(MAC, "[MAIN] init UE MAC functions \n");
+ mac_top_init_ue(eMBMS_active, uecap_xer, cba_group_active, HO_active);
+ return (1);
+}
+
diff --git a/openair2/LAYER2/MAC/ra_procedures.c b/openair2/LAYER2/MAC/ra_procedures.c
index 3f2df025c773db688fd255b1439d86dcb15e4478..8868d2d548ad30ba445b924c7e294d7df1fc8294 100644
--- a/openair2/LAYER2/MAC/ra_procedures.c
+++ b/openair2/LAYER2/MAC/ra_procedures.c
@@ -372,14 +372,14 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
if (UE_mac_inst[module_idP].RA_active == 0) {
LOG_I(MAC, "RA not active\n");
// check if RRC is ready to initiate the RA procedure
- Size = mac_rrc_data_req(module_idP,
+ Size = mac_rrc_data_req_ue(module_idP,
CC_id,
frameP,
CCCH, 1,
&UE_mac_inst[module_idP].
CCCH_pdu.payload[sizeof
(SCH_SUBHEADER_SHORT)
- + 1], 0, eNB_indexP,
+ + 1], eNB_indexP,
0);
Size16 = (uint16_t) Size;
diff --git a/openair2/LAYER2/MAC/rar_tools.c b/openair2/LAYER2/MAC/rar_tools.c
index 8d9e5bb3e14d88664d06a3f621f25cb07c033188..6261eaf35690f672225209e7972aa333d6bd9087 100644
--- a/openair2/LAYER2/MAC/rar_tools.c
+++ b/openair2/LAYER2/MAC/rar_tools.c
@@ -182,104 +182,3 @@ fill_rar_br(eNB_MAC_INST * eNB,
}
#endif
-//------------------------------------------------------------------------------
-uint16_t ue_process_rar(const module_id_t module_idP, const int CC_id, const frame_t frameP, const rnti_t ra_rnti, uint8_t * const dlsch_buffer, rnti_t * const t_crnti, const uint8_t preamble_index, uint8_t * selected_rar_buffer // output argument for storing the selected RAR header and RAR payload
- )
-//------------------------------------------------------------------------------
-{
- uint16_t ret = 0; // return value
-
- RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *) dlsch_buffer;
- // RAR_PDU *rar = (RAR_PDU *)(dlsch_buffer+1);
- uint8_t *rar = (uint8_t *) (dlsch_buffer + 1);
-
- // get the last RAR payload for working with CMW500
- uint8_t n_rarpy = 0; // number of RAR payloads
- uint8_t n_rarh = 0; // number of MAC RAR subheaders
- uint8_t best_rx_rapid = -1; // the closest RAPID receive from all RARs
- while (1) {
- n_rarh++;
- if (rarh->T == 1) {
- n_rarpy++;
- LOG_D(MAC, "RAPID %d\n", rarh->RAPID);
- }
-
- if (rarh->RAPID == preamble_index) {
- LOG_D(PHY, "Found RAR with the intended RAPID %d\n",
- rarh->RAPID);
- rar = (uint8_t *) (dlsch_buffer + n_rarh + (n_rarpy - 1) * 6);
- break;
- }
-
- if (abs((int) rarh->RAPID - (int) preamble_index) <
- abs((int) best_rx_rapid - (int) preamble_index)) {
- best_rx_rapid = rarh->RAPID;
- rar = (uint8_t *) (dlsch_buffer + n_rarh + (n_rarpy - 1) * 6);
- }
-
- if (rarh->E == 0) {
- LOG_I(PHY,
- "No RAR found with the intended RAPID. The closest RAPID in all RARs is %d\n",
- best_rx_rapid);
- break;
- } else {
- rarh++;
- }
- };
- LOG_D(MAC, "number of RAR subheader %d; number of RAR pyloads %d\n",
- n_rarh, n_rarpy);
-
- if (CC_id > 0) {
- LOG_W(MAC, "Should not have received RAR on secondary CCs! \n");
- return (0xffff);
- }
-
- LOG_I(MAC,
- "[eNB %d][RAPROC] Frame %d Received RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for preamble %d/%d\n",
- module_idP, frameP, *(uint8_t *) rarh, rar[0], rar[1], rar[2],
- rar[3], rar[4], rar[5], rarh->RAPID, preamble_index);
-#ifdef DEBUG_RAR
- LOG_D(MAC, "[UE %d][RAPROC] rarh->E %d\n", module_idP, rarh->E);
- LOG_D(MAC, "[UE %d][RAPROC] rarh->T %d\n", module_idP, rarh->T);
- LOG_D(MAC, "[UE %d][RAPROC] rarh->RAPID %d\n", module_idP,
- rarh->RAPID);
-
- // LOG_I(MAC,"[UE %d][RAPROC] rar->R %d\n",module_idP,rar->R);
- LOG_D(MAC, "[UE %d][RAPROC] rar->Timing_Advance_Command %d\n",
- module_idP, (((uint16_t) (rar[0] & 0x7f)) << 4) + (rar[1] >> 4));
- // LOG_I(MAC,"[UE %d][RAPROC] rar->hopping_flag %d\n",module_idP,rar->hopping_flag);
- // LOG_I(MAC,"[UE %d][RAPROC] rar->rb_alloc %d\n",module_idP,rar->rb_alloc);
- // LOG_I(MAC,"[UE %d][RAPROC] rar->mcs %d\n",module_idP,rar->mcs);
- // LOG_I(MAC,"[UE %d][RAPROC] rar->TPC %d\n",module_idP,rar->TPC);
- // LOG_I(MAC,"[UE %d][RAPROC] rar->UL_delay %d\n",module_idP,rar->UL_delay);
- // LOG_I(MAC,"[UE %d][RAPROC] rar->cqi_req %d\n",module_idP,rar->cqi_req);
- LOG_D(MAC, "[UE %d][RAPROC] rar->t_crnti %x\n", module_idP,
- (uint16_t) rar[5] + (rar[4] << 8));
-#endif
-
- if (opt_enabled) {
- LOG_D(OPT,
- "[UE %d][RAPROC] CC_id %d RAR Frame %d trace pdu for ra-RNTI %x\n",
- module_idP, CC_id, frameP, ra_rnti);
- trace_pdu(1, (uint8_t *) dlsch_buffer, n_rarh + n_rarpy * 6,
- module_idP, 2, ra_rnti, UE_mac_inst[module_idP].rxFrame,
- UE_mac_inst[module_idP].rxSubframe, 0, 0);
- }
-
- if (preamble_index == rarh->RAPID) {
- *t_crnti = (uint16_t) rar[5] + (rar[4] << 8); //rar->t_crnti;
- UE_mac_inst[module_idP].crnti = *t_crnti; //rar->t_crnti;
- //return(rar->Timing_Advance_Command);
- ret = ((((uint16_t) (rar[0] & 0x7f)) << 4) + (rar[1] >> 4));
- } else {
- UE_mac_inst[module_idP].crnti = 0;
- ret = (0xffff);
- }
-
- // move the selected RAR to the front of the RA_PDSCH buffer
- memcpy(selected_rar_buffer + 0, (uint8_t *) rarh, 1);
- memcpy(selected_rar_buffer + 1, (uint8_t *) rar, 6);
-
- return ret;
-
-}
diff --git a/openair2/LAYER2/MAC/rar_tools_ue.c b/openair2/LAYER2/MAC/rar_tools_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab193c7a66b2422473dd208af125fc815c4a7259
--- /dev/null
+++ b/openair2/LAYER2/MAC/rar_tools_ue.c
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file rar_tools.c
+ * \brief random access tools
+ * \author Raymond Knopp and navid nikaein
+ * \date 2011 - 2014
+ * \version 1.0
+ * @ingroup _mac
+
+ */
+
+#include "defs.h"
+#include "proto.h"
+#include "extern.h"
+#include "SIMULATION/TOOLS/defs.h"
+#include "UTIL/LOG/log.h"
+#include "OCG.h"
+#include "OCG_extern.h"
+#include "UTIL/OPT/opt.h"
+#include "common/ran_context.h"
+
+#define DEBUG_RAR
+
+//------------------------------------------------------------------------------
+uint16_t ue_process_rar(const module_id_t module_idP, const int CC_id, const frame_t frameP, const rnti_t ra_rnti, uint8_t * const dlsch_buffer, rnti_t * const t_crnti, const uint8_t preamble_index, uint8_t * selected_rar_buffer // output argument for storing the selected RAR header and RAR payload
+ )
+//------------------------------------------------------------------------------
+{
+ uint16_t ret = 0; // return value
+
+ RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *) dlsch_buffer;
+ // RAR_PDU *rar = (RAR_PDU *)(dlsch_buffer+1);
+ uint8_t *rar = (uint8_t *) (dlsch_buffer + 1);
+
+ // get the last RAR payload for working with CMW500
+ uint8_t n_rarpy = 0; // number of RAR payloads
+ uint8_t n_rarh = 0; // number of MAC RAR subheaders
+ uint8_t best_rx_rapid = -1; // the closest RAPID receive from all RARs
+ while (1) {
+ n_rarh++;
+ if (rarh->T == 1) {
+ n_rarpy++;
+ LOG_D(MAC, "RAPID %d\n", rarh->RAPID);
+ }
+
+ if (rarh->RAPID == preamble_index) {
+ LOG_D(PHY, "Found RAR with the intended RAPID %d\n",
+ rarh->RAPID);
+ rar = (uint8_t *) (dlsch_buffer + n_rarh + (n_rarpy - 1) * 6);
+ break;
+ }
+
+ if (abs((int) rarh->RAPID - (int) preamble_index) <
+ abs((int) best_rx_rapid - (int) preamble_index)) {
+ best_rx_rapid = rarh->RAPID;
+ rar = (uint8_t *) (dlsch_buffer + n_rarh + (n_rarpy - 1) * 6);
+ }
+
+ if (rarh->E == 0) {
+ LOG_I(PHY,
+ "No RAR found with the intended RAPID. The closest RAPID in all RARs is %d\n",
+ best_rx_rapid);
+ break;
+ } else {
+ rarh++;
+ }
+ };
+ LOG_D(MAC, "number of RAR subheader %d; number of RAR pyloads %d\n",
+ n_rarh, n_rarpy);
+
+ if (CC_id > 0) {
+ LOG_W(MAC, "Should not have received RAR on secondary CCs! \n");
+ return (0xffff);
+ }
+
+ LOG_I(MAC,
+ "[eNB %d][RAPROC] Frame %d Received RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for preamble %d/%d\n",
+ module_idP, frameP, *(uint8_t *) rarh, rar[0], rar[1], rar[2],
+ rar[3], rar[4], rar[5], rarh->RAPID, preamble_index);
+#ifdef DEBUG_RAR
+ LOG_D(MAC, "[UE %d][RAPROC] rarh->E %d\n", module_idP, rarh->E);
+ LOG_D(MAC, "[UE %d][RAPROC] rarh->T %d\n", module_idP, rarh->T);
+ LOG_D(MAC, "[UE %d][RAPROC] rarh->RAPID %d\n", module_idP,
+ rarh->RAPID);
+
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->R %d\n",module_idP,rar->R);
+ LOG_D(MAC, "[UE %d][RAPROC] rar->Timing_Advance_Command %d\n",
+ module_idP, (((uint16_t) (rar[0] & 0x7f)) << 4) + (rar[1] >> 4));
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->hopping_flag %d\n",module_idP,rar->hopping_flag);
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->rb_alloc %d\n",module_idP,rar->rb_alloc);
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->mcs %d\n",module_idP,rar->mcs);
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->TPC %d\n",module_idP,rar->TPC);
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->UL_delay %d\n",module_idP,rar->UL_delay);
+ // LOG_I(MAC,"[UE %d][RAPROC] rar->cqi_req %d\n",module_idP,rar->cqi_req);
+ LOG_D(MAC, "[UE %d][RAPROC] rar->t_crnti %x\n", module_idP,
+ (uint16_t) rar[5] + (rar[4] << 8));
+#endif
+
+ if (opt_enabled) {
+ LOG_D(OPT,
+ "[UE %d][RAPROC] CC_id %d RAR Frame %d trace pdu for ra-RNTI %x\n",
+ module_idP, CC_id, frameP, ra_rnti);
+ trace_pdu(1, (uint8_t *) dlsch_buffer, n_rarh + n_rarpy * 6,
+ module_idP, 2, ra_rnti, UE_mac_inst[module_idP].rxFrame,
+ UE_mac_inst[module_idP].rxSubframe, 0, 0);
+ }
+
+ if (preamble_index == rarh->RAPID) {
+ *t_crnti = (uint16_t) rar[5] + (rar[4] << 8); //rar->t_crnti;
+ UE_mac_inst[module_idP].crnti = *t_crnti; //rar->t_crnti;
+ //return(rar->Timing_Advance_Command);
+ ret = ((((uint16_t) (rar[0] & 0x7f)) << 4) + (rar[1] >> 4));
+ } else {
+ UE_mac_inst[module_idP].crnti = 0;
+ ret = (0xffff);
+ }
+
+ // move the selected RAR to the front of the RA_PDSCH buffer
+ memcpy(selected_rar_buffer + 0, (uint8_t *) rarh, 1);
+ memcpy(selected_rar_buffer + 1, (uint8_t *) rar, 6);
+
+ return ret;
+
+}
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index 7a9b811d0e86cd9e47daa747e3cfe04e0e4d1468..5ca6d10bb530f4ac19246777c488a24d6c8f3b4e 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -515,13 +515,13 @@ ue_send_sdu(module_id_t module_idP,
LOG_T(MAC, "\n");
#endif
- mac_rrc_data_ind(module_idP,
+ mac_rrc_data_ind_ue(module_idP,
CC_id,
frameP, subframeP,
UE_mac_inst[module_idP].crnti,
CCCH,
(uint8_t *) payload_ptr,
- rx_lengths[i], ENB_FLAG_NO, eNB_index, 0);
+ rx_lengths[i], eNB_index, 0);
} else if ((rx_lcids[i] == DCCH) || (rx_lcids[i] == DCCH1)) {
LOG_D(MAC,
@@ -584,9 +584,9 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP,
LOG_D(MAC, "[UE %d] Frame %d Sending SI to RRC (LCID Id %d,len %d)\n",
module_idP, frameP, BCCH, len);
- mac_rrc_data_ind(module_idP, CC_id, frameP, 0, // unknown subframe
+ mac_rrc_data_ind_ue(module_idP, CC_id, frameP, 0, // unknown subframe
SI_RNTI,
- BCCH, (uint8_t *) pdu, len, ENB_FLAG_NO, eNB_index,
+ BCCH, (uint8_t *) pdu, len, eNB_index,
0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_SI, VCD_FUNCTION_OUT);
@@ -622,9 +622,9 @@ ue_decode_p(module_id_t module_idP, int CC_id, frame_t frameP,
"[UE %d] Frame %d Sending Paging message to RRC (LCID Id %d,len %d)\n",
module_idP, frameP, PCCH, len);
- mac_rrc_data_ind(module_idP, CC_id, frameP, 0, // unknown subframe
+ mac_rrc_data_ind_ue(module_idP, CC_id, frameP, 0, // unknown subframe
P_RNTI,
- PCCH, (uint8_t *) pdu, len, ENB_FLAG_NO, eNB_index,
+ PCCH, (uint8_t *) pdu, len, eNB_index,
0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_PCCH, VCD_FUNCTION_OUT);
@@ -744,10 +744,10 @@ ue_send_mch_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
"[UE %d] Frame %d : SDU %d MCH->MCCH for sync area %d (eNB %d, %d bytes)\n",
module_idP, frameP, i, sync_area, eNB_index,
rx_lengths[i]);
- mac_rrc_data_ind(module_idP, CC_id, frameP, 0, // unknown subframe
+ mac_rrc_data_ind_ue(module_idP, CC_id, frameP, 0, // unknown subframe
M_RNTI,
MCCH,
- payload_ptr, rx_lengths[i], 0, eNB_index,
+ payload_ptr, rx_lengths[i], eNB_index,
sync_area);
} else if (rx_lcids[i] == MTCH) {
if (UE_mac_inst[module_idP].msi_status == 1) {
@@ -2230,10 +2230,10 @@ ue_scheduler(const module_id_t module_idP,
UE_mac_inst[module_idP].rxSubframe = rxSubframeP;
#ifdef CELLULAR
- rrc_rx_tx(module_idP, txFrameP, 0, eNB_indexP);
+ rrc_rx_tx_ue(module_idP, txFrameP, 0, eNB_indexP);
#else
- switch (rrc_rx_tx(&ctxt, eNB_indexP, CC_id)) {
+ switch (rrc_rx_tx_ue(&ctxt, eNB_indexP, CC_id)) {
case RRC_OK:
break;
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index 7023defc439d8b61893bc5c9410784907e650381..91621ab50fdf2d471e9df5286ac5f9fc5f47b438 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -630,11 +630,11 @@ pdcp_data_ind(
PROTOCOL_PDCP_CTXT_FMT" DATA-IND len %u",
PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p),
sdu_buffer_sizeP - pdcp_header_len - pdcp_tailer_len);
- rrc_data_ind(ctxt_pP,
+ rrc_data_ind(ctxt_pP,
rb_id,
sdu_buffer_sizeP - pdcp_header_len - pdcp_tailer_len,
(uint8_t*)&sdu_buffer_pP->data[pdcp_header_len]);
- free_mem_block(sdu_buffer_pP, __func__);
+
// free_mem_block(new_sdu, __func__);
if (ctxt_pP->enb_flag) {
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index eb060e85352eab6dcd05cce3bed337bcee825f19..e9d2188bfb8577c8071b4a0748ef8151f57d679f 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -792,9 +792,9 @@ void pdcp_fifo_read_input_sdus_from_otg (const protocol_ctxt_t* const ctxt_pP)
for (dst_id = 0; dst_id<NUMBER_OF_UE_MAX; dst_id++) {
ctxt.rnti = oai_emulation.info.eNB_ue_module_id_to_rnti[ctxt.module_id][dst_id];
-
+/*
if (ctxt.rnti != NOT_A_RNTI) {
- if (mac_eNB_get_rrc_status(ctxt.module_id, ctxt.rnti ) > 2 /*RRC_SI_RECEIVED*/) {
+ if (mac_eNB_get_rrc_status(ctxt.module_id, ctxt.rnti ) > 2 ) {
unsigned int temp = 0;
otg_pkt=packet_gen(
ENB_MODULE_ID_TO_INSTANCE(ctxt.module_id),
@@ -821,6 +821,7 @@ void pdcp_fifo_read_input_sdus_from_otg (const protocol_ctxt_t* const ctxt_pP)
}
}
}
+*/
}
}
}
diff --git a/openair2/LAYER2/openair2_proc.c b/openair2/LAYER2/openair2_proc.c
index a3e8e2164a91dda95238a40076c0c962786aeb6d..34c06a9c538cd968d835210210353015920c0be2 100644
--- a/openair2/LAYER2/openair2_proc.c
+++ b/openair2/LAYER2/openair2_proc.c
@@ -228,7 +228,7 @@ int dump_eNB_l2_stats(char *buffer, int length)
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt,
eNB_id,
ENB_FLAG_YES,
- UE_list->eNB_UE_stats[UE_PCCID(eNB_id,UE_id)][UE_id].crnti,
+ UE_list->eNB_UE_stats[0][UE_id].crnti,//UE_PCCID(eNB_id,UE_id)][UE_id].crnti,
eNB->frame,
eNB->subframe,
eNB_id);
diff --git a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
index b13d72f980bcdc6eb21872bbe1fb1b5775adb96b..4b651761de57a7c1cf7438afe33956cef1a3cdec 100644
--- a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
+++ b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
@@ -41,8 +41,6 @@ mac_rrc_data_req(
const rb_id_t srb_idP,
const uint8_t nb_tbP,
uint8_t* const buffer_pP,
- const eNB_flag_t eNB_flagP,
- const mac_enb_index_t eNB_indexP,
const uint8_t mbsfn_sync_areaP
);
@@ -56,7 +54,31 @@ mac_rrc_data_ind(
const rb_id_t srb_idP,
const uint8_t *sduP,
const sdu_size_t sdu_lenP,
- const eNB_flag_t eNB_flagP,
+ const uint8_t mbsfn_sync_area
+);
+
+int8_t
+mac_rrc_data_req_ue(
+ const module_id_t module_idP,
+ const int CC_idP,
+ const frame_t frameP,
+ const rb_id_t srb_idP,
+ const uint8_t nb_tbP,
+ uint8_t* const buffer_pP,
+ const mac_enb_index_t eNB_indexP,
+ const uint8_t mbsfn_sync_areaP
+);
+
+int8_t
+mac_rrc_data_ind_ue(
+ const module_id_t module_idP,
+ const int CC_idP,
+ const frame_t frameP,
+ const sub_frame_t sub_frameP,
+ const rnti_t rntiP,
+ const rb_id_t srb_idP,
+ const uint8_t *sduP,
+ const sdu_size_t sdu_lenP,
const mac_enb_index_t eNB_indexP,
const uint8_t mbsfn_sync_area
);
diff --git a/openair2/RRC/LITE/L2_interface.c b/openair2/RRC/LITE/L2_interface.c
index 47adc80f959389eaa6a8acbc64e994add6867563..ab4fd170c0678729ef5ce14939e46ae945ac2aa7 100644
--- a/openair2/RRC/LITE/L2_interface.c
+++ b/openair2/RRC/LITE/L2_interface.c
@@ -56,7 +56,6 @@ extern UE_MAC_INST *UE_mac_inst;
//#define RRC_DATA_REQ_DEBUG
//#define DEBUG_RRC 1
-mui_t mui=0;
extern RAN_CONTEXT_t RC;
@@ -69,8 +68,6 @@ mac_rrc_data_req(
const rb_id_t Srb_id,
const uint8_t Nb_tb,
uint8_t* const buffer_pP,
- const eNB_flag_t enb_flagP,
- const uint8_t eNB_index,
const uint8_t mbsfn_sync_area
)
//--------------------------------------------------------------------------
@@ -90,7 +87,6 @@ mac_rrc_data_req(
rrc_eNB_carrier_data_t *carrier;
BCCH_BCH_Message_t *mib;
- if( enb_flagP == ENB_FLAG_YES) {
rrc = RC.rrc[Mod_idP];
carrier = &rrc->carrier[0];
@@ -359,48 +355,6 @@ mac_rrc_data_req(
#endif
- } else { //This is an UE
-
-
- LOG_D(RRC,"[UE %d] Frame %d Filling CCCH SRB_ID %d\n",Mod_idP,frameP,Srb_id);
- LOG_D(RRC,"[UE %d] Frame %d buffer_pP status %d,\n",Mod_idP,frameP, UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size);
-
-
- if( (UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size > 0) ) {
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- int ccch_size = UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size;
- int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu);
-
- if (ccch_size > sdu_size) {
- LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", ccch_size, sdu_size);
- ccch_size = sdu_size;
- }
-
- message_p = itti_alloc_new_message (TASK_RRC_UE, RRC_MAC_CCCH_DATA_REQ);
- RRC_MAC_CCCH_DATA_REQ (message_p).frame = frameP;
- RRC_MAC_CCCH_DATA_REQ (message_p).sdu_size = ccch_size;
- memset (RRC_MAC_CCCH_DATA_REQ (message_p).sdu, 0, CCCH_SDU_SIZE);
- memcpy (RRC_MAC_CCCH_DATA_REQ (message_p).sdu, UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.Payload, ccch_size);
- RRC_MAC_CCCH_DATA_REQ (message_p).enb_index = eNB_index;
-
- itti_send_msg_to_task (TASK_MAC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
- }
-#endif
-
- memcpy(&buffer_pP[0],&UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.Payload[0],UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size);
- uint8_t Ret_size=UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size;
- // UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.payload_size=0;
- UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active = 1;
- UE_rrc_inst[Mod_idP].Info[eNB_index].T300_cnt = 0;
- // msg("[RRC][UE %d] Sending rach\n",Mod_id);
- return(Ret_size);
- } else {
- return 0;
- }
- }
return(0);
}
@@ -416,8 +370,6 @@ mac_rrc_data_ind(
const rb_id_t srb_idP,
const uint8_t* sduP,
const sdu_size_t sdu_lenP,
- const eNB_flag_t eNB_flagP,
- const mac_enb_index_t eNB_indexP,
const uint8_t mbsfn_sync_areaP
)
//--------------------------------------------------------------------------
@@ -432,114 +384,8 @@ mac_rrc_data_ind(
/*
int si_window;
*/
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, eNB_flagP, rntiP, frameP, sub_frameP,eNB_indexP);
-
- if(eNB_flagP == ENB_FLAG_NO) {
- if(srb_idP == BCCH) {
- LOG_D(RRC,"[UE %d] Received SDU for BCCH on SRB %d from eNB %d\n",module_idP,srb_idP,eNB_indexP);
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- int msg_sdu_size = sizeof(RRC_MAC_BCCH_DATA_IND (message_p).sdu);
-
- if (sdu_lenP > msg_sdu_size) {
- LOG_E(RRC, "SDU larger than BCCH SDU buffer size (%d, %d)", sdu_lenP, msg_sdu_size);
- sdu_size = msg_sdu_size;
- } else {
- sdu_size = sdu_lenP;
- }
-
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_BCCH_DATA_IND);
- memset (RRC_MAC_BCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
- RRC_MAC_BCCH_DATA_IND (message_p).frame = frameP;
- RRC_MAC_BCCH_DATA_IND (message_p).sub_frame = sub_frameP;
- RRC_MAC_BCCH_DATA_IND (message_p).sdu_size = sdu_size;
- memcpy (RRC_MAC_BCCH_DATA_IND (message_p).sdu, sduP, sdu_size);
- RRC_MAC_BCCH_DATA_IND (message_p).enb_index = eNB_indexP;
- RRC_MAC_BCCH_DATA_IND (message_p).rsrq = 30 /* TODO change phy to report rspq */;
- RRC_MAC_BCCH_DATA_IND (message_p).rsrp = 45 /* TODO change phy to report rspp */;
-
- itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
- }
-#else
- decode_BCCH_DLSCH_Message(&ctxt,eNB_indexP,(uint8_t*)sduP,sdu_lenP, 0, 0);
-#endif
- }
-
- if(srb_idP == PCCH) {
- LOG_D(RRC,"[UE %d] Received SDU for PCCH on SRB %d from eNB %d\n",module_idP,srb_idP,eNB_indexP);
- decode_PCCH_DLSCH_Message(&ctxt,eNB_indexP,(uint8_t*)sduP,sdu_lenP);
- }
- if((srb_idP & RAB_OFFSET) == CCCH) {
- if (sdu_lenP>0) {
- LOG_T(RRC,"[UE %d] Received SDU for CCCH on SRB %d from eNB %d\n",module_idP,srb_idP & RAB_OFFSET,eNB_indexP);
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- int msg_sdu_size = CCCH_SDU_SIZE;
-
- if (sdu_lenP > msg_sdu_size) {
- LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
- sdu_size = msg_sdu_size;
- } else {
- sdu_size = sdu_lenP;
- }
-
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_CCCH_DATA_IND);
- memset (RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
- memcpy (RRC_MAC_CCCH_DATA_IND (message_p).sdu, sduP, sdu_size);
- RRC_MAC_CCCH_DATA_IND (message_p).frame = frameP;
- RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = sub_frameP;
- RRC_MAC_CCCH_DATA_IND (message_p).sdu_size = sdu_size;
- RRC_MAC_CCCH_DATA_IND (message_p).enb_index = eNB_indexP;
- RRC_MAC_CCCH_DATA_IND (message_p).rnti = rntiP;
- itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
- }
-#else
- Srb_info = &UE_rrc_inst[module_idP].Srb0[eNB_indexP];
- memcpy(Srb_info->Rx_buffer.Payload,sduP,sdu_lenP);
- Srb_info->Rx_buffer.payload_size = sdu_lenP;
- rrc_ue_decode_ccch(&ctxt, Srb_info, eNB_indexP);
-#endif
- }
- }
-
-#if defined(Rel10) || defined(Rel14)
-
- if ((srb_idP & RAB_OFFSET) == MCCH) {
- LOG_T(RRC,"[UE %d] Frame %d: Received SDU on MBSFN sync area %d for MCCH on SRB %d from eNB %d\n",
- module_idP,frameP, mbsfn_sync_areaP, srb_idP & RAB_OFFSET,eNB_indexP);
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- int msg_sdu_size = sizeof(RRC_MAC_MCCH_DATA_IND (message_p).sdu);
-
- if (sdu_size > msg_sdu_size) {
- LOG_E(RRC, "SDU larger than MCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
- sdu_size = msg_sdu_size;
- }
-
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_MCCH_DATA_IND);
- RRC_MAC_MCCH_DATA_IND (message_p).frame = frameP;
- RRC_MAC_MCCH_DATA_IND (message_p).sub_frame = sub_frameP;
- RRC_MAC_MCCH_DATA_IND (message_p).sdu_size = sdu_lenP;
- memset (RRC_MAC_MCCH_DATA_IND (message_p).sdu, 0, MCCH_SDU_SIZE);
- memcpy (RRC_MAC_MCCH_DATA_IND (message_p).sdu, sduP, sdu_lenP);
- RRC_MAC_MCCH_DATA_IND (message_p).enb_index = eNB_indexP;
- RRC_MAC_MCCH_DATA_IND (message_p).mbsfn_sync_area = mbsfn_sync_areaP;
- itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
- }
-#else
- decode_MCCH_Message(&ctxt, eNB_indexP, sduP, sdu_lenP, mbsfn_sync_areaP);
-#endif
- }
-
-#endif // Rel10 || Rel14
+ PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, ENB_FLAG_YES, rntiP, frameP, sub_frameP,0);
- } else { // This is an eNB
Srb_info = &RC.rrc[module_idP]->carrier[CC_id].Srb0;
LOG_D(RRC,"[eNB %d] Received SDU for CCCH on SRB %d\n",module_idP,Srb_info->Srb_id);
@@ -576,205 +422,11 @@ mac_rrc_data_ind(
}
#endif
- }
return(0);
}
-//-------------------------------------------------------------------------------------------//
-// this function is Not USED anymore
-void mac_sync_ind(module_id_t Mod_idP,uint8_t Status)
-{
- //-------------------------------------------------------------------------------------------//
-}
-
-//------------------------------------------------------------------------------
-uint8_t
-rrc_data_req(
- const protocol_ctxt_t* const ctxt_pP,
- const rb_id_t rb_idP,
- const mui_t muiP,
- const confirm_t confirmP,
- const sdu_size_t sdu_sizeP,
- uint8_t* const buffer_pP,
- const pdcp_transmission_mode_t modeP
-)
-//------------------------------------------------------------------------------
-{
- MSC_LOG_TX_MESSAGE(
- ctxt_pP->enb_flag ? MSC_RRC_ENB : MSC_RRC_UE,
- ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
- buffer_pP,
- sdu_sizeP,
- MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- muiP,
- sdu_sizeP);
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
- uint8_t *message_buffer;
-
- message_buffer = itti_malloc (
- ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE,
- ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
- sdu_sizeP);
-
- memcpy (message_buffer, buffer_pP, sdu_sizeP);
-
- message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, RRC_DCCH_DATA_REQ);
- RRC_DCCH_DATA_REQ (message_p).frame = ctxt_pP->frame;
- RRC_DCCH_DATA_REQ (message_p).enb_flag = ctxt_pP->enb_flag;
- RRC_DCCH_DATA_REQ (message_p).rb_id = rb_idP;
- RRC_DCCH_DATA_REQ (message_p).muip = muiP;
- RRC_DCCH_DATA_REQ (message_p).confirmp = confirmP;
- RRC_DCCH_DATA_REQ (message_p).sdu_size = sdu_sizeP;
- RRC_DCCH_DATA_REQ (message_p).sdu_p = message_buffer;
- RRC_DCCH_DATA_REQ (message_p).mode = modeP;
- RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
- RRC_DCCH_DATA_REQ (message_p).rnti = ctxt_pP->rnti;
- RRC_DCCH_DATA_REQ (message_p).eNB_index = ctxt_pP->eNB_index;
-
- itti_send_msg_to_task (
- ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
- ctxt_pP->instance,
- message_p);
- return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
-
- }
-#else
- return pdcp_data_req (
- ctxt_pP,
- SRB_FLAG_YES,
- rb_idP,
- muiP,
- confirmP,
- sdu_sizeP,
- buffer_pP,
- modeP);
-#endif
-}
-
-//------------------------------------------------------------------------------
-void
-rrc_data_ind(
- const protocol_ctxt_t* const ctxt_pP,
- const rb_id_t Srb_id,
- const sdu_size_t sdu_sizeP,
- const uint8_t* const buffer_pP
-)
-//------------------------------------------------------------------------------
-{
- rb_id_t DCCH_index = Srb_id;
-
- if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
- LOG_N(RRC, "[UE %x] Frame %d: received a DCCH %d message on SRB %d with Size %d from eNB %d\n",
- ctxt_pP->module_id, ctxt_pP->frame, DCCH_index,Srb_id,sdu_sizeP, ctxt_pP->eNB_index);
- } else {
- LOG_N(RRC, "[eNB %d] Frame %d: received a DCCH %d message on SRB %d with Size %d from UE %x\n",
- ctxt_pP->module_id,
- ctxt_pP->frame,
- DCCH_index,
- Srb_id,
- sdu_sizeP,
- ctxt_pP->rnti);
- }
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
- uint8_t *message_buffer;
-
- message_buffer = itti_malloc (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, sdu_sizeP);
- memcpy (message_buffer, buffer_pP, sdu_sizeP);
-
- message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, RRC_DCCH_DATA_IND);
- RRC_DCCH_DATA_IND (message_p).frame = ctxt_pP->frame;
- RRC_DCCH_DATA_IND (message_p).dcch_index = DCCH_index;
- RRC_DCCH_DATA_IND (message_p).sdu_size = sdu_sizeP;
- RRC_DCCH_DATA_IND (message_p).sdu_p = message_buffer;
- RRC_DCCH_DATA_IND (message_p).rnti = ctxt_pP->rnti;
- RRC_DCCH_DATA_IND (message_p).module_id = ctxt_pP->module_id;
- RRC_DCCH_DATA_IND (message_p).eNB_index = ctxt_pP->eNB_index;
-
- itti_send_msg_to_task (ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, ctxt_pP->instance, message_p);
- }
-#else
-
- if (ctxt_pP->enb_flag == ENB_FLAG_YES) {
- rrc_eNB_decode_dcch(
- ctxt_pP,
- DCCH_index,
- buffer_pP,
- sdu_sizeP);
- } else {
-//#warning "LG put 0 to arg4 that is eNB index"
- rrc_ue_decode_dcch(
- ctxt_pP,
- DCCH_index,
- buffer_pP,
- 0);
- }
-
-#endif
-}
-
-//-------------------------------------------------------------------------------------------//
-void rrc_in_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
-{
- //-------------------------------------------------------------------------------------------//
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
- //LOG_I(RRC,"sending a message to task_mac_ue\n");
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_IN_SYNC_IND);
- RRC_MAC_IN_SYNC_IND (message_p).frame = frameP;
- RRC_MAC_IN_SYNC_IND (message_p).enb_index = eNB_index;
-
- itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
- }
-#else
- UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt=0;
-
- if (UE_rrc_inst[Mod_idP].Info[eNB_index].T310_active==1) {
- UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt++;
- }
-
-#endif
-}
-
-//-------------------------------------------------------------------------------------------//
-void rrc_out_of_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
-{
- //-------------------------------------------------------------------------------------------//
- if (UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt>10)
- LOG_I(RRC,"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
- Mod_idP,frameP,eNB_index,
- UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active,
- UE_rrc_inst[Mod_idP].Info[eNB_index].T310_cnt,
- UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt,
- UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt);
-
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
-
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_OUT_OF_SYNC_IND);
- RRC_MAC_OUT_OF_SYNC_IND (message_p).frame = frameP;
- RRC_MAC_OUT_OF_SYNC_IND (message_p).enb_index = eNB_index;
-
- itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
- }
-#else
- UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt++;
-#endif
-}
-
//------------------------------------------------------------------------------
int
mac_eNB_get_rrc_status(
@@ -858,36 +510,3 @@ void mac_eNB_rrc_ul_in_sync(const module_id_t Mod_instP,
frameP, subframeP, rntiP);
}
}
-//------------------------------------------------------------------------------
-int
-mac_UE_get_rrc_status(
- const module_id_t Mod_idP,
- const uint8_t indexP
-)
-//------------------------------------------------------------------------------
-{
- if (UE_rrc_inst)
- return(UE_rrc_inst[Mod_idP].Info[indexP].State);
- else
- return(-1);
-}
-
-//-------------------------------------------------------------------------------------------//
-int mac_ue_ccch_success_ind(module_id_t Mod_idP, uint8_t eNB_index)
-{
- //-------------------------------------------------------------------------------------------//
-#if defined(ENABLE_ITTI)
- {
- MessageDef *message_p;
-
- message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_CCCH_DATA_CNF);
- RRC_MAC_CCCH_DATA_CNF (message_p).enb_index = eNB_index;
-
- itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
- }
-#else
- // reset the tx buffer to indicate RRC that ccch was successfully transmitted (for example if contention resolution succeeds)
- UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size=0;
-#endif
- return 0;
-}
diff --git a/openair2/RRC/LITE/L2_interface_common.c b/openair2/RRC/LITE/L2_interface_common.c
new file mode 100644
index 0000000000000000000000000000000000000000..1b832521528ec231b8b8dc9d016e62584ff97191
--- /dev/null
+++ b/openair2/RRC/LITE/L2_interface_common.c
@@ -0,0 +1,183 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file l2_interface.c
+ * \brief layer 2 interface, used to support different RRC sublayer
+ * \author Raymond Knopp and Navid Nikaein
+ * \date 2010-2014
+ * \version 1.0
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr
+ */
+
+#include "platform_types.h"
+//#include "openair_defs.h"
+//#include "openair_proto.h"
+#include "defs.h"
+#include "extern.h"
+//#include "mac_lchan_interface.h"
+//#include "openair_rrc_utils.h"
+//#include "openair_rrc_main.h"
+#include "UTIL/LOG/log.h"
+#include "rrc_eNB_UE_context.h"
+#include "pdcp.h"
+#include "msc.h"
+#include "common/ran_context.h"
+
+#ifdef PHY_EMUL
+#include "SIMULATION/simulation_defs.h"
+extern EMULATION_VARS *Emul_vars;
+extern eNB_MAC_INST *eNB_mac_inst;
+extern UE_MAC_INST *UE_mac_inst;
+#endif
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+//#define RRC_DATA_REQ_DEBUG
+//#define DEBUG_RRC 1
+
+//------------------------------------------------------------------------------
+uint8_t
+rrc_data_req(
+ const protocol_ctxt_t* const ctxt_pP,
+ const rb_id_t rb_idP,
+ const mui_t muiP,
+ const confirm_t confirmP,
+ const sdu_size_t sdu_sizeP,
+ uint8_t* const buffer_pP,
+ const pdcp_transmission_mode_t modeP
+)
+//------------------------------------------------------------------------------
+{
+ MSC_LOG_TX_MESSAGE(
+ ctxt_pP->enb_flag ? MSC_RRC_ENB : MSC_RRC_UE,
+ ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
+ buffer_pP,
+ sdu_sizeP,
+ MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
+ MSC_AS_TIME_ARGS(ctxt_pP),
+ ctxt_pP->rnti,
+ muiP,
+ sdu_sizeP);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
+ uint8_t *message_buffer;
+
+ message_buffer = itti_malloc (
+ ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE,
+ ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
+ sdu_sizeP);
+
+ memcpy (message_buffer, buffer_pP, sdu_sizeP);
+
+ message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, RRC_DCCH_DATA_REQ);
+ RRC_DCCH_DATA_REQ (message_p).frame = ctxt_pP->frame;
+ RRC_DCCH_DATA_REQ (message_p).enb_flag = ctxt_pP->enb_flag;
+ RRC_DCCH_DATA_REQ (message_p).rb_id = rb_idP;
+ RRC_DCCH_DATA_REQ (message_p).muip = muiP;
+ RRC_DCCH_DATA_REQ (message_p).confirmp = confirmP;
+ RRC_DCCH_DATA_REQ (message_p).sdu_size = sdu_sizeP;
+ RRC_DCCH_DATA_REQ (message_p).sdu_p = message_buffer;
+ RRC_DCCH_DATA_REQ (message_p).mode = modeP;
+ RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
+ RRC_DCCH_DATA_REQ (message_p).rnti = ctxt_pP->rnti;
+ RRC_DCCH_DATA_REQ (message_p).eNB_index = ctxt_pP->eNB_index;
+
+ itti_send_msg_to_task (
+ ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
+ ctxt_pP->instance,
+ message_p);
+ return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
+
+ }
+#else
+ return pdcp_data_req (
+ ctxt_pP,
+ SRB_FLAG_YES,
+ rb_idP,
+ muiP,
+ confirmP,
+ sdu_sizeP,
+ buffer_pP,
+ modeP);
+#endif
+}
+
+//------------------------------------------------------------------------------
+void
+rrc_data_ind(
+ const protocol_ctxt_t* const ctxt_pP,
+ const rb_id_t Srb_id,
+ const sdu_size_t sdu_sizeP,
+ const uint8_t* const buffer_pP
+)
+//------------------------------------------------------------------------------
+{
+ rb_id_t DCCH_index = Srb_id;
+
+ if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ LOG_N(RRC, "[UE %x] Frame %d: received a DCCH %d message on SRB %d with Size %d from eNB %d\n",
+ ctxt_pP->module_id, ctxt_pP->frame, DCCH_index,Srb_id,sdu_sizeP, ctxt_pP->eNB_index);
+ } else {
+ LOG_N(RRC, "[eNB %d] Frame %d: received a DCCH %d message on SRB %d with Size %d from UE %x\n",
+ ctxt_pP->module_id,
+ ctxt_pP->frame,
+ DCCH_index,
+ Srb_id,
+ sdu_sizeP,
+ ctxt_pP->rnti);
+ }
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
+ uint8_t *message_buffer;
+
+ message_buffer = itti_malloc (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, sdu_sizeP);
+ memcpy (message_buffer, buffer_pP, sdu_sizeP);
+
+ message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, RRC_DCCH_DATA_IND);
+ RRC_DCCH_DATA_IND (message_p).frame = ctxt_pP->frame;
+ RRC_DCCH_DATA_IND (message_p).dcch_index = DCCH_index;
+ RRC_DCCH_DATA_IND (message_p).sdu_size = sdu_sizeP;
+ RRC_DCCH_DATA_IND (message_p).sdu_p = message_buffer;
+ RRC_DCCH_DATA_IND (message_p).rnti = ctxt_pP->rnti;
+ RRC_DCCH_DATA_IND (message_p).module_id = ctxt_pP->module_id;
+ RRC_DCCH_DATA_IND (message_p).eNB_index = ctxt_pP->eNB_index;
+
+ itti_send_msg_to_task (ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, ctxt_pP->instance, message_p);
+ }
+#else
+
+ rrc_eNB_decode_dcch(
+ ctxt_pP,
+ DCCH_index,
+ buffer_pP,
+ sdu_sizeP);
+
+#endif
+}
diff --git a/openair2/RRC/LITE/L2_interface_ue.c b/openair2/RRC/LITE/L2_interface_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..7bdbe2523e818e9641b915e4cfea60f88e7165f4
--- /dev/null
+++ b/openair2/RRC/LITE/L2_interface_ue.c
@@ -0,0 +1,463 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file l2_interface.c
+ * \brief layer 2 interface, used to support different RRC sublayer
+ * \author Raymond Knopp and Navid Nikaein
+ * \date 2010-2014
+ * \version 1.0
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr
+ */
+
+#include "platform_types.h"
+//#include "openair_defs.h"
+//#include "openair_proto.h"
+#include "defs.h"
+#include "extern.h"
+//#include "mac_lchan_interface.h"
+//#include "openair_rrc_utils.h"
+//#include "openair_rrc_main.h"
+#include "UTIL/LOG/log.h"
+#include "rrc_eNB_UE_context.h"
+#include "pdcp.h"
+#include "msc.h"
+
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+//#define RRC_DATA_REQ_DEBUG
+//#define DEBUG_RRC 1
+
+
+
+//------------------------------------------------------------------------------
+int8_t
+mac_rrc_data_req_ue(
+ const module_id_t Mod_idP,
+ const int CC_id,
+ const frame_t frameP,
+ const rb_id_t Srb_id,
+ const uint8_t Nb_tb,
+ uint8_t* const buffer_pP,
+ const uint8_t eNB_index,
+ const uint8_t mbsfn_sync_area
+)
+//--------------------------------------------------------------------------
+{
+ asn_enc_rval_t enc_rval;
+ SRB_INFO *Srb_info;
+ uint8_t Sdu_size = 0;
+ uint8_t sfn = (uint8_t)((frameP>>2)&0xff);
+
+
+#ifdef DEBUG_RRC
+ int i;
+ LOG_I(RRC,"[eNB %d] mac_rrc_data_req to SRB ID=%d\n",Mod_idP,Srb_id);
+#endif
+
+ eNB_RRC_INST *rrc;
+ rrc_eNB_carrier_data_t *carrier;
+ BCCH_BCH_Message_t *mib;
+
+
+ LOG_D(RRC,"[UE %d] Frame %d Filling CCCH SRB_ID %d\n",Mod_idP,frameP,Srb_id);
+ LOG_D(RRC,"[UE %d] Frame %d buffer_pP status %d,\n",Mod_idP,frameP, UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size);
+
+
+ if( (UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size > 0) ) {
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ int ccch_size = UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size;
+ int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu);
+
+ if (ccch_size > sdu_size) {
+ LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", ccch_size, sdu_size);
+ ccch_size = sdu_size;
+ }
+
+ message_p = itti_alloc_new_message (TASK_RRC_UE, RRC_MAC_CCCH_DATA_REQ);
+ RRC_MAC_CCCH_DATA_REQ (message_p).frame = frameP;
+ RRC_MAC_CCCH_DATA_REQ (message_p).sdu_size = ccch_size;
+ memset (RRC_MAC_CCCH_DATA_REQ (message_p).sdu, 0, CCCH_SDU_SIZE);
+ memcpy (RRC_MAC_CCCH_DATA_REQ (message_p).sdu, UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.Payload, ccch_size);
+ RRC_MAC_CCCH_DATA_REQ (message_p).enb_index = eNB_index;
+
+ itti_send_msg_to_task (TASK_MAC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
+ }
+#endif
+
+ memcpy(&buffer_pP[0],&UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.Payload[0],UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size);
+ uint8_t Ret_size=UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size;
+ // UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.payload_size=0;
+ UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active = 1;
+ UE_rrc_inst[Mod_idP].Info[eNB_index].T300_cnt = 0;
+ // msg("[RRC][UE %d] Sending rach\n",Mod_id);
+ return(Ret_size);
+ } else {
+ return 0;
+ }
+
+ return(0);
+}
+
+//------------------------------------------------------------------------------
+int8_t
+mac_rrc_data_ind_ue(
+ const module_id_t module_idP,
+ const int CC_id,
+ const frame_t frameP,
+ const sub_frame_t sub_frameP,
+ const rnti_t rntiP,
+ const rb_id_t srb_idP,
+ const uint8_t* sduP,
+ const sdu_size_t sdu_lenP,
+ const mac_enb_index_t eNB_indexP,
+ const uint8_t mbsfn_sync_areaP
+)
+//--------------------------------------------------------------------------
+{
+ SRB_INFO *Srb_info;
+ protocol_ctxt_t ctxt;
+ sdu_size_t sdu_size = 0;
+
+ /* for no gcc warnings */
+ (void)sdu_size;
+
+ /*
+ int si_window;
+ */
+ PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, 0, rntiP, frameP, sub_frameP,eNB_indexP);
+
+ if(srb_idP == BCCH) {
+ LOG_D(RRC,"[UE %d] Received SDU for BCCH on SRB %d from eNB %d\n",module_idP,srb_idP,eNB_indexP);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ int msg_sdu_size = sizeof(RRC_MAC_BCCH_DATA_IND (message_p).sdu);
+
+ if (sdu_lenP > msg_sdu_size) {
+ LOG_E(RRC, "SDU larger than BCCH SDU buffer size (%d, %d)", sdu_lenP, msg_sdu_size);
+ sdu_size = msg_sdu_size;
+ } else {
+ sdu_size = sdu_lenP;
+ }
+
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_BCCH_DATA_IND);
+ memset (RRC_MAC_BCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
+ RRC_MAC_BCCH_DATA_IND (message_p).frame = frameP;
+ RRC_MAC_BCCH_DATA_IND (message_p).sub_frame = sub_frameP;
+ RRC_MAC_BCCH_DATA_IND (message_p).sdu_size = sdu_size;
+ memcpy (RRC_MAC_BCCH_DATA_IND (message_p).sdu, sduP, sdu_size);
+ RRC_MAC_BCCH_DATA_IND (message_p).enb_index = eNB_indexP;
+ RRC_MAC_BCCH_DATA_IND (message_p).rsrq = 30 /* TODO change phy to report rspq */;
+ RRC_MAC_BCCH_DATA_IND (message_p).rsrp = 45 /* TODO change phy to report rspp */;
+
+ itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
+ }
+#else
+ decode_BCCH_DLSCH_Message(&ctxt,eNB_indexP,(uint8_t*)sduP,sdu_lenP, 0, 0);
+#endif
+ }
+
+ if(srb_idP == PCCH) {
+ LOG_D(RRC,"[UE %d] Received SDU for PCCH on SRB %d from eNB %d\n",module_idP,srb_idP,eNB_indexP);
+ decode_PCCH_DLSCH_Message(&ctxt,eNB_indexP,(uint8_t*)sduP,sdu_lenP);
+ }
+ if((srb_idP & RAB_OFFSET) == CCCH) {
+ if (sdu_lenP>0) {
+ LOG_T(RRC,"[UE %d] Received SDU for CCCH on SRB %d from eNB %d\n",module_idP,srb_idP & RAB_OFFSET,eNB_indexP);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ int msg_sdu_size = CCCH_SDU_SIZE;
+
+ if (sdu_lenP > msg_sdu_size) {
+ LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
+ sdu_size = msg_sdu_size;
+ } else {
+ sdu_size = sdu_lenP;
+ }
+
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_CCCH_DATA_IND);
+ memset (RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
+ memcpy (RRC_MAC_CCCH_DATA_IND (message_p).sdu, sduP, sdu_size);
+ RRC_MAC_CCCH_DATA_IND (message_p).frame = frameP;
+ RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = sub_frameP;
+ RRC_MAC_CCCH_DATA_IND (message_p).sdu_size = sdu_size;
+ RRC_MAC_CCCH_DATA_IND (message_p).enb_index = eNB_indexP;
+ RRC_MAC_CCCH_DATA_IND (message_p).rnti = rntiP;
+ itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
+ }
+#else
+ Srb_info = &UE_rrc_inst[module_idP].Srb0[eNB_indexP];
+ memcpy(Srb_info->Rx_buffer.Payload,sduP,sdu_lenP);
+ Srb_info->Rx_buffer.payload_size = sdu_lenP;
+ rrc_ue_decode_ccch(&ctxt, Srb_info, eNB_indexP);
+#endif
+ }
+ }
+
+#if defined(Rel10) || defined(Rel14)
+
+ if ((srb_idP & RAB_OFFSET) == MCCH) {
+ LOG_T(RRC,"[UE %d] Frame %d: Received SDU on MBSFN sync area %d for MCCH on SRB %d from eNB %d\n",
+ module_idP,frameP, mbsfn_sync_areaP, srb_idP & RAB_OFFSET,eNB_indexP);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ int msg_sdu_size = sizeof(RRC_MAC_MCCH_DATA_IND (message_p).sdu);
+
+ if (sdu_size > msg_sdu_size) {
+ LOG_E(RRC, "SDU larger than MCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
+ sdu_size = msg_sdu_size;
+ }
+
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_MCCH_DATA_IND);
+ RRC_MAC_MCCH_DATA_IND (message_p).frame = frameP;
+ RRC_MAC_MCCH_DATA_IND (message_p).sub_frame = sub_frameP;
+ RRC_MAC_MCCH_DATA_IND (message_p).sdu_size = sdu_lenP;
+ memset (RRC_MAC_MCCH_DATA_IND (message_p).sdu, 0, MCCH_SDU_SIZE);
+ memcpy (RRC_MAC_MCCH_DATA_IND (message_p).sdu, sduP, sdu_lenP);
+ RRC_MAC_MCCH_DATA_IND (message_p).enb_index = eNB_indexP;
+ RRC_MAC_MCCH_DATA_IND (message_p).mbsfn_sync_area = mbsfn_sync_areaP;
+ itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
+ }
+#else
+ decode_MCCH_Message(&ctxt, eNB_indexP, sduP, sdu_lenP, mbsfn_sync_areaP);
+#endif
+ }
+
+#endif // Rel10 || Rel14
+
+ return(0);
+
+}
+
+
+//------------------------------------------------------------------------------
+uint8_t
+rrc_data_req_ue(
+ const protocol_ctxt_t* const ctxt_pP,
+ const rb_id_t rb_idP,
+ const mui_t muiP,
+ const confirm_t confirmP,
+ const sdu_size_t sdu_sizeP,
+ uint8_t* const buffer_pP,
+ const pdcp_transmission_mode_t modeP
+)
+//------------------------------------------------------------------------------
+{
+ MSC_LOG_TX_MESSAGE(
+ ctxt_pP->enb_flag ? MSC_RRC_ENB : MSC_RRC_UE,
+ ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
+ buffer_pP,
+ sdu_sizeP,
+ MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
+ MSC_AS_TIME_ARGS(ctxt_pP),
+ ctxt_pP->rnti,
+ muiP,
+ sdu_sizeP);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
+ uint8_t *message_buffer;
+
+ message_buffer = itti_malloc (
+ ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE,
+ ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
+ sdu_sizeP);
+
+ memcpy (message_buffer, buffer_pP, sdu_sizeP);
+
+ message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, RRC_DCCH_DATA_REQ);
+ RRC_DCCH_DATA_REQ (message_p).frame = ctxt_pP->frame;
+ RRC_DCCH_DATA_REQ (message_p).enb_flag = ctxt_pP->enb_flag;
+ RRC_DCCH_DATA_REQ (message_p).rb_id = rb_idP;
+ RRC_DCCH_DATA_REQ (message_p).muip = muiP;
+ RRC_DCCH_DATA_REQ (message_p).confirmp = confirmP;
+ RRC_DCCH_DATA_REQ (message_p).sdu_size = sdu_sizeP;
+ RRC_DCCH_DATA_REQ (message_p).sdu_p = message_buffer;
+ RRC_DCCH_DATA_REQ (message_p).mode = modeP;
+ RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
+ RRC_DCCH_DATA_REQ (message_p).rnti = ctxt_pP->rnti;
+ RRC_DCCH_DATA_REQ (message_p).eNB_index = ctxt_pP->eNB_index;
+
+ itti_send_msg_to_task (
+ TASK_PDCP_UE,
+ ctxt_pP->instance,
+ message_p);
+ return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
+
+ }
+#else
+ return pdcp_data_req (
+ ctxt_pP,
+ SRB_FLAG_YES,
+ rb_idP,
+ muiP,
+ confirmP,
+ sdu_sizeP,
+ buffer_pP,
+ modeP);
+#endif
+}
+
+//------------------------------------------------------------------------------
+void
+rrc_data_ind_ue(
+ const protocol_ctxt_t* const ctxt_pP,
+ const rb_id_t Srb_id,
+ const sdu_size_t sdu_sizeP,
+ const uint8_t* const buffer_pP
+)
+//------------------------------------------------------------------------------
+{
+ rb_id_t DCCH_index = Srb_id;
+
+ LOG_N(RRC, "[UE %x] Frame %d: received a DCCH %d message on SRB %d with Size %d from eNB %d\n",
+ ctxt_pP->module_id, ctxt_pP->frame, DCCH_index,Srb_id,sdu_sizeP, ctxt_pP->eNB_index);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
+ uint8_t *message_buffer;
+
+ message_buffer = itti_malloc (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, ctxt_pP->enb_flag ? TASK_RRC_ENB : TASK_RRC_UE, sdu_sizeP);
+ memcpy (message_buffer, buffer_pP, sdu_sizeP);
+
+ message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, RRC_DCCH_DATA_IND);
+ RRC_DCCH_DATA_IND (message_p).frame = ctxt_pP->frame;
+ RRC_DCCH_DATA_IND (message_p).dcch_index = DCCH_index;
+ RRC_DCCH_DATA_IND (message_p).sdu_size = sdu_sizeP;
+ RRC_DCCH_DATA_IND (message_p).sdu_p = message_buffer;
+ RRC_DCCH_DATA_IND (message_p).rnti = ctxt_pP->rnti;
+ RRC_DCCH_DATA_IND (message_p).module_id = ctxt_pP->module_id;
+ RRC_DCCH_DATA_IND (message_p).eNB_index = ctxt_pP->eNB_index;
+
+ itti_send_msg_to_task (TASK_RRC_UE, ctxt_pP->instance, message_p);
+ }
+#else
+
+//#warning "LG put 0 to arg4 that is eNB index"
+ rrc_ue_decode_dcch(
+ ctxt_pP,
+ DCCH_index,
+ buffer_pP,
+ 0);
+
+#endif
+}
+
+//-------------------------------------------------------------------------------------------//
+void rrc_in_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
+{
+ //-------------------------------------------------------------------------------------------//
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+ //LOG_I(RRC,"sending a message to task_mac_ue\n");
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_IN_SYNC_IND);
+ RRC_MAC_IN_SYNC_IND (message_p).frame = frameP;
+ RRC_MAC_IN_SYNC_IND (message_p).enb_index = eNB_index;
+
+ itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
+ }
+#else
+ UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt=0;
+
+ if (UE_rrc_inst[Mod_idP].Info[eNB_index].T310_active==1) {
+ UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt++;
+ }
+
+#endif
+}
+
+//-------------------------------------------------------------------------------------------//
+void rrc_out_of_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
+{
+ //-------------------------------------------------------------------------------------------//
+ if (UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt>10)
+ LOG_I(RRC,"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
+ Mod_idP,frameP,eNB_index,
+ UE_rrc_inst[Mod_idP].Info[eNB_index].T300_active,
+ UE_rrc_inst[Mod_idP].Info[eNB_index].T310_cnt,
+ UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt,
+ UE_rrc_inst[Mod_idP].Info[eNB_index].N311_cnt);
+
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_OUT_OF_SYNC_IND);
+ RRC_MAC_OUT_OF_SYNC_IND (message_p).frame = frameP;
+ RRC_MAC_OUT_OF_SYNC_IND (message_p).enb_index = eNB_index;
+
+ itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
+ }
+#else
+ UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt++;
+#endif
+}
+
+//------------------------------------------------------------------------------
+int
+mac_UE_get_rrc_status(
+ const module_id_t Mod_idP,
+ const uint8_t indexP
+)
+//------------------------------------------------------------------------------
+{
+ if (UE_rrc_inst)
+ return(UE_rrc_inst[Mod_idP].Info[indexP].State);
+ else
+ return(-1);
+}
+
+//-------------------------------------------------------------------------------------------//
+int mac_ue_ccch_success_ind(module_id_t Mod_idP, uint8_t eNB_index)
+{
+ //-------------------------------------------------------------------------------------------//
+#if defined(ENABLE_ITTI)
+ {
+ MessageDef *message_p;
+
+ message_p = itti_alloc_new_message (TASK_MAC_UE, RRC_MAC_CCCH_DATA_CNF);
+ RRC_MAC_CCCH_DATA_CNF (message_p).enb_index = eNB_index;
+
+ itti_send_msg_to_task (TASK_RRC_UE, UE_MODULE_ID_TO_INSTANCE(Mod_idP), message_p);
+ }
+#else
+ // reset the tx buffer to indicate RRC that ccch was successfully transmitted (for example if contention resolution succeeds)
+ UE_rrc_inst[Mod_idP].Srb0[eNB_index].Tx_buffer.payload_size=0;
+#endif
+ return 0;
+}
diff --git a/openair2/RRC/LITE/proto.h b/openair2/RRC/LITE/proto.h
index 3e00bc9769ea2b4edd8903aebde5eaa5aaba70fb..4cebb778605011f5e78b8bb278cb6da45ac028bd 100644
--- a/openair2/RRC/LITE/proto.h
+++ b/openair2/RRC/LITE/proto.h
@@ -54,15 +54,30 @@ void rrc_config_buffer(SRB_INFO *srb_info, uint8_t Lchan_type, uint8_t Role);
void
openair_rrc_on(
const protocol_ctxt_t* const ctxt_pP);
+void
+openair_rrc_on_ue(
+ const protocol_ctxt_t* const ctxt_pP);
+
void rrc_top_cleanup(void);
-/** \brief Function to update timers every subframe. For UE it updates T300,T304 and T310.
+/** \brief Function to update eNB timers every subframe.
@param ctxt_pP running context
@param enb_index
@param CC_id
*/
RRC_status_t
rrc_rx_tx(
+ protocol_ctxt_t* const ctxt_pP,
+ const int CC_id
+);
+
+/** \brief Function to update timers every subframe. For UE it updates T300,T304 and T310.
+@param ctxt_pP running context
+@param enb_index
+@param CC_id
+*/
+RRC_status_t
+rrc_rx_tx_ue(
protocol_ctxt_t* const ctxt_pP,
const uint8_t enb_index,
const int CC_id
@@ -310,8 +325,6 @@ mac_rrc_data_req(
const rb_id_t Srb_id,
const uint8_t Nb_tb,
uint8_t* const buffer_pP,
- const eNB_flag_t enb_flagP,
- const uint8_t eNB_index,
const uint8_t mbsfn_sync_area
);
@@ -325,7 +338,31 @@ mac_rrc_data_ind(
const rb_id_t srb_idP,
const uint8_t* sduP,
const sdu_size_t sdu_lenP,
- const eNB_flag_t eNB_flagP,
+ const uint8_t mbsfn_sync_areaP
+);
+
+int8_t
+mac_rrc_data_req_ue(
+ const module_id_t Mod_idP,
+ const int CC_id,
+ const frame_t frameP,
+ const rb_id_t Srb_id,
+ const uint8_t Nb_tb,
+ uint8_t* const buffer_pP,
+ const mac_enb_index_t eNB_indexP,
+ const uint8_t mbsfn_sync_area
+);
+
+int8_t
+mac_rrc_data_ind_ue(
+ const module_id_t module_idP,
+ const int CC_id,
+ const frame_t frameP,
+ const sub_frame_t sub_frameP,
+ const rnti_t rntiP,
+ const rb_id_t srb_idP,
+ const uint8_t* sduP,
+ const sdu_size_t sdu_lenP,
const mac_enb_index_t eNB_indexP,
const uint8_t mbsfn_sync_areaP
);
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index d66025301f59e9eea60b0865804b1ae6cbf3274a..a8b24c326e2cf2481ade0be33622d55cc6669684 100644
--- a/openair2/RRC/LITE/rrc_UE.c
+++ b/openair2/RRC/LITE/rrc_UE.c
@@ -233,6 +233,30 @@ static int rrc_set_sub_state( module_id_t ue_mod_idP, Rrc_Sub_State_t subState )
return (0);
}
+//-----------------------------------------------------------------------------
+void
+openair_rrc_on_ue(
+ const protocol_ctxt_t* const ctxt_pP
+)
+//-----------------------------------------------------------------------------
+{
+ unsigned short i;
+ int CC_id;
+
+ LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" UE?:OPENAIR RRC IN....\n",
+ PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
+
+ for (i = 0; i < NB_eNB_INST; i++) {
+ LOG_D(RRC, PROTOCOL_RRC_CTXT_FMT" Activating CCCH (eNB %d)\n",
+ PROTOCOL_RRC_CTXT_ARGS(ctxt_pP), i);
+ UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Srb_id = CCCH;
+ memcpy (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Lchan_desc[0], &CCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+ memcpy (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Lchan_desc[1], &CCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+ rrc_config_buffer (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i], CCCH, 1);
+ UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Active = 1;
+ }
+}
+
//-----------------------------------------------------------------------------
static void init_SI_UE( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_index )
{
@@ -339,7 +363,7 @@ char openair_rrc_ue_init( const module_id_t ue_mod_idP, const unsigned char eNB_
#endif
#ifdef NO_RRM //init ch SRB0, SRB1 & BDTCH
- openair_rrc_on(&ctxt);
+ openair_rrc_on_ue(&ctxt);
#endif
#ifdef CBA
int j;
@@ -430,6 +454,47 @@ static const char const nas_attach_req_guti[] = {
};
#endif
+//-----------------------------------------------------------------------------
+void
+rrc_t310_expiration(
+ const protocol_ctxt_t* const ctxt_pP,
+ const uint8_t eNB_index
+)
+//-----------------------------------------------------------------------------
+{
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].State != RRC_CONNECTED) {
+ LOG_D(RRC, "Timer 310 expired, going to RRC_IDLE\n");
+ UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].State = RRC_IDLE;
+ UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].UE_index = 0xffff;
+ UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Rx_buffer.payload_size = 0;
+ UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.payload_size = 0;
+ UE_rrc_inst[ctxt_pP->module_id].Srb1[eNB_index].Srb_info.Rx_buffer.payload_size = 0;
+ UE_rrc_inst[ctxt_pP->module_id].Srb1[eNB_index].Srb_info.Tx_buffer.payload_size = 0;
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Active == 1) {
+ LOG_D (RRC,"[Inst %d] eNB_index %d, Remove RB %d\n ", ctxt_pP->module_id, eNB_index,
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id);
+ rrc_pdcp_config_req (ctxt_pP,
+ SRB_FLAG_YES,
+ CONFIG_ACTION_REMOVE,
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
+ 0);
+ rrc_rlc_config_req (ctxt_pP,
+ SRB_FLAG_YES,
+ MBMS_FLAG_NO,
+ CONFIG_ACTION_REMOVE,
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
+ Rlc_info_um);
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Active = 0;
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Status = IDLE;
+ UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Next_check_frame = 0;
+ }
+ } else { // Restablishment procedure
+ LOG_D(RRC, "Timer 310 expired, trying RRCRestablishment ...\n");
+ }
+}
+
//-----------------------------------------------------------------------------
static void rrc_ue_generate_RRCConnectionSetupComplete( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_index, const uint8_t Transaction_id )
{
@@ -454,7 +519,7 @@ static void rrc_ue_generate_RRCConnectionSetupComplete( const protocol_ctxt_t* c
LOG_D(RLC,
"[FRAME %05d][RRC_UE][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (RRCConnectionSetupComplete to eNB %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
ctxt_pP->frame, ctxt_pP->module_id+NB_eNB_INST, size, eNB_index, rrc_mui, ctxt_pP->module_id+NB_eNB_INST, DCCH);
- rrc_data_req (
+ rrc_data_req_ue (
ctxt_pP,
DCCH,
rrc_mui++,
@@ -481,7 +546,7 @@ static void rrc_ue_generate_RRCConnectionReconfigurationComplete( const protocol
rrc_mui,
UE_MODULE_ID_TO_INSTANCE(ctxt_pP->module_id),
DCCH);
- rrc_data_req (
+ rrc_data_req_ue (
ctxt_pP,
DCCH,
rrc_mui++,
@@ -725,7 +790,7 @@ rrc_ue_establish_drb(
#ifdef PDCP_USE_NETLINK
# if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO) && !defined(OAI_USRP) && !defined(OAI_BLADERF) && !defined(ETHERNET) && !defined(LINK_ENB_PDCP_TO_GTPV1U)
ip_addr_offset3 = 0;
- ip_addr_offset4 = 8;
+ ip_addr_offset4 = 1;
LOG_I(OIP,"[UE %d] trying to bring up the OAI interface oai%d, IP 10.0.%d.%d\n", ue_mod_idP, ip_addr_offset3+ue_mod_idP,
ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1);
oip_ifup=nas_config(ip_addr_offset3+ue_mod_idP, // interface_id
@@ -1662,42 +1727,45 @@ rrc_ue_process_securityModeCommand(
#endif //#if defined(ENABLE_SECURITY)
if (securityModeCommand->criticalExtensions.present == SecurityModeCommand__criticalExtensions_PR_c1) {
- if (securityModeCommand->criticalExtensions.choice.c1.present == SecurityModeCommand__criticalExtensions__c1_PR_securityModeCommand_r8) {
-
- ul_dcch_msg.message.choice.c1.choice.securityModeComplete.rrc_TransactionIdentifier = securityModeCommand->rrc_TransactionIdentifier;
- ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.present = SecurityModeCommand__criticalExtensions_PR_c1;
- ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.choice.securityModeComplete_r8.nonCriticalExtension =NULL;
-
- LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), encoding securityModeComplete (eNB %d)\n",
- ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
-
- enc_rval = uper_encode_to_buffer(&asn_DEF_UL_DCCH_Message,
- (void*)&ul_dcch_msg,
- buffer,
- 100);
- AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
- enc_rval.failed_type->name, enc_rval.encoded);
-
+ if (securityModeCommand->criticalExtensions.choice.c1.present != SecurityModeCommand__criticalExtensions__c1_PR_securityModeCommand_r8)
+ LOG_W(RRC,"securityModeCommand->criticalExtensions.choice.c1.present (%d) != SecurityModeCommand__criticalExtensions__c1_PR_securityModeCommand_r8\n",
+ securityModeCommand->criticalExtensions.choice.c1.present);
+
+
+ ul_dcch_msg.message.choice.c1.choice.securityModeComplete.rrc_TransactionIdentifier = securityModeCommand->rrc_TransactionIdentifier;
+ ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.present = SecurityModeCommand__criticalExtensions_PR_c1;
+ ul_dcch_msg.message.choice.c1.choice.securityModeComplete.criticalExtensions.choice.securityModeComplete_r8.nonCriticalExtension =NULL;
+
+ LOG_I(RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), encoding securityModeComplete (eNB %d)\n",
+ ctxt_pP->module_id,ctxt_pP->frame,eNB_index);
+
+ enc_rval = uper_encode_to_buffer(&asn_DEF_UL_DCCH_Message,
+ (void*)&ul_dcch_msg,
+ buffer,
+ 100);
+ AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
+ enc_rval.failed_type->name, enc_rval.encoded);
+
#ifdef XER_PRINT
- xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
+ xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
#endif
-
+
#if defined(ENABLE_ITTI)
# if !defined(DISABLE_XER_SPRINT)
- {
- char message_string[20000];
- size_t message_string_size;
-
- if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) {
- MessageDef *msg_p;
-
- msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText));
- msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size;
- memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size);
-
- itti_send_msg_to_task(TASK_UNKNOWN, ctxt_pP->instance, msg_p);
- }
+ {
+ char message_string[20000];
+ size_t message_string_size;
+
+ if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) {
+ MessageDef *msg_p;
+
+ msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText));
+ msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size;
+ memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size);
+
+ itti_send_msg_to_task(TASK_UNKNOWN, ctxt_pP->instance, msg_p);
}
+ }
# endif
#endif
@@ -1717,7 +1785,9 @@ rrc_ue_process_securityModeCommand(
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
}
- }
+
+ else LOG_W(RRC,"securityModeCommand->criticalExtensions.present (%d) != SecurityModeCommand__criticalExtensions_PR_c1\n",
+ securityModeCommand->criticalExtensions.present);
}
//-----------------------------------------------------------------------------
@@ -1761,66 +1831,71 @@ rrc_ue_process_ueCapabilityEnquiry(
// ue_CapabilityRAT_Container.ueCapabilityRAT_Container.size = UE_rrc_inst[ue_mod_idP].UECapability_size;
- if (UECapabilityEnquiry->criticalExtensions.present == UECapabilityEnquiry__criticalExtensions_PR_c1) {
- if (UECapabilityEnquiry->criticalExtensions.choice.c1.present == UECapabilityEnquiry__criticalExtensions__c1_PR_ueCapabilityEnquiry_r8) {
- ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.present = UECapabilityInformation__criticalExtensions_PR_c1;
- ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.present =
- UECapabilityInformation__criticalExtensions__c1_PR_ueCapabilityInformation_r8;
- ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.count
- =0;
-
- for (i=0; i<UECapabilityEnquiry->criticalExtensions.choice.c1.choice.ueCapabilityEnquiry_r8.ue_CapabilityRequest.list.count; i++) {
-
- if (*UECapabilityEnquiry->criticalExtensions.choice.c1.choice.ueCapabilityEnquiry_r8.ue_CapabilityRequest.list.array[i]
- == RAT_Type_eutra) {
- ASN_SEQUENCE_ADD(
- &ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list,
- &ue_CapabilityRAT_Container);
-
- enc_rval = uper_encode_to_buffer(&asn_DEF_UL_DCCH_Message, (void*) &ul_dcch_msg, buffer, 100);
- AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
- enc_rval.failed_type->name, enc_rval.encoded);
+ AssertFatal(UECapabilityEnquiry->criticalExtensions.present == UECapabilityEnquiry__criticalExtensions_PR_c1,
+ "UECapabilityEnquiry->criticalExtensions.present (%d) != UECapabilityEnquiry__criticalExtensions_PR_c1 (%d)\n",
+ UECapabilityEnquiry->criticalExtensions.present,UECapabilityEnquiry__criticalExtensions_PR_c1);
+ if (UECapabilityEnquiry->criticalExtensions.choice.c1.present != UECapabilityEnquiry__criticalExtensions__c1_PR_ueCapabilityEnquiry_r8)
+ LOG_W(RRC,"UECapabilityEnquiry->criticalExtensions.choice.c1.present (%d) != UECapabilityEnquiry__criticalExtensions__c1_PR_ueCapabilityEnquiry_r8)\n",
+ UECapabilityEnquiry->criticalExtensions.choice.c1.present);
+
+ ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.present = UECapabilityInformation__criticalExtensions_PR_c1;
+ ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.present =
+ UECapabilityInformation__criticalExtensions__c1_PR_ueCapabilityInformation_r8;
+ ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.count
+ =0;
+
+ for (i=0; i<UECapabilityEnquiry->criticalExtensions.choice.c1.choice.ueCapabilityEnquiry_r8.ue_CapabilityRequest.list.count; i++) {
+
+ if (*UECapabilityEnquiry->criticalExtensions.choice.c1.choice.ueCapabilityEnquiry_r8.ue_CapabilityRequest.list.array[i]
+ == RAT_Type_eutra) {
+ ASN_SEQUENCE_ADD(
+ &ul_dcch_msg.message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list,
+ &ue_CapabilityRAT_Container);
+
+ enc_rval = uper_encode_to_buffer(&asn_DEF_UL_DCCH_Message, (void*) &ul_dcch_msg, buffer, 100);
+ AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
+ enc_rval.failed_type->name, enc_rval.encoded);
+
#ifdef XER_PRINT
- xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
+ xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
#endif
-
+
#if defined(ENABLE_ITTI)
# if !defined(DISABLE_XER_SPRINT)
- {
- char message_string[20000];
- size_t message_string_size;
-
- if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) {
- MessageDef *msg_p;
-
- msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText));
- msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size;
- memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size);
-
- itti_send_msg_to_task(TASK_UNKNOWN, ctxt_pP->instance, msg_p);
- }
- }
+ {
+ char message_string[20000];
+ size_t message_string_size;
+
+ if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) {
+ MessageDef *msg_p;
+
+ msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText));
+ msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size;
+ memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size);
+
+ itti_send_msg_to_task(TASK_UNKNOWN, ctxt_pP->instance, msg_p);
+ }
+ }
# endif
#endif
+
LOG_D(RRC,"UECapabilityInformation Encoded %zd bits (%zd bytes)\n",enc_rval.encoded,(enc_rval.encoded+7)/8);
for (i = 0; i < (enc_rval.encoded + 7) / 8; i++) {
LOG_T(RRC, "%02x.", buffer[i]);
}
-
- LOG_T(RRC, "\n");
- rrc_data_req (
- ctxt_pP,
- DCCH,
- rrc_mui++,
- SDU_CONFIRM_NO,
- (enc_rval.encoded + 7) / 8,
- buffer,
- PDCP_TRANSMISSION_MODE_CONTROL);
- }
- }
+
+ LOG_T(RRC, "\n");
+ rrc_data_req_ue (
+ ctxt_pP,
+ DCCH,
+ rrc_mui++,
+ SDU_CONFIRM_NO,
+ (enc_rval.encoded + 7) / 8,
+ buffer,
+ PDCP_TRANSMISSION_MODE_CONTROL);
}
}
}
@@ -4503,7 +4578,7 @@ void *rrc_ue_task( void *args_p )
// check if SRB2 is created, if yes request data_req on DCCH1 (SRB2)
if(UE_rrc_inst[ue_mod_id].SRB2_config[0] == NULL)
{
- rrc_data_req (&ctxt,
+ rrc_data_req_ue (&ctxt,
DCCH,
rrc_mui++,
SDU_CONFIRM_NO,
@@ -4512,7 +4587,7 @@ void *rrc_ue_task( void *args_p )
}
else
{
- rrc_data_req (&ctxt,
+ rrc_data_req_ue (&ctxt,
DCCH1,
rrc_mui++,
SDU_CONFIRM_NO,
@@ -4755,3 +4830,121 @@ rrc_top_cleanup_ue(
}
+
+
+//-----------------------------------------------------------------------------
+RRC_status_t
+rrc_rx_tx_ue(
+ protocol_ctxt_t* const ctxt_pP,
+ const uint8_t enb_indexP,
+ const int CC_id
+)
+//-----------------------------------------------------------------------------
+{
+ //uint8_t UE_id;
+ int32_t current_timestamp_ms, ref_timestamp_ms;
+ struct timeval ts;
+ struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL;
+
+#ifdef LOCALIZATION
+ double estimated_distance;
+ protocol_ctxt_t ctxt;
+#endif
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_IN);
+
+ // check timers
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_active == 1) {
+ if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt % 10) == 0)
+ LOG_D(RRC,
+ "[UE %d][RAPROC] Frame %d T300 Count %d ms\n", ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt);
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt
+ == T300[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.t300]) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_active = 0;
+ // ALLOW CCCH to be used
+ UE_rrc_inst[ctxt_pP->module_id].Srb0[enb_indexP].Tx_buffer.payload_size = 0;
+ rrc_ue_generate_RRCConnectionRequest (ctxt_pP, enb_indexP);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return (RRC_ConnSetup_failed);
+ }
+
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt++;
+ }
+
+ if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].SIStatus&2)>0) {
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt
+ == N310[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.n310]) {
+ LOG_I(RRC,"Activating T310\n");
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 1;
+ }
+ } else { // in case we have not received SIB2 yet
+ /* if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt == 100) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt = 0;
+
+ }*/
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return RRC_OK;
+ }
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active == 1) {
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N311_cnt
+ == N311[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.n311]) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 0;
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N311_cnt = 0;
+ }
+
+ if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt % 10) == 0) {
+ LOG_D(RRC, "[UE %d] Frame %d T310 Count %d ms\n", ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt);
+ }
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt == T310[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.t310]) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 0;
+ rrc_t310_expiration (ctxt_pP, enb_indexP);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ LOG_I(RRC,"Returning RRC_PHY_RESYNCH: T310 expired\n");
+ return RRC_PHY_RESYNCH;
+ }
+
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt++;
+ }
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_active==1) {
+ if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt % 10) == 0)
+ LOG_D(RRC,"[UE %d][RAPROC] Frame %d T304 Count %d ms\n",ctxt_pP->module_id,ctxt_pP->frame,
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt);
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt == 0) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_active = 0;
+ UE_rrc_inst[ctxt_pP->module_id].HandoverInfoUe.measFlag = 1;
+ LOG_E(RRC,"[UE %d] Handover failure..initiating connection re-establishment procedure... \n",
+ ctxt_pP->module_id);
+ //Implement 36.331, section 5.3.5.6 here
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return(RRC_Handover_failed);
+ }
+
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt--;
+ }
+
+ // Layer 3 filtering of RRC measurements
+ if (UE_rrc_inst[ctxt_pP->module_id].QuantityConfig[0] != NULL) {
+ ue_meas_filtering(ctxt_pP,enb_indexP);
+ }
+
+ ue_measurement_report_triggering(ctxt_pP,enb_indexP);
+
+ if (UE_rrc_inst[ctxt_pP->module_id].Info[0].handoverTarget > 0) {
+ LOG_I(RRC,"[UE %d] Frame %d : RRC handover initiated\n", ctxt_pP->module_id, ctxt_pP->frame);
+ }
+
+ if((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].State == RRC_HO_EXECUTION) &&
+ (UE_rrc_inst[ctxt_pP->module_id].HandoverInfoUe.targetCellId != 0xFF)) {
+ UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].State= RRC_IDLE;
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return(RRC_HO_STARTED);
+ }
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return (RRC_OK);
+}
diff --git a/openair2/RRC/LITE/rrc_common.c b/openair2/RRC/LITE/rrc_common.c
index d16ae97435de89f092d0ab6259839da66d4df15f..a6a2bbb613b8f2d46a554b422ca2cab4f78bbaac 100644
--- a/openair2/RRC/LITE/rrc_common.c
+++ b/openair2/RRC/LITE/rrc_common.c
@@ -53,42 +53,6 @@ extern UE_MAC_INST *UE_mac_inst;
extern mui_t rrc_eNB_mui;
-//configure BCCH & CCCH Logical Channels and associated rrc_buffers, configure associated SRBs
-//-----------------------------------------------------------------------------
-void
-openair_rrc_on(
- const protocol_ctxt_t* const ctxt_pP
-)
-//-----------------------------------------------------------------------------
-{
- unsigned short i;
- int CC_id;
-
- if (ctxt_pP->enb_flag == ENB_FLAG_YES) {
- LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" ENB:OPENAIR RRC IN....\n",
- PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- rrc_config_buffer (&RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SI, BCCH, 1);
- RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SI.Active = 1;
- rrc_config_buffer (&RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0, CCCH, 1);
- RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Active = 1;
- }
- } else {
- LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" UE?:OPENAIR RRC IN....\n",
- PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
-
- for (i = 0; i < NB_eNB_INST; i++) {
- LOG_D(RRC, PROTOCOL_RRC_CTXT_FMT" Activating CCCH (eNB %d)\n",
- PROTOCOL_RRC_CTXT_ARGS(ctxt_pP), i);
- UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Srb_id = CCCH;
- memcpy (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Lchan_desc[0], &CCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
- memcpy (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Lchan_desc[1], &CCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
- rrc_config_buffer (&UE_rrc_inst[ctxt_pP->module_id].Srb0[i], CCCH, 1);
- UE_rrc_inst[ctxt_pP->module_id].Srb0[i].Active = 1;
- }
- }
-}
-
//-----------------------------------------------------------------------------
int
rrc_init_global_param(
@@ -168,282 +132,6 @@ rrc_config_buffer(
}
-//-----------------------------------------------------------------------------
-void
-rrc_t310_expiration(
- const protocol_ctxt_t* const ctxt_pP,
- const uint8_t eNB_index
-)
-//-----------------------------------------------------------------------------
-{
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].State != RRC_CONNECTED) {
- LOG_D(RRC, "Timer 310 expired, going to RRC_IDLE\n");
- UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].State = RRC_IDLE;
- UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].UE_index = 0xffff;
- UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Rx_buffer.payload_size = 0;
- UE_rrc_inst[ctxt_pP->module_id].Srb0[eNB_index].Tx_buffer.payload_size = 0;
- UE_rrc_inst[ctxt_pP->module_id].Srb1[eNB_index].Srb_info.Rx_buffer.payload_size = 0;
- UE_rrc_inst[ctxt_pP->module_id].Srb1[eNB_index].Srb_info.Tx_buffer.payload_size = 0;
-
- if (UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Active == 1) {
- msg ("[RRC Inst %d] eNB_index %d, Remove RB %d\n ", ctxt_pP->module_id, eNB_index,
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id);
- rrc_pdcp_config_req (ctxt_pP,
- SRB_FLAG_YES,
- CONFIG_ACTION_REMOVE,
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
- 0);
- rrc_rlc_config_req (ctxt_pP,
- SRB_FLAG_YES,
- MBMS_FLAG_NO,
- CONFIG_ACTION_REMOVE,
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
- Rlc_info_um);
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Active = 0;
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Status = IDLE;
- UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Next_check_frame = 0;
- }
- } else { // Restablishment procedure
- LOG_D(RRC, "Timer 310 expired, trying RRCRestablishment ...\n");
- }
-}
-
-//-----------------------------------------------------------------------------
-RRC_status_t
-rrc_rx_tx(
- protocol_ctxt_t* const ctxt_pP,
- const uint8_t enb_indexP,
- const int CC_id
-)
-//-----------------------------------------------------------------------------
-{
- //uint8_t UE_id;
- int32_t current_timestamp_ms, ref_timestamp_ms;
- struct timeval ts;
- struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL;
-
-#ifdef LOCALIZATION
- double estimated_distance;
- protocol_ctxt_t ctxt;
-#endif
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_IN);
-
- if(ctxt_pP->enb_flag == ENB_FLAG_NO) {
- // check timers
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_active == 1) {
- if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt % 10) == 0)
- LOG_D(RRC,
- "[UE %d][RAPROC] Frame %d T300 Count %d ms\n", ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt);
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt
- == T300[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.t300]) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_active = 0;
- // ALLOW CCCH to be used
- UE_rrc_inst[ctxt_pP->module_id].Srb0[enb_indexP].Tx_buffer.payload_size = 0;
- rrc_ue_generate_RRCConnectionRequest (ctxt_pP, enb_indexP);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- return (RRC_ConnSetup_failed);
- }
-
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T300_cnt++;
- }
-
- if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].SIStatus&2)>0) {
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt
- == N310[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.n310]) {
- LOG_I(RRC,"Activating T310\n");
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 1;
- }
- } else { // in case we have not received SIB2 yet
- /* if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt == 100) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N310_cnt = 0;
-
- }*/
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- return RRC_OK;
- }
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active == 1) {
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N311_cnt
- == N311[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.n311]) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 0;
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].N311_cnt = 0;
- }
-
- if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt % 10) == 0) {
- LOG_D(RRC, "[UE %d] Frame %d T310 Count %d ms\n", ctxt_pP->module_id, ctxt_pP->frame, UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt);
- }
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt == T310[UE_rrc_inst[ctxt_pP->module_id].sib2[enb_indexP]->ue_TimersAndConstants.t310]) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_active = 0;
- rrc_t310_expiration (ctxt_pP, enb_indexP);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- LOG_I(RRC,"Returning RRC_PHY_RESYNCH: T310 expired\n");
- return RRC_PHY_RESYNCH;
- }
-
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T310_cnt++;
- }
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_active==1) {
- if ((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt % 10) == 0)
- LOG_D(RRC,"[UE %d][RAPROC] Frame %d T304 Count %d ms\n",ctxt_pP->module_id,ctxt_pP->frame,
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt);
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt == 0) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_active = 0;
- UE_rrc_inst[ctxt_pP->module_id].HandoverInfoUe.measFlag = 1;
- LOG_E(RRC,"[UE %d] Handover failure..initiating connection re-establishment procedure... \n",
- ctxt_pP->module_id);
- //Implement 36.331, section 5.3.5.6 here
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- return(RRC_Handover_failed);
- }
-
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].T304_cnt--;
- }
-
- // Layer 3 filtering of RRC measurements
- if (UE_rrc_inst[ctxt_pP->module_id].QuantityConfig[0] != NULL) {
- ue_meas_filtering(ctxt_pP,enb_indexP);
- }
-
- ue_measurement_report_triggering(ctxt_pP,enb_indexP);
-
- if (UE_rrc_inst[ctxt_pP->module_id].Info[0].handoverTarget > 0) {
- LOG_I(RRC,"[UE %d] Frame %d : RRC handover initiated\n", ctxt_pP->module_id, ctxt_pP->frame);
- }
-
- if((UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].State == RRC_HO_EXECUTION) &&
- (UE_rrc_inst[ctxt_pP->module_id].HandoverInfoUe.targetCellId != 0xFF)) {
- UE_rrc_inst[ctxt_pP->module_id].Info[enb_indexP].State= RRC_IDLE;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- return(RRC_HO_STARTED);
- }
-
- } else { // eNB
- check_handovers(ctxt_pP);
- // counetr, and get the value and aggregate
-
- // check for UL failure
- RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
- if ((ctxt_pP->frame == 0) && (ctxt_pP->subframe==0)) {
- if (ue_context_p->ue_context.Initialue_identity_s_TMSI.presence == TRUE) {
- LOG_I(RRC,"UE rnti %x:S-TMSI %x failure timer %d/8\n",
- ue_context_p->ue_context.rnti,
- ue_context_p->ue_context.Initialue_identity_s_TMSI.m_tmsi,
- ue_context_p->ue_context.ul_failure_timer);
- }
- else {
- LOG_I(RRC,"UE rnti %x failure timer %d/8\n",
- ue_context_p->ue_context.rnti,
- ue_context_p->ue_context.ul_failure_timer);
- }
- }
- if (ue_context_p->ue_context.ul_failure_timer>0) {
- ue_context_p->ue_context.ul_failure_timer++;
- if (ue_context_p->ue_context.ul_failure_timer >= 8) {
- // remove UE after 20 seconds after MAC has indicated UL failure
- LOG_I(RRC,"Removing UE %x instance\n",ue_context_p->ue_context.rnti);
- ue_to_be_removed = ue_context_p;
- break;
- }
- }
- if (ue_context_p->ue_context.ue_release_timer_s1>0) {
- ue_context_p->ue_context.ue_release_timer_s1++;
- if (ue_context_p->ue_context.ue_release_timer_s1 >=
- ue_context_p->ue_context.ue_release_timer_thres_s1) {
- LOG_I(RRC,"Removing UE %x instance Because of UE_CONTEXT_RELEASE_COMMAND not received after %d ms from sending request\n",
- ue_context_p->ue_context.rnti, ue_context_p->ue_context.ue_release_timer_thres_s1);
- ue_to_be_removed = ue_context_p;
- break;
- }
- }
-
- if (ue_context_p->ue_context.ue_release_timer_rrc>0) {
- ue_context_p->ue_context.ue_release_timer_rrc++;
- if (ue_context_p->ue_context.ue_release_timer_rrc >=
- ue_context_p->ue_context.ue_release_timer_thres_rrc) {
- LOG_I(RRC,"Removing UE %x instance After UE_CONTEXT_RELEASE_Complete\n", ue_context_p->ue_context.rnti);
- ue_to_be_removed = ue_context_p;
- break;
- }
- }
-
- if (ue_context_p->ue_context.ue_reestablishment_timer>0) {
- ue_context_p->ue_context.ue_reestablishment_timer++;
- if (ue_context_p->ue_context.ue_reestablishment_timer >=
- ue_context_p->ue_context.ue_reestablishment_timer_thres) {
- LOG_I(RRC,"UE %d reestablishment_timer max\n",ue_context_p->ue_context.rnti);
- ue_context_p->ue_context.ul_failure_timer = 20000;
- ue_to_be_removed = ue_context_p;
- ue_context_p->ue_context.ue_reestablishment_timer = 0;
- break;
- }
- }
- if (ue_context_p->ue_context.ue_release_timer>0) {
- ue_context_p->ue_context.ue_release_timer++;
- if (ue_context_p->ue_context.ue_release_timer >=
- ue_context_p->ue_context.ue_release_timer_thres) {
- LOG_I(RRC,"Removing UE %x instance\n",ue_context_p->ue_context.rnti);
- ue_to_be_removed = ue_context_p;
- break;
- }
- }
- }
- if (ue_to_be_removed) {
- if(ue_to_be_removed->ue_context.ul_failure_timer >= 8) {
- ue_to_be_removed->ue_context.ue_release_timer_s1 = 1;
- ue_to_be_removed->ue_context.ue_release_timer_thres_s1 = 100;
- ue_to_be_removed->ue_context.ue_release_timer = 0;
- ue_to_be_removed->ue_context.ue_reestablishment_timer = 0;
- }
- rrc_eNB_free_UE(ctxt_pP->module_id,ue_to_be_removed);
- if(ue_to_be_removed->ue_context.ul_failure_timer >= 8){
- ue_to_be_removed->ue_context.ul_failure_timer = 0;
- }
- }
-#ifdef RRC_LOCALIZATION
-
- /* for the localization, only primary CC_id might be relevant*/
- gettimeofday(&ts, NULL);
- current_timestamp_ms = ts.tv_sec * 1000 + ts.tv_usec / 1000;
- ref_timestamp_ms = RC.rrc[ctxt_pP->module_id]->reference_timestamp_ms;
- RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
- ctxt = *ctxt_pP;
- ctxt.rnti = ue_context_p->ue_context.rnti;
- estimated_distance = rrc_get_estimated_ue_distance(
- &ctxt,
- CC_id,
- RC.rrc[ctxt_pP->module_id]->loc_type);
-
- if ((current_timestamp_ms - ref_timestamp_ms > RC.rrc[ctxt_pP->module_id]->aggregation_period_ms) &&
- estimated_distance != -1) {
- LOG_D(LOCALIZE, " RRC [UE/id %d -> eNB/id %d] timestamp %d frame %d estimated r = %f\n",
- ctxt.rnti,
- ctxt_pP->module_id,
- current_timestamp_ms,
- ctxt_pP->frame,
- estimated_distance);
- LOG_D(LOCALIZE, " RRC status %d\n", ue_context_p->ue_context.Status);
- push_front(&RC.rrc[ctxt_pP->module_id]->loc_list,
- estimated_distance);
- RC.rrc[ctxt_pP->module_id]->reference_timestamp_ms = current_timestamp_ms;
- }
- }
-
-#endif
- (void)ts; /* remove gcc warning "unused variable" */
- (void)ref_timestamp_ms; /* remove gcc warning "unused variable" */
- (void)current_timestamp_ms; /* remove gcc warning "unused variable" */
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
- return (RRC_OK);
-}
-
//-----------------------------------------------------------------------------
long
binary_search_int(
@@ -529,3 +217,110 @@ binary_search_float(
return first;
}
+typedef enum { BAND_TYPE_FDD, BAND_TYPE_TDD } band_type;
+
+typedef struct {
+ band_type t;
+ int band;
+ unsigned long ul_minfreq, ul_maxfreq;
+ unsigned long dl_minfreq, dl_maxfreq;
+} band_freq;
+
+static band_freq bands[] = {
+ { BAND_TYPE_FDD, 1, 1920000000UL, 1980000000UL, 2110000000UL, 2170000000UL },
+ { BAND_TYPE_FDD, 2, 1850000000UL, 1910000000UL, 1930000000UL, 1990000000UL },
+ { BAND_TYPE_FDD, 3, 1710000000UL, 1785000000UL, 1805000000UL, 1880000000UL },
+ { BAND_TYPE_FDD, 4, 1710000000UL, 1755000000UL, 2110000000UL, 2155000000UL },
+ { BAND_TYPE_FDD, 5, 824000000UL, 849000000UL, 869000000UL, 894000000UL },
+ /* to remove? */{ BAND_TYPE_FDD, 6, 830000000UL, 840000000UL, 875000000UL, 885000000UL },
+ { BAND_TYPE_FDD, 7, 2500000000UL, 2570000000UL, 2620000000UL, 2690000000UL },
+ { BAND_TYPE_FDD, 8, 880000000UL, 915000000UL, 925000000UL, 960000000UL },
+ { BAND_TYPE_FDD, 9, 1749900000UL, 1784900000UL, 1844900000UL, 1879900000UL },
+ { BAND_TYPE_FDD, 10, 1710000000UL, 1770000000UL, 2110000000UL, 2170000000UL },
+ { BAND_TYPE_FDD, 11, 1427900000UL, 1447900000UL, 1475900000UL, 1495900000UL },
+ { BAND_TYPE_FDD, 12, 699000000UL, 716000000UL, 729000000UL, 746000000UL },
+ { BAND_TYPE_FDD, 13, 777000000UL, 787000000UL, 746000000UL, 756000000UL },
+ { BAND_TYPE_FDD, 14, 788000000UL, 798000000UL, 758000000UL, 768000000UL },
+ { BAND_TYPE_FDD, 17, 704000000UL, 716000000UL, 734000000UL, 746000000UL },
+ { BAND_TYPE_FDD, 18, 815000000UL, 830000000UL, 860000000UL, 875000000UL },
+ { BAND_TYPE_FDD, 19, 830000000UL, 845000000UL, 875000000UL, 890000000UL },
+ { BAND_TYPE_FDD, 20, 832000000UL, 862000000UL, 791000000UL, 821000000UL },
+ { BAND_TYPE_FDD, 21, 1447900000UL, 1462900000UL, 1495900000UL, 1510900000UL },
+ { BAND_TYPE_FDD, 22, 3410000000UL, 3490000000UL, 3510000000UL, 3590000000UL },
+ { BAND_TYPE_FDD, 23, 2000000000UL, 2020000000UL, 2180000000UL, 2200000000UL },
+ { BAND_TYPE_FDD, 24, 1626500000UL, 1660500000UL, 1525000000UL, 1559000000UL },
+ { BAND_TYPE_FDD, 25, 1850000000UL, 1915000000UL, 1930000000UL, 1995000000UL },
+
+ { BAND_TYPE_TDD, 33, 1900000000UL, 1920000000UL, 1900000000UL, 1920000000UL },
+ { BAND_TYPE_TDD, 34, 2010000000UL, 2025000000UL, 2010000000UL, 2025000000UL },
+ { BAND_TYPE_TDD, 35, 1850000000UL, 1910000000UL, 1850000000UL, 1910000000UL },
+ { BAND_TYPE_TDD, 36, 1930000000UL, 1990000000UL, 1930000000UL, 1990000000UL },
+ { BAND_TYPE_TDD, 37, 1910000000UL, 1930000000UL, 1910000000UL, 1930000000UL },
+ { BAND_TYPE_TDD, 38, 2570000000UL, 2620000000UL, 2570000000UL, 2620000000UL },
+ { BAND_TYPE_TDD, 39, 1880000000UL, 1920000000UL, 1880000000UL, 1920000000UL },
+ { BAND_TYPE_TDD, 40, 2300000000UL, 2400000000UL, 2300000000UL, 2400000000UL },
+ { BAND_TYPE_TDD, 41, 2496000000UL, 2690000000UL, 2496000000UL, 2690000000UL },
+ { BAND_TYPE_TDD, 42, 3400000000UL, 3600000000UL, 3400000000UL, 3600000000UL },
+ { BAND_TYPE_TDD, 43, 3600000000UL, 3800000000UL, 3600000000UL, 3800000000UL },
+};
+
+typedef struct {
+ int band;
+ unsigned long dl_flow;
+ int dl_off;
+ int dl_offmin, dl_offmax;
+ unsigned long ul_flow;
+ int ul_off;
+ int ul_offmin, ul_offmax;
+} earfcn;
+
+static earfcn earfcn_table[] = {
+ { 1, 2110000000UL, 0, 0, 599, 1920000000UL, 18000, 18000, 18599 },
+ { 2, 1930000000UL, 600, 600, 1199, 1850000000UL, 18600, 18600, 19199 },
+ { 3, 1805000000UL, 1200, 1200, 1949, 1710000000UL, 19200, 19200, 19949 },
+ { 4, 2110000000UL, 1950, 1950, 2399, 1710000000UL, 19950, 19950, 20399 },
+ { 5, 869000000UL, 2400, 2400, 2649, 824000000UL, 20400, 20400, 20649 },
+ { 6, 875000000UL, 2650, 2650, 2749, 830000000UL, 20650, 20650, 20749 },
+ { 7, 2620000000UL, 2750, 2750, 3449, 2500000000UL, 20750, 20750, 21449 },
+ { 8, 925000000UL, 3450, 3450, 3799, 880000000UL, 21450, 21450, 21799 },
+ { 9, 1844900000UL, 3800, 3800, 4149, 1749900000UL, 21800, 21800, 22149 },
+ { 10, 2110000000UL, 4150, 4150, 4749, 1710000000UL, 22150, 22150, 22749 },
+ { 11, 1475900000UL, 4750, 4750, 4949, 1427900000UL, 22750, 22750, 22949 },
+ { 12, 729000000UL, 5010, 5010, 5179, 699000000UL, 23010, 23010, 23179 },
+ { 13, 746000000UL, 5180, 5180, 5279, 777000000UL, 23180, 23180, 23279 },
+ { 14, 758000000UL, 5280, 5280, 5379, 788000000UL, 23280, 23280, 23379 },
+ { 17, 734000000UL, 5730, 5730, 5849, 704000000UL, 23730, 23730, 23849 },
+ { 18, 860000000UL, 5850, 5850, 5999, 815000000UL, 23850, 23850, 23999 },
+ { 19, 875000000UL, 6000, 6000, 6149, 830000000UL, 24000, 24000, 24149 },
+ { 20, 791000000UL, 6150, 6150, 6449, 832000000UL, 24150, 24150, 24449 },
+ { 21, 1495900000UL, 6450, 6450, 6599, 1447900000UL, 24450, 24450, 24599 },
+ { 22, 3510000000UL, 6600, 6600, 7399, 3410000000UL, 24600, 24600, 25399 },
+ { 23, 2180000000UL, 7500, 7500, 7699, 2000000000UL, 25500, 25500, 25699 },
+ { 24, 1525000000UL, 7700, 7700, 8039, 1626500000UL, 25700, 25700, 26039 },
+ { 25, 1930000000UL, 8040, 8040, 8689, 1850000000UL, 26040, 26040, 26689 },
+ { 33, 1900000000UL, 36000, 36000, 36199, 1900000000UL, 36000, 36000, 36199 },
+ { 34, 2010000000UL, 36200, 36200, 36349, 2010000000UL, 36200, 36200, 36349 },
+ { 35, 1850000000UL, 36350, 36350, 36949, 1850000000UL, 36350, 36350, 36949 },
+ { 36, 1930000000UL, 36950, 36950, 37549, 1930000000UL, 36950, 36950, 37549 },
+ { 37, 1910000000UL, 37550, 37550, 37749, 1910000000UL, 37550, 37550, 37749 },
+ { 38, 2570000000UL, 37750, 37750, 38249, 2570000000UL, 37750, 37750, 38249 },
+ { 39, 1880000000UL, 38250, 38250, 38649, 1880000000UL, 38250, 38250, 38649 },
+ { 40, 2300000000UL, 38650, 38650, 39649, 2300000000UL, 38650, 38650, 39649 },
+ { 41, 2496000000UL, 39650, 39650, 41589, 2496000000UL, 39650, 39650, 41589 },
+ { 42, 3400000000UL, 41590, 41590, 43589, 3400000000UL, 41590, 41590, 43589 },
+ { 43, 3600000000UL, 43590, 43590, 45589, 3600000000UL, 43590, 43590, 45589 },
+};
+
+int freq_to_arfcn10(int band, unsigned long freq)
+{
+ int N = sizeof(earfcn_table) / sizeof(earfcn_table[0]);
+ int i;
+
+ for (i = 0; i < N; i++) if (bands[i].band == band) break;
+ if (i == N) return -1;
+
+ if (!(bands[i].dl_minfreq < freq && freq < bands[i].dl_maxfreq))
+ return -1;
+
+ return (freq - earfcn_table[i].dl_flow) / 100000UL + earfcn_table[i].dl_off;
+}
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 66e8a93a3a5b356ba9f3e589257086f071e78d0c..fbc95c8b7433527ae7523f7e316cca006293f9f3 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -56,6 +56,7 @@
#include "rrc_eNB_UE_context.h"
#include "platform_types.h"
#include "msc.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
#include "T.h"
@@ -114,6 +115,25 @@ extern uint16_t two_tier_hexagonal_cellIds[7];
mui_t rrc_eNB_mui = 0;
+void
+openair_rrc_on(
+ const protocol_ctxt_t* const ctxt_pP
+)
+//-----------------------------------------------------------------------------
+{
+ unsigned short i;
+ int CC_id;
+
+ LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" ENB:OPENAIR RRC IN....\n",
+ PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ rrc_config_buffer (&RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SI, BCCH, 1);
+ RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SI.Active = 1;
+ rrc_config_buffer (&RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0, CCCH, 1);
+ RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Active = 1;
+ }
+}
+
//-----------------------------------------------------------------------------
static void
init_SI(
@@ -613,7 +633,7 @@ rrc_eNB_get_next_free_ue_context(
}
}
-#if !defined(ENABLE_USE_MME)
+#if 0 //!defined(ENABLE_USE_MME)
void rrc_eNB_emulation_notify_ue_module_id(
const module_id_t ue_module_idP,
const rnti_t rntiP,
@@ -3333,113 +3353,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t* cons
PDCP_TRANSMISSION_MODE_CONTROL);
}
-typedef enum { BAND_TYPE_FDD, BAND_TYPE_TDD } band_type;
-
-typedef struct {
- band_type t;
- int band;
- unsigned long ul_minfreq, ul_maxfreq;
- unsigned long dl_minfreq, dl_maxfreq;
-} band_freq;
-
-static band_freq bands[] = {
- { BAND_TYPE_FDD, 1, 1920000000UL, 1980000000UL, 2110000000UL, 2170000000UL },
- { BAND_TYPE_FDD, 2, 1850000000UL, 1910000000UL, 1930000000UL, 1990000000UL },
- { BAND_TYPE_FDD, 3, 1710000000UL, 1785000000UL, 1805000000UL, 1880000000UL },
- { BAND_TYPE_FDD, 4, 1710000000UL, 1755000000UL, 2110000000UL, 2155000000UL },
- { BAND_TYPE_FDD, 5, 824000000UL, 849000000UL, 869000000UL, 894000000UL },
- /* to remove? */{ BAND_TYPE_FDD, 6, 830000000UL, 840000000UL, 875000000UL, 885000000UL },
- { BAND_TYPE_FDD, 7, 2500000000UL, 2570000000UL, 2620000000UL, 2690000000UL },
- { BAND_TYPE_FDD, 8, 880000000UL, 915000000UL, 925000000UL, 960000000UL },
- { BAND_TYPE_FDD, 9, 1749900000UL, 1784900000UL, 1844900000UL, 1879900000UL },
- { BAND_TYPE_FDD, 10, 1710000000UL, 1770000000UL, 2110000000UL, 2170000000UL },
- { BAND_TYPE_FDD, 11, 1427900000UL, 1447900000UL, 1475900000UL, 1495900000UL },
- { BAND_TYPE_FDD, 12, 699000000UL, 716000000UL, 729000000UL, 746000000UL },
- { BAND_TYPE_FDD, 13, 777000000UL, 787000000UL, 746000000UL, 756000000UL },
- { BAND_TYPE_FDD, 14, 788000000UL, 798000000UL, 758000000UL, 768000000UL },
- { BAND_TYPE_FDD, 17, 704000000UL, 716000000UL, 734000000UL, 746000000UL },
- { BAND_TYPE_FDD, 18, 815000000UL, 830000000UL, 860000000UL, 875000000UL },
- { BAND_TYPE_FDD, 19, 830000000UL, 845000000UL, 875000000UL, 890000000UL },
- { BAND_TYPE_FDD, 20, 832000000UL, 862000000UL, 791000000UL, 821000000UL },
- { BAND_TYPE_FDD, 21, 1447900000UL, 1462900000UL, 1495900000UL, 1510900000UL },
- { BAND_TYPE_FDD, 22, 3410000000UL, 3490000000UL, 3510000000UL, 3590000000UL },
- { BAND_TYPE_FDD, 23, 2000000000UL, 2020000000UL, 2180000000UL, 2200000000UL },
- { BAND_TYPE_FDD, 24, 1626500000UL, 1660500000UL, 1525000000UL, 1559000000UL },
- { BAND_TYPE_FDD, 25, 1850000000UL, 1915000000UL, 1930000000UL, 1995000000UL },
-
- { BAND_TYPE_TDD, 33, 1900000000UL, 1920000000UL, 1900000000UL, 1920000000UL },
- { BAND_TYPE_TDD, 34, 2010000000UL, 2025000000UL, 2010000000UL, 2025000000UL },
- { BAND_TYPE_TDD, 35, 1850000000UL, 1910000000UL, 1850000000UL, 1910000000UL },
- { BAND_TYPE_TDD, 36, 1930000000UL, 1990000000UL, 1930000000UL, 1990000000UL },
- { BAND_TYPE_TDD, 37, 1910000000UL, 1930000000UL, 1910000000UL, 1930000000UL },
- { BAND_TYPE_TDD, 38, 2570000000UL, 2620000000UL, 2570000000UL, 2620000000UL },
- { BAND_TYPE_TDD, 39, 1880000000UL, 1920000000UL, 1880000000UL, 1920000000UL },
- { BAND_TYPE_TDD, 40, 2300000000UL, 2400000000UL, 2300000000UL, 2400000000UL },
- { BAND_TYPE_TDD, 41, 2496000000UL, 2690000000UL, 2496000000UL, 2690000000UL },
- { BAND_TYPE_TDD, 42, 3400000000UL, 3600000000UL, 3400000000UL, 3600000000UL },
- { BAND_TYPE_TDD, 43, 3600000000UL, 3800000000UL, 3600000000UL, 3800000000UL },
-};
-
-typedef struct {
- int band;
- unsigned long dl_flow;
- int dl_off;
- int dl_offmin, dl_offmax;
- unsigned long ul_flow;
- int ul_off;
- int ul_offmin, ul_offmax;
-} earfcn;
-
-static earfcn earfcn_table[] = {
- { 1, 2110000000UL, 0, 0, 599, 1920000000UL, 18000, 18000, 18599 },
- { 2, 1930000000UL, 600, 600, 1199, 1850000000UL, 18600, 18600, 19199 },
- { 3, 1805000000UL, 1200, 1200, 1949, 1710000000UL, 19200, 19200, 19949 },
- { 4, 2110000000UL, 1950, 1950, 2399, 1710000000UL, 19950, 19950, 20399 },
- { 5, 869000000UL, 2400, 2400, 2649, 824000000UL, 20400, 20400, 20649 },
- { 6, 875000000UL, 2650, 2650, 2749, 830000000UL, 20650, 20650, 20749 },
- { 7, 2620000000UL, 2750, 2750, 3449, 2500000000UL, 20750, 20750, 21449 },
- { 8, 925000000UL, 3450, 3450, 3799, 880000000UL, 21450, 21450, 21799 },
- { 9, 1844900000UL, 3800, 3800, 4149, 1749900000UL, 21800, 21800, 22149 },
- { 10, 2110000000UL, 4150, 4150, 4749, 1710000000UL, 22150, 22150, 22749 },
- { 11, 1475900000UL, 4750, 4750, 4949, 1427900000UL, 22750, 22750, 22949 },
- { 12, 729000000UL, 5010, 5010, 5179, 699000000UL, 23010, 23010, 23179 },
- { 13, 746000000UL, 5180, 5180, 5279, 777000000UL, 23180, 23180, 23279 },
- { 14, 758000000UL, 5280, 5280, 5379, 788000000UL, 23280, 23280, 23379 },
- { 17, 734000000UL, 5730, 5730, 5849, 704000000UL, 23730, 23730, 23849 },
- { 18, 860000000UL, 5850, 5850, 5999, 815000000UL, 23850, 23850, 23999 },
- { 19, 875000000UL, 6000, 6000, 6149, 830000000UL, 24000, 24000, 24149 },
- { 20, 791000000UL, 6150, 6150, 6449, 832000000UL, 24150, 24150, 24449 },
- { 21, 1495900000UL, 6450, 6450, 6599, 1447900000UL, 24450, 24450, 24599 },
- { 22, 3510000000UL, 6600, 6600, 7399, 3410000000UL, 24600, 24600, 25399 },
- { 23, 2180000000UL, 7500, 7500, 7699, 2000000000UL, 25500, 25500, 25699 },
- { 24, 1525000000UL, 7700, 7700, 8039, 1626500000UL, 25700, 25700, 26039 },
- { 25, 1930000000UL, 8040, 8040, 8689, 1850000000UL, 26040, 26040, 26689 },
- { 33, 1900000000UL, 36000, 36000, 36199, 1900000000UL, 36000, 36000, 36199 },
- { 34, 2010000000UL, 36200, 36200, 36349, 2010000000UL, 36200, 36200, 36349 },
- { 35, 1850000000UL, 36350, 36350, 36949, 1850000000UL, 36350, 36350, 36949 },
- { 36, 1930000000UL, 36950, 36950, 37549, 1930000000UL, 36950, 36950, 37549 },
- { 37, 1910000000UL, 37550, 37550, 37749, 1910000000UL, 37550, 37550, 37749 },
- { 38, 2570000000UL, 37750, 37750, 38249, 2570000000UL, 37750, 37750, 38249 },
- { 39, 1880000000UL, 38250, 38250, 38649, 1880000000UL, 38250, 38250, 38649 },
- { 40, 2300000000UL, 38650, 38650, 39649, 2300000000UL, 38650, 38650, 39649 },
- { 41, 2496000000UL, 39650, 39650, 41589, 2496000000UL, 39650, 39650, 41589 },
- { 42, 3400000000UL, 41590, 41590, 43589, 3400000000UL, 41590, 41590, 43589 },
- { 43, 3600000000UL, 43590, 43590, 45589, 3600000000UL, 43590, 43590, 45589 },
-};
-
-int freq_to_arfcn10(int band, unsigned long freq)
-{
- int N = sizeof(earfcn_table) / sizeof(earfcn_table[0]);
- int i;
-
- for (i = 0; i < N; i++) if (bands[i].band == band) break;
- if (i == N) return -1;
-
- if (!(bands[i].dl_minfreq < freq && freq < bands[i].dl_maxfreq))
- return -1;
-
- return (freq - earfcn_table[i].dl_flow) / 100000UL + earfcn_table[i].dl_off;
-}
+
//-----------------------------------------------------------------------------
int
@@ -6727,3 +6641,101 @@ rrc_top_cleanup_eNB(
free(RC.rrc);
}
+
+//-----------------------------------------------------------------------------
+RRC_status_t
+rrc_rx_tx(
+ protocol_ctxt_t* const ctxt_pP,
+ const int CC_id
+)
+//-----------------------------------------------------------------------------
+{
+ //uint8_t UE_id;
+ int32_t current_timestamp_ms, ref_timestamp_ms;
+ struct timeval ts;
+ struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL;
+
+#ifdef LOCALIZATION
+ double estimated_distance;
+ protocol_ctxt_t ctxt;
+#endif
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_IN);
+
+ check_handovers(ctxt_pP);
+ // counetr, and get the value and aggregate
+
+ // check for UL failure
+ RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
+ if ((ctxt_pP->frame == 0) && (ctxt_pP->subframe==0)) {
+ if (ue_context_p->ue_context.Initialue_identity_s_TMSI.presence == TRUE) {
+ LOG_I(RRC,"UE rnti %x:S-TMSI %x failure timer %d/20000\n",
+ ue_context_p->ue_context.rnti,
+ ue_context_p->ue_context.Initialue_identity_s_TMSI.m_tmsi,
+ ue_context_p->ue_context.ul_failure_timer);
+ }
+ else {
+ LOG_I(RRC,"UE rnti %x failure timer %d/20000\n",
+ ue_context_p->ue_context.rnti,
+ ue_context_p->ue_context.ul_failure_timer);
+ }
+ }
+ if (ue_context_p->ue_context.ul_failure_timer>0) {
+ ue_context_p->ue_context.ul_failure_timer++;
+ if (ue_context_p->ue_context.ul_failure_timer >= 20000) {
+ // remove UE after 20 seconds after MAC has indicated UL failure
+ LOG_I(RRC,"Removing UE %x instance\n",ue_context_p->ue_context.rnti);
+ ue_to_be_removed = ue_context_p;
+ break;
+ }
+ }
+ if (ue_context_p->ue_context.ue_release_timer>0) {
+ ue_context_p->ue_context.ue_release_timer++;
+ if (ue_context_p->ue_context.ue_release_timer >=
+ ue_context_p->ue_context.ue_release_timer_thres) {
+ LOG_I(RRC,"Removing UE %x instance\n",ue_context_p->ue_context.rnti);
+ ue_to_be_removed = ue_context_p;
+ break;
+ }
+ }
+ }
+ if (ue_to_be_removed)
+ rrc_eNB_free_UE(ctxt_pP->module_id,ue_to_be_removed);
+
+#ifdef RRC_LOCALIZATION
+
+ /* for the localization, only primary CC_id might be relevant*/
+ gettimeofday(&ts, NULL);
+ current_timestamp_ms = ts.tv_sec * 1000 + ts.tv_usec / 1000;
+ ref_timestamp_ms = RC.rrc[ctxt_pP->module_id]->reference_timestamp_ms;
+ RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
+ ctxt = *ctxt_pP;
+ ctxt.rnti = ue_context_p->ue_context.rnti;
+ estimated_distance = rrc_get_estimated_ue_distance(
+ &ctxt,
+ CC_id,
+ RC.rrc[ctxt_pP->module_id]->loc_type);
+
+ if ((current_timestamp_ms - ref_timestamp_ms > RC.rrc[ctxt_pP->module_id]->aggregation_period_ms) &&
+ estimated_distance != -1) {
+ LOG_D(LOCALIZE, " RRC [UE/id %d -> eNB/id %d] timestamp %d frame %d estimated r = %f\n",
+ ctxt.rnti,
+ ctxt_pP->module_id,
+ current_timestamp_ms,
+ ctxt_pP->frame,
+ estimated_distance);
+ LOG_D(LOCALIZE, " RRC status %d\n", ue_context_p->ue_context.Status);
+ push_front(&RC.rrc[ctxt_pP->module_id]->loc_list,
+ estimated_distance);
+ RC.rrc[ctxt_pP->module_id]->reference_timestamp_ms = current_timestamp_ms;
+ }
+ }
+
+#endif
+ (void)ts; /* remove gcc warning "unused variable" */
+ (void)ref_timestamp_ms; /* remove gcc warning "unused variable" */
+ (void)current_timestamp_ms; /* remove gcc warning "unused variable" */
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
+ return (RRC_OK);
+}
+
diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c
index b911fbc5a4a38a7b322a218e3962ce29832240c1..1efe6f73eb74a8d518a81015f7c1a3ee0decefbf 100644
--- a/targets/COMMON/create_tasks.c
+++ b/targets/COMMON/create_tasks.c
@@ -40,9 +40,9 @@
# endif
# include "enb_app.h"
-int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
+int create_tasks(uint32_t enb_nb)
{
- LOG_D(ENB_APP, "%s(enb_nb:%d ue_nb:%d)\n", __FUNCTION__, enb_nb, ue_nb);
+ LOG_D(ENB_APP, "%s(enb_nb:%d\n", __FUNCTION__, enb_nb);
itti_wait_ready(1);
if (itti_create_task (TASK_L2L1, l2l1_task, NULL) < 0) {
@@ -58,11 +58,7 @@ int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
}
}
-
-# ifdef OPENAIR2
- {
# if defined(ENABLE_USE_MME)
- {
if (enb_nb > 0) {
if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
LOG_E(SCTP, "Create task for SCTP failed\n");
@@ -85,19 +81,7 @@ int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
}
}
-# if defined(NAS_BUILT_IN_UE)
- if (ue_nb > 0) {
- nas_user_container_t *users = calloc(1, sizeof(*users));
- if (users == NULL) abort();
- users->count = ue_nb;
- if (itti_create_task (TASK_NAS_UE, nas_ue_task, users) < 0) {
- LOG_E(NAS, "Create task for NAS UE failed\n");
- return -1;
- }
- }
# endif
- }
-# endif
if (enb_nb > 0) {
LOG_I(RRC,"Creating RRC eNB Task\n");
@@ -106,26 +90,7 @@ int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
LOG_E(RRC, "Create task for RRC eNB failed\n");
return -1;
}
-
- }
-
- if (ue_nb > 0) {
- if (itti_create_task (TASK_RRC_UE, rrc_ue_task, NULL) < 0) {
- LOG_E(RRC, "Create task for RRC UE failed\n");
- return -1;
- }
-
-# if ENABLE_RAL
-
- if (itti_create_task (TASK_RAL_UE, mRAL_task, NULL) < 0) {
- LOG_E(RAL_UE, "Create task for RAL UE failed\n");
- return -1;
- }
-
-# endif
}
- }
-# endif // openair2: NN: should be openair3
itti_wait_ready(0);
diff --git a/targets/COMMON/create_tasks.h b/targets/COMMON/create_tasks.h
index 493c441f59adbd6bfe2d544e835abb066f58e8f6..ff1d9ace5199fbc0dbf3bf8b9cc7a52f1db983c5 100644
--- a/targets/COMMON/create_tasks.h
+++ b/targets/COMMON/create_tasks.h
@@ -26,7 +26,8 @@
/* External declaration of L2L1 task that depend on the target */
extern void *l2l1_task(void *arg);
-int create_tasks(uint32_t enb_nb, uint32_t ue_nb);
+int create_tasks(uint32_t enb_nb);
+int create_tasks_ue(uint32_t ue_nb);
#endif
#endif /* CREATE_TASKS_H_ */
diff --git a/targets/COMMON/create_tasks_ue.c b/targets/COMMON/create_tasks_ue.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd36511b524a093504730643748f55bea95254ff
--- /dev/null
+++ b/targets/COMMON/create_tasks_ue.c
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+# include "create_tasks.h"
+# include "log.h"
+
+# ifdef OPENAIR2
+# if defined(ENABLE_USE_MME)
+# include "sctp_eNB_task.h"
+# include "s1ap_eNB.h"
+# include "nas_ue_task.h"
+# include "udp_eNB_task.h"
+# include "gtpv1u_eNB_task.h"
+# endif
+# if ENABLE_RAL
+# include "lteRALue.h"
+# include "lteRALenb.h"
+# endif
+# include "RRC/LITE/defs.h"
+# endif
+# include "enb_app.h"
+
+int create_tasks_ue(uint32_t ue_nb)
+{
+ LOG_D(ENB_APP, "%s(ue_nb:%d)\n", __FUNCTION__, ue_nb);
+
+ itti_wait_ready(1);
+ if (itti_create_task (TASK_L2L1, l2l1_task, NULL) < 0) {
+ LOG_E(PDCP, "Create task for L2L1 failed\n");
+ return -1;
+ }
+
+# if defined(ENABLE_USE_MME)
+# if defined(NAS_BUILT_IN_UE)
+ if (ue_nb > 0) {
+ nas_user_container_t *users = calloc(1, sizeof(*users));
+ if (users == NULL) abort();
+ users->count = ue_nb;
+ if (itti_create_task (TASK_NAS_UE, nas_ue_task, users) < 0) {
+ LOG_E(NAS, "Create task for NAS UE failed\n");
+ return -1;
+ }
+ }
+# endif
+# endif
+
+ if (ue_nb > 0) {
+ if (itti_create_task (TASK_RRC_UE, rrc_ue_task, NULL) < 0) {
+ LOG_E(RRC, "Create task for RRC UE failed\n");
+ return -1;
+ }
+
+ }
+
+
+ itti_wait_ready(0);
+
+ return 0;
+}
+#endif
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
index 048f2fcc358fa6de5fc02e48d7223b8b5a202514..e60e7934386b9b8296a5b1b1ebc4845a984f1a7a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
@@ -197,13 +197,13 @@ RUs = (
);
log_config = {
- global_log_level ="debug";
+ global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
- phy_log_level ="debug";
+ phy_log_level ="info";
phy_log_verbosity ="medium";
- mac_log_level ="debug";
+ mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index 9f67e75b1c8f59003009747345c221258e75762d..65d945dd7eac3832d81e75ba57503bdd8394331b 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -95,6 +95,9 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "enb_config.h"
//#include "PHY/TOOLS/time_meas.h"
+#include "ENB_APP/enb_paramdef.h"
+#include "common/config/config_userapi.h"
+
#ifndef OPENAIR2
#include "UTIL/OTG/otg_extern.h"
#endif
@@ -626,7 +629,8 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
if ((frame_tx == 0)&&(subframe_tx == 0)) proc->frame_tx_unwrap += 1024;
- proc->timestamp_tx = (((frame_tx + proc->frame_tx_unwrap) * 10) + subframe_tx) * fp->samples_per_tti;
+ proc->timestamp_tx = ((((uint64_t)frame_tx + (uint64_t)proc->frame_tx_unwrap) * 10) + (uint64_t)subframe_tx) * (uint64_t)fp->samples_per_tti;
+
LOG_D(PHY,"RU %d/%d TST %llu, frame %d, subframe %d\n",ru->idx,0,(long long unsigned int)proc->timestamp_tx,frame_tx,subframe_tx);
// dump VCD output for first RU in list
if (ru == RC.ru[0]) {
@@ -958,13 +962,27 @@ static void* ru_thread_prach( void* param ) {
if (oai_exit) break;
if (wait_on_condition(&proc->mutex_prach,&proc->cond_prach,&proc->instance_cnt_prach,"ru_prach_thread") < 0) break;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 1 );
- prach_procedures(
+ if (ru->eNB_list[0]){
+ prach_procedures(
ru->eNB_list[0]
#ifdef Rel14
,0
#endif
);
-
+ }
+ else {
+ rx_prach(NULL,
+ ru,
+ NULL,
+ NULL,
+ NULL,
+ proc->frame_prach,
+ 0
+#ifdef Rel14
+ ,0
+#endif
+ );
+ }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0 );
if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"ru_prach_thread") < 0) break;
}
@@ -1158,10 +1176,11 @@ static inline int wakeup_prach_ru(RU_t *ru) {
ru->proc.subframe_prach = ru->proc.subframe_rx;
// DJP - think prach_procedures() is looking at eNB frame_prach
- ru->eNB_list[0]->proc.frame_prach = ru->proc.frame_rx;
- ru->eNB_list[0]->proc.subframe_prach = ru->proc.subframe_rx;
-
- LOG_D(PHY,"RU %d: waking up PRACH thread\n",ru->idx);
+ if (ru->eNB_list[0]) {
+ ru->eNB_list[0]->proc.frame_prach = ru->proc.frame_rx;
+ ru->eNB_list[0]->proc.subframe_prach = ru->proc.subframe_rx;
+ }
+ LOG_I(PHY,"RU %d: waking up PRACH thread\n",ru->idx);
// the thread can now be woken up
AssertFatal(pthread_cond_signal(&ru->proc.cond_prach) == 0, "ERROR pthread_cond_signal for RU prach thread\n");
}
@@ -1446,6 +1465,7 @@ static void* ru_thread( void* param ) {
if (ru->fh_south_in) ru->fh_south_in(ru,&frame,&subframe);
else AssertFatal(1==0, "No fronthaul interface at south port");
+/*
LOG_D(PHY,"AFTER fh_south_in - SFN/SF:%d%d RU->proc[RX:%d%d TX:%d%d] RC.eNB[0][0]:[RX:%d%d TX(SFN):%d]\n",
frame,subframe,
proc->frame_rx,proc->subframe_rx,
@@ -1457,7 +1477,7 @@ static void* ru_thread( void* param ) {
ru->do_prach,
is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx),
proc->frame_rx,proc->subframe_rx);
-
+*/
if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)==1)) {
wakeup_prach_ru(ru);
}
@@ -1822,8 +1842,11 @@ void configure_rru(int idx,
ru->frame_parms.threequarter_fs = config->threequarter_fs[0];
ru->frame_parms.pdsch_config_common.referenceSignalPower = ru->max_pdschReferenceSignalPower-config->att_tx[0];
if (ru->function==NGFI_RRU_IF4p5) {
- LOG_I(PHY,"Setting ru->function to NGFI_RRU_IF4p5, prach_FrequOffset %d, prach_ConfigIndex %d\n",
- config->prach_FreqOffset[0],config->prach_ConfigIndex[0]);
+ ru->frame_parms.att_rx = ru->att_rx;
+ ru->frame_parms.att_tx = ru->att_tx;
+
+ LOG_I(PHY,"Setting ru->function to NGFI_RRU_IF4p5, prach_FrequOffset %d, prach_ConfigIndex %d, att (%d,%d)\n",
+ config->prach_FreqOffset[0],config->prach_ConfigIndex[0],ru->att_tx,ru->att_rx);
ru->frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset = config->prach_FreqOffset[0];
ru->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex = config->prach_ConfigIndex[0];
#ifdef Rel14
@@ -1837,6 +1860,8 @@ void configure_rru(int idx,
init_frame_parms(&ru->frame_parms,1);
+ fill_rf_config(ru,ru->rf_config_file);
+
phy_init_RU(ru);
@@ -1879,7 +1904,7 @@ void init_RU(char *rf_config_file) {
int ru_id;
RU_t *ru;
int ret;
- PHY_VARS_eNB *eNB0;
+ PHY_VARS_eNB *eNB0= (PHY_VARS_eNB *)NULL;
int i;
int CC_id;
@@ -1907,22 +1932,23 @@ void init_RU(char *rf_config_file) {
// use eNB_list[0] as a reference for RU frame parameters
// NOTE: multiple CC_id are not handled here yet!
- LOG_D(PHY, "%s() RC.ru[%d].num_eNB:%d ru->eNB_list[0]:%p RC.eNB[0][0]:%p rf_config_file:%s\n", __FUNCTION__, ru_id, ru->num_eNB, ru->eNB_list[0], RC.eNB[0][0], ru->rf_config_file);
+ if (ru->num_eNB > 0) {
+ LOG_D(PHY, "%s() RC.ru[%d].num_eNB:%d ru->eNB_list[0]:%p RC.eNB[0][0]:%p rf_config_file:%s\n", __FUNCTION__, ru_id, ru->num_eNB, ru->eNB_list[0], RC.eNB[0][0], ru->rf_config_file);
- if (ru->eNB_list[0] == 0)
- {
- LOG_E(PHY,"%s() DJP - ru->eNB_list ru->num_eNB are not initialized - so do it manually\n", __FUNCTION__);
- ru->eNB_list[0] = RC.eNB[0][0];
- ru->num_eNB=1;
+ if (ru->eNB_list[0] == 0)
+ {
+ LOG_E(PHY,"%s() DJP - ru->eNB_list ru->num_eNB are not initialized - so do it manually\n", __FUNCTION__);
+ ru->eNB_list[0] = RC.eNB[0][0];
+ ru->num_eNB=1;
//
// DJP - feptx_prec() / feptx_ofdm() parses the eNB_list (based on num_eNB) and copies the txdata_F to txdata in RU
//
+ }
+ else
+ {
+ LOG_E(PHY,"DJP - delete code above this %s:%d\n", __FILE__, __LINE__);
+ }
}
- else
- {
- LOG_E(PHY,"DJP - delete code above this %s:%d\n", __FILE__, __LINE__);
- }
-
eNB0 = ru->eNB_list[0];
LOG_D(PHY, "RU FUnction:%d ru->if_south:%d\n", ru->function, ru->if_south);
LOG_D(PHY, "eNB0:%p\n", eNB0);
@@ -2114,3 +2140,134 @@ void stop_ru(RU_t *ru) {
}
+
+/* --------------------------------------------------------*/
+/* from here function to use configuration module */
+void RCconfig_RU(void) {
+
+ int j = 0;
+ int i = 0;
+
+
+ paramdef_t RUParams[] = RUPARAMS_DESC;
+ paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
+
+
+ config_getlist( &RUParamList,RUParams,sizeof(RUParams)/sizeof(paramdef_t), NULL);
+
+
+ if ( RUParamList.numelt > 0) {
+
+ RC.ru = (RU_t**)malloc(RC.nb_RU*sizeof(RU_t*));
+
+
+
+
+ RC.ru_mask=(1<<NB_RU) - 1;
+ printf("Set RU mask to %lx\n",RC.ru_mask);
+
+ for (j = 0; j < RC.nb_RU; j++) {
+
+ RC.ru[j] = (RU_t*)malloc(sizeof(RU_t));
+ memset((void*)RC.ru[j],0,sizeof(RU_t));
+ RC.ru[j]->idx = j;
+
+ printf("Creating RC.ru[%d]:%p\n", j, RC.ru[j]);
+
+ RC.ru[j]->if_timing = synch_to_ext_device;
+ if (RC.nb_L1_inst >0)
+ RC.ru[j]->num_eNB = RUParamList.paramarray[j][RU_ENB_LIST_IDX].numelt;
+ else
+ RC.ru[j]->num_eNB = 0;
+ for (i=0;i<RC.ru[j]->num_eNB;i++) RC.ru[j]->eNB_list[i] = RC.eNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]][0];
+
+
+ if (strcmp(*(RUParamList.paramarray[j][RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
+ if ( !(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX)) ) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = eNodeB_3GPP;
+ printf("Setting function for RU %d to eNodeB_3GPP\n",j);
+ }
+ else {
+ RC.ru[j]->eth_params.local_if_name = strdup(*(RUParamList.paramarray[j][RU_LOCAL_IF_NAME_IDX].strptr));
+ RC.ru[j]->eth_params.my_addr = strdup(*(RUParamList.paramarray[j][RU_LOCAL_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.remote_addr = strdup(*(RUParamList.paramarray[j][RU_REMOTE_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.my_portc = *(RUParamList.paramarray[j][RU_LOCAL_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portc = *(RUParamList.paramarray[j][RU_REMOTE_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.my_portd = *(RUParamList.paramarray[j][RU_LOCAL_PORTD_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portd = *(RUParamList.paramarray[j][RU_REMOTE_PORTD_IDX].uptr);
+
+ if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp") == 0) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = NGFI_RRU_IF5;
+ RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
+ printf("Setting function for RU %d to NGFI_RRU_IF5 (udp)\n",j);
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw") == 0) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = NGFI_RRU_IF5;
+ RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
+ printf("Setting function for RU %d to NGFI_RRU_IF5 (raw)\n",j);
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp_if4p5") == 0) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = NGFI_RRU_IF4p5;
+ RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
+ printf("Setting function for RU %d to NGFI_RRU_IF4p5 (udp)\n",j);
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if4p5") == 0) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = NGFI_RRU_IF4p5;
+ RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
+ printf("Setting function for RU %d to NGFI_RRU_IF4p5 (raw)\n",j);
+ }
+ }
+ RC.ru[j]->max_pdschReferenceSignalPower = *(RUParamList.paramarray[j][RU_MAX_RS_EPRE_IDX].uptr);;
+ RC.ru[j]->max_rxgain = *(RUParamList.paramarray[j][RU_MAX_RXGAIN_IDX].uptr);
+ RC.ru[j]->num_bands = RUParamList.paramarray[j][RU_BAND_LIST_IDX].numelt;
+ for (i=0;i<RC.ru[j]->num_bands;i++) RC.ru[j]->band[i] = RUParamList.paramarray[j][RU_BAND_LIST_IDX].iptr[i];
+ } //strcmp(local_rf, "yes") == 0
+ else {
+ printf("RU %d: Transport %s\n",j,*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr));
+
+ RC.ru[j]->eth_params.local_if_name = strdup(*(RUParamList.paramarray[j][RU_LOCAL_IF_NAME_IDX].strptr));
+ RC.ru[j]->eth_params.my_addr = strdup(*(RUParamList.paramarray[j][RU_LOCAL_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.remote_addr = strdup(*(RUParamList.paramarray[j][RU_REMOTE_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.my_portc = *(RUParamList.paramarray[j][RU_LOCAL_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portc = *(RUParamList.paramarray[j][RU_REMOTE_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.my_portd = *(RUParamList.paramarray[j][RU_LOCAL_PORTD_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portd = *(RUParamList.paramarray[j][RU_REMOTE_PORTD_IDX].uptr);
+ if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp") == 0) {
+ RC.ru[j]->if_south = REMOTE_IF5;
+ RC.ru[j]->function = NGFI_RAU_IF5;
+ RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw") == 0) {
+ RC.ru[j]->if_south = REMOTE_IF5;
+ RC.ru[j]->function = NGFI_RAU_IF5;
+ RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "udp_if4p5") == 0) {
+ RC.ru[j]->if_south = REMOTE_IF4p5;
+ RC.ru[j]->function = NGFI_RAU_IF4p5;
+ RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if4p5") == 0) {
+ RC.ru[j]->if_south = REMOTE_IF4p5;
+ RC.ru[j]->function = NGFI_RAU_IF4p5;
+ RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
+ } else if (strcmp(*(RUParamList.paramarray[j][RU_TRANSPORT_PREFERENCE_IDX].strptr), "raw_if5_mobipass") == 0) {
+ RC.ru[j]->if_south = REMOTE_IF5;
+ RC.ru[j]->function = NGFI_RAU_IF5;
+ RC.ru[j]->if_timing = synch_to_other;
+ RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
+ }
+ RC.ru[j]->att_tx = *(RUParamList.paramarray[j][RU_ATT_TX_IDX].uptr);
+ RC.ru[j]->att_rx = *(RUParamList.paramarray[j][RU_ATT_TX_IDX].uptr);
+ } /* strcmp(local_rf, "yes") != 0 */
+
+ RC.ru[j]->nb_tx = *(RUParamList.paramarray[j][RU_NB_TX_IDX].uptr);
+ RC.ru[j]->nb_rx = *(RUParamList.paramarray[j][RU_NB_RX_IDX].uptr);
+
+ }// j=0..num_rus
+ } else {
+ RC.nb_RU = 0;
+ } // setting != NULL
+
+ return;
+
+}
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 04a8f72505aaab5cda5fbe4c33ddbc11b0235dcc..6044bab9fd648591d128d9677b2ee6c3ab0e4f93 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -628,8 +628,8 @@ static void get_options(void) {
if ( (cmdline_uemodeparams[CMDLINE_CALIBUERXBYP_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue_byp;
if ( (cmdline_uemodeparams[CMDLINE_DEBUGUEPRACH_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = debug_prach;
if ( (cmdline_uemodeparams[CMDLINE_NOL2CONNECT_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = no_L2_connect;
- if ( (cmdline_uemodeparams[CMDLINE_CALIBPRACHTX_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = calib_prach_tx;
- if (dumpframe > 0) mode = rx_dump_frame;
+ if ( (cmdline_uemodeparams[CMDLINE_CALIBPRACHTX_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = calib_prach_tx;
+ if ( (cmdline_uemodeparams[CMDLINE_DUMPMEMORY_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = rx_dump_frame;
if ( downlink_frequency[0][0] > 0) {
printf("Downlink frequency set to %u\n", downlink_frequency[0][0]);
@@ -1176,11 +1176,18 @@ int main( int argc, char **argv )
(RC.nb_inst > 0)) {
// don't create if node doesn't connect to RRC/S1/GTP
- if (create_tasks(UE_flag ? 0 : 1, UE_flag ? 1 : 0) < 0) {
- printf("cannot create ITTI tasks\n");
- exit(-1); // need a softer mode
+ if (UE_flag == 0) {
+ if (create_tasks(1) < 0) {
+ printf("cannot create ITTI tasks\n");
+ exit(-1); // need a softer mode
+ }
+ }
+ else {
+ if (create_tasks_ue(1) < 0) {
+ printf("cannot create ITTI tasks\n");
+ exit(-1); // need a softer mode
+ }
}
-
printf("ITTI tasks created\n");
}
else {
@@ -1293,7 +1300,7 @@ int main( int argc, char **argv )
// start the main threads
if (UE_flag == 1) {
int eMBMS_active = 0;
- init_UE(1,eMBMS_active,uecap_xer_in);
+ init_UE(1,eMBMS_active,uecap_xer_in,0);
if (phy_test==0) {
printf("Filling UE band info\n");
diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h
index 44e35c88a385319e896142e77ec05d5a62a9eb01..e1624760385f720b99885622b4e263c54b41b054 100644
--- a/targets/RT/USER/lte-softmodem.h
+++ b/targets/RT/USER/lte-softmodem.h
@@ -249,7 +249,7 @@ extern void init_RU(const char*);
extern int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
extern void fill_ue_band_info(void);
-extern void init_UE(int,int,int);
+extern void init_UE(int,int,int,int);
extern void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char * name);
extern void reset_opp_meas(void);
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 913ae958fc113af682b1ff17823e2f9bca898855..2c83ea9a04e22671ba45fd6ced7b1ddbbc0656fe 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -70,7 +70,7 @@ typedef enum {
void init_UE_threads(int);
void *UE_thread(void *arg);
-void init_UE(int nb_inst,int,int);
+void init_UE(int nb_inst,int,int,int);
int32_t **rxdata;
int32_t **txdata;
@@ -202,7 +202,7 @@ void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_
}
-void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
+void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correction) {
PHY_VARS_UE *UE;
int inst;
@@ -218,6 +218,8 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0);
+ // turn off timing control loop in UE
+ PHY_vars_UE_g[inst][0]->no_timing_correction = timing_correction;
LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
init_UE_threads(inst);
@@ -852,14 +854,19 @@ void *UE_thread(void *arg) {
writeBlockSize=UE->frame_parms.samples_per_tti;
} else {
// set TO compensation to zero
+
UE->rx_offset_diff = 0;
+
// compute TO compensation that should be applied for this frame
- if ( UE->rx_offset < 5*UE->frame_parms.samples_per_tti &&
- UE->rx_offset > 0 )
+
+ if (UE->no_timing_correction == 0) {
+ if ( UE->rx_offset < 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset > 0 )
UE->rx_offset_diff = -1 ;
- if ( UE->rx_offset > 5*UE->frame_parms.samples_per_tti &&
- UE->rx_offset < 10*UE->frame_parms.samples_per_tti )
+ if ( UE->rx_offset > 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset < 10*UE->frame_parms.samples_per_tti )
UE->rx_offset_diff = 1;
+ }
LOG_D(PHY,"AbsSubframe %d.%d SET rx_off_diff to %d rx_offset %d \n",proc->frame_rx,sub_frame,UE->rx_offset_diff,UE->rx_offset);
readBlockSize=UE->frame_parms.samples_per_tti -
diff --git a/targets/SIMU/USER/channel_sim.c b/targets/SIMU/USER/channel_sim.c
index b31c47ba95d58f7d3f71fdce9510e3177f069aea..e2420a1c77e21ff051c5acfdd1342bc77de4b145 100644
--- a/targets/SIMU/USER/channel_sim.c
+++ b/targets/SIMU/USER/channel_sim.c
@@ -60,7 +60,7 @@
#include "oaisim.h"
#define RF
-#define DEBUG_SIM
+//#define DEBUG_SIM
int number_rb_ul;
int first_rbUL ;
@@ -83,8 +83,8 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
node_desc_t *enb_data[NUMBER_OF_RU_MAX],
node_desc_t *ue_data[NUMBER_OF_UE_MAX],
uint16_t subframe,
- uint16_t offset,
- uint16_t length,
+ uint32_t offset,
+ uint32_t length,
uint8_t abstraction_flag,LTE_DL_FRAME_PARMS *ue_frame_parms,
uint8_t UE_id,
int CC_id)
@@ -244,22 +244,54 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
frame_parms = &RC.ru[ru_id]->frame_parms;
sf_offset = (subframe*frame_parms->samples_per_tti) + offset;
- LOG_D(EMU,"TXPATH: RU %d : DL_sig reading TX for subframe %d (sf_offset %d, length %d) from %p\n",ru_id,subframe,sf_offset,length,txdata[0]+sf_offset);
+ LOG_D(EMU,">>>>>>>>>>>>>>>>>TXPATH: RU %d : DL_sig reading TX for subframe %d (sf_offset %d, length %d) from %p\n",ru_id,subframe,sf_offset,length,txdata[0]+sf_offset);
int length_meas = frame_parms->ofdm_symbol_size;
- tx_pwr = dac_fixed_gain(s_re,
- s_im,
- txdata,
- sf_offset,
- nb_antennas_tx,
- length,
- sf_offset,
- length_meas,
- 14,
- frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
- 0,
- &ru_amp[ru_id],
- frame_parms->N_RB_DL*12);
+ if (sf_offset+length <= frame_parms->samples_per_tti*10) {
+ tx_pwr = dac_fixed_gain(s_re,
+ s_im,
+ txdata,
+ sf_offset,
+ nb_antennas_tx,
+ length,
+ sf_offset,
+ length_meas,
+ 14,
+ frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
+ 0,
+ &ru_amp[ru_id],
+ frame_parms->N_RB_DL*12);
+
+ }
+ else {
+ tx_pwr = dac_fixed_gain(s_re,
+ s_im,
+ txdata,
+ sf_offset,
+ nb_antennas_tx,
+ (frame_parms->samples_per_tti*10)-sf_offset,
+ sf_offset,
+ length_meas,
+ 14,
+ frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
+ 0,
+ &ru_amp[ru_id],
+ frame_parms->N_RB_DL*12);
+
+ tx_pwr = dac_fixed_gain(s_re,
+ s_im,
+ txdata,
+ sf_offset,
+ nb_antennas_tx,
+ length+sf_offset-(frame_parms->samples_per_tti*10),
+ sf_offset,
+ length_meas,
+ 14,
+ frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
+ 0,
+ &ru_amp[ru_id],
+ frame_parms->N_RB_DL*12);
+ }
#ifdef DEBUG_SIM
LOG_D(PHY,"[SIM][DL] subframe %d: txp (time) %d dB\n",
subframe,dB_fixed(signal_energy(&txdata[0][sf_offset],length_meas)));
@@ -460,7 +492,7 @@ void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM
if (((double)PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe] +
UE2RU[UE_id][ru_id][CC_id]->path_loss_dB) <= -125.0) {
// don't simulate a UE that is too weak
- LOG_D(OCM,"[SIM][UL] UE %d tx_pwr %d dBm (num_RE %d) for subframe %d (sf_offset %d)\n",
+ LOG_D(OCM,"[SIM][UL] ULPOWERS UE %d tx_pwr %d dBm (num_RE %d) for subframe %d (sf_offset %d)\n",
UE_id,
PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe],
PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe],
@@ -479,7 +511,7 @@ void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM
1,
NULL,
PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]); // This make the previous argument the total power
- LOG_D(OCM,"[SIM][UL] UE %d tx_pwr %f dBm (target %d dBm, num_RE %d) for subframe %d (sf_offset %d)\n",
+ LOG_D(OCM,"[SIM][UL] ULPOWERS UE %d tx_pwr %f dBm (target %d dBm, num_RE %d) for subframe %d (sf_offset %d)\n",
UE_id,
10*log10(tx_pwr*PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]),
PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe],
@@ -539,11 +571,11 @@ void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM
1e3/UE2RU[0][ru_id][CC_id]->sampling_rate, // sampling time (ns)
(double)RC.ru[ru_id]->max_rxgain-(double)RC.ru[ru_id]->att_rx - 66.227); // rx_gain (dB) (66.227 = 20*log10(pow2(11)) = gain from the adc that will be applied later)
-#ifdef DEBUG_SIM
+ //#ifdef DEBUG_SIM
rx_pwr = signal_energy_fp(r_re_p,r_im_p,nb_antennas_rx,frame_parms->samples_per_tti,0);//*(double)frame_parms->ofdm_symbol_size/(12.0*frame_parms->N_RB_DL;
LOG_D(OCM,"[SIM][UL] rx_pwr (ADC in) %f dB for subframe %d (rx_gain %f)\n",10*log10(rx_pwr),subframe,
(double)RC.ru[ru_id]->max_rxgain-(double)RC.ru[ru_id]->att_rx);
-#endif
+ //#endif
rxdata = RC.ru[ru_id]->common.rxdata;
sf_offset = subframe*frame_parms->samples_per_tti;
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index 94e05dd754b1b11afdfbc3015925aad04f1dac14..7d8b33f12c0b9f9feb729958ac9873a440f1b66a 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -160,6 +160,8 @@ volatile int oai_exit = 0;
//int32_t **rxdata;
//int32_t **txdata;
+uint16_t sf_ahead=4;
+uint8_t nfapi_mode = 0;
// Added for PHY abstraction
extern node_list* ue_node_list;
@@ -377,7 +379,7 @@ int omv_write(int pfd, node_list* enb_node_list, node_list* ue_node_list, Data_F
omv_data.geo[i].node_type = 0; //eNB
enb_node_list = enb_node_list->next;
omv_data.geo[i].Neighbors = 0;
-
+/*
for (j = NB_RU; j < NB_UE_INST + NB_RU; j++) {
if (is_UE_active (i, j - NB_RU) == 1) {
omv_data.geo[i].Neighbor[omv_data.geo[i].Neighbors] = j;
@@ -387,6 +389,7 @@ int omv_write(int pfd, node_list* enb_node_list, node_list* ue_node_list, Data_F
"[RU %d][UE %d] is_UE_active(i,j) %d geo (x%d, y%d) num neighbors %d\n", i, j-NB_RU, is_UE_active(i,j-NB_RU), omv_data.geo[i].x, omv_data.geo[i].y, omv_data.geo[i].Neighbors);
}
}
+*/
}
}
@@ -413,7 +416,7 @@ int omv_write(int pfd, node_list* enb_node_list, node_list* ue_node_list, Data_F
ue_node_list = ue_node_list->next;
omv_data.geo[i].Neighbors = 0;
-
+/*
for (j = 0; j < NB_RU; j++) {
if (is_UE_active (j, i - NB_RU) == 1) {
omv_data.geo[i].Neighbor[omv_data.geo[i].Neighbors] = j;
@@ -423,6 +426,7 @@ int omv_write(int pfd, node_list* enb_node_list, node_list* ue_node_list, Data_F
"[UE %d][RU %d] is_UE_active %d geo (x%d, y%d) num neighbors %d\n", i-NB_RU, j, is_UE_active(j,i-NB_RU), omv_data.geo[i].x, omv_data.geo[i].y, omv_data.geo[i].Neighbors);
}
}
+*/
}
}
@@ -524,11 +528,6 @@ l2l1_task (void *args_p)
}
}
- // UL scope at eNB 0
- form_enb[UE_inst] = create_lte_phy_scope_enb();
- sprintf (title, "LTE UL SCOPE UE %d to eNB %d", UE_inst, eNB_inst);
- fl_show_form (form_enb[UE_inst]->lte_phy_scope_enb, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
-
}
}
@@ -747,7 +746,7 @@ l2l1_task (void *args_p)
int subframe_ru_mask_local = subframe_ru_mask;
int subframe_UE_mask_local = subframe_UE_mask;
pthread_mutex_unlock(&subframe_mutex);
- LOG_D(EMU,"Frame %d, Subframe %d: Checking masks %x,%x\n",frame,sf,subframe_ru_mask_local,subframe_UE_mask_local);
+ LOG_D(EMU,"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x\n",frame,sf,NB_RU,NB_UE_INST,subframe_ru_mask_local,subframe_UE_mask_local);
if ((subframe_ru_mask_local == ((1<<NB_RU)-1)) &&
(subframe_UE_mask_local == ((1<<NB_UE_INST)-1)))
all_done=1;
@@ -840,200 +839,6 @@ l2l1_task (void *args_p)
#endif
- /*
- clear_UE_transport_info (oai_emulation.info.nb_ue_local);
- clear_UE_transport_info (oai_emulation.info.nb_ue_local);
-
- for (UE_inst = oai_emulation.info.first_ue_local;
- (UE_inst < (oai_emulation.info.first_ue_local + oai_emulation.info.nb_ue_local));
- UE_inst++) {
- if (oai_emulation.info.cli_start_ue[UE_inst] != 0) {
-#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
-
-#else
-
- if (frame >= (UE_inst * 20)) // activate UE only after 20*UE_id frames so that different UEs turn on separately
-#endif
- {
- LOG_D(EMU,
- "PHY procedures UE %d for frame %d, slot %d (subframe TX %d, RX %d)\n",
- UE_inst, frame % MAX_FRAME_NUMBER, slot, next_slot >> 1,
- last_slot >> 1);
-
- if (PHY_vars_UE_g[UE_inst][0]->UE_mode[0]
- != NOT_SYNCHED) {
- if (frame > 0) {
- PHY_vars_UE_g[UE_inst][0]->frame_rx = frame % MAX_FRAME_NUMBER;
- PHY_vars_UE_g[UE_inst][0]->slot_rx = last_slot;
- PHY_vars_UE_g[UE_inst][0]->slot_tx = next_slot;
-
- if (next_slot > 1)
- PHY_vars_UE_g[UE_inst][0]->frame_tx = frame % MAX_FRAME_NUMBER;
- else
- PHY_vars_UE_g[UE_inst][0]->frame_tx = (frame + 1) % MAX_FRAME_NUMBER;
-#ifdef OPENAIR2
- //Application
- update_otg_UE (UE_inst, oai_emulation.info.time_ms);
-
- //Access layer
- // PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE_inst, ENB_FLAG_NO, NOT_A_RNTI, frame, next_slot>>1, 0);
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE_inst, 0, ENB_FLAG_NO, NOT_A_RNTI, frame % MAX_FRAME_NUMBER, next_slot);
- pdcp_run (&ctxt);
-#endif
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs;
- CC_id++) {
- phy_procedures_UE_lte (
- PHY_vars_UE_g[UE_inst][CC_id],
- 0, abstraction_flag,
- normal_txrx, no_relay,
- NULL);
- }
-
- ue_data[UE_inst]->tx_power_dBm =
- PHY_vars_UE_g[UE_inst][0]->tx_power_dBm;
- }
- } else {
- if (abstraction_flag == 1) {
- LOG_E(EMU,
- "sync not supported in abstraction mode (UE%d,mode%d)\n",
- UE_inst,
- PHY_vars_UE_g[UE_inst][0]->UE_mode[0]);
- exit (-1);
- }
-
- if ((frame > 0)
- && (last_slot
- == (LTE_SLOTS_PER_FRAME
- - 2))) {
- initial_sync (PHY_vars_UE_g[UE_inst][0],
- normal_txrx);
-
- }
- }
-
-#ifdef PRINT_STATS
-
- if(last_slot==2 && frame%10==0) {
- if (UE_stats_th[UE_inst]) {
- fprintf(UE_stats_th[UE_inst],"%d %d\n",frame%MAX_FRAME_NUMBER, PHY_vars_UE_g[UE_inst][0]->bitrate[0]/1000);
- }
- }
-
- if (UE_stats[UE_inst]) {
- len = dump_ue_stats (PHY_vars_UE_g[UE_inst][0], stats_buffer, 0, normal_txrx, 0);
- rewind (UE_stats[UE_inst]);
- fwrite (stats_buffer, 1, len, UE_stats[UE_inst]);
- fflush(UE_stats[UE_inst]);
- }
-
-#endif
- }
- }
- }
-
-#if defined(Rel10) || defined(Rel14)
-
- for (RN_id=oai_emulation.info.first_rn_local;
- RN_id<oai_emulation.info.first_rn_local+oai_emulation.info.nb_rn_local;
- RN_id++) {
- // UE id and eNB id of the RN
- UE_inst= oai_emulation.info.first_ue_local+oai_emulation.info.nb_ue_local + RN_id;// NB_UE_INST + RN_id
- eNB_inst= oai_emulation.info.first_enb_local+oai_emulation.info.nb_enb_local + RN_id;// NB_eNB_INST + RN_id
-
- // currently only works in FDD
- if (oai_emulation.info.eMBMS_active_state == 4) {
- r_type = multicast_relay;
- //LOG_I(EMU,"Activating the multicast relaying\n");
- } else {
- LOG_E(EMU,"Not supported eMBMS option when relaying is enabled %d\n", r_type);
- exit(-1);
- }
-
- PHY_vars_RN_g[RN_id]->frame = frame % MAX_FRAME_NUMBER;
-
- if ( oai_emulation.info.frame_type == 0) {
- // RN == UE
- if (frame>0) {
- if (PHY_vars_UE_g[UE_inst][0]->UE_mode[0] != NOT_SYNCHED) {
- LOG_D(EMU,"[RN %d] PHY procedures UE %d for frame %d, slot %d (subframe TX %d, RX %d)\n",
- RN_id, UE_inst, frame, slot, next_slot >> 1,last_slot>>1);
- PHY_vars_UE_g[UE_inst][0]->frame_rx = frame % MAX_FRAME_NUMBER;
- PHY_vars_UE_g[UE_inst][0]->slot_rx = last_slot;
- PHY_vars_UE_g[UE_inst][0]->slot_tx = next_slot;
-
- if (next_slot>1) PHY_vars_UE_g[UE_inst][0]->frame_tx = frame % MAX_FRAME_NUMBER;
- else PHY_vars_UE_g[UE_inst][0]->frame_tx = (frame+1) % MAX_FRAME_NUMBER;
-
- phy_procedures_UE_lte (PHY_vars_UE_g[UE_inst][0], 0, abstraction_flag,normal_txrx,
- r_type, PHY_vars_RN_g[RN_id]);
- } else if (last_slot == (LTE_SLOTS_PER_FRAME-2)) {
- initial_sync(PHY_vars_UE_g[UE_inst][0],normal_txrx);
- }
- }
-
- emu_transport (frame % MAX_FRAME_NUMBER, sf<<1, ((sf+4)%10)<<1, subframe_select(&PHY_vars_eNB_g[0][0]->frame_parms,sf),
- oai_emulation.info.frame_type[0], ethernet_flag);
-
- start_meas (&dl_chan_stats);
-
- for (UE_inst = 0; UE_inst < NB_UE_INST; UE_inst++)
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- //#warning figure out what to do with UE frame_parms during initial_sync
- do_DL_sig (r_re0,
- r_im0,
- r_re,
- r_im,
- s_re,
- s_im,
- eNB2UE,
- enb_data,
- ue_data,
- PHY_vars_eNB_g[0][CC_id]->proc.proc_rxtx[sf&1].subframe_tx<<1,
- abstraction_flag,
- &PHY_vars_eNB_g[0][CC_id]->frame_parms,
- UE_inst, CC_id);
- do_DL_sig (r_re0,
- r_im0,
- r_re,
- r_im,n
-
- s_re,
- s_im,
- eNB2UE,
- enb_data,
- ue_data,
- (PHY_vars_eNB_g[0][CC_id]->proc.proc_rxtx[sf&1].subframe_tx<<1)+1,
- abstraction_flag,
- &PHY_vars_eNB_g[0][CC_id]->frame_parms,
- UE_inst, CC_id);
- }
-
- stop_meas (&dl_chan_stats);
-
-
- start_meas (&ul_chan_stats);
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- //#warning figure out what to do with UE frame_parms during initial_sync
- do_UL_sig (r_re0, r_im0, r_re, r_im, s_re, s_im, UE2eNB,
- enb_data, ue_data,
- PHY_vars_UE_g[0][CC_id]->proc.proc_rxtx[sf&1].subframe_tx<<1,
- abstraction_flag,
- &PHY_vars_eNB_g[0][CC_id]->frame_parms,
- frame % MAX_FRAME_NUMBER, CC_id);
- do_UL_sig (r_re0, r_im0, r_re, r_im, s_re, s_im, UE2eNB,
- enb_data, ue_data,
- (PHY_vars_UE_g[0][CC_id]->proc.proc_rxtx[sf&1].subframe_tx<<1)+1,
- abstraction_flag,
- &PHY_vars_eNB_g[0][CC_id]->frame_parms,
- frame % MAX_FRAME_NUMBER, CC_id);
- }
-
- stop_meas (&ul_chan_stats);
-
- */
-
if ((sf == 0) && ((frame % MAX_FRAME_NUMBER) == 0) && (abstraction_flag == 0)
&& (oai_emulation.info.n_frames == 1)) {
@@ -1237,9 +1042,22 @@ void wait_RUs() {
printf("RUs are ready, let's go\n");
}
-void init_UE(int,int,int);
+void init_UE(int,int,int,int);
void init_RU(const char*);
+void set_UE_defaults(int nb_ue) {
+
+ for (int UE_id = 0;UE_id<nb_ue;UE_id++) {
+ for (int CC_id = 0;CC_id<MAX_NUM_CCs;CC_id++) {
+ for (uint8_t i=0; i<RX_NB_TH_MAX; i++) {
+ PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[i][0]->dciFormat = 0;
+ PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[i][0]->agregationLevel = 0xFF;
+ }
+ PHY_vars_UE_g[UE_id][CC_id]->current_dlsch_cqi[0] = 10;
+ }
+ }
+}
+
static void print_current_directory(void)
{
@@ -1364,15 +1182,17 @@ main (int argc, char **argv)
- if (create_tasks(0,
- oai_emulation.info.nb_ue_local) < 0)
+ if (create_tasks_ue(oai_emulation.info.nb_ue_local) < 0)
exit(-1); // need a softer mode
printf("Waiting for RUs to get set up\n");
wait_RUs();
- init_UE(NB_UE_INST,0,0);
+ init_UE(NB_UE_INST,0,0,1);
+
+ set_UE_defaults(NB_UE_INST);
+
init_ocm ();
printf("Sending sync to all threads\n");
@@ -1493,6 +1313,8 @@ reset_opp_meas_oaisim (void)
reset_meas (&PHY_vars_UE_g[UE_id][0]->ulsch_turbo_encoding_stats);
reset_meas (&PHY_vars_UE_g[UE_id][0]->ulsch_interleaving_stats);
reset_meas (&PHY_vars_UE_g[UE_id][0]->ulsch_multiplexing_stats);
+
+
/*
* L2 functions
*/
@@ -1513,6 +1335,7 @@ reset_opp_meas_oaisim (void)
reset_meas (&UE_pdcp_stats[UE_id].pdcp_ip);
reset_meas (&UE_pdcp_stats[UE_id].ip_pdcp);
+
}
for (eNB_id = 0; eNB_id < NB_eNB_INST; eNB_id++) {
@@ -1951,9 +1774,6 @@ oai_shutdown (void)
}
} //End of PHY abstraction changes
-#ifdef OPENAIR2
- mac_top_cleanup ();
-#endif
// stop OMG
stop_mobility_generator (omg_param_list); //omg_param_list.mobility_type
@@ -2006,3 +1826,10 @@ get_OAI_emulation ()
}
+// dummy function declarations
+
+void *rrc_enb_task(void *args_p) {
+
+
+}
+
diff --git a/targets/SIMU/USER/oaisim.h b/targets/SIMU/USER/oaisim.h
index ce21470ed4918e57310472946a20f930e6b305f2..0fdc4002e47cd053fd8ffe56a4b4d7d5f2bd94d8 100644
--- a/targets/SIMU/USER/oaisim.h
+++ b/targets/SIMU/USER/oaisim.h
@@ -48,10 +48,11 @@ void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM
uint32_t frame,int eNB_id,uint8_t CC_id);
void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM_CCs],
- node_desc_t *enb_data[NUMBER_OF_RU_MAX],node_desc_t *ue_data[NUMBER_OF_UE_MAX],
+ node_desc_t *enb_data[NUMBER_OF_RU_MAX],
+ node_desc_t *ue_data[NUMBER_OF_UE_MAX],
uint16_t subframe,
- uint16_t offset,
- uint16_t length,
+ uint32_t offset,
+ uint32_t length,
uint8_t abstraction_flag,LTE_DL_FRAME_PARMS *frame_parms,uint8_t UE_id,int CC_id);
void init_ue(node_desc_t *ue_data, UE_Antenna ue_ant);//Abstraction changes
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index ae139b797f74e374de0efdcae64bd5103b84612a..be8f66fb9336873e3b5bb311af3987cf4881e1f6 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -80,6 +80,9 @@
#include "../../ARCH/COMMON/common_lib.h"
#include "../../ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "ENB_APP/enb_paramdef.h"
+#include "common/config/config_userapi.h"
+
#ifdef SMBV
extern uint8_t config_smbv;
extern char smbv_ip[16];
@@ -177,6 +180,18 @@ extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
int oaisim_flag=1;
+void RCConfig_sim(void) {
+
+ paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
+
+
+ // Get num RU instances
+ config_getlist( &RUParamList,NULL,0, NULL);
+ RC.nb_RU = RUParamList.numelt;
+
+
+}
+
void get_simulation_options(int argc, char *argv[])
{
int option;
@@ -782,13 +797,13 @@ void get_simulation_options(int argc, char *argv[])
}
}
- if ( load_configmodule(argc,argv) == NULL) {
+ if ( load_configmodule(argc,argv) == NULL) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
}
if (RC.config_file_name != NULL) {
/* Read eNB configuration file */
- RCConfig();
+ RCConfig_sim();
printf("returned with %d eNBs, %d rus\n",RC.nb_inst,RC.nb_RU);
oai_emulation.info.nb_enb_local = RC.nb_inst;
oai_emulation.info.nb_ru_local = RC.nb_RU;
@@ -1099,62 +1114,70 @@ int UE_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void **
int UE_id = device->Mod_id;
int CC_id = device->CC_id;
- int subframe,new_subframe;
+ int subframe;
int sample_count=0;
int read_size;
+ int sptti = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti;
*ptimestamp = last_UE_rx_timestamp[UE_id][CC_id];
- LOG_D(EMU,"[TXPATH]UE_trx_read nsamps %d TS %llu (%llu) antenna %d\n",nsamps,
+ LOG_D(EMU,"UE %d DL simulation 0: UE_trx_read nsamps %d TS %llu (%llu, offset %d) antenna %d\n",
+ UE_id,
+ nsamps,
(unsigned long long)current_UE_rx_timestamp[UE_id][CC_id],
(unsigned long long)last_UE_rx_timestamp[UE_id][CC_id],
+ (int)(last_UE_rx_timestamp[UE_id][CC_id]%sptti),
cc);
- if (nsamps < PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti)
+ if (nsamps < sptti)
read_size = nsamps;
else
- read_size = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti;
+ read_size = sptti;
while (sample_count<nsamps) {
+ LOG_D(EMU,"UE %d: DL simulation 1: UE_trx_read : current TS now %llu, last TS %llu\n",UE_id,current_UE_rx_timestamp[UE_id][CC_id],last_UE_rx_timestamp[UE_id][CC_id]);
while (current_UE_rx_timestamp[UE_id][CC_id] <
(last_UE_rx_timestamp[UE_id][CC_id]+read_size)) {
- LOG_D(EMU,"[TXPATH]UE_trx_read : current TS %d, last TS %d, sleeping\n",current_UE_rx_timestamp[UE_id][CC_id],last_UE_rx_timestamp[UE_id][CC_id]);
+ LOG_D(EMU,"UE %d: DL simulation 2: UE_trx_read : current TS %llu, last TS %llu, sleeping\n",UE_id,current_UE_rx_timestamp[UE_id][CC_id],last_UE_rx_timestamp[UE_id][CC_id]);
usleep(500);
}
-
- // LOG_D(EMU,"UE_trx_read : current TS %d, last TS %d, sleeping\n",current_UE_rx_timestamp[UE_id][CC_id],last_UE_rx_timestamp[UE_id][CC_id]);
+ LOG_D(EMU,"UE %d: DL simulation 3: UE_trx_read : current TS now %llu, last TS %llu\n",UE_id,current_UE_rx_timestamp[UE_id][CC_id],last_UE_rx_timestamp[UE_id][CC_id]);
// if we cross a subframe-boundary
- subframe = (last_UE_rx_timestamp[UE_id][CC_id]/PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti)%10;
- new_subframe = ((last_UE_rx_timestamp[UE_id][CC_id]+read_size)/PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti)%10;
- if (new_subframe!=subframe) {
- // tell top-level we are busy
- pthread_mutex_lock(&subframe_mutex);
- subframe_UE_mask|=(1<<UE_id);
- LOG_D(EMU,"Setting UE_id %d mask to busy (%d)\n",UE_id,subframe_UE_mask);
- pthread_mutex_unlock(&subframe_mutex);
+ subframe = (last_UE_rx_timestamp[UE_id][CC_id]/sptti)%10;
- }
+ // tell top-level we are busy
+ pthread_mutex_lock(&subframe_mutex);
+ subframe_UE_mask|=(1<<UE_id);
+ LOG_D(EMU,"Setting UE_id %d mask to busy (%d)\n",UE_id,subframe_UE_mask);
+ pthread_mutex_unlock(&subframe_mutex);
+
+
+
+ LOG_D(PHY,"UE %d: DL simulation 4: UE_trx_read generating DL subframe %d (Ts %llu, current TS %llu,nsamps %d)\n",
+ UE_id,subframe,(unsigned long long)*ptimestamp,
+ (unsigned long long)current_UE_rx_timestamp[UE_id][CC_id],
+ nsamps);
+
+ LOG_D(EMU,"UE %d: DL simulation 5: Doing DL simulation for %d samples starting in subframe %d at offset %d\n",
+ UE_id,nsamps,subframe,
+ (int)(last_UE_rx_timestamp[UE_id][CC_id]%sptti));
- LOG_D(PHY,"UE_trx_read generating DL subframe %d (Ts %llu, current TS %llu)\n",
- subframe,(unsigned long long)*ptimestamp,
- (unsigned long long)current_UE_rx_timestamp[UE_id][CC_id]);
do_DL_sig(RU2UE,
enb_data,
ue_data,
subframe,
- last_UE_rx_timestamp[UE_id][CC_id]%PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti,
- nsamps,
+ last_UE_rx_timestamp[UE_id][CC_id]%sptti,
+ sptti,
0, //abstraction_flag,
&PHY_vars_UE_g[UE_id][CC_id]->frame_parms,
UE_id,
CC_id);
-
- LOG_D(EMU,"[TXPATH]UE_trx_read @ TS %llu (%llu)=> frame %d, subframe %d\n",
- (unsigned long long)current_UE_rx_timestamp[UE_id][CC_id],
+ LOG_D(EMU,"UE %d: DL simulation 6: UE_trx_read @ TS %llu (%llu)=> frame %d, subframe %d\n",
+ UE_id,(unsigned long long)current_UE_rx_timestamp[UE_id][CC_id],
(unsigned long long)last_UE_rx_timestamp[UE_id][CC_id],
- ((unsigned long long)last_UE_rx_timestamp[UE_id][CC_id]/(PHY_vars_UE_g[UE_id][CC_id]->frame_parms.samples_per_tti*10))&1023,
+ ((unsigned long long)last_UE_rx_timestamp[UE_id][CC_id]/(sptti*10))&1023,
subframe);
last_UE_rx_timestamp[UE_id][CC_id] += read_size;
@@ -1329,7 +1352,9 @@ void init_devices(void){
PHY_vars_UE_g[UE_id][CC_id]->rfdevice.trx_set_freq_func = UE_trx_set_freq;
PHY_vars_UE_g[UE_id][CC_id]->rfdevice.trx_set_gains_func = UE_trx_set_gains;
last_UE_rx_timestamp[UE_id][CC_id] = 0;
-
+
+
+
}
}
}
@@ -1396,7 +1421,7 @@ void init_ocm(void)
for (ru_id = 0; ru_id < RC.nb_RU; ru_id++) {
for (UE_id = 0; UE_id < NB_UE_INST; UE_id++) {
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
- LOG_D(OCM,"Initializing channel (%s, %d) from eNB %d to UE %d\n", oai_emulation.environment_system_config.fading.small_scale.selected_option,
+ LOG_I(OCM,"Initializing channel (%s, %d) from RU %d to UE %d\n", oai_emulation.environment_system_config.fading.small_scale.selected_option,
map_str_to_int(small_scale_names,oai_emulation.environment_system_config.fading.small_scale.selected_option), ru_id, UE_id);
@@ -1539,7 +1564,7 @@ void update_ocm()
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
AssertFatal(RU2UE[ru_id][UE_id][CC_id]!=NULL,"RU2UE[%d][%d][%d] is null\n",ru_id,UE_id,CC_id);
- AssertFatal(UE2RU[ru_id][UE_id][CC_id]!=NULL,"RU2UE[%d][%d][%d] is null\n",ru_id,UE_id,CC_id);
+ AssertFatal(UE2RU[UE_id][ru_id][CC_id]!=NULL,"UE2RU[%d][%d][%d] is null\n",UE_id,ru_id,CC_id);
//pathloss: -132.24 dBm/15kHz RE + target SNR - eNB TX power per RE
if (ru_id == (UE_id % RC.nb_RU)) {
RU2UE[ru_id][UE_id][CC_id]->path_loss_dB = -132.24 + snr_dB - RC.ru[ru_id]->frame_parms.pdsch_config_common.referenceSignalPower;
@@ -1563,6 +1588,119 @@ void update_ocm()
void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
{
+#if defined(USER_MODE) && defined(OAI_EMU)
+
+ //int rrc_state=0;
+/*
+ if (oai_emulation.info.otg_enabled ==1 ) {
+
+ int dst_id, app_id;
+ Packet_otg_elt_t *otg_pkt;
+
+ for (dst_id = 0; dst_id < NUMBER_OF_UE_MAX; dst_id++) {
+ for_times += 1;
+
+ // generate traffic if the ue is rrc reconfigured state
+ //if ((rrc_state=mac_eNB_get_rrc_status(enb_module_idP, dst_id)) > 2 //RRC_CONNECTED
+ {
+ if (mac_eNB_get_rrc_status(enb_module_idP, oai_emulation.info.eNB_ue_module_id_to_rnti[enb_module_idP][dst_id]) > 2 ){
+ if_times += 1;
+
+ for (app_id=0; app_id<MAX_NUM_APPLICATION; app_id++) {
+ otg_pkt = malloc (sizeof(Packet_otg_elt_t));
+
+ (otg_pkt->otg_pkt).sdu_buffer = (uint8_t*) packet_gen(enb_module_idP, dst_id + NB_eNB_INST, app_id, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size));
+
+ if ((otg_pkt->otg_pkt).sdu_buffer != NULL) {
+ otg_times += 1;
+ (otg_pkt->otg_pkt).rb_id = DTCH-2; // app could be binded to a given DRB
+ (otg_pkt->otg_pkt).module_id = enb_module_idP;
+ (otg_pkt->otg_pkt).dst_id = dst_id;
+ (otg_pkt->otg_pkt).is_ue = 0;
+ (otg_pkt->otg_pkt).mode = PDCP_TRANSMISSION_MODE_DATA;
+ //Adding the packet to the OTG-PDCP buffer
+ pkt_list_add_tail_eurecom(otg_pkt, &(otg_pdcp_buffer[enb_module_idP]));
+ LOG_D(EMU,"[eNB %d] ADD pkt to OTG buffer with size %d for dst %d on rb_id %d for app id %d \n",
+ (otg_pkt->otg_pkt).module_id, otg_pkt->otg_pkt.sdu_buffer_size, (otg_pkt->otg_pkt).dst_id,(otg_pkt->otg_pkt).rb_id, app_id);
+ } else {
+ free(otg_pkt);
+ otg_pkt=NULL;
+ }
+ }
+ }
+ }
+
+#if defined(Rel10) || defined(Rel14)
+ mbms_service_id_t service_id;
+ mbms_session_id_t session_id;
+ rb_id_t rb_id;
+
+ // MBSM multicast traffic
+ if (ctime >= 500 ) {// only generate when UE can receive MTCH (need to control this value)
+ for (service_id = 0; service_id < 2 ; service_id++) { //maxServiceCount
+ for (session_id = 0; session_id < 2; session_id++) { // maxSessionPerPMCH
+ if (pdcp_mbms_array_eNB[enb_module_idP][service_id][session_id].instanciated_instance == TRUE) { // this service/session is configured
+
+ otg_pkt = malloc (sizeof(Packet_otg_elt_t));
+ // LOG_T(OTG,"multicast packet gen for (service/mch %d, session/lcid %d, rb_id %d)\n", service_id, session_id, service_id*maxSessionPerPMCH + session_id);
+ rb_id = pdcp_mbms_array_eNB[enb_module_idP][service_id][session_id].rb_id;
+ (otg_pkt->otg_pkt).sdu_buffer = (uint8_t*) packet_gen_multicast(enb_module_idP, session_id, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size));
+
+ if ((otg_pkt->otg_pkt).sdu_buffer != NULL) {
+ (otg_pkt->otg_pkt).rb_id = rb_id;
+ (otg_pkt->otg_pkt).module_id = enb_module_idP;
+ (otg_pkt->otg_pkt).dst_id = session_id;
+ (otg_pkt->otg_pkt).is_ue = FALSE;
+ //Adding the packet to the OTG-PDCP buffer
+ (otg_pkt->otg_pkt).mode = PDCP_TRANSMISSION_MODE_TRANSPARENT;
+ pkt_list_add_tail_eurecom(otg_pkt, &(otg_pdcp_buffer[enb_module_idP]));
+ LOG_D(EMU, "[eNB %d] ADD packet (%p) multicast to OTG buffer for dst %d on rb_id %d\n",
+ (otg_pkt->otg_pkt).module_id, otg_pkt, (otg_pkt->otg_pkt).dst_id,(otg_pkt->otg_pkt).rb_id);
+ } else {
+ //LOG_I(EMU, "OTG returns null \n");
+ free(otg_pkt);
+ otg_pkt=NULL;
+ }
+
+*/
+ // old version
+ /* // MBSM multicast traffic
+ #if defined(Rel10) || defined(Rel14)
+ if (frame >= 46) {// only generate when UE can receive MTCH (need to control this value)
+ for (service_id = 0; service_id < 2 ; service_id++) { //maxServiceCount
+ for (session_id = 0; session_id < 2; session_id++) { // maxSessionPerPMCH
+ // LOG_I(OTG,"DUY:frame %d, pdcp_mbms_array[module_id][rb_id].instanciated_instance is %d\n",frame,pdcp_mbms_array[module_id][service_id*maxSessionPerPMCH + session_id].instanciated_instance);
+ if ((pdcp_mbms_array[module_idP][service_id*maxSessionPerPMCH + session_id].instanciated_instance== module_idP + 1) && (eNB_flag == 1)){ // this service/session is configured
+ // LOG_T(OTG,"multicast packet gen for (service/mch %d, session/lcid %d)\n", service_id, session_id);
+ // Duy add
+ LOG_I(OTG, "frame %d, multicast packet gen for (service/mch %d, session/lcid %d, rb_id %d)\n",frame, service_id, session_id,service_id*maxSessionPerPMCH + session_id);
+ // end Duy add
+ rb_id = pdcp_mbms_array[module_id][service_id*maxSessionPerPMCH + session_id].rb_id;
+ otg_pkt=(uint8_t*) packet_gen_multicast(module_idP, session_id, ctime, &pkt_size);
+ if (otg_pkt != NULL) {
+ LOG_D(OTG,"[eNB %d] sending a multicast packet from module %d on rab id %d (src %d, dst %d) pkt size %d\n", eNB_index, module_idP, rb_id, module_idP, session_id, pkt_size);
+ pdcp_data_req(module_id, frame, eNB_flag, rb_id, RLC_MUI_UNDEFINED, RLC_SDU_CONFIRM_NO, pkt_size, otg_pkt,PDCP_TM);
+ free(otg_pkt);
+ }
+ }
+ }
+ }
+ } // end multicast traffic
+ #endif
+ */
+/*
+
+ }
+ }
+ }
+
+ } // end multicast traffic
+*/
+
+#endif
+ }
+
+#else
#if 0 // defined(EXMIMO) || defined(OAI_USRP)
if (otg_enabled==1) {
ctime = frame * 100;
@@ -1664,6 +1802,13 @@ void init_time()
td_avg = TARGET_SF_TIME_NS;
}
+// dummy function
+int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind) {
+
+ return(0);
+
+}
+
/*
int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params) {