only .c, .h and .cpp processed. Changes to be committed: modified: common/utils/asn1_conversions.h modified: common/utils/assertions.h modified: common/utils/itti/assertions.h modified: common/utils/itti/backtrace.c modified: common/utils/itti/backtrace.h modified: common/utils/itti/intertask_interface.c modified: common/utils/itti/intertask_interface.h modified: common/utils/itti/intertask_interface_dump.c modified: common/utils/itti/intertask_interface_dump.h modified: common/utils/itti/intertask_interface_init.h modified: common/utils/itti/intertask_interface_types.h modified: common/utils/itti/intertask_messages_def.h modified: common/utils/itti/intertask_messages_types.h modified: common/utils/itti/itti_types.h modified: common/utils/itti/memory_pools.c modified: common/utils/itti/memory_pools.h modified: common/utils/itti/messages_def.h modified: common/utils/itti/messages_types.h modified: common/utils/itti/signals.c modified: common/utils/itti/signals.h modified: common/utils/itti/tasks_def.h modified: common/utils/itti/timer.c modified: common/utils/itti/timer.h modified: common/utils/itti/timer_messages_def.h modified: common/utils/itti/timer_messages_types.h modified: common/utils/itti_analyzer/common/itti_types.h modified: common/utils/itti_analyzer/common/logs.h modified: common/utils/itti_analyzer/common/rc.h modified: common/utils/itti_analyzer/itti_analyzer.c modified: common/utils/itti_analyzer/libbuffers/buffers.c modified: common/utils/itti_analyzer/libbuffers/buffers.h modified: common/utils/itti_analyzer/libbuffers/file.c modified: common/utils/itti_analyzer/libbuffers/file.h modified: common/utils/itti_analyzer/libbuffers/socket.c modified: common/utils/itti_analyzer/libbuffers/socket.h modified: common/utils/itti_analyzer/libparser/array_type.c modified: common/utils/itti_analyzer/libparser/array_type.h modified: common/utils/itti_analyzer/libparser/enum_type.c modified: common/utils/itti_analyzer/libparser/enum_type.h modified: common/utils/itti_analyzer/libparser/enum_value_type.c modified: common/utils/itti_analyzer/libparser/enum_value_type.h modified: common/utils/itti_analyzer/libparser/field_type.c modified: common/utils/itti_analyzer/libparser/field_type.h modified: common/utils/itti_analyzer/libparser/file_type.c modified: common/utils/itti_analyzer/libparser/file_type.h modified: common/utils/itti_analyzer/libparser/fundamental_type.c modified: common/utils/itti_analyzer/libparser/fundamental_type.h modified: common/utils/itti_analyzer/libparser/intertask_contexts.h modified: common/utils/itti_analyzer/libparser/pointer_type.c modified: common/utils/itti_analyzer/libparser/pointer_type.h modified: common/utils/itti_analyzer/libparser/reference_type.c modified: common/utils/itti_analyzer/libparser/reference_type.h modified: common/utils/itti_analyzer/libparser/struct_type.c modified: common/utils/itti_analyzer/libparser/struct_type.h modified: common/utils/itti_analyzer/libparser/typedef_type.c modified: common/utils/itti_analyzer/libparser/typedef_type.h modified: common/utils/itti_analyzer/libparser/types.c modified: common/utils/itti_analyzer/libparser/types.h modified: common/utils/itti_analyzer/libparser/union_type.c modified: common/utils/itti_analyzer/libparser/union_type.h modified: common/utils/itti_analyzer/libparser/xml_parse.c modified: common/utils/itti_analyzer/libparser/xml_parse.h modified: common/utils/itti_analyzer/libresolver/locate_root.c modified: common/utils/itti_analyzer/libresolver/locate_root.h modified: common/utils/itti_analyzer/libresolver/resolvers.c modified: common/utils/itti_analyzer/libresolver/resolvers.h modified: common/utils/itti_analyzer/libui/ui_callbacks.c modified: common/utils/itti_analyzer/libui/ui_callbacks.h modified: common/utils/itti_analyzer/libui/ui_filters.c modified: common/utils/itti_analyzer/libui/ui_filters.h modified: common/utils/itti_analyzer/libui/ui_interface.c modified: common/utils/itti_analyzer/libui/ui_interface.h modified: common/utils/itti_analyzer/libui/ui_main_screen.c modified: common/utils/itti_analyzer/libui/ui_main_screen.h modified: common/utils/itti_analyzer/libui/ui_menu_bar.c modified: common/utils/itti_analyzer/libui/ui_menu_bar.h modified: common/utils/itti_analyzer/libui/ui_notebook.c modified: common/utils/itti_analyzer/libui/ui_notebook.h modified: common/utils/itti_analyzer/libui/ui_notif_dlg.c modified: common/utils/itti_analyzer/libui/ui_notif_dlg.h modified: common/utils/itti_analyzer/libui/ui_notifications.c modified: common/utils/itti_analyzer/libui/ui_notifications.h modified: common/utils/itti_analyzer/libui/ui_signal_dissect_view.c modified: common/utils/itti_analyzer/libui/ui_signal_dissect_view.h modified: common/utils/itti_analyzer/libui/ui_tree_view.c modified: common/utils/itti_analyzer/libui/ui_tree_view.h modified: common/utils/msc/msc.c modified: common/utils/msc/msc.h modified: openair1/PHY/CODING/3gpplte.c modified: openair1/PHY/CODING/3gpplte_sse.c modified: openair1/PHY/CODING/3gpplte_turbo_decoder.c modified: openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c modified: openair1/PHY/CODING/3gpplte_turbo_decoder_sse.c modified: openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c modified: openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c modified: openair1/PHY/CODING/TESTBENCH/ltetest.c modified: openair1/PHY/CODING/TESTBENCH/pdcch_test.c modified: openair1/PHY/CODING/TESTBENCH/viterbi_test.c modified: openair1/PHY/CODING/ccoding_byte.c modified: openair1/PHY/CODING/ccoding_byte_lte.c modified: openair1/PHY/CODING/crc_byte.c modified: openair1/PHY/CODING/defs.h modified: openair1/PHY/CODING/extern.h modified: openair1/PHY/CODING/extern_3GPPinterleaver.h modified: openair1/PHY/CODING/lte_interleaver.h modified: openair1/PHY/CODING/lte_interleaver2.h modified: openair1/PHY/CODING/lte_interleaver_inline.h modified: openair1/PHY/CODING/lte_rate_matching.c modified: openair1/PHY/CODING/lte_segmentation.c modified: openair1/PHY/CODING/rate_matching.c modified: openair1/PHY/CODING/scrambler.h modified: openair1/PHY/CODING/vars.h modified: openair1/PHY/CODING/viterbi.c modified: openair1/PHY/CODING/viterbi_lte.c modified: openair1/PHY/INIT/defs.h modified: openair1/PHY/INIT/extern.h modified: openair1/PHY/INIT/init_top.c modified: openair1/PHY/INIT/lte_init.c modified: openair1/PHY/INIT/lte_param_init.c modified: openair1/PHY/INIT/lte_parms.c modified: openair1/PHY/INIT/vars.h modified: openair1/PHY/LTE_ESTIMATION/adjust_gain.c modified: openair1/PHY/LTE_ESTIMATION/defs.h modified: openair1/PHY/LTE_ESTIMATION/extern.h modified: openair1/PHY/LTE_ESTIMATION/filt96_32.h modified: openair1/PHY/LTE_ESTIMATION/freq_equalization.c modified: openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c modified: openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c modified: openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation_emos.c modified: openair1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c modified: openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c modified: openair1/PHY/LTE_ESTIMATION/lte_est_freq_offset.c modified: openair1/PHY/LTE_ESTIMATION/lte_sync_time.c modified: openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c modified: openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c modified: openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c modified: openair1/PHY/LTE_ESTIMATION/pss6144.h modified: openair1/PHY/LTE_ESTIMATION/vars.h modified: openair1/PHY/LTE_REFSIG/defs.h modified: openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c modified: openair1/PHY/LTE_REFSIG/lte_dl_mbsfn.c modified: openair1/PHY/LTE_REFSIG/lte_dl_uespec.c modified: openair1/PHY/LTE_REFSIG/lte_gold.c modified: openair1/PHY/LTE_REFSIG/lte_gold_mbsfn.c modified: openair1/PHY/LTE_REFSIG/lte_ul_ref.c modified: openair1/PHY/LTE_REFSIG/mod_table.h modified: openair1/PHY/LTE_REFSIG/primary_synch.h modified: openair1/PHY/LTE_TRANSPORT/dci.c modified: openair1/PHY/LTE_TRANSPORT/dci.h modified: openair1/PHY/LTE_TRANSPORT/dci_tools.c modified: openair1/PHY/LTE_TRANSPORT/defs.h modified: openair1/PHY/LTE_TRANSPORT/dlsch_coding.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c modified: openair1/PHY/LTE_TRANSPORT/dlsch_tbs.h modified: openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h modified: openair1/PHY/LTE_TRANSPORT/drs_modulation.c modified: openair1/PHY/LTE_TRANSPORT/extern.h modified: openair1/PHY/LTE_TRANSPORT/group_hopping.c modified: openair1/PHY/LTE_TRANSPORT/if4_tools.c modified: openair1/PHY/LTE_TRANSPORT/if4_tools.h modified: openair1/PHY/LTE_TRANSPORT/if5_tools.c modified: openair1/PHY/LTE_TRANSPORT/if5_tools.h modified: openair1/PHY/LTE_TRANSPORT/initial_sync.c modified: openair1/PHY/LTE_TRANSPORT/lte_mcs.c modified: openair1/PHY/LTE_TRANSPORT/mcs_tbs_tools.h modified: openair1/PHY/LTE_TRANSPORT/pbch.c modified: openair1/PHY/LTE_TRANSPORT/pcfich.c modified: openair1/PHY/LTE_TRANSPORT/pch.c modified: openair1/PHY/LTE_TRANSPORT/phich.c modified: openair1/PHY/LTE_TRANSPORT/pilots.c modified: openair1/PHY/LTE_TRANSPORT/pilots_mbsfn.c modified: openair1/PHY/LTE_TRANSPORT/pmch.c modified: openair1/PHY/LTE_TRANSPORT/power_control.c modified: openair1/PHY/LTE_TRANSPORT/prach.c modified: openair1/PHY/LTE_TRANSPORT/prach.h modified: openair1/PHY/LTE_TRANSPORT/print_stats.c modified: openair1/PHY/LTE_TRANSPORT/proto.h modified: openair1/PHY/LTE_TRANSPORT/pss.c modified: openair1/PHY/LTE_TRANSPORT/pucch.c modified: openair1/PHY/LTE_TRANSPORT/rar_tools.c modified: openair1/PHY/LTE_TRANSPORT/srs_modulation.c modified: openair1/PHY/LTE_TRANSPORT/sss.c modified: openair1/PHY/LTE_TRANSPORT/sss.h modified: openair1/PHY/LTE_TRANSPORT/uci.h modified: openair1/PHY/LTE_TRANSPORT/uci_tools.c modified: openair1/PHY/LTE_TRANSPORT/ulsch_coding.c modified: openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c modified: openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c modified: openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c modified: openair1/PHY/LTE_TRANSPORT/vars.h modified: openair1/PHY/MODULATION/defs.h modified: openair1/PHY/MODULATION/extern.h modified: openair1/PHY/MODULATION/kHz_7_5.h modified: openair1/PHY/MODULATION/ofdm_mod.c modified: openair1/PHY/MODULATION/prach625Hz.h modified: openair1/PHY/MODULATION/slot_fep.c modified: openair1/PHY/MODULATION/slot_fep_mbsfn.c modified: openair1/PHY/MODULATION/slot_fep_ul.c modified: openair1/PHY/MODULATION/ul_7_5_kHz.c modified: openair1/PHY/MODULATION/vars.h modified: openair1/PHY/TOOLS/8bit_rxdemux.c modified: openair1/PHY/TOOLS/8bit_txmux.c modified: openair1/PHY/TOOLS/alaw_lut.h modified: openair1/PHY/TOOLS/angle.c modified: openair1/PHY/TOOLS/cadd_sv.c modified: openair1/PHY/TOOLS/cadd_vv.c modified: openair1/PHY/TOOLS/cdot_prod.c modified: openair1/PHY/TOOLS/cmult_sv.c modified: openair1/PHY/TOOLS/cmult_vv.c modified: openair1/PHY/TOOLS/costable.h modified: openair1/PHY/TOOLS/dB_routines.c modified: openair1/PHY/TOOLS/dB_routines.h modified: openair1/PHY/TOOLS/defs.h modified: openair1/PHY/TOOLS/extern.h modified: openair1/PHY/TOOLS/file_output.c modified: openair1/PHY/TOOLS/invSqrt.c modified: openair1/PHY/TOOLS/log2_approx.c modified: openair1/PHY/TOOLS/lte_dfts.c modified: openair1/PHY/TOOLS/lte_phy_scope.c modified: openair1/PHY/TOOLS/lte_phy_scope.h modified: openair1/PHY/TOOLS/lut.c modified: openair1/PHY/TOOLS/memory_routines.c modified: openair1/PHY/TOOLS/signal_energy.c modified: openair1/PHY/TOOLS/smbv.c modified: openair1/PHY/TOOLS/smbv.h modified: openair1/PHY/TOOLS/sqrt.c modified: openair1/PHY/TOOLS/time_meas.c modified: openair1/PHY/TOOLS/time_meas.h modified: openair1/PHY/TOOLS/twiddle12288.h modified: openair1/PHY/TOOLS/twiddle1536.h modified: openair1/PHY/TOOLS/twiddle24576.h modified: openair1/PHY/TOOLS/twiddle6144.h modified: openair1/PHY/TOOLS/twiddles4096.h modified: openair1/PHY/TOOLS/twiddles8192.h modified: openair1/PHY/TOOLS/vars.h modified: openair1/PHY/defs.h modified: openair1/PHY/extern.h modified: openair1/PHY/impl_defs_lte.h modified: openair1/PHY/impl_defs_top.h modified: openair1/PHY/sse_intrin.h modified: openair1/PHY/types.h modified: openair1/PHY/vars.h modified: openair1/SCHED/defs.h modified: openair1/SCHED/extern.h modified: openair1/SCHED/phy_mac_stub.c modified: openair1/SCHED/phy_procedures_emos.h modified: openair1/SCHED/phy_procedures_lte_common.c modified: openair1/SCHED/phy_procedures_lte_eNb.c modified: openair1/SCHED/phy_procedures_lte_ue.c modified: openair1/SCHED/pucch_pc.c modified: openair1/SCHED/pusch_pc.c modified: openair1/SCHED/rt_compat.h modified: openair1/SCHED/vars.h modified: openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c modified: openair1/SIMULATION/ETH_TRANSPORT/defs.h modified: openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c modified: openair1/SIMULATION/ETH_TRANSPORT/extern.h modified: openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c modified: openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h modified: openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c modified: openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c modified: openair1/SIMULATION/ETH_TRANSPORT/pgm_link.h modified: openair1/SIMULATION/ETH_TRANSPORT/proto.h modified: openair1/SIMULATION/ETH_TRANSPORT/socket.c modified: openair1/SIMULATION/ETH_TRANSPORT/socket.h modified: openair1/SIMULATION/ETH_TRANSPORT/vars.h modified: openair1/SIMULATION/LTE_PHY/LTE_Configuration.c modified: openair1/SIMULATION/LTE_PHY/LTE_Configuration.h modified: openair1/SIMULATION/LTE_PHY/dlsim.c modified: openair1/SIMULATION/LTE_PHY/framegen.c modified: openair1/SIMULATION/LTE_PHY/gpib_send.c modified: openair1/SIMULATION/LTE_PHY/gpib_send.h modified: openair1/SIMULATION/LTE_PHY/mbmssim.c modified: openair1/SIMULATION/LTE_PHY/pbchsim.c modified: openair1/SIMULATION/LTE_PHY/pdcchsim.c modified: openair1/SIMULATION/LTE_PHY/prachsim.c modified: openair1/SIMULATION/LTE_PHY/pucchsignalgegerator.h modified: openair1/SIMULATION/LTE_PHY/pucchsignalgenerator.c modified: openair1/SIMULATION/LTE_PHY/pucchsim.c modified: openair1/SIMULATION/LTE_PHY/scansim.c modified: openair1/SIMULATION/LTE_PHY/signalanalyzer.c modified: openair1/SIMULATION/LTE_PHY/signalanalyzer.h modified: openair1/SIMULATION/LTE_PHY/syncsim.c modified: openair1/SIMULATION/LTE_PHY/test.c modified: openair1/SIMULATION/LTE_PHY/ulsignalgenerator.c modified: openair1/SIMULATION/LTE_PHY/ulsignalgenerator.h modified: openair1/SIMULATION/LTE_PHY/ulsim.c modified: openair1/SIMULATION/LTE_PHY/ulsim2.c modified: openair1/SIMULATION/LTE_PHY/unitary_defs.h modified: openair1/SIMULATION/RF/adc.c modified: openair1/SIMULATION/RF/dac.c modified: openair1/SIMULATION/RF/defs.h modified: openair1/SIMULATION/RF/rf.c modified: openair1/SIMULATION/TOOLS/abstraction.c modified: openair1/SIMULATION/TOOLS/ch_desc_proto.c modified: openair1/SIMULATION/TOOLS/defs.h modified: openair1/SIMULATION/TOOLS/gauss.c modified: openair1/SIMULATION/TOOLS/llr_quantization.c modified: openair1/SIMULATION/TOOLS/multipath_channel.c modified: openair1/SIMULATION/TOOLS/multipath_tv_channel.c modified: openair1/SIMULATION/TOOLS/random_channel.c modified: openair1/SIMULATION/TOOLS/rangen_double.c modified: openair1/SIMULATION/TOOLS/scm_corrmat.h modified: openair1/SIMULATION/TOOLS/taus.c modified: openair2/COMMON/as_message.h modified: openair2/COMMON/commonDef.h modified: openair2/COMMON/gtpv1_u_messages_def.h modified: openair2/COMMON/gtpv1_u_messages_types.h modified: openair2/COMMON/intertask_interface_conf.h modified: openair2/COMMON/mac_messages_def.h modified: openair2/COMMON/mac_messages_types.h modified: openair2/COMMON/mac_primitives.h modified: openair2/COMMON/mac_rlc_primitives.h modified: openair2/COMMON/mac_rrc_primitives.h modified: openair2/COMMON/messages_def.h modified: openair2/COMMON/messages_types.h modified: openair2/COMMON/nas_messages_def.h modified: openair2/COMMON/nas_messages_types.h modified: openair2/COMMON/networkDef.h modified: openair2/COMMON/openair_defs.h modified: openair2/COMMON/openair_types.h modified: openair2/COMMON/pdcp_messages_def.h modified: openair2/COMMON/pdcp_messages_types.h modified: openair2/COMMON/phy_messages_def.h modified: openair2/COMMON/phy_messages_types.h modified: openair2/COMMON/platform_constants.h modified: openair2/COMMON/platform_types.h modified: openair2/COMMON/ral_messages_def.h modified: openair2/COMMON/ral_messages_types.h modified: openair2/COMMON/rlc_messages_def.h modified: openair2/COMMON/rlc_messages_types.h modified: openair2/COMMON/rrc_messages_def.h modified: openair2/COMMON/rrc_messages_types.h modified: openair2/COMMON/rrm_config_structs.h modified: openair2/COMMON/rrm_constants.h modified: openair2/COMMON/rtos_header.h modified: openair2/COMMON/s1ap_messages_def.h modified: openair2/COMMON/s1ap_messages_types.h modified: openair2/COMMON/sctp_messages_def.h modified: openair2/COMMON/sctp_messages_types.h modified: openair2/COMMON/tasks_def.h modified: openair2/COMMON/udp_messages_def.h modified: openair2/COMMON/udp_messages_types.h modified: openair2/COMMON/x2ap_messages_def.h modified: openair2/COMMON/x2ap_messages_types.h modified: openair2/DOCS/TEMPLATES/CODE/example_doxy.h modified: openair2/ENB_APP/enb_app.c modified: openair2/ENB_APP/enb_app.h modified: openair2/ENB_APP/enb_config.c modified: openair2/ENB_APP/enb_config.h modified: openair2/LAYER2/MAC/config.c modified: openair2/LAYER2/MAC/defs.h modified: openair2/LAYER2/MAC/eNB_scheduler.c modified: openair2/LAYER2/MAC/eNB_scheduler_RA.c modified: openair2/LAYER2/MAC/eNB_scheduler_bch.c modified: openair2/LAYER2/MAC/eNB_scheduler_dlsch.c modified: openair2/LAYER2/MAC/eNB_scheduler_mch.c modified: openair2/LAYER2/MAC/eNB_scheduler_primitives.c modified: openair2/LAYER2/MAC/eNB_scheduler_ulsch.c modified: openair2/LAYER2/MAC/extern.h modified: openair2/LAYER2/MAC/l1_helpers.c modified: openair2/LAYER2/MAC/lte_transport_init.c modified: openair2/LAYER2/MAC/main.c modified: openair2/LAYER2/MAC/openair2_proc.c modified: openair2/LAYER2/MAC/pre_processor.c modified: openair2/LAYER2/MAC/proto.h modified: openair2/LAYER2/MAC/ra_procedures.c modified: openair2/LAYER2/MAC/rar_tools.c modified: openair2/LAYER2/MAC/ue_procedures.c modified: openair2/LAYER2/MAC/vars.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_control_primitive.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_control_primitives_proto_extern.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.h modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_thread.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_util.c modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_util.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_constants.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_entity.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_init.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_init.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_proto_extern.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segments_holes.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segments_holes.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_structs.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.h modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_windows.c modified: openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_windows.h modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.c modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.h modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_entity.h modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.c modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.h modified: openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_structs.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_constants.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_entity.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_fsm.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_fsm.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_structs.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_very_simple_test.c modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_very_simple_test.h modified: openair2/LAYER2/RLC/mac_primitives.h modified: openair2/LAYER2/RLC/rlc.c modified: openair2/LAYER2/RLC/rlc.h modified: openair2/LAYER2/RLC/rlc_def.h modified: openair2/LAYER2/RLC/rlc_def_lte.h modified: openair2/LAYER2/RLC/rlc_mac.c modified: openair2/LAYER2/RLC/rlc_mpls.c modified: openair2/LAYER2/RLC/rlc_primitives.h modified: openair2/LAYER2/RLC/rlc_rrc.c modified: openair2/LAYER2/layer2_top.c modified: openair2/LAYER2/openair2_proc.c modified: openair2/LAYER2/register.c modified: openair2/LAYER2/register.h modified: openair2/NAS/DRIVER/CELLULAR/CTL_TOOL/nascell_ioctl.c modified: openair2/NAS/DRIVER/CELLULAR/CTL_TOOL/nascell_ioctl.h modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_ascontrol.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_classifier.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_common.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_constant.h modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_device.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_iocontrol.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_iocontrol.h modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_netlink.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_proto.h modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_sap.h modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_tool.c modified: openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_variables.h modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_ascontrol.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_classifier.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_common.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_constant.h modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_iocontrol.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_iocontrol.h modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_netlink.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_proto.h modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_sap.h modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_tool.c modified: openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_variables.h modified: openair2/NAS/DRIVER/CELLULAR/NETLTEST/netltest.c modified: openair2/NAS/DRIVER/CELLULAR/NETLTEST/nettestPDCP.c modified: openair2/NAS/SIMU_CELLULAR/nas_simu_proto.h modified: openair2/NAS/SIMU_CELLULAR/nasrg_simu_meas.c modified: openair2/NAS/SIMU_CELLULAR/rrm_fifo_standalone.c modified: openair2/NAS/nas_ue_task.h modified: openair2/NETWORK_DRIVER/LITE/RB_TOOL/rb_tool.c modified: openair2/NETWORK_DRIVER/LITE/classifier.c modified: openair2/NETWORK_DRIVER/LITE/common.c modified: openair2/NETWORK_DRIVER/LITE/constant.h modified: openair2/NETWORK_DRIVER/LITE/device.c modified: openair2/NETWORK_DRIVER/LITE/ioctl.c modified: openair2/NETWORK_DRIVER/LITE/ioctl.h modified: openair2/NETWORK_DRIVER/LITE/local.h modified: openair2/NETWORK_DRIVER/LITE/netlink.c modified: openair2/NETWORK_DRIVER/LITE/proto_extern.h modified: openair2/NETWORK_DRIVER/LITE/sap.h modified: openair2/NETWORK_DRIVER/LITE/tool.c modified: openair2/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c modified: openair2/NETWORK_DRIVER/MESH/TESTBENCH/testbench.c modified: openair2/NETWORK_DRIVER/MESH/classifier.c modified: openair2/NETWORK_DRIVER/MESH/common.c modified: openair2/NETWORK_DRIVER/MESH/constant.h modified: openair2/NETWORK_DRIVER/MESH/device.c modified: openair2/NETWORK_DRIVER/MESH/ioctl.c modified: openair2/NETWORK_DRIVER/MESH/ioctl.h modified: openair2/NETWORK_DRIVER/MESH/local.h modified: openair2/NETWORK_DRIVER/MESH/mesh.c modified: openair2/NETWORK_DRIVER/MESH/netlink.c modified: openair2/NETWORK_DRIVER/MESH/proto_extern.h modified: openair2/NETWORK_DRIVER/MESH/rrc_nas_primitives.h modified: openair2/NETWORK_DRIVER/MESH/sap.h modified: openair2/NETWORK_DRIVER/MESH/tool.c modified: openair2/NETWORK_DRIVER/UE_IP/common.c modified: openair2/NETWORK_DRIVER/UE_IP/constant.h modified: openair2/NETWORK_DRIVER/UE_IP/device.c modified: openair2/NETWORK_DRIVER/UE_IP/local.h modified: openair2/NETWORK_DRIVER/UE_IP/netlink.c modified: openair2/NETWORK_DRIVER/UE_IP/proto_extern.h modified: openair2/NETWORK_DRIVER/UE_IP/sap.h modified: openair2/PHY_INTERFACE/defs.h modified: openair2/PHY_INTERFACE/extern.h modified: openair2/PHY_INTERFACE/mac_phy_primitives.c modified: openair2/PHY_INTERFACE/mac_phy_primitives.h modified: openair2/PHY_INTERFACE/vars.h modified: openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.c modified: openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h modified: openair2/RRC/LITE/L2_interface.c modified: openair2/RRC/LITE/MESSAGES/asn1_msg.c modified: openair2/RRC/LITE/MESSAGES/asn1_msg.h modified: openair2/RRC/LITE/MESSAGES/rtai_mem.c modified: openair2/RRC/LITE/MESSAGES/rtai_mem.h modified: openair2/RRC/LITE/defs.h modified: openair2/RRC/LITE/extern.h modified: openair2/RRC/LITE/mesh_top.c modified: openair2/RRC/LITE/plmn_data.h modified: openair2/RRC/LITE/proto.h modified: openair2/RRC/LITE/rrc_2_rrm_msg.c modified: openair2/RRC/LITE/rrc_UE.c modified: openair2/RRC/LITE/rrc_UE_ral.c modified: openair2/RRC/LITE/rrc_UE_ral.h modified: openair2/RRC/LITE/rrc_common.c modified: openair2/RRC/LITE/rrc_config.c modified: openair2/RRC/LITE/rrc_eNB.c modified: openair2/RRC/LITE/rrc_eNB_GTPV1U.c modified: openair2/RRC/LITE/rrc_eNB_GTPV1U.h modified: openair2/RRC/LITE/rrc_eNB_S1AP.c modified: openair2/RRC/LITE/rrc_eNB_S1AP.h modified: openair2/RRC/LITE/rrc_eNB_UE_context.c modified: openair2/RRC/LITE/rrc_eNB_UE_context.h modified: openair2/RRC/LITE/rrc_eNB_ral.c modified: openair2/RRC/LITE/rrc_eNB_ral.h modified: openair2/RRC/LITE/rrc_rrm_interface.c modified: openair2/RRC/LITE/rrc_rrm_interface.h modified: openair2/RRC/LITE/rrc_types.h modified: openair2/RRC/LITE/rrm_2_rrc_msg.c modified: openair2/RRC/LITE/utils.c modified: openair2/RRC/LITE/vars.h modified: openair2/RRC/NAS/nas_config.c modified: openair2/RRC/NAS/nas_config.h modified: openair2/RRC/NAS/rb_config.c modified: openair2/RRC/NAS/rb_config.h modified: openair2/RRM_4_RRC_LITE/src/com/Message.cpp modified: openair2/RRM_4_RRC_LITE/src/com/Message.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddRadioAccessBearerConfirm.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddRadioAccessBearerConfirm.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddRadioAccessBearerRequest.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddRadioAccessBearerRequest.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddUserConfirm.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddUserConfirm.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddUserRequest.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageAddUserRequest.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageConnectionRequest.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageConnectionRequest.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageRemoveRadioAccessBearerRequest.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageRemoveRadioAccessBearerRequest.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageRemoveUserRequest.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageRemoveUserRequest.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageUserReconfigurationComplete.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRC2RRMMessageUserReconfigurationComplete.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRCMessageHandler.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRCMessageHandler.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRCUdpSocket.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRCUdpSocket.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageAddRadioAccessBearerResponse.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageAddRadioAccessBearerResponse.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageAddUserResponse.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageAddUserResponse.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageConnectionResponse.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageConnectionResponse.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageRemoveRadioAccessBearerResponse.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageRemoveRadioAccessBearerResponse.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageRemoveUserResponse.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageRemoveUserResponse.h modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageUserReconfiguration.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrc/RRM2RRCMessageUserReconfiguration.h modified: openair2/RRM_4_RRC_LITE/src/com/rrm/RRMMessageHandler.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrm/RRMMessageHandler.h modified: openair2/RRM_4_RRC_LITE/src/com/rrm/RRMUdpSocket.cpp modified: openair2/RRM_4_RRC_LITE/src/com/rrm/RRMUdpSocket.h modified: openair2/RRM_4_RRC_LITE/src/platform.h modified: openair2/RRM_4_RRC_LITE/src/platform_constants.h modified: openair2/RRM_4_RRC_LITE/src/platform_defines.h modified: openair2/RRM_4_RRC_LITE/src/platform_dim.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Asn1Utils.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Asn1Utils.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Command.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Command.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/DataRadioBearer.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/DataRadioBearer.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/ENodeB.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/ENodeB.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Exceptions.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/LogicalChannel.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/LogicalChannel.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Mobile.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Mobile.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/RadioBearer.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/RadioBearer.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/RadioResources.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/RadioResources.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/SignallingRadioBearer.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/SignallingRadioBearer.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Transaction.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Transaction.h modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Transactions.cpp modified: openair2/RRM_4_RRC_LITE/src/radio_resources/Transactions.h modified: openair2/RRM_4_RRC_LITE/src/rrm.cpp modified: openair2/RRM_4_RRC_LITE/src/test/TestScenario.cpp modified: openair2/RRM_4_RRC_LITE/src/test/TestScenario.h modified: openair2/RRM_4_RRC_LITE/src/test/test.cpp modified: openair2/RRM_4_RRC_LITE/src/version.h modified: openair2/UTIL/BIGPHYS/bigphys.c modified: openair2/UTIL/BIGPHYS/defs.h modified: openair2/UTIL/CLI/cli.c modified: openair2/UTIL/CLI/cli.h modified: openair2/UTIL/CLI/cli_cmd.c modified: openair2/UTIL/CLI/cli_if.h modified: openair2/UTIL/CLI/cli_server.c modified: openair2/UTIL/FIFO/pad_list.c modified: openair2/UTIL/FIFO/pad_list.h modified: openair2/UTIL/FIFO/types.h modified: openair2/UTIL/LISTS/list.c modified: openair2/UTIL/LISTS/list.h modified: openair2/UTIL/LISTS/list2.c modified: openair2/UTIL/LOG/log.c modified: openair2/UTIL/LOG/log.h modified: openair2/UTIL/LOG/log_extern.h modified: openair2/UTIL/LOG/log_if.h modified: openair2/UTIL/LOG/vcd_signal_dumper.c modified: openair2/UTIL/LOG/vcd_signal_dumper.h modified: openair2/UTIL/MATH/crc_byte.c modified: openair2/UTIL/MATH/oml.c modified: openair2/UTIL/MATH/oml.h modified: openair2/UTIL/MATH/random.c modified: openair2/UTIL/MATH/random_proto_extern.h modified: openair2/UTIL/MATH/taus.c modified: openair2/UTIL/MEM/mem_block.c modified: openair2/UTIL/MEM/mem_block.h modified: openair2/UTIL/MEM/mem_mngt.c modified: openair2/UTIL/MEM/mem_mngt_proto_extern.h modified: openair2/UTIL/MEM/mem_pool.h modified: openair2/UTIL/OCG/OCG.c modified: openair2/UTIL/OCG/OCG.h modified: openair2/UTIL/OCG/OCG_call_emu.c modified: openair2/UTIL/OCG/OCG_call_emu.h modified: openair2/UTIL/OCG/OCG_config_mobi.c modified: openair2/UTIL/OCG/OCG_config_mobi.h modified: openair2/UTIL/OCG/OCG_create_dir.c modified: openair2/UTIL/OCG/OCG_create_dir.h modified: openair2/UTIL/OCG/OCG_detect_file.c modified: openair2/UTIL/OCG/OCG_detect_file.h modified: openair2/UTIL/OCG/OCG_extern.h modified: openair2/UTIL/OCG/OCG_generate_report.c modified: openair2/UTIL/OCG/OCG_generate_report.h modified: openair2/UTIL/OCG/OCG_get_opt.c modified: openair2/UTIL/OCG/OCG_get_opt.h modified: openair2/UTIL/OCG/OCG_if.h modified: openair2/UTIL/OCG/OCG_parse_XML.c modified: openair2/UTIL/OCG/OCG_parse_XML.h modified: openair2/UTIL/OCG/OCG_parse_filename.c modified: openair2/UTIL/OCG/OCG_parse_filename.h modified: openair2/UTIL/OCG/OCG_save_XML.c modified: openair2/UTIL/OCG/OCG_save_XML.h modified: openair2/UTIL/OCG/OCG_vars.h modified: openair2/UTIL/OMG/client_traci_OMG.c modified: openair2/UTIL/OMG/client_traci_OMG.h modified: openair2/UTIL/OMG/common.c modified: openair2/UTIL/OMG/defs.h modified: openair2/UTIL/OMG/grid.c modified: openair2/UTIL/OMG/grid.h modified: openair2/UTIL/OMG/id_manager.c modified: openair2/UTIL/OMG/id_manager.h modified: openair2/UTIL/OMG/job.c modified: openair2/UTIL/OMG/mobility_parser.c modified: openair2/UTIL/OMG/mobility_parser.h modified: openair2/UTIL/OMG/omg.c modified: openair2/UTIL/OMG/omg.h modified: openair2/UTIL/OMG/omg_constants.h modified: openair2/UTIL/OMG/omg_hashtable.c modified: openair2/UTIL/OMG/omg_hashtable.h modified: openair2/UTIL/OMG/omg_vars.h modified: openair2/UTIL/OMG/rwalk.c modified: openair2/UTIL/OMG/rwalk.h modified: openair2/UTIL/OMG/rwp.c modified: openair2/UTIL/OMG/rwp.h modified: openair2/UTIL/OMG/socket_traci_OMG.c modified: openair2/UTIL/OMG/socket_traci_OMG.h modified: openair2/UTIL/OMG/static.c modified: openair2/UTIL/OMG/static.h modified: openair2/UTIL/OMG/steadystaterwp.c modified: openair2/UTIL/OMG/steadystaterwp.h modified: openair2/UTIL/OMG/storage_traci_OMG.c modified: openair2/UTIL/OMG/storage_traci_OMG.h modified: openair2/UTIL/OMG/sumo.c modified: openair2/UTIL/OMG/sumo.h modified: openair2/UTIL/OMG/trace.c modified: openair2/UTIL/OMG/trace.h modified: openair2/UTIL/OMG/trace_hashtable.c modified: openair2/UTIL/OMG/trace_hashtable.h modified: openair2/UTIL/OMV/communicationthread.cpp modified: openair2/UTIL/OMV/communicationthread.h modified: openair2/UTIL/OMV/mywindow.cpp modified: openair2/UTIL/OMV/mywindow.h modified: openair2/UTIL/OMV/omv.cpp modified: openair2/UTIL/OMV/openglwidget.cpp modified: openair2/UTIL/OMV/openglwidget.h modified: openair2/UTIL/OMV/structures.h modified: openair2/UTIL/OPT/opt.h modified: openair2/UTIL/OPT/socket_sender.c modified: openair2/UTIL/OPT/vars.h modified: openair2/UTIL/OSA/osa_defs.h modified: openair2/UTIL/OSA/osa_internal.h modified: openair2/UTIL/OSA/osa_key_deriver.c modified: openair2/UTIL/OSA/osa_rijndael.c modified: openair2/UTIL/OSA/osa_rijndael.h modified: openair2/UTIL/OSA/osa_snow3g.c modified: openair2/UTIL/OSA/osa_snow3g.h modified: openair2/UTIL/OSA/osa_stream_eea.c modified: openair2/UTIL/OSA/osa_stream_eia.c modified: openair2/UTIL/OTG/main.c modified: openair2/UTIL/OTG/otg.c modified: openair2/UTIL/OTG/otg.h modified: openair2/UTIL/OTG/otg_config.h modified: openair2/UTIL/OTG/otg_defs.h modified: openair2/UTIL/OTG/otg_externs.h modified: openair2/UTIL/OTG/otg_form.c modified: openair2/UTIL/OTG/otg_form.h modified: openair2/UTIL/OTG/otg_kpi.c modified: openair2/UTIL/OTG/otg_kpi.h modified: openair2/UTIL/OTG/otg_models.c modified: openair2/UTIL/OTG/otg_models.h modified: openair2/UTIL/OTG/otg_rx.c modified: openair2/UTIL/OTG/otg_rx.h modified: openair2/UTIL/OTG/otg_rx_socket.c modified: openair2/UTIL/OTG/otg_rx_socket.h modified: openair2/UTIL/OTG/otg_tx.c modified: openair2/UTIL/OTG/otg_tx.h modified: openair2/UTIL/OTG/otg_tx_socket.c modified: openair2/UTIL/OTG/otg_tx_socket.h modified: openair2/UTIL/OTG/otg_vars.h modified: openair2/UTIL/OTG/traffic_config.h modified: openair2/UTIL/TIMER/umts_timer.c modified: openair2/UTIL/TIMER/umts_timer.h modified: openair2/UTIL/TIMER/umts_timer_proto_extern.h modified: openair2/UTIL/TIMER/umts_timer_struct.h modified: openair2/UTIL/TRACE/fifo_printf.c modified: openair2/UTIL/TRACE/fifo_printf.h modified: openair2/UTIL/TRACE/fifo_printf_proto_extern.h modified: openair2/UTIL/TRACE/print.h modified: openair2/X2AP/x2ap.c modified: openair2/X2AP/x2ap.h modified: openair2/X2AP/x2ap_common.c modified: openair2/X2AP/x2ap_common.h modified: openair3/COMMON/common_types.h modified: openair3/COMMON/gtpv1_u_messages_def.h modified: openair3/COMMON/gtpv1_u_messages_types.h modified: openair3/COMMON/intertask_interface_conf.h modified: openair3/COMMON/messages_def.h modified: openair3/COMMON/messages_types.h modified: openair3/COMMON/nas_messages_def.h modified: openair3/COMMON/nas_messages_types.h modified: openair3/COMMON/s1ap_messages_def.h modified: openair3/COMMON/s1ap_messages_types.h modified: openair3/COMMON/sctp_messages_def.h modified: openair3/COMMON/sctp_messages_types.h modified: openair3/COMMON/security_types.h modified: openair3/COMMON/tasks_def.h modified: openair3/COMMON/udp_messages_def.h modified: openair3/COMMON/udp_messages_types.h modified: openair3/GTPV1-U/gtpv1u.h modified: openair3/GTPV1-U/gtpv1u_eNB.c modified: openair3/GTPV1-U/gtpv1u_eNB_defs.h modified: openair3/GTPV1-U/gtpv1u_eNB_task.h modified: openair3/GTPV1-U/gtpv1u_sgw_defs.h modified: openair3/GTPV1-U/gtpv1u_task.c modified: openair3/GTPV1-U/gtpv1u_teid_pool.c modified: openair3/NAS/COMMON/API/NETWORK/as_message.c modified: openair3/NAS/COMMON/API/NETWORK/l2_message.h modified: openair3/NAS/COMMON/API/NETWORK/nas_message.c modified: openair3/NAS/COMMON/API/NETWORK/nas_message.h modified: openair3/NAS/COMMON/API/NETWORK/network_api.c modified: openair3/NAS/COMMON/API/NETWORK/network_api.h modified: openair3/NAS/COMMON/EMM/MSG/AttachAccept.c modified: openair3/NAS/COMMON/EMM/MSG/AttachAccept.h modified: openair3/NAS/COMMON/EMM/MSG/AttachComplete.c modified: openair3/NAS/COMMON/EMM/MSG/AttachComplete.h modified: openair3/NAS/COMMON/EMM/MSG/AttachReject.c modified: openair3/NAS/COMMON/EMM/MSG/AttachReject.h modified: openair3/NAS/COMMON/EMM/MSG/AttachRequest.c modified: openair3/NAS/COMMON/EMM/MSG/AttachRequest.h modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.c modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.h modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.c modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.h modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.c modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.h modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.c modified: openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.h modified: openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.c modified: openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.h modified: openair3/NAS/COMMON/EMM/MSG/DetachAccept.c modified: openair3/NAS/COMMON/EMM/MSG/DetachAccept.h modified: openair3/NAS/COMMON/EMM/MSG/DetachRequest.c modified: openair3/NAS/COMMON/EMM/MSG/DetachRequest.h modified: openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c modified: openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h modified: openair3/NAS/COMMON/EMM/MSG/EmmInformation.c modified: openair3/NAS/COMMON/EMM/MSG/EmmInformation.h modified: openair3/NAS/COMMON/EMM/MSG/EmmStatus.c modified: openair3/NAS/COMMON/EMM/MSG/EmmStatus.h modified: openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c modified: openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h modified: openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c modified: openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h modified: openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c modified: openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h modified: openair3/NAS/COMMON/EMM/MSG/IdentityRequest.c modified: openair3/NAS/COMMON/EMM/MSG/IdentityRequest.h modified: openair3/NAS/COMMON/EMM/MSG/IdentityResponse.c modified: openair3/NAS/COMMON/EMM/MSG/IdentityResponse.h modified: openair3/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h modified: openair3/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h modified: openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c modified: openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c modified: openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.c modified: openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.h modified: openair3/NAS/COMMON/EMM/MSG/ServiceReject.c modified: openair3/NAS/COMMON/EMM/MSG/ServiceReject.h modified: openair3/NAS/COMMON/EMM/MSG/ServiceRequest.c modified: openair3/NAS/COMMON/EMM/MSG/ServiceRequest.h modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c modified: openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h modified: openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.c modified: openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.h modified: openair3/NAS/COMMON/EMM/MSG/emm_cause.h modified: openair3/NAS/COMMON/EMM/MSG/emm_msg.c modified: openair3/NAS/COMMON/EMM/MSG/emm_msg.h modified: openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c modified: openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c modified: openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h modified: openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c modified: openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h modified: openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c modified: openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h modified: openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.c modified: openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.h modified: openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.c modified: openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.h modified: openair3/NAS/COMMON/ESM/MSG/EsmStatus.c modified: openair3/NAS/COMMON/ESM/MSG/EsmStatus.h modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c modified: openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h modified: openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c modified: openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h modified: openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c modified: openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h modified: openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c modified: openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h modified: openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c modified: openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h modified: openair3/NAS/COMMON/ESM/MSG/esm_cause.h modified: openair3/NAS/COMMON/ESM/MSG/esm_msg.c modified: openair3/NAS/COMMON/ESM/MSG/esm_msg.h modified: openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h modified: openair3/NAS/COMMON/IES/AccessPointName.c modified: openair3/NAS/COMMON/IES/AccessPointName.h modified: openair3/NAS/COMMON/IES/AdditionalUpdateResult.c modified: openair3/NAS/COMMON/IES/AdditionalUpdateResult.h modified: openair3/NAS/COMMON/IES/AdditionalUpdateType.c modified: openair3/NAS/COMMON/IES/AdditionalUpdateType.h modified: openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c modified: openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h modified: openair3/NAS/COMMON/IES/AuthenticationFailureParameter.c modified: openair3/NAS/COMMON/IES/AuthenticationFailureParameter.h modified: openair3/NAS/COMMON/IES/AuthenticationParameterAutn.c modified: openair3/NAS/COMMON/IES/AuthenticationParameterAutn.h modified: openair3/NAS/COMMON/IES/AuthenticationParameterRand.c modified: openair3/NAS/COMMON/IES/AuthenticationParameterRand.h modified: openair3/NAS/COMMON/IES/AuthenticationResponseParameter.c modified: openair3/NAS/COMMON/IES/AuthenticationResponseParameter.h modified: openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.c modified: openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.h modified: openair3/NAS/COMMON/IES/Cli.c modified: openair3/NAS/COMMON/IES/Cli.h modified: openair3/NAS/COMMON/IES/CsfbResponse.c modified: openair3/NAS/COMMON/IES/CsfbResponse.h modified: openair3/NAS/COMMON/IES/DaylightSavingTime.c modified: openair3/NAS/COMMON/IES/DaylightSavingTime.h modified: openair3/NAS/COMMON/IES/DetachType.c modified: openair3/NAS/COMMON/IES/DetachType.h modified: openair3/NAS/COMMON/IES/DrxParameter.c modified: openair3/NAS/COMMON/IES/DrxParameter.h modified: openair3/NAS/COMMON/IES/EmergencyNumberList.c modified: openair3/NAS/COMMON/IES/EmergencyNumberList.h modified: openair3/NAS/COMMON/IES/EmmCause.c modified: openair3/NAS/COMMON/IES/EmmCause.h modified: openair3/NAS/COMMON/IES/EpsAttachResult.c modified: openair3/NAS/COMMON/IES/EpsAttachResult.h modified: openair3/NAS/COMMON/IES/EpsAttachType.c modified: openair3/NAS/COMMON/IES/EpsAttachType.h modified: openair3/NAS/COMMON/IES/EpsBearerContextStatus.c modified: openair3/NAS/COMMON/IES/EpsBearerContextStatus.h modified: openair3/NAS/COMMON/IES/EpsBearerIdentity.c modified: openair3/NAS/COMMON/IES/EpsBearerIdentity.h modified: openair3/NAS/COMMON/IES/EpsMobileIdentity.c modified: openair3/NAS/COMMON/IES/EpsMobileIdentity.h modified: openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.c modified: openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.h modified: openair3/NAS/COMMON/IES/EpsQualityOfService.c modified: openair3/NAS/COMMON/IES/EpsQualityOfService.h modified: openair3/NAS/COMMON/IES/EpsUpdateResult.c modified: openair3/NAS/COMMON/IES/EpsUpdateResult.h modified: openair3/NAS/COMMON/IES/EpsUpdateType.c modified: openair3/NAS/COMMON/IES/EpsUpdateType.h modified: openair3/NAS/COMMON/IES/EsmCause.c modified: openair3/NAS/COMMON/IES/EsmCause.h modified: openair3/NAS/COMMON/IES/EsmInformationTransferFlag.c modified: openair3/NAS/COMMON/IES/EsmInformationTransferFlag.h modified: openair3/NAS/COMMON/IES/EsmMessageContainer.c modified: openair3/NAS/COMMON/IES/EsmMessageContainer.h modified: openair3/NAS/COMMON/IES/GprsTimer.c modified: openair3/NAS/COMMON/IES/GprsTimer.h modified: openair3/NAS/COMMON/IES/GutiType.c modified: openair3/NAS/COMMON/IES/GutiType.h modified: openair3/NAS/COMMON/IES/IdentityType2.c modified: openair3/NAS/COMMON/IES/IdentityType2.h modified: openair3/NAS/COMMON/IES/ImeisvRequest.c modified: openair3/NAS/COMMON/IES/ImeisvRequest.h modified: openair3/NAS/COMMON/IES/KsiAndSequenceNumber.c modified: openair3/NAS/COMMON/IES/KsiAndSequenceNumber.h modified: openair3/NAS/COMMON/IES/LcsClientIdentity.c modified: openair3/NAS/COMMON/IES/LcsClientIdentity.h modified: openair3/NAS/COMMON/IES/LcsIndicator.c modified: openair3/NAS/COMMON/IES/LcsIndicator.h modified: openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.c modified: openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.h modified: openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c modified: openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h modified: openair3/NAS/COMMON/IES/LocationAreaIdentification.c modified: openair3/NAS/COMMON/IES/LocationAreaIdentification.h modified: openair3/NAS/COMMON/IES/MessageType.c modified: openair3/NAS/COMMON/IES/MessageType.h modified: openair3/NAS/COMMON/IES/MobileIdentity.c modified: openair3/NAS/COMMON/IES/MobileIdentity.h modified: openair3/NAS/COMMON/IES/MobileStationClassmark2.c modified: openair3/NAS/COMMON/IES/MobileStationClassmark2.h modified: openair3/NAS/COMMON/IES/MobileStationClassmark3.c modified: openair3/NAS/COMMON/IES/MobileStationClassmark3.h modified: openair3/NAS/COMMON/IES/MsNetworkCapability.c modified: openair3/NAS/COMMON/IES/MsNetworkCapability.h modified: openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c modified: openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.h modified: openair3/NAS/COMMON/IES/NasKeySetIdentifier.c modified: openair3/NAS/COMMON/IES/NasKeySetIdentifier.h modified: openair3/NAS/COMMON/IES/NasMessageContainer.c modified: openair3/NAS/COMMON/IES/NasMessageContainer.h modified: openair3/NAS/COMMON/IES/NasRequestType.c modified: openair3/NAS/COMMON/IES/NasRequestType.h modified: openair3/NAS/COMMON/IES/NasSecurityAlgorithms.c modified: openair3/NAS/COMMON/IES/NasSecurityAlgorithms.h modified: openair3/NAS/COMMON/IES/NetworkName.c modified: openair3/NAS/COMMON/IES/NetworkName.h modified: openair3/NAS/COMMON/IES/Nonce.c modified: openair3/NAS/COMMON/IES/Nonce.h modified: openair3/NAS/COMMON/IES/PTmsiSignature.c modified: openair3/NAS/COMMON/IES/PTmsiSignature.h modified: openair3/NAS/COMMON/IES/PacketFlowIdentifier.c modified: openair3/NAS/COMMON/IES/PacketFlowIdentifier.h modified: openair3/NAS/COMMON/IES/PagingIdentity.c modified: openair3/NAS/COMMON/IES/PagingIdentity.h modified: openair3/NAS/COMMON/IES/PdnAddress.c modified: openair3/NAS/COMMON/IES/PdnAddress.h modified: openair3/NAS/COMMON/IES/PdnType.c modified: openair3/NAS/COMMON/IES/PdnType.h modified: openair3/NAS/COMMON/IES/PlmnList.c modified: openair3/NAS/COMMON/IES/PlmnList.h modified: openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.c modified: openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h modified: openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.c modified: openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.h modified: openair3/NAS/COMMON/IES/ProtocolDiscriminator.c modified: openair3/NAS/COMMON/IES/ProtocolDiscriminator.h modified: openair3/NAS/COMMON/IES/QualityOfService.c modified: openair3/NAS/COMMON/IES/QualityOfService.h modified: openair3/NAS/COMMON/IES/RadioPriority.c modified: openair3/NAS/COMMON/IES/RadioPriority.h modified: openair3/NAS/COMMON/IES/SecurityHeaderType.c modified: openair3/NAS/COMMON/IES/SecurityHeaderType.h modified: openair3/NAS/COMMON/IES/ServiceType.c modified: openair3/NAS/COMMON/IES/ServiceType.h modified: openair3/NAS/COMMON/IES/ShortMac.c modified: openair3/NAS/COMMON/IES/ShortMac.h modified: openair3/NAS/COMMON/IES/SsCode.c modified: openair3/NAS/COMMON/IES/SsCode.h modified: openair3/NAS/COMMON/IES/SupportedCodecList.c modified: openair3/NAS/COMMON/IES/SupportedCodecList.h modified: openair3/NAS/COMMON/IES/TimeZone.c modified: openair3/NAS/COMMON/IES/TimeZone.h modified: openair3/NAS/COMMON/IES/TimeZoneAndTime.c modified: openair3/NAS/COMMON/IES/TimeZoneAndTime.h modified: openair3/NAS/COMMON/IES/TmsiStatus.c modified: openair3/NAS/COMMON/IES/TmsiStatus.h modified: openair3/NAS/COMMON/IES/TrackingAreaIdentity.c modified: openair3/NAS/COMMON/IES/TrackingAreaIdentity.h modified: openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c modified: openair3/NAS/COMMON/IES/TrackingAreaIdentityList.h modified: openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.c modified: openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.h modified: openair3/NAS/COMMON/IES/TrafficFlowTemplate.c modified: openair3/NAS/COMMON/IES/TrafficFlowTemplate.h modified: openair3/NAS/COMMON/IES/TransactionIdentifier.c modified: openair3/NAS/COMMON/IES/TransactionIdentifier.h modified: openair3/NAS/COMMON/IES/UeNetworkCapability.c modified: openair3/NAS/COMMON/IES/UeNetworkCapability.h modified: openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c modified: openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h modified: openair3/NAS/COMMON/IES/UeSecurityCapability.c modified: openair3/NAS/COMMON/IES/UeSecurityCapability.h modified: openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c modified: openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h modified: openair3/NAS/COMMON/UTIL/OctetString.c modified: openair3/NAS/COMMON/UTIL/OctetString.h modified: openair3/NAS/COMMON/UTIL/TLVDecoder.c modified: openair3/NAS/COMMON/UTIL/TLVDecoder.h modified: openair3/NAS/COMMON/UTIL/TLVEncoder.c modified: openair3/NAS/COMMON/UTIL/TLVEncoder.h modified: openair3/NAS/COMMON/UTIL/device.c modified: openair3/NAS/COMMON/UTIL/device.h modified: openair3/NAS/COMMON/UTIL/memory.c modified: openair3/NAS/COMMON/UTIL/memory.h modified: openair3/NAS/COMMON/UTIL/nas_log.c modified: openair3/NAS/COMMON/UTIL/nas_log.h modified: openair3/NAS/COMMON/UTIL/nas_timer.c modified: openair3/NAS/COMMON/UTIL/nas_timer.h modified: openair3/NAS/COMMON/UTIL/parser.c modified: openair3/NAS/COMMON/UTIL/parser.h modified: openair3/NAS/COMMON/UTIL/socket.c modified: openair3/NAS/COMMON/UTIL/socket.h modified: openair3/NAS/COMMON/UTIL/stty.c modified: openair3/NAS/COMMON/UTIL/tst/timer.c modified: openair3/NAS/COMMON/securityDef.h modified: openair3/NAS/COMMON/userDef.h modified: openair3/NAS/TEST/AS_SIMULATOR/as_data.c modified: openair3/NAS/TEST/AS_SIMULATOR/as_data.h modified: openair3/NAS/TEST/AS_SIMULATOR/as_process.c modified: openair3/NAS/TEST/AS_SIMULATOR/as_process.h modified: openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c modified: openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c modified: openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h modified: openair3/NAS/TEST/AS_SIMULATOR/nas_data.c modified: openair3/NAS/TEST/AS_SIMULATOR/nas_data.h modified: openair3/NAS/TEST/AS_SIMULATOR/nas_process.c modified: openair3/NAS/TEST/AS_SIMULATOR/nas_process.h modified: openair3/NAS/TEST/NETWORK/network_parser.c modified: openair3/NAS/TEST/NETWORK/network_parser.h modified: openair3/NAS/TEST/NETWORK/network_simulator.c modified: openair3/NAS/TEST/USER/user_parser.c modified: openair3/NAS/TEST/USER/user_parser.h modified: openair3/NAS/TEST/USER/user_simulator.c modified: openair3/NAS/TOOLS/network.h modified: openair3/NAS/TOOLS/ue_data.c modified: openair3/NAS/TOOLS/usim_data.c modified: openair3/NAS/UE/API/USER/at_command.c modified: openair3/NAS/UE/API/USER/at_command.h modified: openair3/NAS/UE/API/USER/at_error.c modified: openair3/NAS/UE/API/USER/at_error.h modified: openair3/NAS/UE/API/USER/at_response.c modified: openair3/NAS/UE/API/USER/at_response.h modified: openair3/NAS/UE/API/USER/tst/at_parser.c modified: openair3/NAS/UE/API/USER/user_api.c modified: openair3/NAS/UE/API/USER/user_api.h modified: openair3/NAS/UE/API/USER/user_indication.c modified: openair3/NAS/UE/API/USER/user_indication.h modified: openair3/NAS/UE/API/USIM/aka_functions.c modified: openair3/NAS/UE/API/USIM/aka_functions.h modified: openair3/NAS/UE/API/USIM/usim_api.c modified: openair3/NAS/UE/API/USIM/usim_api.h modified: openair3/NAS/UE/EMM/Attach.c modified: openair3/NAS/UE/EMM/Authentication.c modified: openair3/NAS/UE/EMM/Detach.c modified: openair3/NAS/UE/EMM/EmmStatusHdl.c modified: openair3/NAS/UE/EMM/Identification.c modified: openair3/NAS/UE/EMM/IdleMode.c modified: openair3/NAS/UE/EMM/IdleMode.h modified: openair3/NAS/UE/EMM/LowerLayer.c modified: openair3/NAS/UE/EMM/LowerLayer.h modified: openair3/NAS/UE/EMM/SAP/EmmDeregistered.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c modified: openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c modified: openair3/NAS/UE/EMM/SAP/EmmNull.c modified: openair3/NAS/UE/EMM/SAP/EmmRegistered.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c modified: openair3/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c modified: openair3/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c modified: openair3/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c modified: openair3/NAS/UE/EMM/SAP/emm_as.c modified: openair3/NAS/UE/EMM/SAP/emm_as.h modified: openair3/NAS/UE/EMM/SAP/emm_asDef.h modified: openair3/NAS/UE/EMM/SAP/emm_esm.c modified: openair3/NAS/UE/EMM/SAP/emm_esm.h modified: openair3/NAS/UE/EMM/SAP/emm_esmDef.h modified: openair3/NAS/UE/EMM/SAP/emm_fsm.c modified: openair3/NAS/UE/EMM/SAP/emm_fsm.h modified: openair3/NAS/UE/EMM/SAP/emm_recv.c modified: openair3/NAS/UE/EMM/SAP/emm_recv.h modified: openair3/NAS/UE/EMM/SAP/emm_reg.c modified: openair3/NAS/UE/EMM/SAP/emm_reg.h modified: openair3/NAS/UE/EMM/SAP/emm_regDef.h modified: openair3/NAS/UE/EMM/SAP/emm_sap.c modified: openair3/NAS/UE/EMM/SAP/emm_sap.h modified: openair3/NAS/UE/EMM/SAP/emm_send.c modified: openair3/NAS/UE/EMM/SAP/emm_send.h modified: openair3/NAS/UE/EMM/SecurityModeControl.c modified: openair3/NAS/UE/EMM/ServiceRequestHdl.c modified: openair3/NAS/UE/EMM/TrackingAreaUpdate.c modified: openair3/NAS/UE/EMM/emmData.h modified: openair3/NAS/UE/EMM/emm_main.c modified: openair3/NAS/UE/EMM/emm_main.h modified: openair3/NAS/UE/EMM/emm_proc.h modified: openair3/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c modified: openair3/NAS/UE/ESM/DefaultEpsBearerContextActivation.c modified: openair3/NAS/UE/ESM/EpsBearerContextDeactivation.c modified: openair3/NAS/UE/ESM/EsmStatusHdl.c modified: openair3/NAS/UE/ESM/PdnConnectivity.c modified: openair3/NAS/UE/ESM/PdnDisconnect.c modified: openair3/NAS/UE/ESM/SAP/esm_recv.c modified: openair3/NAS/UE/ESM/SAP/esm_recv.h modified: openair3/NAS/UE/ESM/SAP/esm_sap.c modified: openair3/NAS/UE/ESM/SAP/esm_sap.h modified: openair3/NAS/UE/ESM/SAP/esm_sapDef.h modified: openair3/NAS/UE/ESM/SAP/esm_send.c modified: openair3/NAS/UE/ESM/SAP/esm_send.h modified: openair3/NAS/UE/ESM/esmData.h modified: openair3/NAS/UE/ESM/esm_ebr.c modified: openair3/NAS/UE/ESM/esm_ebr.h modified: openair3/NAS/UE/ESM/esm_ebr_context.c modified: openair3/NAS/UE/ESM/esm_ebr_context.h modified: openair3/NAS/UE/ESM/esm_ip.c modified: openair3/NAS/UE/ESM/esm_main.c modified: openair3/NAS/UE/ESM/esm_main.h modified: openair3/NAS/UE/ESM/esm_proc.h modified: openair3/NAS/UE/ESM/esm_pt.c modified: openair3/NAS/UE/ESM/esm_pt.h modified: openair3/NAS/UE/UEprocess.c modified: openair3/NAS/UE/nas_itti_messaging.c modified: openair3/NAS/UE/nas_itti_messaging.h modified: openair3/NAS/UE/nas_network.c modified: openair3/NAS/UE/nas_network.h modified: openair3/NAS/UE/nas_parser.c modified: openair3/NAS/UE/nas_parser.h modified: openair3/NAS/UE/nas_proc.c modified: openair3/NAS/UE/nas_proc.h modified: openair3/NAS/UE/nas_ue_task.c modified: openair3/NAS/UE/nas_user.c modified: openair3/NAS/UE/nas_user.h modified: openair3/S1AP/s1ap_common.c modified: openair3/S1AP/s1ap_common.h modified: openair3/S1AP/s1ap_eNB.c modified: openair3/S1AP/s1ap_eNB.h modified: openair3/S1AP/s1ap_eNB_context_management_procedures.c modified: openair3/S1AP/s1ap_eNB_context_management_procedures.h modified: openair3/S1AP/s1ap_eNB_decoder.c modified: openair3/S1AP/s1ap_eNB_decoder.h modified: openair3/S1AP/s1ap_eNB_default_values.h modified: openair3/S1AP/s1ap_eNB_defs.h modified: openair3/S1AP/s1ap_eNB_encoder.c modified: openair3/S1AP/s1ap_eNB_encoder.h modified: openair3/S1AP/s1ap_eNB_handlers.c modified: openair3/S1AP/s1ap_eNB_handlers.h modified: openair3/S1AP/s1ap_eNB_itti_messaging.c modified: openair3/S1AP/s1ap_eNB_itti_messaging.h modified: openair3/S1AP/s1ap_eNB_management_procedures.c modified: openair3/S1AP/s1ap_eNB_management_procedures.h modified: openair3/S1AP/s1ap_eNB_nas_procedures.c modified: openair3/S1AP/s1ap_eNB_nas_procedures.h modified: openair3/S1AP/s1ap_eNB_nnsf.c modified: openair3/S1AP/s1ap_eNB_nnsf.h modified: openair3/S1AP/s1ap_eNB_overload.c modified: openair3/S1AP/s1ap_eNB_overload.h modified: openair3/S1AP/s1ap_eNB_trace.c modified: openair3/S1AP/s1ap_eNB_trace.h modified: openair3/S1AP/s1ap_eNB_ue_context.c modified: openair3/S1AP/s1ap_eNB_ue_context.h modified: openair3/SCTP/sctp_common.c modified: openair3/SCTP/sctp_common.h modified: openair3/SCTP/sctp_default_values.h modified: openair3/SCTP/sctp_eNB_defs.h modified: openair3/SCTP/sctp_eNB_itti_messaging.c modified: openair3/SCTP/sctp_eNB_itti_messaging.h modified: openair3/SCTP/sctp_eNB_task.c modified: openair3/SCTP/sctp_eNB_task.h modified: openair3/SCTP/sctp_primitives_client.c modified: openair3/SCTP/sctp_primitives_client.h modified: openair3/SECU/kdf.c modified: openair3/SECU/key_nas_deriver.c modified: openair3/SECU/key_nas_encryption.c modified: openair3/SECU/nas_stream_eea1.c modified: openair3/SECU/nas_stream_eea2.c modified: openair3/SECU/nas_stream_eia1.c modified: openair3/SECU/nas_stream_eia2.c modified: openair3/SECU/rijndael.c modified: openair3/SECU/rijndael.h modified: openair3/SECU/secu_defs.h modified: openair3/SECU/snow3g.c modified: openair3/SECU/snow3g.h modified: openair3/TEST/EPC_TEST/generate_scenario.c modified: openair3/TEST/EPC_TEST/generate_scenario.h modified: openair3/TEST/EPC_TEST/play_scenario.c modified: openair3/TEST/EPC_TEST/play_scenario.h modified: openair3/TEST/EPC_TEST/play_scenario_decode.c modified: openair3/TEST/EPC_TEST/play_scenario_display.c modified: openair3/TEST/EPC_TEST/play_scenario_fsm.c modified: openair3/TEST/EPC_TEST/play_scenario_parse.c modified: openair3/TEST/EPC_TEST/play_scenario_s1ap.c modified: openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c modified: openair3/TEST/EPC_TEST/play_scenario_s1ap_eNB_defs.h modified: openair3/TEST/EPC_TEST/play_scenario_sctp.c modified: openair3/TEST/oaisim_mme_client_test.c modified: openair3/TEST/oaisim_mme_itti_test.c modified: openair3/TEST/oaisim_mme_list_benchmark.c modified: openair3/TEST/oaisim_mme_s1ap_test.c modified: openair3/TEST/oaisim_mme_sctp_test.c modified: openair3/TEST/oaisim_mme_test_s1c.c modified: openair3/TEST/oaisim_mme_test_s1c.h modified: openair3/TEST/oaisim_mme_test_s1c_s1ap.c modified: openair3/TEST/oaisim_mme_test_s1c_s1ap.h modified: openair3/TEST/oaisim_mme_test_s1c_scenario.c modified: openair3/TEST/oaisim_mme_test_s1c_scenario.h modified: openair3/TEST/oaisim_mme_test_s1c_scenario1.c modified: openair3/TEST/test_aes128_cmac_encrypt.c modified: openair3/TEST/test_aes128_ctr_decrypt.c modified: openair3/TEST/test_aes128_ctr_encrypt.c modified: openair3/TEST/test_kdf.c modified: openair3/TEST/test_s1ap.c modified: openair3/TEST/test_secu.c modified: openair3/TEST/test_secu_kenb.c modified: openair3/TEST/test_secu_knas.c modified: openair3/TEST/test_secu_knas_encrypt_eea1.c modified: openair3/TEST/test_secu_knas_encrypt_eea2.c modified: openair3/TEST/test_secu_knas_encrypt_eia1.c modified: openair3/TEST/test_secu_knas_encrypt_eia2.c modified: openair3/TEST/test_secu_knas_stream_int.c modified: openair3/UDP/udp_eNB_task.c modified: openair3/UDP/udp_eNB_task.h modified: openair3/UTILS/conversions.c modified: openair3/UTILS/conversions.h modified: openair3/UTILS/enum_string.c modified: openair3/UTILS/enum_string.h modified: openair3/UTILS/log.c modified: openair3/UTILS/log.h modified: openair3/UTILS/mcc_mnc_itu.c modified: openair3/UTILS/mcc_mnc_itu.h modified: openair3/UTILS/mme_config.c modified: openair3/UTILS/mme_config.h modified: openair3/UTILS/mme_default_values.h modified: targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c modified: targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h modified: targets/ARCH/COMMON/common_lib.c modified: targets/ARCH/COMMON/common_lib.h modified: targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c modified: targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c modified: targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c modified: targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h modified: targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h modified: targets/ARCH/EXMIMO/DEFS/openair_device.h modified: targets/ARCH/EXMIMO/DEFS/pcie_interface.h modified: targets/ARCH/EXMIMO/DRIVER/eurecom/defs.h modified: targets/ARCH/EXMIMO/DRIVER/eurecom/exmimo_fw.c modified: targets/ARCH/EXMIMO/DRIVER/eurecom/extern.h modified: targets/ARCH/EXMIMO/DRIVER/eurecom/fileops.c modified: targets/ARCH/EXMIMO/DRIVER/eurecom/irq.c modified: targets/ARCH/EXMIMO/DRIVER/eurecom/module_main.c modified: targets/ARCH/EXMIMO/DRIVER/eurecom/vars.h modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/defs.h modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/exmimo_fw.c modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/extern.h modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/fileops.c modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/irq.c modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/module_main.c modified: targets/ARCH/EXMIMO/DRIVER/exmimo3/vars.h modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_dev.c modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_drv.c modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_drv.h modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_fifos.c modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_ioctl.c modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_mmap.c modified: targets/ARCH/EXMIMO/DRIVER/telecomparistech/em1_rw.c modified: targets/ARCH/EXMIMO/USERSPACE/LIB/example.c modified: targets/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c modified: targets/ARCH/EXMIMO/USERSPACE/LIB/gain_control.h modified: targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c modified: targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.h modified: targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/updatefw.c modified: targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/updatefw.h modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf.h modified: targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp modified: targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp modified: targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp modified: targets/COMMON/create_tasks.c modified: targets/COMMON/create_tasks.h modified: targets/RT/USER/TOOLS/thread_ipc.c modified: targets/RT/USER/TOOLS/thread_ipc.h modified: targets/RT/USER/UE_transport_IQ.c modified: targets/RT/USER/condtest.c modified: targets/RT/USER/eNB_transport_IQ.c modified: targets/RT/USER/emos-raw.c modified: targets/RT/USER/lte-enb.c modified: targets/RT/USER/lte-softmodem.c modified: targets/RT/USER/lte-ue.c modified: targets/RT/USER/msg_helper.c modified: targets/RT/USER/msg_many.c modified: targets/RT/USER/msg_many.h modified: targets/RT/USER/rrh.c modified: targets/RT/USER/rrh_gw.c modified: targets/RT/USER/rrh_gw.h modified: targets/RT/USER/rrh_gw_externs.h modified: targets/RT/USER/rt_wrapper.c modified: targets/RT/USER/rt_wrapper.h modified: targets/RT/USER/sleeptest.c modified: targets/RT/USER/stats.c modified: targets/RT/USER/stats.h modified: targets/RT/USER/synctest.c modified: targets/SIMU/PROC/Process.c modified: targets/SIMU/PROC/Process.h modified: targets/SIMU/PROC/Tsync.h modified: targets/SIMU/PROC/channel_sim_proc.c modified: targets/SIMU/PROC/channel_sim_proc.h modified: targets/SIMU/PROC/interface.h modified: targets/SIMU/USER/channel_sim.c modified: targets/SIMU/USER/cor_SF_sim.c modified: targets/SIMU/USER/cor_SF_sim.h modified: targets/SIMU/USER/event_handler.c modified: targets/SIMU/USER/event_handler.h modified: targets/SIMU/USER/init_lte.c modified: targets/SIMU/USER/init_lte.h modified: targets/SIMU/USER/oaisim.c modified: targets/SIMU/USER/oaisim.h modified: targets/SIMU/USER/oaisim_config.c modified: targets/SIMU/USER/oaisim_config.h modified: targets/SIMU/USER/oaisim_functions.c modified: targets/SIMU/USER/oaisim_functions.h modified: targets/SIMU/USER/oaisim_pad.c modified: targets/SIMU/USER/phy_procedures_sim_form.c modified: targets/SIMU/USER/phy_procedures_sim_form.h modified: targets/SIMU/USER/sinr_sim.c modified: targets/TEST/AT_COMMANDS/oaisim.c modified: targets/TEST/PACKET_TRACER/pt.c modified: targets/TEST/PDCP/test_pdcp.c modified: targets/TEST/PDCP/test_pdcp.h modified: targets/TEST/PDCP/test_util.h modified: targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c modified: targets/TEST/RLC_AM_V9.3.0/oaisim.c modified: targets/TEST/RLC_UM_V9.3.0/oaisim.c modified: targets/TEST/ROHDE_SCHWARZ/EthernetRawCommand.cpp modified: targets/TEST/ROHDE_SCHWARZ/TcpClient.cpp modified: targets/TEST/ROHDE_SCHWARZ/TcpClient.h
2081 lines
62 KiB
C
2081 lines
62 KiB
C
/*
|
|
* 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.0 (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/LTE_TRANSPORT/dlsch_modulation.c
|
|
* \brief Top-level routines for generating the PDSCH physical channel from 36-211, V8.6 2009-03
|
|
* \author R. Knopp, F. Kaltenberger
|
|
* \date 2011
|
|
* \version 0.1
|
|
* \company Eurecom
|
|
* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
|
|
* \note
|
|
* \warning
|
|
*/
|
|
#include "PHY/defs.h"
|
|
#include "PHY/extern.h"
|
|
#include "PHY/CODING/defs.h"
|
|
#include "PHY/CODING/extern.h"
|
|
#include "PHY/CODING/lte_interleaver_inline.h"
|
|
#include "PHY/LTE_TRANSPORT/defs.h"
|
|
#include "defs.h"
|
|
#include "UTIL/LOG/vcd_signal_dumper.h"
|
|
|
|
//#define DEBUG_DLSCH_MODULATION
|
|
|
|
//#define is_not_pilot(pilots,re,nushift,use2ndpilots) ((pilots==0) || ((re!=nushift) && (re!=nushift+6)&&((re!=nushift+3)||(use2ndpilots==1))&&((re!=nushift+9)||(use2ndpilots==1)))?1:0)
|
|
|
|
uint8_t is_not_pilot(uint8_t pilots, uint8_t re, uint8_t nushift, uint8_t use2ndpilots)
|
|
{
|
|
|
|
uint8_t offset = (pilots==2)?3:0;
|
|
int nushiftmod3 = nushift%3;
|
|
|
|
if (pilots==0)
|
|
return(1);
|
|
|
|
if (use2ndpilots==1) { // This is for SISO (mode 1)
|
|
if ((re!=nushift+offset) && (re!=((nushift+6+offset)%12)))
|
|
return(1);
|
|
} else { // 2 antenna pilots
|
|
if ((re!=nushiftmod3) && (re!=nushiftmod3+6) && (re!=nushiftmod3+3) && (re!=nushiftmod3+9))
|
|
return(1);
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
uint8_t is_not_UEspecRS(int first_layer,int re)
|
|
{
|
|
|
|
return(1);
|
|
}
|
|
|
|
void generate_64qam_table(void)
|
|
{
|
|
|
|
int a,b,c,index;
|
|
|
|
|
|
for (a=-1; a<=1; a+=2)
|
|
for (b=-1; b<=1; b+=2)
|
|
for (c=-1; c<=1; c+=2) {
|
|
index = (1+a)*2 + (1+b) + (1+c)/2;
|
|
qam64_table[index] = -a*(QAM64_n1 + b*(QAM64_n2 + (c*QAM64_n3))); // 0 1 2
|
|
}
|
|
}
|
|
|
|
void generate_16qam_table(void)
|
|
{
|
|
|
|
int a,b,index;
|
|
|
|
for (a=-1; a<=1; a+=2)
|
|
for (b=-1; b<=1; b+=2) {
|
|
index = (1+a) + (1+b)/2;
|
|
qam16_table[index] = -a*(QAM16_n1 + (b*QAM16_n2));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
void layer1prec2A(int32_t *antenna0_sample, int32_t *antenna1_sample, uint8_t precoding_index)
|
|
{
|
|
|
|
switch (precoding_index) {
|
|
|
|
case 0: // 1 1
|
|
*antenna1_sample=*antenna0_sample;
|
|
break;
|
|
|
|
case 1: // 1 -1
|
|
((int16_t *)antenna1_sample)[0] = -((int16_t *)antenna0_sample)[0];
|
|
((int16_t *)antenna1_sample)[1] = -((int16_t *)antenna0_sample)[1];
|
|
break;
|
|
|
|
case 2: // 1 j
|
|
((int16_t *)antenna1_sample)[0] = -((int16_t *)antenna0_sample)[1];
|
|
((int16_t *)antenna1_sample)[1] = ((int16_t *)antenna0_sample)[0];
|
|
break;
|
|
|
|
case 3: // 1 -j
|
|
((int16_t *)antenna1_sample)[0] = ((int16_t *)antenna0_sample)[1];
|
|
((int16_t *)antenna1_sample)[1] = -((int16_t *)antenna0_sample)[0];
|
|
break;
|
|
}
|
|
|
|
// normalize
|
|
/* ((int16_t *)antenna0_sample)[0] = (int16_t)((((int16_t *)antenna0_sample)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t *)antenna0_sample)[1] = (int16_t)((((int16_t *)antenna0_sample)[1]*ONE_OVER_SQRT2_Q15)>>15); ((int16_t *)antenna1_sample)[0] = (int16_t)((((int16_t *)antenna1_sample)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t *)antenna1_sample)[1] = (int16_t)((((int16_t *)antenna1_sample)[1]*ONE_OVER_SQRT2_Q15)>>15); */
|
|
}
|
|
|
|
uint32_t FOUR[2]={0,4};
|
|
uint32_t TWO[2]={0,2};
|
|
|
|
int allocate_REs_in_RB_no_pilots_16QAM_siso(LTE_DL_FRAME_PARMS *frame_parms,
|
|
int **txdataF,
|
|
uint32_t *jj,
|
|
uint32_t *jj2,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq,
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq,
|
|
uint8_t pilots,
|
|
int16_t amp,
|
|
uint8_t precoder_index,
|
|
int16_t *qam_table_s0,
|
|
int16_t *qam_table_s1,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
uint8_t skip_half,
|
|
int *P1_SHIFT,
|
|
int *P2_SHIFT)
|
|
{
|
|
|
|
|
|
uint8_t *x0 = dlsch0_harq->e;
|
|
uint32_t qam16_table_offset_re = 0;
|
|
uint32_t qam16_table_offset_im = 0;
|
|
|
|
uint32_t tti_offset;
|
|
uint8_t re;
|
|
uint8_t *x0p;
|
|
|
|
if (skip_dc == 0) {
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset,re=0;
|
|
re<12;
|
|
re++,x0p+=4,tti_offset++) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
}
|
|
}
|
|
else {
|
|
// 1st half of PRB
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset,re=0;
|
|
re<6;
|
|
re++,x0p+=4,tti_offset++) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
}
|
|
// 2nd half of PRB
|
|
for (tti_offset=symbol_offset+re_offset-frame_parms->ofdm_symbol_size+7;
|
|
re<12;
|
|
re++,x0p+=4,tti_offset++) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
}
|
|
}
|
|
*re_allocated = *re_allocated + 12;
|
|
*jj=*jj + 48;
|
|
|
|
return(0);
|
|
}
|
|
|
|
int allocate_REs_in_RB_pilots_16QAM_siso(LTE_DL_FRAME_PARMS *frame_parms,
|
|
int **txdataF,
|
|
uint32_t *jj,
|
|
uint32_t *jj2,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq,
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq,
|
|
uint8_t pilots,
|
|
int16_t amp,
|
|
uint8_t precoder_index,
|
|
int16_t *qam_table_s0,
|
|
int16_t *qam_table_s1,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
uint8_t skip_half,
|
|
int *P1_SHIFT,
|
|
int *P2_SHIFT)
|
|
{
|
|
|
|
|
|
uint8_t *x0 = dlsch0_harq->e;
|
|
uint32_t qam16_table_offset_re = 0;
|
|
uint32_t qam16_table_offset_im = 0;
|
|
|
|
uint32_t tti_offset;
|
|
uint8_t re;
|
|
uint8_t *x0p;
|
|
|
|
|
|
if (skip_dc == 0) {
|
|
// printf("pilots: P1_SHIFT[0] %d\n",P1_SHIFT[0]);
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset+P1_SHIFT[0],re=P1_SHIFT[0];
|
|
re<12;
|
|
x0p+=4) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
// printf("pilots: re %d, tti_offset %d, P1_SHIFT %d\n",re,tti_offset,P1_SHIFT[re+1]);
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
}
|
|
else {
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset+P1_SHIFT[0],re=P1_SHIFT[0];
|
|
re<6;
|
|
x0p+=4) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
|
|
for (tti_offset=symbol_offset+re_offset-frame_parms->ofdm_symbol_size+6+P1_SHIFT[6];
|
|
re<12;
|
|
x0p+=4) {
|
|
|
|
qam16_table_offset_re=TWO[x0p[0]];
|
|
qam16_table_offset_im=TWO[x0p[1]];
|
|
qam16_table_offset_re+=x0p[2];
|
|
qam16_table_offset_im+=x0p[3];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam16_table_offset_im];
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
}
|
|
*re_allocated = *re_allocated + 10;
|
|
*jj=*jj + 40;
|
|
|
|
return(0);
|
|
}
|
|
|
|
int allocate_REs_in_RB_no_pilots_64QAM_siso(LTE_DL_FRAME_PARMS *frame_parms,
|
|
int **txdataF,
|
|
uint32_t *jj,
|
|
uint32_t *jj2,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq,
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq,
|
|
uint8_t pilots,
|
|
int16_t amp,
|
|
uint8_t precoder_index,
|
|
int16_t *qam_table_s0,
|
|
int16_t *qam_table_s1,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
uint8_t skip_half,
|
|
int *P1_SHIFT,
|
|
int *P2_SHIFT)
|
|
{
|
|
|
|
|
|
uint8_t *x0 = dlsch0_harq->e;
|
|
uint32_t qam64_table_offset_re = 0;
|
|
uint32_t qam64_table_offset_im = 0;
|
|
|
|
uint32_t tti_offset;
|
|
uint8_t re;
|
|
uint8_t *x0p;
|
|
|
|
if (skip_dc == 0) {
|
|
|
|
x0p=&x0[*jj],tti_offset=symbol_offset+re_offset;
|
|
|
|
/* for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset,re=0;
|
|
re<12;
|
|
re+=4,x0p+=24,tti_offset+=4) {*/
|
|
|
|
qam64_table_offset_re=(x0p[0]<<2)|(x0p[2]<<1)|x0p[4];
|
|
qam64_table_offset_im=(x0p[1]<<2)|(x0p[3]<<1)|x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[6]<<2)|(x0p[8]<<1)|x0p[10];
|
|
qam64_table_offset_im=(x0p[7]<<2)|(x0p[9]<<1)|x0p[11];
|
|
((int16_t *)&txdataF[0][tti_offset])[2]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[3]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[12]<<2)|(x0p[14]<<1)|x0p[16];
|
|
qam64_table_offset_im=(x0p[13]<<2)|(x0p[15]<<1)|x0p[17];
|
|
((int16_t *)&txdataF[0][tti_offset])[4]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[5]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[18]<<2)|(x0p[20]<<1)|x0p[22];
|
|
qam64_table_offset_im=(x0p[19]<<2)|(x0p[21]<<1)|x0p[23];
|
|
((int16_t *)&txdataF[0][tti_offset])[6]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[7]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[24]<<2)|(x0p[26]<<1)|x0p[28];
|
|
qam64_table_offset_im=(x0p[25]<<2)|(x0p[27]<<1)|x0p[29];
|
|
((int16_t *)&txdataF[0][tti_offset])[8]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[9]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[30]<<2)|(x0p[32]<<1)|x0p[34];
|
|
qam64_table_offset_im=(x0p[31]<<2)|(x0p[33]<<1)|x0p[35];
|
|
((int16_t *)&txdataF[0][tti_offset])[10]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[11]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[36]<<2)|(x0p[38]<<1)|x0p[40];
|
|
qam64_table_offset_im=(x0p[37]<<2)|(x0p[39]<<1)|x0p[41];
|
|
((int16_t *)&txdataF[0][tti_offset])[12]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[13]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[42]<<2)|(x0p[44]<<1)|x0p[46];
|
|
qam64_table_offset_im=(x0p[43]<<2)|(x0p[45]<<1)|x0p[47];
|
|
((int16_t *)&txdataF[0][tti_offset])[14]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[15]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[48]<<2)|(x0p[50]<<1)|x0p[52];
|
|
qam64_table_offset_im=(x0p[49]<<2)|(x0p[51]<<1)|x0p[53];
|
|
((int16_t *)&txdataF[0][tti_offset])[16]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[17]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[54]<<2)|(x0p[56]<<1)|x0p[58];
|
|
qam64_table_offset_im=(x0p[55]<<2)|(x0p[57]<<1)|x0p[59];
|
|
((int16_t *)&txdataF[0][tti_offset])[18]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[19]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[60]<<2)|(x0p[62]<<1)|x0p[64];
|
|
qam64_table_offset_im=(x0p[61]<<2)|(x0p[63]<<1)|x0p[65];
|
|
((int16_t *)&txdataF[0][tti_offset])[20]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[21]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
qam64_table_offset_re=(x0p[66]<<2)|(x0p[68]<<1)|x0p[70];
|
|
qam64_table_offset_im=(x0p[67]<<2)|(x0p[69]<<1)|x0p[71];
|
|
((int16_t *)&txdataF[0][tti_offset])[22]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[23]=qam_table_s0[qam64_table_offset_im];
|
|
|
|
|
|
// }
|
|
}
|
|
else {
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset,re=0;
|
|
re<6;
|
|
re++,x0p+=6,tti_offset++) {
|
|
|
|
qam64_table_offset_re=FOUR[x0p[0]];
|
|
qam64_table_offset_im=FOUR[x0p[1]];
|
|
qam64_table_offset_re+=TWO[x0p[2]];
|
|
qam64_table_offset_im+=TWO[x0p[3]];
|
|
qam64_table_offset_re+=x0p[4];
|
|
qam64_table_offset_im+=x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
}
|
|
|
|
for (tti_offset=symbol_offset+re_offset-frame_parms->ofdm_symbol_size+7;
|
|
re<12;
|
|
re++,x0p+=6,tti_offset++) {
|
|
|
|
qam64_table_offset_re=FOUR[x0p[0]];
|
|
qam64_table_offset_im=FOUR[x0p[1]];
|
|
qam64_table_offset_re+=TWO[x0p[2]];
|
|
qam64_table_offset_im+=TWO[x0p[3]];
|
|
qam64_table_offset_re+=x0p[4];
|
|
qam64_table_offset_im+=x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
}
|
|
}
|
|
|
|
*re_allocated = *re_allocated + 12;
|
|
*jj=*jj + 72;
|
|
|
|
return(0);
|
|
}
|
|
|
|
int allocate_REs_in_RB_pilots_64QAM_siso(LTE_DL_FRAME_PARMS *frame_parms,
|
|
int **txdataF,
|
|
uint32_t *jj,
|
|
uint32_t *jj2,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq,
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq,
|
|
uint8_t pilots,
|
|
int16_t amp,
|
|
uint8_t precoder_index,
|
|
int16_t *qam_table_s0,
|
|
int16_t *qam_table_s1,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
uint8_t skip_half,
|
|
int *P1_SHIFT,
|
|
int *P2_SHIFT)
|
|
{
|
|
|
|
|
|
uint8_t *x0 = dlsch0_harq->e;
|
|
uint32_t qam64_table_offset_re = 0;
|
|
uint32_t qam64_table_offset_im = 0;
|
|
|
|
uint32_t tti_offset;
|
|
uint8_t re;
|
|
uint8_t *x0p;
|
|
|
|
|
|
if (skip_dc == 0) {
|
|
// printf("pilots: P1_SHIFT[0] %d\n",P1_SHIFT[0]);
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset+P1_SHIFT[0],re=P1_SHIFT[0];
|
|
re<12;
|
|
x0p+=6) {
|
|
|
|
qam64_table_offset_re=FOUR[x0p[0]];
|
|
qam64_table_offset_im=FOUR[x0p[1]];
|
|
qam64_table_offset_re+=TWO[x0p[2]];
|
|
qam64_table_offset_im+=TWO[x0p[3]];
|
|
qam64_table_offset_re+=x0p[4];
|
|
qam64_table_offset_im+=x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
// printf("pilots: re %d, tti_offset %d, P1_SHIFT %d\n",re,tti_offset,P1_SHIFT[re+1]);
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
}
|
|
else {
|
|
for (x0p=&x0[*jj],tti_offset=symbol_offset+re_offset+P1_SHIFT[0],re=P1_SHIFT[0];
|
|
re<6;
|
|
x0p+=6) {
|
|
|
|
qam64_table_offset_re=FOUR[x0p[0]];
|
|
qam64_table_offset_im=FOUR[x0p[1]];
|
|
qam64_table_offset_re+=TWO[x0p[2]];
|
|
qam64_table_offset_im+=TWO[x0p[3]];
|
|
qam64_table_offset_re+=x0p[4];
|
|
qam64_table_offset_im+=x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
|
|
for (tti_offset=symbol_offset+re_offset-frame_parms->ofdm_symbol_size+6+P1_SHIFT[6];
|
|
re<12;
|
|
x0p+=6) {
|
|
|
|
qam64_table_offset_re=FOUR[x0p[0]];
|
|
qam64_table_offset_im=FOUR[x0p[1]];
|
|
qam64_table_offset_re+=TWO[x0p[2]];
|
|
qam64_table_offset_im+=TWO[x0p[3]];
|
|
qam64_table_offset_re+=x0p[4];
|
|
qam64_table_offset_im+=x0p[5];
|
|
((int16_t *)&txdataF[0][tti_offset])[0]=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[0][tti_offset])[1]=qam_table_s0[qam64_table_offset_im];
|
|
tti_offset+=P1_SHIFT[re+1];
|
|
re+=P1_SHIFT[re+1];
|
|
}
|
|
}
|
|
*re_allocated = *re_allocated + 10;
|
|
*jj=*jj + 60;
|
|
|
|
return(0);
|
|
}
|
|
|
|
int allocate_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
|
|
int32_t **txdataF,
|
|
uint32_t *jj,
|
|
uint32_t *jj2,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq,
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq,
|
|
uint8_t pilots,
|
|
int16_t amp,
|
|
uint8_t precoder_index,
|
|
int16_t *qam_table_s0,
|
|
int16_t *qam_table_s1,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
uint8_t skip_half,
|
|
int *P1_SHIFT,
|
|
int *P2_SHIFT)
|
|
{
|
|
|
|
|
|
uint8_t *x0 = dlsch0_harq->e;
|
|
MIMO_mode_t mimo_mode = dlsch0_harq->mimo_mode;
|
|
|
|
int first_layer0 = dlsch0_harq->first_layer;
|
|
int Nlayers0 = dlsch0_harq->Nlayers;
|
|
uint8_t mod_order0 = get_Qm(dlsch0_harq->mcs);
|
|
|
|
|
|
uint8_t *x1=NULL;
|
|
uint8_t mod_order1=2;
|
|
// Fill these in later for TM8-10
|
|
// int Nlayers1;
|
|
// int first_layer1;
|
|
|
|
|
|
int use2ndpilots = (frame_parms->mode1_flag==1)?1:0;
|
|
|
|
uint32_t tti_offset,aa;
|
|
uint8_t re;
|
|
uint8_t qam64_table_offset_re = 0;
|
|
uint8_t qam64_table_offset_im = 0;
|
|
uint8_t qam16_table_offset_re = 0;
|
|
uint8_t qam16_table_offset_im = 0;
|
|
uint8_t qam64_table_offset_re0 = 0;
|
|
uint8_t qam64_table_offset_im0 = 0;
|
|
uint8_t qam16_table_offset_re0 = 0;
|
|
uint8_t qam16_table_offset_im0 = 0;
|
|
uint8_t qam64_table_offset_re1 = 0;
|
|
uint8_t qam64_table_offset_im1 = 0;
|
|
uint8_t qam16_table_offset_re1 = 0;
|
|
uint8_t qam16_table_offset_im1 = 0;
|
|
int16_t xx0_re,xx1_re;
|
|
int16_t xx0_im,xx1_im;
|
|
|
|
int16_t gain_lin_QPSK;//,gain_lin_16QAM1,gain_lin_16QAM2;
|
|
int16_t re_off=re_offset;
|
|
|
|
uint8_t first_re,last_re;
|
|
int32_t tmp_sample1,tmp_sample2;
|
|
int16_t tmp_amp=amp;
|
|
int s=1;
|
|
|
|
gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
|
|
// if (mimo_mode == LARGE_CDD) gain_lin_QPSK>>=1;
|
|
|
|
if (dlsch1_harq) {
|
|
x1 = dlsch1_harq->e;
|
|
// Fill these in later for TM8-10
|
|
// Nlayers1 = dlsch1_harq->Nlayers;
|
|
// first_layer1 = dlsch1_harq->first_layer;
|
|
mod_order1 = get_Qm(dlsch1_harq->mcs);
|
|
|
|
}
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("allocate_re (mod %d): symbol_offset %d re_offset %d (%d,%d), jj %d -> %d,%d\n",mod_order0,symbol_offset,re_offset,skip_dc,skip_half,*jj, x0[*jj], x0[1+*jj]);
|
|
#endif
|
|
|
|
first_re=0;
|
|
last_re=12;
|
|
|
|
if (skip_half==1)
|
|
last_re=6;
|
|
else if (skip_half==2)
|
|
first_re=6;
|
|
|
|
|
|
for (re=first_re; re<last_re; re++) {
|
|
|
|
|
|
if ((skip_dc == 1) && (re==6))
|
|
re_off=re_off - frame_parms->ofdm_symbol_size+1;
|
|
|
|
tti_offset = symbol_offset + re_off + re;
|
|
|
|
// check that RE is not from Cell-specific RS
|
|
|
|
if (is_not_pilot(pilots,re,frame_parms->nushift,use2ndpilots)==1) {
|
|
// printf("re %d (jj %d)\n",re,*jj);
|
|
|
|
|
|
if (mimo_mode == SISO) { //SISO mapping
|
|
*re_allocated = *re_allocated + 1;
|
|
|
|
switch (mod_order0) {
|
|
case 2: //QPSK
|
|
|
|
// printf("re %d %d(%d) : %d,%d => ",re,tti_offset,*jj,((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t*)&txdataF[aa][tti_offset])[0] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //I //b_i
|
|
}
|
|
|
|
*jj = *jj + 1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t*)&txdataF[aa][tti_offset])[1] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //Q //b_{i+1}
|
|
}
|
|
|
|
*jj = *jj + 1;
|
|
|
|
// printf("%d,%d\n",((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t *)&txdataF[aa][tti_offset])[0]+=qam_table_s0[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[aa][tti_offset])[1]+=qam_table_s0[qam16_table_offset_im];
|
|
// ((int16_t *)&txdataF[aa][tti_offset])[0]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_re])>>15);
|
|
// ((int16_t *)&txdataF[aa][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_im])>>15);
|
|
}
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t *)&txdataF[aa][tti_offset])[0]+=qam_table_s0[qam64_table_offset_re];
|
|
((int16_t *)&txdataF[aa][tti_offset])[1]+=qam_table_s0[qam64_table_offset_im];
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
else if (mimo_mode == ALAMOUTI) {
|
|
*re_allocated = *re_allocated + 1;
|
|
|
|
switch (mod_order0) {
|
|
case 2: //QPSK
|
|
|
|
// first antenna position n -> x0
|
|
|
|
((int16_t*)&tmp_sample1)[0] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj=*jj+1;
|
|
((int16_t*)&tmp_sample1)[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj=*jj+1;
|
|
|
|
// second antenna position n -> -x1*
|
|
|
|
((int16_t*)&tmp_sample2)[0] = (x0[*jj]==1) ? (gain_lin_QPSK) : -gain_lin_QPSK;
|
|
*jj=*jj+1;
|
|
((int16_t*)&tmp_sample2)[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj=*jj+1;
|
|
|
|
// normalization for 2 tx antennas
|
|
((int16_t*)&txdataF[0][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample1)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t*)&txdataF[0][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample1)[1]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t*)&txdataF[1][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample2)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t*)&txdataF[1][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample2)[1]*ONE_OVER_SQRT2_Q15)>>15);
|
|
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
// Antenna 0 position n
|
|
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
//((int16_t *)&txdataF[0][tti_offset])[0]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_re])>>15);
|
|
//((int16_t *)&txdataF[0][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_im])>>15);
|
|
((int16_t *)&txdataF[0][tti_offset])[0]+=(qam_table_s0[qam16_table_offset_re]*ONE_OVER_SQRT2_Q15)>>15;
|
|
((int16_t *)&txdataF[0][tti_offset])[1]+=(qam_table_s0[qam16_table_offset_im]*ONE_OVER_SQRT2_Q15)>>15;
|
|
|
|
// Antenna 1 position n Real part -> -x1*
|
|
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
//((int16_t *)&txdataF[1][tti_offset])[0]+=-(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_re])>>15);
|
|
//((int16_t *)&txdataF[1][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_im])>>15);
|
|
((int16_t *)&txdataF[1][tti_offset])[0]+=-(qam_table_s0[qam16_table_offset_re]*ONE_OVER_SQRT2_Q15)>>15;
|
|
((int16_t *)&txdataF[1][tti_offset])[1]+=(qam_table_s0[qam16_table_offset_im]*ONE_OVER_SQRT2_Q15)>>15;
|
|
|
|
|
|
break;
|
|
|
|
case 6: // 64-QAM
|
|
|
|
// Antenna 0
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
//((int16_t *)&txdataF[0][tti_offset])[0]+=(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_re])>>15);
|
|
//((int16_t *)&txdataF[0][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_im])>>15);
|
|
((int16_t *)&txdataF[0][tti_offset])[0]+=(qam_table_s0[qam64_table_offset_re]*ONE_OVER_SQRT2_Q15)>>15;
|
|
((int16_t *)&txdataF[0][tti_offset])[1]+=(qam_table_s0[qam64_table_offset_im]*ONE_OVER_SQRT2_Q15)>>15;
|
|
|
|
|
|
// Antenna 1 => -x1*
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
//((int16_t *)&txdataF[1][tti_offset])[0]+=-(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_re])>>15);
|
|
//((int16_t *)&txdataF[1][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_im])>>15);
|
|
((int16_t *)&txdataF[1][tti_offset])[0]+=-(qam_table_s0[qam64_table_offset_re]*ONE_OVER_SQRT2_Q15)>>15;
|
|
((int16_t *)&txdataF[1][tti_offset])[1]+=(qam_table_s0[qam64_table_offset_im]*ONE_OVER_SQRT2_Q15)>>15;
|
|
|
|
|
|
break;
|
|
}
|
|
|
|
// fill in the rest of the ALAMOUTI precoding
|
|
if (is_not_pilot(pilots,re + 1,frame_parms->nushift,use2ndpilots)==1) {
|
|
((int16_t *)&txdataF[0][tti_offset+1])[0] += -((int16_t *)&txdataF[1][tti_offset])[0]; //x1
|
|
((int16_t *)&txdataF[0][tti_offset+1])[1] += ((int16_t *)&txdataF[1][tti_offset])[1];
|
|
((int16_t *)&txdataF[1][tti_offset+1])[0] += ((int16_t *)&txdataF[0][tti_offset])[0]; //x0*
|
|
((int16_t *)&txdataF[1][tti_offset+1])[1] += -((int16_t *)&txdataF[0][tti_offset])[1];
|
|
} else {
|
|
((int16_t *)&txdataF[0][tti_offset+2])[0] += -((int16_t *)&txdataF[1][tti_offset])[0]; //x1
|
|
((int16_t *)&txdataF[0][tti_offset+2])[1] += ((int16_t *)&txdataF[1][tti_offset])[1];
|
|
((int16_t *)&txdataF[1][tti_offset+2])[0] += ((int16_t *)&txdataF[0][tti_offset])[0]; //x0*
|
|
((int16_t *)&txdataF[1][tti_offset+2])[1] += -((int16_t *)&txdataF[0][tti_offset])[1];
|
|
}
|
|
} else if (mimo_mode == LARGE_CDD) {
|
|
|
|
*re_allocated = *re_allocated + 1;
|
|
|
|
if (frame_parms->nb_antennas_tx == 2) {
|
|
switch (mod_order0) {
|
|
default:
|
|
LOG_E(PHY,"Unknown mod_order0 %d\n",mod_order0);
|
|
xx0_re=xx0_im=0;
|
|
break;
|
|
|
|
case 2: //QPSK
|
|
// printf("%d(%d) : %d,%d => ",tti_offset,*jj,((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
xx0_re = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj = *jj + 1;
|
|
xx0_im = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj = *jj + 1;
|
|
|
|
|
|
|
|
// printf("%d,%d\n",((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
qam16_table_offset_re0 = 0;
|
|
qam16_table_offset_im0 = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re0+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im0+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re0+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im0+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
xx0_re = qam_table_s0[qam16_table_offset_re0];
|
|
xx0_im = qam_table_s0[qam16_table_offset_im0];
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
|
|
qam64_table_offset_re0 = 0;
|
|
qam64_table_offset_im0 = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re0+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im0+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re0+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im0+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re0+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im0+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
xx0_re = qam_table_s0[qam64_table_offset_re0];
|
|
xx0_im = qam_table_s0[qam64_table_offset_im0];
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (mod_order1) {
|
|
default:
|
|
LOG_E(PHY,"Unknown mod_order1 %d\n",mod_order1);
|
|
xx1_re=xx1_im=0;
|
|
break;
|
|
|
|
case 2: //QPSK
|
|
// printf("%d(%d) : %d,%d => ",tti_offset,*jj,((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
xx1_re = (x1[*jj2]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj2 = *jj2 + 1;
|
|
xx1_im = (x1[*jj2]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj2 = *jj2 + 1;
|
|
// printf("%d,%d\n",((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
qam16_table_offset_re1 = 0;
|
|
qam16_table_offset_im1 = 0;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam16_table_offset_re1+=2;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam16_table_offset_im1+=2;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam16_table_offset_re1+=1;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam16_table_offset_im1+=1;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
xx1_re = qam_table_s1[qam16_table_offset_re1];
|
|
xx1_im = qam_table_s1[qam16_table_offset_im1];
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
qam64_table_offset_re1 = 0;
|
|
qam64_table_offset_im1 = 0;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_re1+=4;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_im1+=4;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_re1+=2;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_im1+=2;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_re1+=1;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
if (x1[*jj2] == 1)
|
|
qam64_table_offset_im1+=1;
|
|
|
|
*jj2 = *jj2 + 1;
|
|
|
|
xx1_re = qam_table_s1[qam64_table_offset_re1];
|
|
xx1_im = qam_table_s1[qam64_table_offset_im1];
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// This implements the Large CDD precoding for 2 TX antennas
|
|
// - - - - - - - - - - - -
|
|
//| y0 | | 1 0 || 1 0 || 1 1 || x0 | | x0 + x1 |
|
|
//| y1 | = .5 | 0 1 || 0 (-1)^i || 1 -1 || x1 | = .5| (-1)^i(x0 - x1)|
|
|
// - - - - - - - - - - -
|
|
// Note: Factor .5 is accounted for in amplitude when calling this function
|
|
((int16_t *)&txdataF[0][tti_offset])[0]+=((xx0_re+xx1_re)>>1);
|
|
((int16_t *)&txdataF[1][tti_offset])[0]+=(s*((xx0_re-xx1_re)>>1));
|
|
((int16_t *)&txdataF[0][tti_offset])[1]+=((xx0_im+xx1_im)>>1);
|
|
((int16_t *)&txdataF[1][tti_offset])[1]+=(s*((xx0_im-xx1_im)>>1));
|
|
/*
|
|
printf("CDD: xx0 (%d,%d), xx1(%d,%d), s(%d), txF[0] (%d,%d), txF[1] (%d,%d)\n",
|
|
xx0_re,xx0_im,xx1_re,xx1_im, s, ((int16_t *)&txdataF[0][tti_offset])[0],((int16_t *)&txdataF[0][tti_offset])[1],
|
|
((int16_t *)&txdataF[1][tti_offset])[0],((int16_t *)&txdataF[1][tti_offset])[1]);
|
|
*/
|
|
// s alternates +1/-1 for each RE
|
|
s = -s;
|
|
}
|
|
} else if ((mimo_mode >= UNIFORM_PRECODING11)&&(mimo_mode <= PUSCH_PRECODING1)) {
|
|
// this is for transmission modes 4-6 (1 layer)
|
|
*re_allocated = *re_allocated + 1;
|
|
amp = (int16_t)(((int32_t)tmp_amp*ONE_OVER_SQRT2_Q15)>>15);
|
|
|
|
switch (mod_order0) {
|
|
case 2: //QPSK
|
|
|
|
((int16_t*)&tmp_sample1)[0] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj = *jj + 1;
|
|
((int16_t*)&tmp_sample1)[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
|
|
*jj = *jj + 1;
|
|
|
|
// normalization for 2 tx antennas
|
|
((int16_t*)&txdataF[0][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample1)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t*)&txdataF[0][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample1)[1]*ONE_OVER_SQRT2_Q15)>>15);
|
|
|
|
if (frame_parms->nb_antennas_tx == 2) {
|
|
layer1prec2A(&tmp_sample1,&tmp_sample2,precoder_index);
|
|
((int16_t*)&txdataF[1][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample2)[0]*ONE_OVER_SQRT2_Q15)>>15);
|
|
((int16_t*)&txdataF[1][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample2)[1]*ONE_OVER_SQRT2_Q15)>>15);
|
|
}
|
|
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
((int16_t*)&tmp_sample1)[0] = (int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_re])>>15);
|
|
((int16_t*)&tmp_sample1)[1] = (int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_im])>>15);
|
|
|
|
((int16_t *)&txdataF[0][tti_offset])[0] += ((int16_t*)&tmp_sample1)[0];
|
|
((int16_t *)&txdataF[0][tti_offset])[1] += ((int16_t*)&tmp_sample1)[1];
|
|
|
|
if (frame_parms->nb_antennas_tx == 2) {
|
|
layer1prec2A(&tmp_sample1,&tmp_sample2,precoder_index);
|
|
((int16_t*)&txdataF[1][tti_offset])[0] += ((int16_t*)&tmp_sample2)[0];
|
|
((int16_t*)&txdataF[1][tti_offset])[1] += ((int16_t*)&tmp_sample2)[1];
|
|
}
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
((int16_t*)&tmp_sample1)[0] = (int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_re])>>15);
|
|
((int16_t*)&tmp_sample1)[1] = (int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_im])>>15);
|
|
|
|
((int16_t *)&txdataF[0][tti_offset])[0] += ((int16_t*)&tmp_sample1)[0];
|
|
((int16_t *)&txdataF[0][tti_offset])[1] += ((int16_t*)&tmp_sample1)[1];
|
|
|
|
if (frame_parms->nb_antennas_tx == 2) {
|
|
layer1prec2A(&tmp_sample1,&tmp_sample2,precoder_index);
|
|
((int16_t*)&txdataF[1][tti_offset])[0] += ((int16_t*)&tmp_sample2)[0];
|
|
((int16_t*)&txdataF[1][tti_offset])[1] += ((int16_t*)&tmp_sample2)[1];
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
if (mimo_mode == ALAMOUTI) {
|
|
re++; // adjacent carriers are taken care of by precoding
|
|
*re_allocated = *re_allocated + 1;
|
|
|
|
if (is_not_pilot(pilots,re,frame_parms->nushift,use2ndpilots)==0) {
|
|
re++;
|
|
*re_allocated = *re_allocated + 1;
|
|
}
|
|
}
|
|
|
|
if (mimo_mode >= TM8) { //TM8,TM9,TM10
|
|
|
|
if (is_not_UEspecRS(first_layer0,re)) {
|
|
switch (mod_order0) {
|
|
case 2: //QPSK
|
|
|
|
// printf("%d : %d,%d => ",tti_offset,((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
for (int layer=first_layer0; layer<=(first_layer0+Nlayers0); layer++) {
|
|
((int16_t*)&txdataF[layer][tti_offset])[0] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //I //b_i
|
|
*jj = *jj + 1;
|
|
((int16_t*)&txdataF[layer][tti_offset])[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //Q //b_{i+1}
|
|
*jj = *jj + 1;
|
|
}
|
|
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
if (is_not_UEspecRS(0/*layer (FIXME uninitialized!)*/,re)) {
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
for (int layer=first_layer0; layer<=(first_layer0+Nlayers0); layer++) {
|
|
((int16_t*)&txdataF[layer][tti_offset])[0] = qam_table_s0[qam16_table_offset_re];
|
|
((int16_t*)&txdataF[layer][tti_offset])[1] = qam_table_s0[qam16_table_offset_im];
|
|
}
|
|
}
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj = *jj + 1;
|
|
|
|
for (int layer=first_layer0; layer<=(first_layer0+Nlayers0); layer++) {
|
|
((int16_t*)&txdataF[layer][tti_offset])[0] = qam_table_s0[qam64_table_offset_re];
|
|
((int16_t*)&txdataF[layer][tti_offset])[1] = qam_table_s0[qam64_table_offset_im];
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
}
|
|
} else if (mimo_mode>=TM9_10) {
|
|
printf("allocate_REs_in_RB() [dlsch.c] : ERROR, unknown mimo_mode %d\n",mimo_mode);
|
|
return(-1);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
int allocate_REs_in_RB_MCH(int32_t **txdataF,
|
|
uint32_t *jj,
|
|
uint16_t re_offset,
|
|
uint32_t symbol_offset,
|
|
uint8_t *x0,
|
|
uint8_t l,
|
|
uint8_t mod_order,
|
|
int16_t amp,
|
|
int16_t *qam_table_s,
|
|
uint32_t *re_allocated,
|
|
uint8_t skip_dc,
|
|
LTE_DL_FRAME_PARMS *frame_parms)
|
|
{
|
|
|
|
uint32_t tti_offset,aa;
|
|
uint8_t re;
|
|
uint8_t qam64_table_offset_re = 0;
|
|
uint8_t qam64_table_offset_im = 0;
|
|
uint8_t qam16_table_offset_re = 0;
|
|
uint8_t qam16_table_offset_im = 0;
|
|
int16_t gain_lin_QPSK;//,gain_lin_16QAM1,gain_lin_16QAM2;
|
|
int16_t re_off=re_offset;
|
|
gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
|
|
uint8_t first_re,last_re;
|
|
int inc;
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("allocate_re_MCH (mod %d): symbol_offset %d re_offset %d (%d), jj %d -> %d,%d, gain_lin_QPSK %d,txdataF %p\n",mod_order,symbol_offset,re_offset,skip_dc,*jj, x0[*jj], x0[1+*jj],gain_lin_QPSK,&txdataF[0][symbol_offset]);
|
|
#endif
|
|
|
|
last_re=12;
|
|
first_re=0;
|
|
inc=1;
|
|
|
|
if ((l==2)||(l==10)) {
|
|
inc=2;
|
|
first_re=1;
|
|
} else if (l==6) {
|
|
inc=2;
|
|
}
|
|
|
|
for (re=first_re; re<last_re; re+=inc) {
|
|
|
|
if ((skip_dc == 1) && (re==(6+first_re)))
|
|
re_off=re_off - frame_parms->ofdm_symbol_size+1;
|
|
|
|
tti_offset = symbol_offset + re_off + re;
|
|
|
|
// printf("re %d (jj %d)\n",re,*jj);
|
|
*re_allocated = *re_allocated + 1;
|
|
|
|
|
|
switch (mod_order) {
|
|
case 2: //QPSK
|
|
|
|
// printf("%d : %d,%d => ",tti_offset,((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++)
|
|
((int16_t*)&txdataF[aa][tti_offset])[0] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //I //b_i
|
|
|
|
*jj = *jj + 1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++)
|
|
((int16_t*)&txdataF[aa][tti_offset])[1] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //Q //b_{i+1}
|
|
|
|
*jj = *jj + 1;
|
|
|
|
// printf("%d,%d\n",((int16_t*)&txdataF[0][tti_offset])[0],((int16_t*)&txdataF[0][tti_offset])[1]);
|
|
break;
|
|
|
|
case 4: //16QAM
|
|
|
|
qam16_table_offset_re = 0;
|
|
qam16_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam16_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t *)&txdataF[aa][tti_offset])[0]+=qam_table_s[qam16_table_offset_re];
|
|
((int16_t *)&txdataF[aa][tti_offset])[1]+=qam_table_s[qam16_table_offset_im];
|
|
// ((int16_t *)&txdataF[aa][tti_offset])[0]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_re])>>15);
|
|
// ((int16_t *)&txdataF[aa][tti_offset])[1]+=(int16_t)(((int32_t)amp*qam16_table[qam16_table_offset_im])>>15);
|
|
}
|
|
|
|
break;
|
|
|
|
case 6: //64QAM
|
|
|
|
|
|
qam64_table_offset_re = 0;
|
|
qam64_table_offset_im = 0;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=4;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=2;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_re+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
if (x0[*jj] == 1)
|
|
qam64_table_offset_im+=1;
|
|
|
|
*jj=*jj+1;
|
|
|
|
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
|
|
((int16_t *)&txdataF[aa][tti_offset])[0]+=qam_table_s[qam64_table_offset_re];//(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_re])>>15);
|
|
((int16_t *)&txdataF[aa][tti_offset])[1]+=qam_table_s[qam64_table_offset_im];//(int16_t)(((int32_t)amp*qam64_table[qam64_table_offset_im])>>15);
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
uint8_t get_pmi(uint8_t N_RB_DL,LTE_DL_eNB_HARQ_t *dlsch_harq,uint16_t rb)
|
|
{
|
|
|
|
|
|
MIMO_mode_t mode = dlsch_harq->mimo_mode;
|
|
uint32_t pmi_alloc = dlsch_harq->pmi_alloc;
|
|
|
|
// printf("Getting pmi for RB %d => %d\n",rb,(pmi_alloc>>((rb>>2)<<1))&3);
|
|
switch (N_RB_DL) {
|
|
case 6: // 1 PRB per subband
|
|
if (mode <= PUSCH_PRECODING1)
|
|
return((pmi_alloc>>(rb<<1))&3);
|
|
else
|
|
return((pmi_alloc>>rb)&1);
|
|
|
|
break;
|
|
|
|
default:
|
|
case 25: // 4 PRBs per subband
|
|
if (mode <= PUSCH_PRECODING1)
|
|
return((pmi_alloc>>((rb>>2)<<1))&3);
|
|
else
|
|
return((pmi_alloc>>(rb>>2))&1);
|
|
|
|
break;
|
|
|
|
case 50: // 6 PRBs per subband
|
|
if (mode <= PUSCH_PRECODING1)
|
|
return((pmi_alloc>>((rb/6)<<1))&3);
|
|
else
|
|
return((pmi_alloc>>(rb/6))&1);
|
|
|
|
break;
|
|
|
|
case 100: // 8 PRBs per subband
|
|
if (mode <= PUSCH_PRECODING1)
|
|
return((pmi_alloc>>((rb>>3)<<1))&3);
|
|
else
|
|
return((pmi_alloc>>(rb>>3))&1);
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
inline int check_skip(int rb,int subframe_offset,LTE_DL_FRAME_PARMS *frame_parms,int l,int nsymb) __attribute__((always_inline));
|
|
inline int check_skip(int rb,int subframe_offset,LTE_DL_FRAME_PARMS *frame_parms,int l,int nsymb) {
|
|
|
|
|
|
if ((frame_parms->N_RB_DL&1) == 1) { // ODD N_RB_DL
|
|
// PBCH
|
|
if ((subframe_offset==0) &&
|
|
(rb>((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(rb<((frame_parms->N_RB_DL>>1)+3)) &&
|
|
(l>=(nsymb>>1)) &&
|
|
(l<((nsymb>>1) + 4))) {
|
|
return(1);
|
|
}
|
|
if (frame_parms->frame_type == TDD) { // TDD
|
|
//SSS TDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb>((frame_parms->N_RB_DL>>1)-3)) && (rb<((frame_parms->N_RB_DL>>1)+3)) && (l==(nsymb-1)) ) {
|
|
return(1);
|
|
}
|
|
//PSS TDD
|
|
if (((subframe_offset==1) || (subframe_offset==6)) && (rb>((frame_parms->N_RB_DL>>1)-3)) && (rb<((frame_parms->N_RB_DL>>1)+3)) && (l==2) ) {
|
|
return(1);
|
|
}
|
|
} else {
|
|
//PSS FDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) &&
|
|
(rb>((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(rb<((frame_parms->N_RB_DL>>1)+3)) &&
|
|
(l==((nsymb>>1)-1)) ) {
|
|
return(1);
|
|
}
|
|
//SSS FDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb>((frame_parms->N_RB_DL>>1)-3)) && (rb<((frame_parms->N_RB_DL>>1)+3)) && (l==((nsymb>>1)-2)) ) {
|
|
return(1);
|
|
}
|
|
}
|
|
}
|
|
else { // even N_RB_DL
|
|
//PBCH
|
|
if ((subframe_offset==0) &&
|
|
(rb>=((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(rb<((frame_parms->N_RB_DL>>1)+3)) &&
|
|
(l>=nsymb>>1) && (l<((nsymb>>1) + 4)))
|
|
return(1);
|
|
|
|
if (frame_parms->frame_type == TDD) { // TDD
|
|
//SSS
|
|
if (((subframe_offset==0)||
|
|
(subframe_offset==5)) &&
|
|
(rb>=((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(rb<((frame_parms->N_RB_DL>>1)+3)) &&
|
|
(l==nsymb-1) ) {
|
|
return(1);
|
|
}
|
|
|
|
//PSS
|
|
if (((subframe_offset==1)||
|
|
(subframe_offset==6)) &&
|
|
(rb>=((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(rb<((frame_parms->N_RB_DL>>1)+3)) &&
|
|
(l==2) ) {
|
|
return(1);
|
|
}
|
|
} else { // FDD
|
|
//SSS
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb>=((frame_parms->N_RB_DL>>1)-3)) && (rb<((frame_parms->N_RB_DL>>1)+3)) && (l==((nsymb>>1)-2)) ) {
|
|
return(1);
|
|
}
|
|
|
|
//PSS
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb>=((frame_parms->N_RB_DL>>1)-3)) && (rb<((frame_parms->N_RB_DL>>1)+3)) && (l==((nsymb>>1)-1)) ) {
|
|
return(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
inline int check_skiphalf(int rb,int subframe_offset,LTE_DL_FRAME_PARMS *frame_parms,int l,int nsymb) __attribute__((always_inline));
|
|
inline int check_skiphalf(int rb,int subframe_offset,LTE_DL_FRAME_PARMS *frame_parms,int l,int nsymb) {
|
|
|
|
// printf("check_skiphalf : rb %d, subframe_offset %d,l %d, nsymb %d\n",rb,subframe_offset,l,nsymb);
|
|
|
|
if ((frame_parms->N_RB_DL&1) == 1) { // ODD N_RB_DL
|
|
|
|
// PBCH
|
|
if ((subframe_offset==0) &&
|
|
(rb==((frame_parms->N_RB_DL>>1)-3)) &&
|
|
(l>=(nsymb>>1)) &&
|
|
(l<((nsymb>>1) + 4)))
|
|
return(1);
|
|
else if ((subframe_offset==0) && (rb==((frame_parms->N_RB_DL>>1)+3)) && (l>=(nsymb>>1)) && (l<((nsymb>>1) + 4)))
|
|
return(2);
|
|
|
|
if (frame_parms->frame_type == TDD) { // TDD
|
|
//SSS TDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)-3)) && (l==(nsymb-1)))
|
|
return(1);
|
|
else if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)+3)) && (l==(nsymb-1)))
|
|
return(2);
|
|
//PSS TDD
|
|
if (((subframe_offset==1)||(subframe_offset==6)) && (rb==((frame_parms->N_RB_DL>>1)-3)) && (l==2))
|
|
return(1);
|
|
else if (((subframe_offset==1)||(subframe_offset==6)) && (rb==((frame_parms->N_RB_DL>>1)+3)) && (l==2))
|
|
return(2);
|
|
}
|
|
else { // FDD
|
|
//PSS FDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)-3)) && (l==((nsymb>>1)-1)))
|
|
return(1);
|
|
else if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)+3)) && (l==(((nsymb>>1)-1))))
|
|
return(2);
|
|
//SSS FDD
|
|
if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)-3)) && ((l==((nsymb>>1)-2))))
|
|
return(1);
|
|
else if (((subframe_offset==0)||(subframe_offset==5)) && (rb==((frame_parms->N_RB_DL>>1)+3)) && ((l==(nsymb>>1)-2)))
|
|
return(2);
|
|
}
|
|
}
|
|
else { // EVEN N_RB_DL
|
|
return(0);
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
inline int check_skip_dc(int rb,LTE_DL_FRAME_PARMS *frame_parms) __attribute__((always_inline));
|
|
inline int check_skip_dc(int rb,LTE_DL_FRAME_PARMS *frame_parms) {
|
|
|
|
if (((frame_parms->N_RB_DL&1) == 1) && // odd N_RB_DL, rb==N_RB_DL/2 PRB contains DC element
|
|
(rb==(frame_parms->N_RB_DL>>1)))
|
|
return(1);
|
|
else
|
|
return(0);
|
|
}
|
|
|
|
|
|
int dlsch_modulation(int32_t **txdataF,
|
|
int16_t amp,
|
|
uint32_t subframe_offset,
|
|
LTE_DL_FRAME_PARMS *frame_parms,
|
|
uint8_t num_pdcch_symbols,
|
|
LTE_eNB_DLSCH_t *dlsch0,
|
|
LTE_eNB_DLSCH_t *dlsch1)
|
|
{
|
|
|
|
uint8_t nsymb;
|
|
uint8_t harq_pid = dlsch0->current_harq_pid;
|
|
LTE_DL_eNB_HARQ_t *dlsch0_harq = dlsch0->harq_processes[harq_pid];
|
|
LTE_DL_eNB_HARQ_t *dlsch1_harq; //= dlsch1->harq_processes[harq_pid];
|
|
uint32_t i,i2,jj,jj2,re_allocated,symbol_offset;
|
|
uint16_t l,rb,re_offset;
|
|
uint32_t rb_alloc_ind;
|
|
uint32_t *rb_alloc = dlsch0_harq->rb_alloc;
|
|
uint8_t pilots=0;
|
|
uint8_t skip_dc=0,skip_half=0;
|
|
uint8_t mod_order0 = get_Qm(dlsch0_harq->mcs);
|
|
uint8_t mod_order1 = 0;
|
|
int16_t amp_rho_a, amp_rho_b;
|
|
int16_t qam16_table_a0[4],qam64_table_a0[8],qam16_table_b0[4],qam64_table_b0[8];
|
|
int16_t qam16_table_a1[4],qam64_table_a1[8],qam16_table_b1[4],qam64_table_b1[8];
|
|
int16_t *qam_table_s0=NULL,*qam_table_s1=NULL;
|
|
int (*allocate_REs)(LTE_DL_FRAME_PARMS *,
|
|
int **,
|
|
uint32_t*,
|
|
uint32_t*,
|
|
uint16_t,
|
|
uint32_t,
|
|
LTE_DL_eNB_HARQ_t *,
|
|
LTE_DL_eNB_HARQ_t *,
|
|
uint8_t,
|
|
int16_t,
|
|
uint8_t,
|
|
int16_t *,
|
|
int16_t *,
|
|
uint32_t *,
|
|
uint8_t,
|
|
uint8_t,
|
|
int *,
|
|
int *);
|
|
int P1_SHIFT[13],P2_SHIFT[13];
|
|
int offset,nushiftmod3;
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
uint8_t Nl0 = dlsch0_harq->Nl;
|
|
uint8_t Nl1;
|
|
#endif
|
|
|
|
if (dlsch1) {
|
|
dlsch1_harq = dlsch1->harq_processes[harq_pid];
|
|
mod_order1 = get_Qm(dlsch1_harq->mcs);
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
Nl1 = dlsch1_harq->Nl;
|
|
#endif
|
|
}
|
|
|
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_MODULATION, VCD_FUNCTION_IN);
|
|
|
|
nsymb = (frame_parms->Ncp==0) ? 14:12;
|
|
|
|
amp_rho_a = (int16_t)(((int32_t)amp*dlsch0->sqrt_rho_a)>>13);
|
|
amp_rho_b = (int16_t)(((int32_t)amp*dlsch0->sqrt_rho_b)>>13);
|
|
|
|
if (mod_order0 == 4)
|
|
for (i=0; i<4; i++) {
|
|
qam16_table_a0[i] = (int16_t)(((int32_t)qam16_table[i]*amp_rho_a)>>15);
|
|
qam16_table_b0[i] = (int16_t)(((int32_t)qam16_table[i]*amp_rho_b)>>15);
|
|
}
|
|
else if (mod_order0 == 6)
|
|
for (i=0; i<8; i++) {
|
|
qam64_table_a0[i] = (int16_t)(((int32_t)qam64_table[i]*amp_rho_a)>>15);
|
|
qam64_table_b0[i] = (int16_t)(((int32_t)qam64_table[i]*amp_rho_b)>>15);
|
|
}
|
|
|
|
if (mod_order1 == 4)
|
|
for (i=0; i<4; i++) {
|
|
qam16_table_a1[i] = (int16_t)(((int32_t)qam16_table[i]*amp_rho_a)>>15);
|
|
qam16_table_b1[i] = (int16_t)(((int32_t)qam16_table[i]*amp_rho_b)>>15);
|
|
}
|
|
else if (mod_order1 == 6)
|
|
for (i=0; i<8; i++) {
|
|
qam64_table_a1[i] = (int16_t)(((int32_t)qam64_table[i]*amp_rho_a)>>15);
|
|
qam64_table_b1[i] = (int16_t)(((int32_t)qam64_table[i]*amp_rho_b)>>15);
|
|
}
|
|
|
|
//Modulation mapping (difference w.r.t. LTE specs)
|
|
|
|
jj=0;
|
|
jj2=0;
|
|
re_allocated=0;
|
|
|
|
|
|
// printf("num_pdcch_symbols %d, nsymb %d\n",num_pdcch_symbols,nsymb);
|
|
for (l=num_pdcch_symbols; l<nsymb; l++) {
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("Generating DLSCH (harq_pid %d,mimo %d, pmi_alloc0 %llx, mod0 %d, mod1 %d, rb_alloc[0] %d) in %d\n",
|
|
harq_pid,
|
|
dlsch0_harq->mimo_mode,
|
|
pmi2hex_2Ar1(dlsch0_harq->pmi_alloc),
|
|
mod_order0,
|
|
mod_order1,
|
|
rb_alloc[0],
|
|
l);
|
|
#endif
|
|
|
|
if (frame_parms->Ncp==0) { // normal prefix
|
|
if ((l==4)||(l==11))
|
|
pilots=2; // pilots in nushift+3, nushift+9
|
|
else if (l==7)
|
|
pilots=1; // pilots in nushift, nushift+6
|
|
else
|
|
pilots=0;
|
|
} else {
|
|
if ((l==3)||(l==9))
|
|
pilots=2;
|
|
else if (l==6)
|
|
pilots=1;
|
|
else
|
|
pilots=0;
|
|
}
|
|
|
|
offset = (pilots==2)?3:0;
|
|
nushiftmod3 = frame_parms->nushift%3;
|
|
|
|
if (pilots>0) { // compute pilot arrays, could be done statically if performance suffers
|
|
if (frame_parms->mode1_flag == 1) {
|
|
// printf("l %d, nushift %d, offset %d\n",l,frame_parms->nushift,offset);
|
|
for (i=0,i2=0;i<12;i++) {
|
|
if ((i!=(frame_parms->nushift+offset)) && (i!=((frame_parms->nushift+6+offset)%12)))
|
|
P1_SHIFT[i2++]=1;
|
|
else
|
|
P1_SHIFT[i2++]=2;
|
|
}
|
|
P1_SHIFT[0]--;
|
|
}
|
|
else {
|
|
for (i=0,i2=0;i<12;i++) {
|
|
if ((i!=nushiftmod3) && (i!=nushiftmod3+6) && (i!=nushiftmod3+3) && (i!=nushiftmod3+9))
|
|
P2_SHIFT[i2++]=1;
|
|
else
|
|
P2_SHIFT[i2++]=2;
|
|
}
|
|
P2_SHIFT[0]--;
|
|
}
|
|
}
|
|
P1_SHIFT[12]=1;P2_SHIFT[12]=1;
|
|
|
|
re_offset = frame_parms->first_carrier_offset;
|
|
symbol_offset = (uint32_t)frame_parms->ofdm_symbol_size*(l+(subframe_offset*nsymb));
|
|
|
|
allocate_REs = allocate_REs_in_RB;
|
|
|
|
switch (mod_order0) {
|
|
case 2:
|
|
qam_table_s0 = NULL;
|
|
break;
|
|
case 4:
|
|
if (pilots) {
|
|
qam_table_s0 = qam16_table_b0;
|
|
allocate_REs = (dlsch0->harq_processes[harq_pid]->mimo_mode == SISO) ?
|
|
allocate_REs_in_RB_pilots_16QAM_siso :
|
|
allocate_REs_in_RB;
|
|
}
|
|
else {
|
|
qam_table_s0 = qam16_table_a0;
|
|
allocate_REs = (dlsch0->harq_processes[harq_pid]->mimo_mode == SISO) ?
|
|
allocate_REs_in_RB_no_pilots_16QAM_siso :
|
|
allocate_REs_in_RB;
|
|
|
|
}
|
|
break;
|
|
|
|
case 6:
|
|
if (pilots) {
|
|
qam_table_s0 = qam64_table_b0;
|
|
allocate_REs = (dlsch0->harq_processes[harq_pid]->mimo_mode == SISO) ?
|
|
allocate_REs_in_RB_pilots_64QAM_siso :
|
|
allocate_REs_in_RB;
|
|
}
|
|
else {
|
|
qam_table_s0 = qam64_table_a0;
|
|
allocate_REs = (dlsch0->harq_processes[harq_pid]->mimo_mode == SISO) ?
|
|
allocate_REs_in_RB_no_pilots_64QAM_siso :
|
|
allocate_REs_in_RB;
|
|
}
|
|
break;
|
|
|
|
}
|
|
|
|
switch (mod_order1) {
|
|
case 2:
|
|
qam_table_s1 = NULL;
|
|
allocate_REs = allocate_REs_in_RB;
|
|
break;
|
|
case 4:
|
|
if (pilots) {
|
|
qam_table_s1 = qam16_table_b1;
|
|
}
|
|
else {
|
|
qam_table_s1 = qam16_table_a1;
|
|
}
|
|
break;
|
|
case 6:
|
|
if (pilots) {
|
|
qam_table_s1 = qam64_table_b1;
|
|
}
|
|
else {
|
|
qam_table_s1 = qam64_table_a1;
|
|
}
|
|
break;
|
|
|
|
}
|
|
|
|
//for (aa=0;aa<frame_parms->nb_antennas_tx;aa++)
|
|
// memset(&txdataF[aa][symbol_offset],0,frame_parms->ofdm_symbol_size<<2);
|
|
//printf("symbol_offset %d,subframe offset %d : pilots %d\n",symbol_offset,subframe_offset,pilots);
|
|
for (rb=0; rb<frame_parms->N_RB_DL; rb++) {
|
|
|
|
if (rb < 32)
|
|
rb_alloc_ind = (rb_alloc[0]>>rb) & 1;
|
|
else if (rb < 64)
|
|
rb_alloc_ind = (rb_alloc[1]>>(rb-32)) & 1;
|
|
else if (rb < 96)
|
|
rb_alloc_ind = (rb_alloc[2]>>(rb-64)) & 1;
|
|
else if (rb < 100)
|
|
rb_alloc_ind = (rb_alloc[3]>>(rb-96)) & 1;
|
|
else
|
|
rb_alloc_ind = 0;
|
|
|
|
if (check_skip(rb,subframe_offset,frame_parms,l,nsymb)==1)
|
|
rb_alloc_ind = 0;
|
|
|
|
skip_half = check_skiphalf(rb,subframe_offset,frame_parms,l,nsymb);
|
|
skip_dc = check_skip_dc(rb,frame_parms);
|
|
|
|
|
|
if (dlsch0_harq->Nlayers>1) {
|
|
printf("Nlayers %d: re_offset %d, symbol %d offset %d\n",dlsch0_harq->Nlayers,re_offset,l,symbol_offset);
|
|
return(-1);
|
|
}
|
|
|
|
if (dlsch1) {
|
|
if (dlsch1_harq->Nlayers>1) {
|
|
printf("Nlayers %d: re_offset %d, symbol %d offset %d\n",dlsch0_harq->Nlayers,re_offset,l,symbol_offset);
|
|
return(-1);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (rb_alloc_ind > 0) {
|
|
// printf("Allocated rb %d/symbol %d, skip_half %d, subframe_offset %d, symbol_offset %d, re_offset %d, jj %d\n",rb,l,skip_half,subframe_offset,symbol_offset,re_offset,jj);
|
|
allocate_REs(frame_parms,
|
|
txdataF,
|
|
&jj,
|
|
&jj2,
|
|
re_offset,
|
|
symbol_offset,
|
|
dlsch0->harq_processes[harq_pid],
|
|
(dlsch1==NULL) ? NULL : dlsch1->harq_processes[harq_pid],
|
|
pilots,
|
|
((pilots) ? amp_rho_b : amp_rho_a),
|
|
get_pmi(frame_parms->N_RB_DL,dlsch0->harq_processes[harq_pid],rb),
|
|
qam_table_s0,
|
|
qam_table_s1,
|
|
&re_allocated,
|
|
skip_dc,
|
|
skip_half,
|
|
P1_SHIFT,
|
|
P2_SHIFT);
|
|
}
|
|
else {
|
|
// printf("Unallocated rb %d/symbol %d, re_offset %d, jj %d\n",rb,l,re_offset,jj);
|
|
}
|
|
re_offset+=12; // go to next RB
|
|
|
|
|
|
// check if we crossed the symbol boundary and skip DCs
|
|
if (re_offset >= frame_parms->ofdm_symbol_size) {
|
|
if (skip_dc == 0) //even number of RBs (doesn't straddle DC)
|
|
re_offset=1;
|
|
else
|
|
re_offset=7; // odd number of RBs
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("generate_dlsch : jj = %d,re_allocated = %d (G %d)\n",jj,re_allocated,get_G(frame_parms,dlsch0_harq->nb_rb,dlsch0_harq->rb_alloc,mod_order0,Nl0,2,0,subframe_offset));
|
|
#endif
|
|
|
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_MODULATION, VCD_FUNCTION_OUT);
|
|
|
|
return (re_allocated);
|
|
}
|
|
|
|
int mch_modulation(int32_t **txdataF,
|
|
int16_t amp,
|
|
uint32_t subframe_offset,
|
|
LTE_DL_FRAME_PARMS *frame_parms,
|
|
LTE_eNB_DLSCH_t *dlsch)
|
|
{
|
|
uint8_t nsymb,nsymb_pmch;
|
|
uint32_t i,jj,re_allocated,symbol_offset;
|
|
uint16_t l,rb,re_offset;
|
|
uint8_t skip_dc=0;
|
|
uint8_t mod_order = get_Qm(dlsch->harq_processes[0]->mcs);
|
|
int16_t qam16_table_a[4],qam64_table_a[8];//,qam16_table_b[4],qam64_table_b[8];
|
|
int16_t *qam_table_s;
|
|
|
|
nsymb_pmch = 12;
|
|
nsymb = (frame_parms->Ncp == NORMAL) ? 14 : 12;
|
|
|
|
if (mod_order == 4)
|
|
for (i=0; i<4; i++) {
|
|
qam16_table_a[i] = (int16_t)(((int32_t)qam16_table[i]*amp)>>15);
|
|
}
|
|
else if (mod_order == 6)
|
|
for (i=0; i<8; i++) {
|
|
qam64_table_a[i] = (int16_t)(((int32_t)qam64_table[i]*amp)>>15);
|
|
}
|
|
|
|
jj=0;
|
|
re_allocated=0;
|
|
|
|
// printf("num_pdcch_symbols %d, nsymb %d\n",num_pdcch_symbols,nsymb);
|
|
for (l=2; l<nsymb_pmch; l++) {
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("Generating MCH (mod %d) in subframe %d for symbol %d\n",mod_order, subframe_offset,l);
|
|
#endif
|
|
|
|
re_offset = frame_parms->first_carrier_offset;
|
|
symbol_offset = (uint32_t)frame_parms->ofdm_symbol_size*(l+(subframe_offset*nsymb));
|
|
|
|
for (rb=0; rb<frame_parms->N_RB_DL; rb++) {
|
|
|
|
|
|
if ((frame_parms->N_RB_DL&1) == 1) { // ODD N_RB_DL
|
|
|
|
if (rb==(frame_parms->N_RB_DL>>1))
|
|
skip_dc = 1;
|
|
else
|
|
skip_dc = 0;
|
|
|
|
}
|
|
|
|
|
|
if (mod_order == 4)
|
|
qam_table_s = qam16_table_a;
|
|
else if (mod_order == 6)
|
|
qam_table_s = qam64_table_a;
|
|
else
|
|
qam_table_s = NULL;
|
|
|
|
// printf("Allocated rb %d, subframe_offset %d,amp %d\n",rb,subframe_offset,amp);
|
|
allocate_REs_in_RB_MCH(txdataF,
|
|
&jj,
|
|
re_offset,
|
|
symbol_offset,
|
|
dlsch->harq_processes[0]->e,
|
|
l,
|
|
mod_order,
|
|
amp,
|
|
qam_table_s,
|
|
&re_allocated,
|
|
skip_dc,
|
|
frame_parms);
|
|
|
|
re_offset+=12; // go to next RB
|
|
|
|
|
|
// check if we crossed the symbol boundary and skip DC
|
|
if (re_offset >= frame_parms->ofdm_symbol_size) {
|
|
if (skip_dc == 0) //even number of RBs (doesn't straddle DC)
|
|
re_offset=1;
|
|
else
|
|
re_offset=7; // odd number of RBs
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_DLSCH_MODULATION
|
|
printf("generate_dlsch(MCH) : jj = %d,re_allocated = %d (G %d)\n",jj,re_allocated,get_G(frame_parms,dlsch->harq_processes[0]->nb_rb,dlsch->harq_processes[0]->rb_alloc,mod_order,1,2,0,subframe_offset));
|
|
#endif
|
|
|
|
return (re_allocated);
|
|
}
|