Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19

Status so far: - monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz. For 20MHz we don't have a nice TCP downlink (on haswell). - oaisim does not compile - UE does not compile - phy simulators don't compile - many new warnings Conflicts: cmake_targets/CMakeLists.txt openair1/PHY/LTE_TRANSPORT/transport_eNB.h openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h openair1/PHY/defs_eNB.h openair1/SCHED/pusch_pc.c openair1/SCHED/sched_common.h openair1/SCHED_UE/phy_procedures_lte_ue.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/eNB_scheduler_mch.c openair2/LAYER2/MAC/mac.h openair2/LAYER2/MAC/ra_procedures.c openair2/LAYER2/MAC/ue_procedures.c openair2/RRC/LTE/MESSAGES/asn1_msg.h openair2/RRC/LTE/rrc_UE.c openair2/RRC/LTE/rrc_defs.h targets/RT/USER/lte-softmodem.h targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00
parent f488673e80 c73cada3f4
commit 68479fa4f8
355 changed files with 25839 additions and 25937 deletions
@@ -284,13 +284,13 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
 add_list2_option(RRC_ASN1_VERSION "Rel14" "ASN.1 version of RRC interface" "Rel8" "Rel10" "Rel14" "CBA")

 if (${RRC_ASN1_VERSION} STREQUAL "Rel8")
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn)
 elseif (${RRC_ASN1_VERSION} STREQUAL "CBA")
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20-lola.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20-lola.asn)
 elseif (${RRC_ASN1_VERSION} STREQUAL "Rel10")
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
 else()
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")

 set (RRC_FULL_DIR ${asn1_generated_dir}/${RRC_ASN1_VERSION})
@@ -315,8 +315,8 @@ file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
 set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn1_constants.h)
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
 add_library(RRC_LIB ${rrc_h} ${rrc_source}
-    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c
-    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c)
+    ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
+    ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
 include_directories ("${RRC_FULL_DIR}")

 # add the command to generate the source code
@@ -635,12 +635,6 @@ add_boolean_option(DEBUG_PHY               False "Enable PHY layer debugging opt
 add_boolean_option(DEBUG_PHY_PROC          False "Enable debugging of PHY layer procedures")
 add_boolean_option(DEBUG_DLSCH             False "Enable debugging of DLSCH physical layer channel")

-##########################
-# 802.21 options
-##########################
-add_boolean_option(ENABLE_RAL              False "ENABLE 802.21 INTERFACE")
-add_boolean_option(USE_3GPP_ADDR_AS_LINK_ADDR False "As per attribute name")
-
 ##########################
 # NAS LAYER OPTIONS
 ##########################
@@ -709,7 +703,7 @@ include_directories("${OPENAIR_BIN_DIR}")
 # add directories to find all include files
 # the internal rule is to use generic names such as defs.h
 # but to make it uniq name as adding the relative path in the include directtive
-# example: #include "RRC/LITE/defs.h"
+# example: #include "RRC/LTE/rrc_defs.h"
 #find_path (include_dirs_all *.h ${OPENAIR_DIR})
 #find_path (include_dirs_all *.h PATHS /usr/include NO_CMAKE_PATH)
 #include_directories("${include_dirs_all}")
@@ -741,11 +735,8 @@ include_directories("${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0")
 include_directories("${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0")
 include_directories("${OPENAIR2_DIR}/LAYER2/RLC/TM_v9.3.0")
 include_directories("${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0")
-include_directories("${OPENAIR2_DIR}/RRC/LITE/MESSAGES")
-include_directories("${OPENAIR2_DIR}/RRC/LITE")
-include_directories("${OPENAIR3_DIR}/RAL-LTE/INTERFACE-802.21/INCLUDE")
-include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_ENB/INCLUDE")
-include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_UE/INCLUDE")
+include_directories("${OPENAIR2_DIR}/RRC/LTE/MESSAGES")
+include_directories("${OPENAIR2_DIR}/RRC/LTE")
 include_directories("${OPENAIR_DIR}/common/utils")
 include_directories("${OPENAIR_DIR}/common/utils/itti")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON")
@@ -782,7 +773,7 @@ include_directories("${OPENAIR2_DIR}/UTIL/OTG")
 include_directories("${OPENAIR2_DIR}/UTIL/CLI")
 include_directories("${OPENAIR2_DIR}/UTIL/OPT")
 include_directories("${OPENAIR2_DIR}/UTIL/OMV")
-include_directories("${OPENAIR2_DIR}/RRC/LITE/MESSAGES")
+include_directories("${OPENAIR2_DIR}/RRC/LTE/MESSAGES")
 include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/shared")
 include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/include")
 include_directories("${OPENAIR_DIR}")
@@ -894,9 +885,9 @@ endif()
 include_directories(${OPENAIR_DIR}/common/utils/msc)

 set(UTIL_SRC
-  ${OPENAIR2_DIR}/UTIL/CLI/cli.c
-  ${OPENAIR2_DIR}/UTIL/CLI/cli_cmd.c
-  ${OPENAIR2_DIR}/UTIL/CLI/cli_server.c
+#  ${OPENAIR2_DIR}/UTIL/CLI/cli.c
+#  ${OPENAIR2_DIR}/UTIL/CLI/cli_cmd.c
+#  ${OPENAIR2_DIR}/UTIL/CLI/cli_server.c
  ${OPENAIR2_DIR}/UTIL/FIFO/pad_list.c
  ${OPENAIR2_DIR}/UTIL/LISTS/list.c
  ${OPENAIR2_DIR}/UTIL/LISTS/list2.c
@@ -904,32 +895,32 @@ set(UTIL_SRC
  ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
  ${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_create_dir.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_detect_file.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_generate_report.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_filename.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_XML.c
-  ${OPENAIR2_DIR}/UTIL/OCG/OCG_save_XML.c
-  ${OPENAIR2_DIR}/UTIL/OMG/common.c
-  ${OPENAIR2_DIR}/UTIL/OMG/grid.c
-  ${OPENAIR2_DIR}/UTIL/OMG/job.c
-  ${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c
-  ${OPENAIR2_DIR}/UTIL/OMG/omg.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_create_dir.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_detect_file.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_generate_report.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_filename.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_XML.c
+#  ${OPENAIR2_DIR}/UTIL/OCG/OCG_save_XML.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/common.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/grid.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/job.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/omg.c
  #${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
-  ${OPENAIR2_DIR}/UTIL/OMG/rwalk.c
-  ${OPENAIR2_DIR}/UTIL/OMG/rwp.c
-  ${OPENAIR2_DIR}/UTIL/OMG/static.c
-  ${OPENAIR2_DIR}/UTIL/OMG/steadystaterwp.c
-  ${OPENAIR2_DIR}/UTIL/OMG/trace.c
-  ${OPENAIR2_DIR}/UTIL/OMG/trace_hashtable.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/rwalk.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/rwp.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/static.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/steadystaterwp.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/trace.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/trace_hashtable.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg_tx.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg_kpi.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg_models.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg_form.c
-  ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg_tx.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg_kpi.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg_models.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg_form.c
+#  ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
  )
 add_library(UTIL ${UTIL_SRC})

@@ -963,30 +954,27 @@ set(SECU_CN_SRC
  )
 add_library(SECU_CN ${SECU_CN_SRC})

-# Scheduler
+# Physical Channel Procedures Scheduling  
 ################################"
 set(SCHED_SRC
  ${OPENAIR1_DIR}/SCHED/fapi_l1.c
  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_eNb.c
-  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
-  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
-#  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
-  ${OPENAIR1_DIR}/SCHED/pucch_pc.c
-  ${OPENAIR1_DIR}/SCHED/pusch_pc.c
-  ${OPENAIR1_DIR}/SCHED/srs_pc.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})

-set(SCHED_SRC_UE
-  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
-  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
-  ${OPENAIR1_DIR}/SCHED/pucch_pc.c
-  ${OPENAIR1_DIR}/SCHED/pusch_pc.c
-  ${OPENAIR1_DIR}/SCHED/srs_pc.c
+)
+add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
+
+set(SCHED_SRC_UE
+  ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
+  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR1_DIR}/SCHED_UE/pucch_pc.c
+  ${OPENAIR1_DIR}/SCHED_UE/pusch_pc.c
+  ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})

@@ -1057,162 +1045,26 @@ set(PHY_TURBOIF
 )

 add_library(coding MODULE ${PHY_TURBOSRC} )
-set(PHY_SRC
+set(PHY_SRC_COMMON
  # depend on code generation from asn1c
  ${RRC_FULL_DIR}/asn1_constants.h
  # actual source
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/power_control.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_scrambling.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pch.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sldch.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slsch.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/group_hopping.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/srs_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/drs_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_coding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/rar_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/print_stats.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/initial_sync.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/ofdm_mod.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/adjust_gain.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_uespec.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_ul_ref.c
-  ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
-  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
-  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
-  ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
-  ${PHY_TURBOIF}
-  ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
-  ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
-  ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
-  ${OPENAIR1_DIR}/PHY/INIT/init_top.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_parms.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_param_init.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/cdot_prod.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
-  )
-
-set(PHY_SRC_UE
-  # depend on code generation from asn1c
-  ${RRC_FULL_DIR}/asn1_constants.h
-  # actual source
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich_common.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich_common.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch_common.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/power_control.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach_common.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch_common.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_scrambling.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sldch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slsch.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/group_hopping.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/srs_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/drs_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_coding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/rar_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/print_stats.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/initial_sync.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/srs_modulation.c
  ${OPENAIR1_DIR}/PHY/MODULATION/ofdm_mod.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/adjust_gain.c
  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_uespec.c
  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold.c
@@ -1228,8 +1080,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
  ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
  ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
-  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
  ${OPENAIR1_DIR}/PHY/INIT/init_top.c
  ${OPENAIR1_DIR}/PHY/INIT/lte_parms.c
  ${OPENAIR1_DIR}/PHY/INIT/lte_param_init.c
@@ -1247,17 +1097,97 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
  )

+set(PHY_SRC
+  # actual source
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sldch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slsch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/rar_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
+  ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
+  )
+
+set(PHY_SRC_RU
+  # actual source
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
+  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
+
+  )
+
+set(PHY_SRC_UE
+  # actual source
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/sss_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/uci_tools_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/pbch_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dci_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/phich_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/pucch_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/prach_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/pmch_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/pch_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/drs_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/rar_tools_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/initial_sync.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/adjust_gain.c
+  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
+  )
+
 if (${SMBV})
  set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
 endif  (${SMBV})

 if (${COMPILATION_AVX2} STREQUAL "True")
-  set(PHY_SRC ${PHY_SRC} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
-  set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
+  set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
 endif ()

+add_library(PHY_COMMON ${PHY_SRC_COMMON})
 add_library(PHY ${PHY_SRC})
 add_library(PHY_UE ${PHY_SRC_UE})
+add_library(PHY_RU ${PHY_SRC_RU})

 #Layer 2 library
 #####################
@@ -1267,7 +1197,7 @@ set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
 set(RLC_AM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0)
 set(RLC_TM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/TM_v9.3.0)
-set(RRC_DIR ${OPENAIR2_DIR}/RRC/LITE)
+set(RRC_DIR ${OPENAIR2_DIR}/RRC/LTE)
 set(PDCP_DIR  ${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0)
 set(L2_SRC
  ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
@@ -1360,12 +1290,12 @@ set (MAC_SRC
  #${PHY_INTERFACE_DIR}/phy_stub_UE.c
  ${PHY_INTERFACE_DIR}/IF_Module.c
  ${MAC_DIR}/main.c
-  ${MAC_DIR}/main_ue.c
-  ${MAC_DIR}/ue_procedures.c
-  ${MAC_DIR}/ra_procedures.c
+  #${MAC_DIR}/main_ue.c
+  #${MAC_DIR}/ue_procedures.c
+  #${MAC_DIR}/ra_procedures.c
  ${MAC_DIR}/l1_helpers.c
  ${MAC_DIR}/rar_tools.c
-  ${MAC_DIR}/rar_tools_ue.c
+  #${MAC_DIR}/rar_tools_ue.c
  ${MAC_DIR}/eNB_scheduler.c
  ${MAC_DIR}/eNB_scheduler_dlsch.c
  ${MAC_DIR}/eNB_scheduler_ulsch.c
@@ -1376,7 +1306,7 @@ set (MAC_SRC
  ${MAC_DIR}/eNB_scheduler_phytest.c
  ${MAC_DIR}/pre_processor.c
  ${MAC_DIR}/config.c
-  ${MAC_DIR}/config_ue.c
+  #${MAC_DIR}/config_ue.c
 )

 set (MAC_SRC_UE
@@ -1411,32 +1341,6 @@ include_directories(${NFAPI_USER_DIR})
 # L3 Libs
 ##########################

-set(RAL_LTE_DIR ${OPENAIR3_DIR}/RAL-LTE/)
-if (${ENABLE_RAL})
-  set(RAL_LTE_SRC
-    ${RRC_DIR}/rrc_UE_ral.c
-    ${RRC_DIR}/rrc_eNB_ral.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_action.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_main.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_parameters.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_process.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_rrc_msg.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_subscribe.c
-    ${RAL_LTE_DIR}LTE_RAL_ENB/SRC/lteRALenb_thresholds.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_action.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_main.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_mih_msg.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_parameters.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_process.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_rrc_msg.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_subscribe.c
-    ${RAL_LTE_DIR}LTE_RAL_UE/SRC/lteRALue_thresholds.c
-    )
-  add_library(RAL ${RAL_LTE_SRC})
-  set(RAL_LIB RAL)
-endif()
-
 # CN libs
 ##########################

@@ -1783,8 +1687,8 @@ ${OPENAIR1_DIR}/SIMULATION/TOOLS/random_channel.c
 ${OPENAIR1_DIR}/SIMULATION/TOOLS/rangen_double.c
 ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
 ${OPENAIR1_DIR}/SIMULATION/TOOLS/multipath_channel.c
-${OPENAIR1_DIR}/SIMULATION/TOOLS/abstraction.c
 ${OPENAIR1_DIR}/SIMULATION/TOOLS/multipath_tv_channel.c
+${OPENAIR1_DIR}/SIMULATION/TOOLS/abstraction.c
 ${OPENAIR1_DIR}/SIMULATION/RF/rf.c
 ${OPENAIR1_DIR}/SIMULATION/RF/dac.c
 ${OPENAIR1_DIR}/SIMULATION/RF/adc.c
@@ -1971,7 +1875,6 @@ add_executable(lte-softmodem
  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -1990,7 +1893,7 @@ add_executable(lte-softmodem

 target_link_libraries (lte-softmodem
  -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2 
  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl)
@@ -2012,7 +1915,6 @@ add_executable(lte-softmodem-nos1
  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
@@ -2029,7 +1931,7 @@ add_executable(lte-softmodem-nos1
  )
 target_link_libraries (lte-softmodem-nos1
  -Wl,--start-group
-  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} 
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} 
  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl )
@@ -2045,12 +1947,11 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 add_executable(lte-uesoftmodem
  ${rrc_h}
  ${s1ap_h}
-  ${OPENAIR_BIN_DIR}/messages_xml.h
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
  ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -2068,7 +1969,7 @@ add_executable(lte-uesoftmodem

 target_link_libraries (lte-uesoftmodem
  -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_UE_LIB PHY_UE LFDS L2_UE 
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE 
  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl)
@@ -2083,12 +1984,11 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
 add_executable(lte-uesoftmodem-nos1
  ${rrc_h}
  ${s1ap_h}
-  ${OPENAIR_BIN_DIR}/messages_xml.h
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
  ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
@@ -2107,7 +2007,7 @@ add_executable(lte-uesoftmodem-nos1

 target_link_libraries (lte-uesoftmodem-nos1
  -Wl,--start-group
-  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_UE_LIB PHY_UE LFDS L2_UE ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} 
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} 
  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl )
@@ -2155,8 +2055,7 @@ add_executable(oaisim
  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
  ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
-  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
+#  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
  ${OPENAIR_TARGETS}/SIMU/USER/sinr_sim.c
  ${OPENAIR_TARGETS}/SIMU/USER/cor_SF_sim.c
  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_functions.c
@@ -2179,7 +2078,7 @@ add_executable(oaisim
 target_include_directories(oaisim PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim
  -Wl,-ldl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_UE_LIB PHY_UE LFDS L2_UE ${MSC_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE ${MSC_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
  ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
  -Wl,--end-group z dl)

@@ -2200,10 +2099,10 @@ add_executable(oaisim_nos1
  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
+  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
  ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
-  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
-  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
+#  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
  ${OPENAIR_TARGETS}/SIMU/USER/sinr_sim.c
  ${OPENAIR_TARGETS}/SIMU/USER/cor_SF_sim.c
  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_functions.c
@@ -2222,7 +2121,7 @@ add_executable(oaisim_nos1
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim_nos1
  -Wl,--start-group
-  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_UE_LIB PHY_UE LFDS ${MSC_LIB} ${ITTI_LIB} SIMU L2_UE ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
+  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS ${MSC_LIB} ${ITTI_LIB} SIMU L2_UE ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
  -Wl,--end-group z dl )

 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -2241,20 +2140,20 @@ target_link_libraries (oaisim_nos1 ${T_LIB})

 #special case for dlim TM4, which uses its own version of phy_scope code
 add_executable(dlsim_tm4
-  ${OPENAIR_BIN_DIR}/messages_xml.h
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
  ${T_SOURCE}
  )
 target_link_libraries (dlsim_tm4
-  -Wl,--start-group SIMU UTIL SCHED_LIB PHY LFDS ${ITTI_LIB} -Wl,--end-group
+  -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB PHY LFDS ${ITTI_LIB} -Wl,--end-group
  pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
  )

 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

  add_executable(${myExe}
-    ${OPENAIR_BIN_DIR}/messages_xml.h
+#    ${OPENAIR_BIN_DIR}/messages_xml.h
    ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
    ${XFORMS_SOURCE}
    ${T_SOURCE}
@@ -2263,7 +2162,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
    )
  target_link_libraries (${myExe}

-    -Wl,--start-group SIMU UTIL SCHED_LIB PHY LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
+    -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY PHY_UE PHY_RU LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
    pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB} dl
    )
 endforeach(myExe)
@@ -2276,7 +2175,7 @@ add_executable(test_epc_generate_scenario
  ${OPENAIR2_DIR}/COMMON/messages_def.h
  ${OPENAIR2_DIR}/COMMON/messages_types.h
  ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
-  ${OPENAIR_BIN_DIR}/messages_xml.h
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  )
 target_link_libraries (test_epc_generate_scenario
  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
@@ -2300,7 +2199,7 @@ add_executable(test_epc_play_scenario
  )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_COMMON PHY PHY_UE LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
  )


@@ -2457,7 +2356,7 @@ list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
 if(OAI_NW_DRIVER_USE_NETLINK)
  list(APPEND oai_nw_drv_src netlink.c)
 endif()
-make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LITE ${oai_nw_drv_src})
+make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LTE ${oai_nw_drv_src})

 # Exmimo board drivers
 #########################
@@ -8,5 +8,5 @@ set(DEBUG_PHY False)
 set(MU_RECIEVER False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
-
+set(RRC_ASN1_VERSION "Rel14")
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
@@ -35,11 +35,11 @@

 #include <pthread.h>
 #include "COMMON/platform_constants.h"
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
 #include "PHY/types.h"
 #include "PHY/impl_defs_top.h"
 #include "PHY/impl_defs_lte.h"
-#include "RRC/LITE/defs.h"
+#include "RRC/LTE/rrc_defs.h"
 #include "flexran_agent_defs.h"

 #include "gtpv1u.h"
@@ -49,7 +49,7 @@
 #include "gtpv1u_eNB_defs.h"

 #include "PHY/defs_L1_NB_IoT.h"
-#include "RRC/LITE/defs_NB_IoT.h"
+#include "RRC/LTE/defs_NB_IoT.h"
 typedef struct {
  /// RAN context config file name
  char *config_file_name;
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <dlfcn.h>
-#include "openair1/PHY/defs.h"
+#include "openair1/PHY/defs_common.h"
 #define LOAD_MODULE_SHLIB_MAIN

 #include "common/config/config_userapi.h"
@@ -48,7 +48,10 @@ extern RAN_CONTEXT_t RC;
 #include "fapi_stub.h"
 //#include "fapi_l1.h"
 #include "UTIL/LOG/log.h"
-#include "openair2/LAYER2/MAC/proto.h"
+#include "openair2/LAYER2/MAC/mac_proto.h"
+
+#include "PHY/INIT/phy_init.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"

 #define NUM_P5_PHY 2

@@ -37,7 +37,8 @@
 #include "vendor_ext.h"

 #include "nfapi_vnf.h"
-
+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"

 #include "common/ran_context.h"
 extern RAN_CONTEXT_t RC;
@@ -29,7 +29,7 @@
 #endif
 #include <stdint.h>
 #include <stdio.h>
-#include "PHY/CODING/defs.h"
+#include "PHY/CODING/coding_defs.h"
 #include "extern_3GPPinterleaver.h"

 //#define DEBUG_TURBO_ENCODER 1
@@ -26,10 +26,10 @@
   date: 09.2012
 */
 #ifndef TC_MAIN
-#include "defs.h"
+#include "coding_defs.h"
 #include "extern_3GPPinterleaver.h"
 #else
-#include "vars.h"
+#include "coding_vars.h"
 #include <stdint.h>
 #endif
 #include <stdio.h>
@@ -27,8 +27,8 @@

 */

-#include "PHY/defs.h"
-#include "PHY/CODING/defs.h"
+#include "PHY/defs_common.h"
+#include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "PHY/sse_intrin.h"

@@ -42,8 +42,9 @@


 #ifndef TEST_DEBUG
-#include "PHY/defs.h"
-#include "PHY/CODING/defs.h"
+#include "PHY/impl_defs_top.h"
+#include "PHY/defs_common.h"
+#include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "extern_3GPPinterleaver.h"
 #else
@@ -41,8 +41,9 @@
 #include "PHY/sse_intrin.h"

 #ifndef TEST_DEBUG
-#include "PHY/defs.h"
-#include "PHY/CODING/defs.h"
+#include "PHY/impl_defs_top.h"
+#include "PHY/defs_common.h"
+#include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "extern_3GPPinterleaver.h"
 #else
@@ -39,8 +39,8 @@
 #include "PHY/sse_intrin.h"

 #ifndef TEST_DEBUG
-#include "PHY/defs.h"
-#include "PHY/CODING/defs.h"
+#include "PHY/defs_common.h"
+#include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "extern_3GPPinterleaver.h"
 #else
@@ -24,7 +24,7 @@
   author: raymond.knopp@eurecom.fr, based on similar code for 3GPP convolutional code (UMTS) by P. Humblet (2000)
   date: 10.2004
 */
-#include "defs.h"
+#include "coding_defs.h"


 unsigned short gdot11[] = { 0133, 0171 }; // {A,B}
@@ -24,7 +24,7 @@
   author: raymond.knopp@eurecom.fr
   date: 21.10.2009
 */
-#include "defs.h"
+#include "coding_defs.h"

 //#define DEBUG_CCODE 1

@@ -29,7 +29,7 @@

 #include <stdint.h>

-#include "PHY/defs.h"
+#include "PHY/defs_common.h"

 #define CRC24_A 0
 #define CRC24_B 1
@@ -75,20 +75,7 @@ int32_t lte_segmentation(uint8_t *input_buffer,
                         uint32_t *Kminus,
                         uint32_t *F);

-/** \fn int16_t estimate_ue_tx_power(uint32_t tbs, uint32_t nb_rb, uint8_t control_only, lte_prefix_type_t ncp, uint8_t use_srs)
-    \brief this functions calculates the delta MCS in dB based on the lte_segmentation function
-\param tbs transport block size
-\param nb_rb number of required rb
-\param control_only a flag for the type of data
-\param ncp cyclic prefix
-\param use_srs a flag indicating the use of srs in the current SF
-\returns ue_tx_power estimated ue tx power = delat_ mcs + bw_factor
-*/
-int16_t estimate_ue_tx_power(uint32_t tbs,
-                             uint32_t nb_rb,
-                             uint8_t control_only,
-                             lte_prefix_type_t ncp,
-                             uint8_t use_srs);
+

 /** \fn uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
 \brief This is the subblock interleaving algorithm from 36-212 (Release 8, 8.6 2009-03), pages 15-16.
@@ -33,8 +33,8 @@
 #include <sys/types.h>


-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_common.h"
+#include "PHY/phy_extern.h"
 #include "common/utils/load_module_shlib.h" 
 #include "common/utils/telnetsrv/telnetsrv.h" 

@@ -31,7 +31,7 @@
 */


-#include "defs.h"
+#include "coding_defs.h"


 /*ref 36-212 v8.6.0 , pp 8-9 */
@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #endif
-#include "PHY/defs.h"
-#include "assertions.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_TRANSPORT/transport_common.h"

 //#define cmin(a,b) ((a)<(b) ? (a) : (b))

@@ -24,8 +24,9 @@
   author: raymond.knopp@eurecom.fr
   date: 21.10.2009
 */
-#include "PHY/defs.h"
-#include "SCHED/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_TRANSPORT/transport_common.h"
+#include "PHY/CODING/coding_defs.h"

 //#define DEBUG_SEGMENTATION

@@ -29,8 +29,8 @@
 */

 #ifndef TEST_DEBUG
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_common.h"
+#include "PHY/phy_extern.h"
 #else
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,9 +20,50 @@
 */

 /*!\brief Initilization and reconfiguration routines for LTE PHY */
-#include "defs.h"
-#include "PHY/extern.h"
-#include "PHY/CODING/extern.h"
+#include "phy_init.h"
+#include "PHY/phy_extern.h"
+#include "PHY/CODING/coding_extern.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
+
+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 generate_qpsk_table(void)
+{
+
+  int a,index;
+
+  for (a=-1; a<=1; a+=2) {
+    index = (1+a)/2;
+    qpsk_table[index] = -a*QPSK;  
+  }
+}
+
 void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms)
 {

@@ -19,14 +19,17 @@
 *      contact@openairinterface.org
 */

-#include "defs.h"
-#include "SCHED/defs.h"
-#include "PHY/extern.h"
-#include "SIMULATION/TOOLS/defs.h"
+#include "PHY/defs_eNB.h"
+#include "phy_init.h"
+#include "SCHED/sched_eNB.h"
+#include "PHY/phy_extern.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "SIMULATION/TOOLS/sim.h"
 #include "RadioResourceConfigCommonSIB.h"
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
-#include "LAYER2/MAC/extern.h"
 #include "MBSFN-SubframeConfigList.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
@@ -721,24 +724,6 @@ void phy_config_dedicated_scell_eNB(uint8_t Mod_id,



-void  phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uint8_t index, rnti_t cba_rnti, uint8_t cba_group_id, uint8_t num_active_cba_groups)
-{
-  //   uint8_t i;
-
-  if (eNB_flag == 0 ) {
-    //LOG_D(PHY,"[UE %d] configure cba group %d with rnti %x, num active cba grp %d\n", index, index, cba_rnti, num_active_cba_groups);
-    PHY_vars_UE_g[Mod_id][CC_id]->ulsch[index]->num_active_cba_groups=num_active_cba_groups;
-    PHY_vars_UE_g[Mod_id][CC_id]->ulsch[index]->cba_rnti[cba_group_id]=cba_rnti;
-  } else {
-    //for (i=index; i < NUMBER_OF_UE_MAX; i+=num_active_cba_groups){
-    //  LOG_D(PHY,"[eNB %d] configure cba group %d with rnti %x for UE %d, num active cba grp %d\n",Mod_id, i%num_active_cba_groups, cba_rnti, i, num_active_cba_groups);
-    RC.eNB[Mod_id][CC_id]->ulsch[index]->num_active_cba_groups=num_active_cba_groups;
-    RC.eNB[Mod_id][CC_id]->ulsch[index]->cba_rnti[cba_group_id] = cba_rnti;
-    //}
-  }
-}
-
-
 int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
                     unsigned char is_secondary_eNB,
                     unsigned char abstraction_flag)
@@ -19,14 +19,13 @@
 *      contact@openairinterface.org
 */

-#include "defs.h"
-#include "SCHED/defs.h"
-#include "PHY/extern.h"
-#include "SIMULATION/TOOLS/defs.h"
+#include "phy_init.h"
+#include "SCHED/sched_eNB.h"
+#include "PHY/phy_extern.h"
+#include "SIMULATION/TOOLS/sim.h"
 #include "RadioResourceConfigCommonSIB.h"
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
-#include "LAYER2/MAC/extern.h"
 #include "MBSFN-SubframeConfigList.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
@@ -19,19 +19,20 @@
 *      contact@openairinterface.org
 */

-#include "defs.h"
-#include "SCHED/defs.h"
-#include "PHY/extern.h"
-#include "SIMULATION/TOOLS/defs.h"
+#include "phy_init.h"
+#include "SCHED_UE/sched_UE.h"
+#include "PHY/phy_extern_ue.h"
+#include "SIMULATION/TOOLS/sim.h"
 #include "RadioResourceConfigCommonSIB.h"
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
-#include "LAYER2/MAC/extern.h"
 #include "MBSFN-SubframeConfigList.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
-
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
+#include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
 extern uint8_t nfapi_mode;
@@ -655,7 +656,7 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
  int th_id;

  LOG_D(PHY,"Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
-  LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
+



@@ -25,10 +25,14 @@
 #include <execinfo.h>
 #include <signal.h>

-#include "SIMULATION/TOOLS/defs.h"
+#include "SIMULATION/TOOLS/sim.h"
 #include "PHY/types.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
+#include "PHY/phy_extern.h"
+#include "phy_init.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"

 extern PHY_VARS_eNB *eNB;
 extern PHY_VARS_UE *UE;
@@ -19,7 +19,7 @@
 *      contact@openairinterface.org
 */

-#include "defs.h"
+#include "phy_init.h"
 #include "log.h"

 uint16_t dl_S_table_normal[10]={3,9,10,11,12,3,9,10,11,6};
@@ -22,8 +22,8 @@
 #ifndef __INIT_DEFS__H__
 #define __INIT_DEFS__H__

-#include "PHY/defs.h"
-
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"

 #include "SystemInformationBlockType2.h"
 //#include "RadioResourceConfigCommonSIB.h"
@@ -20,8 +20,8 @@
 */

 #include "PHY/types.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_UE.h"
+#include "PHY/phy_extern_ue.h"

 void
 phy_adjust_gain (PHY_VARS_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id)
@@ -19,8 +19,8 @@
 *      contact@openairinterface.org
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"

 // This is 512/(1:256) in __m128i format
@@ -20,10 +20,11 @@
 */

 #include "PHY/types.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_UE.h"
+#include "PHY/phy_extern_ue.h"

 #include "UTIL/LOG/vcd_signal_dumper.h"
+#include "openair2/LAYER2/MAC/mac_proto.h"

 #define DEBUG_PHY

@@ -134,128 +135,3 @@ void lte_adjust_synch(LTE_DL_FRAME_PARMS *frame_parms,
      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ADJUST_SYNCH, VCD_FUNCTION_OUT);
  }
 }
-
-
-int lte_est_timing_advance(LTE_DL_FRAME_PARMS *frame_parms,
-                           LTE_eNB_SRS *lte_eNB_srs,
-                           unsigned int  *eNB_id,
-                           unsigned char clear,
-                           unsigned char number_of_cards,
-                           short coef)
-
-{
-
-  static int max_pos_fil2 = 0;
-  int temp, i, aa, max_pos = 0,ind;
-  int max_val=0;
-  short Re,Im,ncoef;
-#ifdef DEBUG_PHY
-  char fname[100],vname[100];
-#endif
-
-  ncoef = 32768 - coef;
-
-  for (ind=0; ind<number_of_cards; ind++) {
-
-    if (ind==0)
-      max_val=0;
-
-
-    for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-      // do ifft of channel estimate
-      switch(frame_parms->N_RB_DL) {
-      case 6:
-	dft128((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
-	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
-	       1);
-	break;
-      case 25:
-	dft512((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
-	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
-	       1);
-	break;
-      case 50:
-	dft1024((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
-		(int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
-		1);
-	break;
-      case 100:
-	dft2048((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
-	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
-	       1);
-	break;
-      }
-#ifdef DEBUG_PHY
-      sprintf(fname,"srs_ch_estimates_time_%d%d.m",ind,aa);
-      sprintf(vname,"srs_time_%d%d",ind,aa);
-      write_output(fname,vname,lte_eNB_srs->srs_ch_estimates_time[aa],frame_parms->ofdm_symbol_size*2,2,1);
-#endif
-    }
-
-    // we only use channel estimates from tx antenna 0 here
-    // remember we fixed the SRS to use only every second subcarriers
-    for (i = 0; i < frame_parms->ofdm_symbol_size/2; i++) {
-      temp = 0;
-
-      for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-        Re = ((int16_t*)lte_eNB_srs->srs_ch_estimates_time[aa])[(i<<1)];
-        Im = ((int16_t*)lte_eNB_srs->srs_ch_estimates_time[aa])[1+(i<<1)];
-        temp += (Re*Re/2) + (Im*Im/2);
-      }
-
-      if (temp > max_val) {
-        max_pos = i;
-        max_val = temp;
-        *eNB_id = ind;
-      }
-    }
-  }
-
-  // filter position to reduce jitter
-  if (clear == 1)
-    max_pos_fil2 = max_pos;
-  else
-    max_pos_fil2 = ((max_pos_fil2 * coef) + (max_pos * ncoef)) >> 15;
-
-  return(max_pos_fil2);
-}
-
-
-int lte_est_timing_advance_pusch(PHY_VARS_eNB* eNB,uint8_t UE_id)
-{
-  int temp, i, aa, max_pos=0, max_val=0;
-  short Re,Im;
-
-  LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
-  LTE_eNB_PUSCH *eNB_pusch_vars = eNB->pusch_vars[UE_id];
-  int32_t **ul_ch_estimates_time=  eNB_pusch_vars->drs_ch_estimates_time;
-  uint8_t cyclic_shift = 0;
-  int sync_pos = (frame_parms->ofdm_symbol_size-cyclic_shift*frame_parms->ofdm_symbol_size/12)%(frame_parms->ofdm_symbol_size);
-
-  AssertFatal(frame_parms->ofdm_symbol_size > 127,"frame_parms->ofdm_symbol_size %d<128\n",frame_parms->ofdm_symbol_size);
-  AssertFatal(frame_parms->nb_antennas_rx >0 && frame_parms->nb_antennas_rx<3,"frame_parms->nb_antennas_rx %d not in [0,1]\n",
-	      frame_parms->nb_antennas_rx);
-  for (i = 0; i < frame_parms->ofdm_symbol_size; i++) {
-    temp = 0;
-
-    for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-      Re = ((int16_t*)ul_ch_estimates_time[aa])[(i<<1)];
-      Im = ((int16_t*)ul_ch_estimates_time[aa])[1+(i<<1)];
-      temp += (Re*Re/2) + (Im*Im/2);
-    }
-
-    if (temp > max_val) {
-      max_pos = i;
-      max_val = temp;
-    }
-  }
-
-  if (max_pos>frame_parms->ofdm_symbol_size/2)
-    max_pos = max_pos-frame_parms->ofdm_symbol_size;
-
-  //#ifdef DEBUG_PHY
-  LOG_D(PHY,"frame %d: max_pos = %d, sync_pos=%d\n",eNB->proc.frame_rx,max_pos,sync_pos);
-  //#endif //DEBUG_PHY
-
-  return max_pos - sync_pos;
-}
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/types.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+#define DEBUG_PHY
+
+int lte_est_timing_advance(LTE_DL_FRAME_PARMS *frame_parms,
+                           LTE_eNB_SRS *lte_eNB_srs,
+                           unsigned int  *eNB_id,
+                           unsigned char clear,
+                           unsigned char number_of_cards,
+                           short coef)
+
+{
+
+  static int max_pos_fil2 = 0;
+  int temp, i, aa, max_pos = 0,ind;
+  int max_val=0;
+  short Re,Im,ncoef;
+#ifdef DEBUG_PHY
+  char fname[100],vname[100];
+#endif
+
+  ncoef = 32768 - coef;
+
+  for (ind=0; ind<number_of_cards; ind++) {
+
+    if (ind==0)
+      max_val=0;
+
+
+    for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+      // do ifft of channel estimate
+      switch(frame_parms->N_RB_DL) {
+      case 6:
+	dft128((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
+	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
+	       1);
+	break;
+      case 25:
+	dft512((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
+	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
+	       1);
+	break;
+      case 50:
+	dft1024((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
+		(int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
+		1);
+	break;
+      case 100:
+	dft2048((int16_t*) &lte_eNB_srs->srs_ch_estimates[aa][0],
+	       (int16_t*) lte_eNB_srs->srs_ch_estimates_time[aa],
+	       1);
+	break;
+      }
+#ifdef DEBUG_PHY
+      sprintf(fname,"srs_ch_estimates_time_%d%d.m",ind,aa);
+      sprintf(vname,"srs_time_%d%d",ind,aa);
+      write_output(fname,vname,lte_eNB_srs->srs_ch_estimates_time[aa],frame_parms->ofdm_symbol_size*2,2,1);
+#endif
+    }
+
+    // we only use channel estimates from tx antenna 0 here
+    // remember we fixed the SRS to use only every second subcarriers
+    for (i = 0; i < frame_parms->ofdm_symbol_size/2; i++) {
+      temp = 0;
+
+      for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+        Re = ((int16_t*)lte_eNB_srs->srs_ch_estimates_time[aa])[(i<<1)];
+        Im = ((int16_t*)lte_eNB_srs->srs_ch_estimates_time[aa])[1+(i<<1)];
+        temp += (Re*Re/2) + (Im*Im/2);
+      }
+
+      if (temp > max_val) {
+        max_pos = i;
+        max_val = temp;
+        *eNB_id = ind;
+      }
+    }
+  }
+
+  // filter position to reduce jitter
+  if (clear == 1)
+    max_pos_fil2 = max_pos;
+  else
+    max_pos_fil2 = ((max_pos_fil2 * coef) + (max_pos * ncoef)) >> 15;
+
+  return(max_pos_fil2);
+}
+
+
+int lte_est_timing_advance_pusch(PHY_VARS_eNB* eNB,uint8_t UE_id)
+{
+  int temp, i, aa, max_pos=0, max_val=0;
+  short Re,Im;
+
+  LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
+  LTE_eNB_PUSCH *eNB_pusch_vars = eNB->pusch_vars[UE_id];
+  int32_t **ul_ch_estimates_time=  eNB_pusch_vars->drs_ch_estimates_time;
+  uint8_t cyclic_shift = 0;
+  int sync_pos = (frame_parms->ofdm_symbol_size-cyclic_shift*frame_parms->ofdm_symbol_size/12)%(frame_parms->ofdm_symbol_size);
+
+  AssertFatal(frame_parms->ofdm_symbol_size > 127,"frame_parms->ofdm_symbol_size %d<128\n",frame_parms->ofdm_symbol_size);
+  AssertFatal(frame_parms->nb_antennas_rx >0 && frame_parms->nb_antennas_rx<3,"frame_parms->nb_antennas_rx %d not in [0,1]\n",
+	      frame_parms->nb_antennas_rx);
+  for (i = 0; i < frame_parms->ofdm_symbol_size; i++) {
+    temp = 0;
+
+    for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+      Re = ((int16_t*)ul_ch_estimates_time[aa])[(i<<1)];
+      Im = ((int16_t*)ul_ch_estimates_time[aa])[1+(i<<1)];
+      temp += (Re*Re/2) + (Im*Im/2);
+    }
+
+    if (temp > max_val) {
+      max_pos = i;
+      max_val = temp;
+    }
+  }
+
+  if (max_pos>frame_parms->ofdm_symbol_size/2)
+    max_pos = max_pos-frame_parms->ofdm_symbol_size;
+
+  //#ifdef DEBUG_PHY
+  LOG_D(PHY,"frame %d: max_pos = %d, sync_pos=%d\n",eNB->proc.frame_rx,max_pos,sync_pos);
+  //#endif //DEBUG_PHY
+
+  return max_pos - sync_pos;
+}
+
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/types.h"
+#include "PHY/defs_UE.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/impl_defs_top.h"
+#include "openair2/LAYER2/MAC/mac_proto.h"
+
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+#define DEBUG_PHY
+
+// Adjust location synchronization point to account for drift
+// The adjustment is performed once per frame based on the
+// last channel estimate of the receiver
+
+void lte_adjust_synch(LTE_DL_FRAME_PARMS *frame_parms,
+                      PHY_VARS_UE *ue,
+                      unsigned char eNB_id,
+					  uint8_t subframe,
+                      unsigned char clear,
+                      short coef)
+{
+
+  static int max_pos_fil = 0;
+  static int count_max_pos_ok = 0;
+  static int first_time = 1;
+  int temp = 0, i, aa, max_val = 0, max_pos = 0;
+  int diff;
+  short Re,Im,ncoef;
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ADJUST_SYNCH, VCD_FUNCTION_IN);
+
+  ncoef = 32767 - coef;
+
+#ifdef DEBUG_PHY
+  LOG_D(PHY,"AbsSubframe %d.%d: rx_offset (before) = %d\n",ue->proc.proc_rxtx[0].frame_rx%1024,subframe,ue->rx_offset);
+#endif //DEBUG_PHY
+
+
+  // we only use channel estimates from tx antenna 0 here
+  for (i = 0; i < frame_parms->nb_prefix_samples; i++) {
+    temp = 0;
+
+    for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+      Re = ((int16_t*)ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].dl_ch_estimates_time[eNB_id][aa])[(i<<2)];
+      Im = ((int16_t*)ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].dl_ch_estimates_time[eNB_id][aa])[1+(i<<2)];
+      temp += (Re*Re/2) + (Im*Im/2);
+    }
+
+    if (temp > max_val) {
+      max_pos = i;
+      max_val = temp;
+    }
+  }
+
+  // filter position to reduce jitter
+  if (clear == 1)
+    max_pos_fil = max_pos;
+  else
+    max_pos_fil = ((max_pos_fil * coef) + (max_pos * ncoef)) >> 15;
+
+  // do not filter to have proactive timing adjustment
+  max_pos_fil = max_pos;
+
+  if(subframe == 6)
+  {
+      diff = max_pos_fil - (frame_parms->nb_prefix_samples>>3);
+
+      if ( abs(diff) < SYNCH_HYST )
+          ue->rx_offset = 0;
+      else
+          ue->rx_offset = diff;
+
+      if(abs(diff)<5)
+          count_max_pos_ok ++;
+      else
+          count_max_pos_ok = 0;
+
+      if(count_max_pos_ok > 10 && first_time == 1)
+      {
+          first_time = 0;
+          ue->time_sync_cell = 1;
+          if (ue->mac_enabled==1) {
+              LOG_I(PHY,"[UE%d] Sending synch status to higher layers\n",ue->Mod_id);
+              //mac_resynch();
+              dl_phy_sync_success(ue->Mod_id,ue->proc.proc_rxtx[0].frame_rx,0,1);//ue->common_vars.eNb_id);
+              ue->UE_mode[0] = PRACH;
+          }
+          else {
+              ue->UE_mode[0] = PUSCH;
+          }
+      }
+
+      if ( ue->rx_offset < 0 )
+          ue->rx_offset += FRAME_LENGTH_COMPLEX_SAMPLES;
+
+      if ( ue->rx_offset >= FRAME_LENGTH_COMPLEX_SAMPLES )
+          ue->rx_offset -= FRAME_LENGTH_COMPLEX_SAMPLES;
+
+
+
+      #ifdef DEBUG_PHY
+      LOG_D(PHY,"AbsSubframe %d.%d: ThreadId %d diff =%i rx_offset (final) = %i : clear %d,max_pos = %d,max_pos_fil = %d (peak %d) max_val %d target_pos %d \n",
+              ue->proc.proc_rxtx[ue->current_thread_id[subframe]].frame_rx,
+              subframe,
+              ue->current_thread_id[subframe],
+              diff,
+              ue->rx_offset,
+              clear,
+              max_pos,
+              max_pos_fil,
+              temp,max_val,
+              (frame_parms->nb_prefix_samples>>3));
+      #endif //DEBUG_PHY
+
+      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ADJUST_SYNCH, VCD_FUNCTION_OUT);
+  }
+}
@@ -20,8 +20,10 @@
 */

 #include <string.h>
-#include "defs.h"
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"
+#include "lte_estimation.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+
 #include "filt16_32.h"
 //#define DEBUG_BF_CH

@@ -20,12 +20,13 @@
 */

 #include <string.h>
-#include "defs.h"
-#include "SCHED/defs.h"
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"
 #include "filt96_32.h"
 #include "T.h"
 //#define DEBUG_CH
+#include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "SCHED_UE/sched_UE.h"

 int lte_dl_channel_estimation(PHY_VARS_UE *ue,
                              uint8_t eNB_id,
@@ -20,8 +20,9 @@
 */

 #include <string.h>
-#include "defs.h"
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"
+#include "lte_estimation.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 //#define DEBUG_CH
 int lte_dl_mbsfn_channel_estimation(PHY_VARS_UE *ue,
@@ -19,8 +19,8 @@
 *      contact@openairinterface.org
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"

 #include "PHY/sse_intrin.h"

@@ -25,7 +25,7 @@
   date: 19.11.2009
 */

-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
 //#define DEBUG_PHY

 #if defined(__x86_64__) || defined(__i386__)
@@ -22,7 +22,9 @@
 #ifndef __LTE_ESTIMATION_DEFS__H__
 #define __LTE_ESTIMATION_DEFS__H__

-#include "PHY/defs.h"
+
+#include "PHY/defs_UE.h"
+#include "PHY/defs_eNB.h"
 /** @addtogroup _PHY_PARAMETER_ESTIMATION_BLOCKS_
 * @{
 */
@@ -26,19 +26,15 @@
 */

 //#include <string.h>
-#include "defs.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "SCHED/extern.h"
+#include "PHY/defs_UE.h"
+#include "PHY/phy_extern_ue.h"
 #include <math.h>

-#ifdef OPENAIR2
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/extern.h"
-#include "RRC/LITE/extern.h"
-#include "PHY_INTERFACE/extern.h"
-#endif
-//#define DEBUG_PHY
+
+#include "LAYER2/MAC/mac.h"
+#include "RRC/LTE/rrc_extern.h"
+#include "PHY_INTERFACE/phy_interface.h"
+

 int* sync_corr_ue0 = NULL;
 int* sync_corr_ue1 = NULL;
@@ -487,8 +483,6 @@ int lte_sync_time(int **rxdata, ///rx data in time domain

 }

-//#define DEBUG_PHY
-
 int lte_sync_time_eNB(int32_t **rxdata, ///rx data in time domain
                      LTE_DL_FRAME_PARMS *frame_parms,
                      uint32_t length,
@@ -578,3 +572,6 @@ int lte_sync_time_eNB(int32_t **rxdata, ///rx data in time domain

 }

+
+
+
@@ -36,8 +36,8 @@
 */

 //#include "defs.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_UE.h"
+#include "PHY/phy_extern_ue.h"

 #if defined(__x86_64__) || defined(__i386__)
 #include "pss6144.h"
@@ -19,13 +19,14 @@
 *      contact@openairinterface.org
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"
 //#define DEBUG_CH
 #include "UTIL/LOG/log.h"
-
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 #include "T.h"
+#include "lte_estimation.h"

 // round(exp(sqrt(-1)*(pi/2)*[0:1:N-1]/N)*pow2(15))
 static int16_t ru_90[2*128] = {32767, 0,32766, 402,32758, 804,32746, 1206,32729, 1608,32706, 2009,32679, 2411,32647, 2811,32610, 3212,32568, 3612,32522, 4011,32470, 4410,32413, 4808,32352, 5205,32286, 5602,32214, 5998,32138, 6393,32058, 6787,31972, 7180,31881, 7571,31786, 7962,31686, 8351,31581, 8740,31471, 9127,31357, 9512,31238, 9896,31114, 10279,30986, 10660,30853, 11039,30715, 11417,30572, 11793,30425, 12167,30274, 12540,30118, 12910,29957, 13279,29792, 13646,29622, 14010,29448, 14373,29269, 14733,29086, 15091,28899, 15447,28707, 15800,28511, 16151,28311, 16500,28106, 16846,27897, 17190,27684, 17531,27467, 17869,27246, 18205,27020, 18538,26791, 18868,26557, 19195,26320, 19520,26078, 19841,25833, 20160,25583, 20475,25330, 20788,25073, 21097,24812, 21403,24548, 21706,24279, 22006,24008, 22302,23732, 22595,23453, 22884,23170, 23170,22884, 23453,22595, 23732,22302, 24008,22006, 24279,21706, 24548,21403, 24812,21097, 25073,20788, 25330,20475, 25583,20160, 25833,19841, 26078,19520, 26320,19195, 26557,18868, 26791,18538, 27020,18205, 27246,17869, 27467,17531, 27684,17190, 27897,16846, 28106,16500, 28311,16151, 28511,15800, 28707,15447, 28899,15091, 29086,14733, 29269,14373, 29448,14010, 29622,13646, 29792,13279, 29957,12910, 30118,12540, 30274,12167, 30425,11793, 30572,11417, 30715,11039, 30853,10660, 30986,10279, 31114,9896, 31238,9512, 31357,9127, 31471,8740, 31581,8351, 31686,7962, 31786,7571, 31881,7180, 31972,6787, 32058,6393, 32138,5998, 32214,5602, 32286,5205, 32352,4808, 32413,4410, 32470,4011, 32522,3612, 32568,3212, 32610,2811, 32647,2411, 32679,2009, 32706,1608, 32729,1206, 32746,804, 32758,402, 32766};
@@ -22,8 +22,9 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "defs.h"
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
+#include "PHY/impl_defs_top.h"

 //extern unsigned int lte_gold_table[3][20][2][14];
 //#define DEBUG_DL_CELL_SPEC
@@ -24,8 +24,10 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "defs.h"
-#include "PHY/defs.h"
+#include "lte_refsig.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
+#include "PHY/impl_defs_top.h"

 //extern unsigned int lte_gold_table[10][3][42];
 //#define DEBUG_DL_MBSFN
@@ -33,9 +33,11 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "defs.h"
-#include "PHY/defs.h"
+#include "lte_refsig.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
 #include "log.h"
+#include "PHY/impl_defs_top.h"

 //extern unsigned int lte_gold_table[3][20][2][14];
 //#define DEBUG_DL_CELL_SPEC
@@ -19,7 +19,7 @@
 *      contact@openairinterface.org
 */

-#include "defs.h"
+#include "lte_refsig.h"


 /* c(n) = x1(n+Nc) + x2(n+Nc) mod 2
@@ -42,7 +42,7 @@
   //unsigned int lte_gold_table[10][3][42];  // need 165 bytes for sequence
   //slot index x pilot within slot x sequence*/

-#include "defs.h"
+#include "lte_refsig.h"

 void lte_gold_mbsfn(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_mbsfn_table[10][3][42],uint16_t Nid_mbsfn)
 {
@@ -23,7 +23,8 @@
 /* Author R. Knopp / EURECOM / OpenAirInterface.org */
 #ifndef __LTE_REFSIG_DEFS__H__
 #define __LTE_REFSIG_DEFS__H__
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"

 /** @ingroup _PHY_REF_SIG
 * @{
@@ -24,7 +24,8 @@
 #include <stdlib.h>
 #include <math.h>
 #endif
-#include "defs.h"
+#include "lte_refsig.h"
+#include "PHY/defs_eNB.h"

 uint16_t dftsizes[33] = {12,24,36,48,60,72,96,108,120,144,180,192,216,240,288,300,324,360,384,432,480,540,576,600,648,720,864,900,960,972,1080,1152,1200};

@@ -30,8 +30,18 @@
 * \warning
 */

+#ifndef __DCI__h__
+#define __DCI__h__
+
 #include <stdint.h>

+#define CCEBITS 72
+#define CCEPERSYMBOL 33  // This is for 1200 RE
+#define CCEPERSYMBOL0 22  // This is for 1200 RE
+#define DCI_BITS_MAX ((2*CCEPERSYMBOL+CCEPERSYMBOL0)*CCEBITS)
+
+//#define Mquad (Msymb/4)
+
 ///  DCI Format Type 0 (5 MHz,TDD0, 27 bits)
 struct DCI0_5MHz_TDD0 {
  /// type = 0 => DCI Format 0, type = 1 => DCI Format 1A
@@ -3014,3 +3024,5 @@ struct DCI_INFO_EXTRACTED {
    uint64_t ap_si_nl_id:3;
 };
 typedef struct DCI_INFO_EXTRACTED DCI_INFO_EXTRACTED_t;
+
+#endif
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/dci_tools_common_extern.h
+ * \brief PHY Support routines (eNB/UE) for filling PDSCH/PUSCH/DLSCH/ULSCH data structures based on DCI PDUs generated by eNB MAC scheduler.
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#include <stdint.h>
+
+extern uint32_t localRIV2alloc_LUT6[32];
+extern uint32_t distRIV2alloc_even_LUT6[32];
+extern uint32_t distRIV2alloc_odd_LUT6[32];
+extern uint16_t RIV2nb_rb_LUT6[32];
+extern uint16_t RIV2first_rb_LUT6[32];
+extern uint16_t RIV_max6;
+
+extern uint32_t localRIV2alloc_LUT25[512];
+extern uint32_t distRIV2alloc_even_LUT25[512];
+extern uint32_t distRIV2alloc_odd_LUT25[512];
+extern uint16_t RIV2nb_rb_LUT25[512];
+extern uint16_t RIV2first_rb_LUT25[512];
+extern uint16_t RIV_max25;
+
+
+extern uint32_t localRIV2alloc_LUT50_0[1600];
+extern uint32_t localRIV2alloc_LUT50_1[1600];
+extern uint32_t distRIV2alloc_gap0_even_LUT50_0[1600];
+extern uint32_t distRIV2alloc_gap0_odd_LUT50_0[1600];
+extern uint32_t distRIV2alloc_gap0_even_LUT50_1[1600];
+extern uint32_t distRIV2alloc_gap0_odd_LUT50_1[1600];
+extern uint32_t distRIV2alloc_gap1_even_LUT50_0[1600];
+extern uint32_t distRIV2alloc_gap1_odd_LUT50_0[1600];
+extern uint32_t distRIV2alloc_gap1_even_LUT50_1[1600];
+extern uint32_t distRIV2alloc_gap1_odd_LUT50_1[1600];
+extern uint16_t RIV2nb_rb_LUT50[1600];
+extern uint16_t RIV2first_rb_LUT50[1600];
+extern uint16_t RIV_max50;
+
+extern uint32_t localRIV2alloc_LUT100_0[6000];
+extern uint32_t localRIV2alloc_LUT100_1[6000];
+extern uint32_t localRIV2alloc_LUT100_2[6000];
+extern uint32_t localRIV2alloc_LUT100_3[6000];
+extern uint32_t distRIV2alloc_gap0_even_LUT100_0[6000];
+extern uint32_t distRIV2alloc_gap0_odd_LUT100_0[6000];
+extern uint32_t distRIV2alloc_gap0_even_LUT100_1[6000];
+extern uint32_t distRIV2alloc_gap0_odd_LUT100_1[6000];
+extern uint32_t distRIV2alloc_gap0_even_LUT100_2[6000];
+extern uint32_t distRIV2alloc_gap0_odd_LUT100_2[6000];
+extern uint32_t distRIV2alloc_gap0_even_LUT100_3[6000];
+extern uint32_t distRIV2alloc_gap0_odd_LUT100_3[6000];
+extern uint32_t distRIV2alloc_gap1_even_LUT100_0[6000];
+extern uint32_t distRIV2alloc_gap1_odd_LUT100_0[6000];
+extern uint32_t distRIV2alloc_gap1_even_LUT100_1[6000];
+extern uint32_t distRIV2alloc_gap1_odd_LUT100_1[6000];
+extern uint32_t distRIV2alloc_gap1_even_LUT100_2[6000];
+extern uint32_t distRIV2alloc_gap1_odd_LUT100_2[6000];
+extern uint32_t distRIV2alloc_gap1_even_LUT100_3[6000];
+extern uint32_t distRIV2alloc_gap1_odd_LUT100_3[6000];
+extern uint16_t RIV2nb_rb_LUT100[6000];
+extern uint16_t RIV2first_rb_LUT100[6000];
+extern uint16_t RIV_max100;
+
+extern int8_t *delta_PUCCH_lut;
+extern int8_t delta_PUSCH_acc[4];
+extern int8_t delta_PUSCH_abs[4];
@@ -30,15 +30,14 @@
 * \warning
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "PHY/CODING/defs.h"
-#include "PHY/CODING/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+#include "PHY/CODING/coding_defs.h"
+#include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
-#include "PHY/LTE_TRANSPORT/defs.h"
-#include "PHY/LTE_TRANSPORT/proto.h"
-#include "SCHED/defs.h"
-#include "defs.h"
+#include "PHY/LTE_TRANSPORT/transport_eNB.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "SCHED/sched_eNB.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "UTIL/LOG/log.h"
 #include <syscall.h>
@@ -398,12 +397,12 @@ int dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
 			    uint8_t subframe,
 			    time_stats_t *rm_stats,
 			    time_stats_t *te_stats,
-				time_stats_t *te_wait_stats,
-                time_stats_t *te_main_stats,
-                time_stats_t *te_wakeup_stats0,
-                time_stats_t *te_wakeup_stats1,
-                time_stats_t *i_stats,
-                int worker_num)
+			    time_stats_t *te_wait_stats,
+			    time_stats_t *te_main_stats,
+			    time_stats_t *te_wakeup_stats0,
+			    time_stats_t *te_wakeup_stats1,
+			    time_stats_t *i_stats,
+			    int worker_num)
 {

  //start_meas(&eNB->dlsch_turbo_encoding_preperation_stats);
@@ -900,186 +899,6 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
 }


-int dlsch_encoding_SIC(PHY_VARS_UE *ue,
-		       unsigned char *a,
-		       uint8_t num_pdcch_symbols,
-		       LTE_eNB_DLSCH_t *dlsch,
-		       int frame,
-		       uint8_t subframe,
-		       time_stats_t *rm_stats,
-		       time_stats_t *te_stats,
-		       time_stats_t *i_stats)
-{
-  
-  unsigned int G;
-  unsigned int crc=1;
-  unsigned short iind;
-
-  LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
-  unsigned char harq_pid = ue->dlsch[subframe&2][0][0]->rnti;
-  unsigned short nb_rb = dlsch->harq_processes[harq_pid]->nb_rb;
-  unsigned int A;
-  unsigned char mod_order;
-  unsigned int Kr=0,Kr_bytes,r,r_offset=0;
-  //  unsigned short m=dlsch->harq_processes[harq_pid]->mcs;
-  uint8_t beamforming_mode=0;
-
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN);
-
-  A = dlsch->harq_processes[harq_pid]->TBS; //6228
-  // printf("Encoder: A: %d\n",A);
-  mod_order = dlsch->harq_processes[harq_pid]->Qm;
-
-  if(dlsch->harq_processes[harq_pid]->mimo_mode == TM7)
-    beamforming_mode = 7;
-  else if(dlsch->harq_processes[harq_pid]->mimo_mode == TM8)
-    beamforming_mode = 8;
-  else if(dlsch->harq_processes[harq_pid]->mimo_mode == TM9_10)
-    beamforming_mode = 9;
-  G = get_G(frame_parms,nb_rb,dlsch->harq_processes[harq_pid]->rb_alloc,mod_order,dlsch->harq_processes[harq_pid]->Nl,num_pdcch_symbols,frame,subframe,beamforming_mode);
-
-
-  //  if (dlsch->harq_processes[harq_pid]->Ndi == 1) {  // this is a new packet
-  if (dlsch->harq_processes[harq_pid]->round == 0) {  // this is a new packet
-#ifdef DEBUG_DLSCH_CODING
-  printf("SIC encoding thinks this is a new packet \n");
-#endif
-    /*
-    int i;
-    printf("dlsch (tx): \n");
-    for (i=0;i<(A>>3);i++)
-      printf("%02x.",a[i]);
-    printf("\n");
-    */
-    // Add 24-bit crc (polynomial A) to payload
-    crc = crc24a(a,
-                 A)>>8;
-    a[A>>3] = ((uint8_t*)&crc)[2];
-    a[1+(A>>3)] = ((uint8_t*)&crc)[1];
-    a[2+(A>>3)] = ((uint8_t*)&crc)[0];
-    //    printf("CRC %x (A %d)\n",crc,A);
-
-    dlsch->harq_processes[harq_pid]->B = A+24;
-    //    dlsch->harq_processes[harq_pid]->b = a;
-    memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);
-
-    if (lte_segmentation(dlsch->harq_processes[harq_pid]->b,
-                         dlsch->harq_processes[harq_pid]->c,
-                         dlsch->harq_processes[harq_pid]->B,
-                         &dlsch->harq_processes[harq_pid]->C,
-                         &dlsch->harq_processes[harq_pid]->Cplus,
-                         &dlsch->harq_processes[harq_pid]->Cminus,
-                         &dlsch->harq_processes[harq_pid]->Kplus,
-                         &dlsch->harq_processes[harq_pid]->Kminus,
-                         &dlsch->harq_processes[harq_pid]->F)<0)
-      return(-1);
-
-    for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
-
-      if (r<dlsch->harq_processes[harq_pid]->Cminus)
-        Kr = dlsch->harq_processes[harq_pid]->Kminus;
-      else
-        Kr = dlsch->harq_processes[harq_pid]->Kplus;
-
-      Kr_bytes = Kr>>3;
-
-      // get interleaver index for Turbo code (lookup in Table 5.1.3-3 36-212, V8.6 2009-03, p. 13-14)
-      if (Kr_bytes<=64)
-        iind = (Kr_bytes-5);
-      else if (Kr_bytes <=128)
-        iind = 59 + ((Kr_bytes-64)>>1);
-      else if (Kr_bytes <= 256)
-        iind = 91 + ((Kr_bytes-128)>>2);
-      else if (Kr_bytes <= 768)
-        iind = 123 + ((Kr_bytes-256)>>3);
-      else {
-        printf("dlsch_coding: Illegal codeword size %d!!!\n",Kr_bytes);
-        return(-1);
-      }
-
-
-#ifdef DEBUG_DLSCH_CODING
-      printf("Generating Code Segment %d (%d bits)\n",r,Kr);
-      // generate codewords
-
-      printf("bits_per_codeword (Kr)= %d, A %d\n",Kr,A);
-      printf("N_RB = %d\n",nb_rb);
-      printf("Ncp %d\n",frame_parms->Ncp);
-      printf("mod_order %d\n",mod_order);
-#endif
-
-
-#ifdef DEBUG_DLSCH_CODING
-      printf("Encoding ... iind %d f1 %d, f2 %d\n",iind,f1f2mat_old[iind*2],f1f2mat_old[(iind*2)+1]);
-#endif
-      start_meas(te_stats);
-      encoder(dlsch->harq_processes[harq_pid]->c[r],
-              Kr>>3,
-              &dlsch->harq_processes[harq_pid]->d[r][96],
-              (r==0) ? dlsch->harq_processes[harq_pid]->F : 0,
-              f1f2mat_old[iind*2],   // f1 (see 36121-820, page 14)
-              f1f2mat_old[(iind*2)+1]  // f2 (see 36121-820, page 14)
-             );
-      stop_meas(te_stats);
-#ifdef DEBUG_DLSCH_CODING
-
-      if (r==0)
-        write_output("enc_output0.m","enc0",&dlsch->harq_processes[harq_pid]->d[r][96],(3*8*Kr_bytes)+12,1,4);
-
-#endif
-      start_meas(i_stats);
-      dlsch->harq_processes[harq_pid]->RTC[r] =
-        sub_block_interleaving_turbo(4+(Kr_bytes*8),
-                                     &dlsch->harq_processes[harq_pid]->d[r][96],
-                                     dlsch->harq_processes[harq_pid]->w[r]);
-      stop_meas(i_stats);
-    }
-
-  }
-
-  // Fill in the "e"-sequence from 36-212, V8.6 2009-03, p. 16-17 (for each "e") and concatenate the
-  // outputs for each code segment, see Section 5.1.5 p.20
-
-  for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
-#ifdef DEBUG_DLSCH_CODING
-    printf("Rate Matching, Code segment %d (coded bits (G) %d,unpunctured/repeated bits per code segment %d,mod_order %d, nb_rb %d)...\n",
-        r,
-        G,
-        Kr*3,
-        mod_order,nb_rb);
-#endif
-
-    start_meas(rm_stats);
-#ifdef DEBUG_DLSCH_CODING
-    printf("rvidx in SIC encoding = %d\n", dlsch->harq_processes[harq_pid]->rvidx);
-#endif
-    r_offset += lte_rate_matching_turbo(dlsch->harq_processes[harq_pid]->RTC[r],
-                                        G,  //G
-                                        dlsch->harq_processes[harq_pid]->w[r],
-                                        dlsch->harq_processes[harq_pid]->e+r_offset,
-                                        dlsch->harq_processes[harq_pid]->C, // C
-                                        dlsch->Nsoft,                    // Nsoft,
-                                        dlsch->Mdlharq,
-                                        dlsch->Kmimo,
-                                        dlsch->harq_processes[harq_pid]->rvidx,
-                                        dlsch->harq_processes[harq_pid]->Qm,
-                                        dlsch->harq_processes[harq_pid]->Nl,
-                                        r,
-                                        nb_rb);
-    //                                        m);                       // r
-    stop_meas(rm_stats);
-#ifdef DEBUG_DLSCH_CODING
-
-    if (r==dlsch->harq_processes[harq_pid]->C-1)
-      write_output("enc_output.m","enc",dlsch->harq_processes[harq_pid]->e,r_offset,1,4);
-
-#endif
-  }
-
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT);
-
-  return(0);
-}



@@ -29,14 +29,14 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "PHY/CODING/defs.h"
-#include "PHY/CODING/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+#include "PHY/CODING/coding_defs.h"
+#include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
-#include "PHY/LTE_TRANSPORT/defs.h"
-#include "defs.h"
+#include "PHY/LTE_TRANSPORT/transport_eNB.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"

 //#define DEBUG_DLSCH_MODULATION
 #define NEW_ALLOC_RE
@@ -95,42 +95,7 @@ uint8_t is_not_UEspecRS(int8_t lprime, uint8_t re, uint8_t nushift, uint8_t Ncp,
  return(0);
 }

-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 generate_qpsk_table(void)
-{
-
-  int a,index;
-
-  for (a=-1; a<=1; a+=2) {
-    index = (1+a)/2;
-    qpsk_table[index] = -a*QPSK;  
-  }
-}



@@ -1970,48 +1935,6 @@ int allocate_REs_in_RB_MCH(int32_t **txdataF,
  return(0);
 }

-uint8_t get_pmi(uint8_t N_RB_DL, MIMO_mode_t mode, uint32_t pmi_alloc,uint16_t rb)
-{
-  /*
-  MIMO_mode_t mode   = dlsch_harq->mimo_mode;
-  uint32_t pmi_alloc = dlsch_harq->pmi_alloc;
-  */
-
-  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));
@@ -32,12 +32,12 @@

 //#define DEBUG_SCRAMBLING 1

-#include "PHY/defs.h"
-#include "PHY/CODING/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
+#include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
-#include "defs.h"
-#include "extern.h"
-#include "PHY/extern.h"
+#include "transport_eNB.h"
+#include "PHY/phy_extern.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"

 static inline unsigned int lte_gold_scram(unsigned int *x1, unsigned int *x2, unsigned char reset) __attribute__((always_inline));
@@ -187,6 +187,20 @@ void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,

 }

+
+
+void init_scrambling_lut(void) {
+
+  uint32_t s;
+  int i=0,j;
+
+  for (s=0;s<=65535;s++) {
+    for (j=0;j<16;j++) {
+      scrambling_lut[i++] = (uint8_t)((s>>j)&1);
+    }
+  }
+}
+
 void dlsch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
                        int mbsfn_flag,
                        LTE_UE_DLSCH_t *dlsch,
@@ -228,7 +242,7 @@ void dlsch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
  }
 }

-void init_unscrambling_lut() {
+void init_unscrambling_lut(void) {

  uint32_t s;
  int i=0,j;
@@ -239,15 +253,3 @@ void init_unscrambling_lut() {
    }
  }
 }
-
-void init_scrambling_lut() {
-
-  uint32_t s;
-  int i=0,j;
-
-  for (s=0;s<=65535;s++) {
-    for (j=0;j<16;j++) {
-      scrambling_lut[i++] = (uint8_t)((s>>j)&1);
-    }
-  }
-}
@@ -32,15 +32,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "SCHED/defs.h"
-#include "SIMULATION/TOOLS/defs.h" // for taus 
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+#include "SCHED/sched_eNB.h"
+#include "SIMULATION/TOOLS/sim.h" // for taus 
 #include "PHY/sse_intrin.h"
-
+#include "transport_proto.h"
+#include "transport_common_proto.h"
 #include "assertions.h" 
 #include "T.h"
 #include "UTIL/LOG/log.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 //#define DEBUG_DCI_ENCODING 1
 //#define DEBUG_DCI_DECODING 1
@@ -29,7 +29,8 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
+#include "PHY/defs_common.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 //#define DEBUG_GROUPHOP 1

@@ -30,10 +30,10 @@
 * \warning
 */

-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
 #include "PHY/TOOLS/alaw_lut.h"
-#include "PHY/extern.h"
-#include "SCHED/defs.h"
+#include "PHY/phy_extern.h"
+#include "SCHED/sched_eNB.h"

 //#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
@@ -32,7 +32,7 @@

 #ifndef __IF4_TOOLS_H__
 #define __IF4_TOOLS_H__
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"

 /// Macro for IF4 packet type
 #define IF4p5_PACKET_TYPE 0x080A 
@@ -30,7 +30,7 @@
 * \warning
 */

-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
 #include "PHY/TOOLS/alaw_lut.h"

 #include "time_utils.h"
@@ -34,7 +34,7 @@
 #define __IF5_TOOLS_H__

 #include <stdint.h>
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"

 #define IF5_RRH_GW_DL 0x0022
 #define IF5_RRH_GW_UL 0x0023
@@ -30,9 +30,9 @@
 * \warning
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "PHY/LTE_TRANSPORT/proto.h"
+#include "PHY/defs_common.h"
+#include "PHY/phy_extern.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"

 unsigned char get_Qm(unsigned char I_MCS)
 {
@@ -30,6 +30,9 @@
 * \warning
 */

+#ifndef __M_DCI__H__
+#define __M_DCI__H__
+
 #include <stdint.h>


@@ -467,3 +470,4 @@ struct DCI6_2_di_20MHz {
 typedef struct DCI6_2_di_20MHz DCI6_2_di_20MHz_t;
 #define sizeof_DCI6_2_20MHz_t 13

+#endif
@@ -29,13 +29,14 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
-#include "PHY/CODING/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
-#include "defs.h"
-#include "extern.h"
-#include "PHY/extern.h"
+#include "transport_eNB.h"
+#include "transport_proto.h"
+#include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 //#define DEBUG_PBCH 1
 //#define DEBUG_PBCH_ENCODING
@@ -138,6 +139,31 @@ int allocate_pbch_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
  return(0);
 }

+void pbch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
+                     uint8_t *pbch_e,
+                     uint32_t length)
+{
+  int i;
+  uint8_t reset;
+  uint32_t x1, x2, s=0;
+
+  reset = 1;
+  // x1 is set in lte_gold_generic
+  x2 = frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.6.1
+  //  msg("pbch_scrambling: Nid_cell = %d\n",x2);
+
+  for (i=0; i<length; i++) {
+    if ((i&0x1f)==0) {
+      s = lte_gold_generic(&x1, &x2, reset);
+      //      printf("lte_gold[%d]=%x\n",i,s);
+      reset = 0;
+    }
+
+    pbch_e[i] = (pbch_e[i]&1) ^ ((s>>(i&0x1f))&1);
+
+  }
+}
+
 //uint8_t pbch_d[96+(3*(16+PBCH_A))], pbch_w[3*3*(16+PBCH_A)],pbch_e[1920];  //one bit per byte
 int generate_pbch(LTE_eNB_PBCH *eNB_pbch,
                  int32_t **txdataF,
@@ -393,623 +419,5 @@ int generate_pbch(LTE_eNB_PBCH *eNB_pbch,
  return(0);
 }

-int32_t generate_pbch_emul(PHY_VARS_eNB *phy_vars_eNB,uint8_t *pbch_pdu)
-{

-  LOG_D(PHY,"[eNB %d] generate_pbch_emul \n",phy_vars_eNB->Mod_id);
-  eNB_transport_info[phy_vars_eNB->Mod_id][phy_vars_eNB->CC_id].cntl.pbch_flag=1;
-  // Copy PBCH payload
-  eNB_transport_info[phy_vars_eNB->Mod_id][phy_vars_eNB->CC_id].cntl.pbch_payload=*(uint32_t *)pbch_pdu;
-  return(0);
-}

-uint16_t pbch_extract(int **rxdataF,
-                      int **dl_ch_estimates,
-                      int **rxdataF_ext,
-                      int **dl_ch_estimates_ext,
-                      uint32_t symbol,
-                      uint32_t high_speed_flag,
-                      LTE_DL_FRAME_PARMS *frame_parms)
-{
-
-
-  uint16_t rb,nb_rb=6;
-  uint8_t i,j,aarx,aatx;
-  int *dl_ch0,*dl_ch0_ext,*rxF,*rxF_ext;
-
-  uint32_t nsymb = (frame_parms->Ncp==0) ? 7:6;
-  uint32_t symbol_mod = symbol % nsymb;
-
-  int rx_offset = frame_parms->ofdm_symbol_size-3*12;
-  int ch_offset = frame_parms->N_RB_DL*6-3*12;
-  int nushiftmod3 = frame_parms->nushift%3;
-
-  for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-    /*
-    printf("extract_rbs (nushift %d): symbol_mod=%d, rx_offset=%d, ch_offset=%d\n",frame_parms->nushift,symbol_mod,
-     (rx_offset + (symbol*(frame_parms->ofdm_symbol_size)))*2,
-     LTE_CE_OFFSET+ch_offset+(symbol_mod*(frame_parms->ofdm_symbol_size)));
-    */
-
-    rxF        = &rxdataF[aarx][(rx_offset + (symbol*(frame_parms->ofdm_symbol_size)))];
-    rxF_ext    = &rxdataF_ext[aarx][symbol_mod*(6*12)];
-
-    for (rb=0; rb<nb_rb; rb++) {
-      // skip DC carrier
-      if (rb==3) {
-        rxF       = &rxdataF[aarx][(1 + (symbol*(frame_parms->ofdm_symbol_size)))];
-      }
-
-      if ((symbol_mod==0) || (symbol_mod==1)) {
-        j=0;
-
-        for (i=0; i<12; i++) {
-          if ((i!=nushiftmod3) &&
-              (i!=(nushiftmod3+3)) &&
-              (i!=(nushiftmod3+6)) &&
-              (i!=(nushiftmod3+9))) {
-            rxF_ext[j++]=rxF[i];
-          }
-        }
-
-        rxF+=12;
-        rxF_ext+=8;
-      } else {
-        for (i=0; i<12; i++) {
-          rxF_ext[i]=rxF[i];
-        }
-
-        rxF+=12;
-        rxF_ext+=12;
-      }
-    }
-
-    for (aatx=0; aatx<4; aatx++) { //frame_parms->nb_antenna_ports_eNB;aatx++) {
-      if (high_speed_flag == 1)
-        dl_ch0     = &dl_ch_estimates[(aatx<<1)+aarx][LTE_CE_OFFSET+ch_offset+(symbol*(frame_parms->ofdm_symbol_size))];
-      else
-        dl_ch0     = &dl_ch_estimates[(aatx<<1)+aarx][LTE_CE_OFFSET+ch_offset];
-
-      dl_ch0_ext = &dl_ch_estimates_ext[(aatx<<1)+aarx][symbol_mod*(6*12)];
-
-      for (rb=0; rb<nb_rb; rb++) {
-        // skip DC carrier
-        // if (rb==3) dl_ch0++;
-        if (symbol_mod>1) {
-          memcpy(dl_ch0_ext,dl_ch0,12*sizeof(int));
-          dl_ch0+=12;
-          dl_ch0_ext+=12;
-        } else {
-          j=0;
-
-          for (i=0; i<12; i++) {
-            if ((i!=nushiftmod3) &&
-                (i!=(nushiftmod3+3)) &&
-                (i!=(nushiftmod3+6)) &&
-                (i!=(nushiftmod3+9))) {
-              //        printf("PBCH extract i %d j %d => (%d,%d)\n",i,j,*(short *)&dl_ch0[i],*(1+(short*)&dl_ch0[i]));
-              dl_ch0_ext[j++]=dl_ch0[i];
-            }
-          }
-
-          dl_ch0+=12;
-          dl_ch0_ext+=8;
-        }
-      }
-    }  //tx antenna loop
-
-  }
-
-  return(0);
-}
-
-//__m128i avg128;
-
-//compute average channel_level on each (TX,RX) antenna pair
-int pbch_channel_level(int **dl_ch_estimates_ext,
-                       LTE_DL_FRAME_PARMS *frame_parms,
-                       uint32_t symbol)
-{
-
-  int16_t rb, nb_rb=6;
-  uint8_t aatx,aarx;
-
-#if defined(__x86_64__) || defined(__i386__)
-  __m128i avg128;
-  __m128i *dl_ch128;
-#elif defined(__arm__)
-  int32x4_t avg128;
-  int16x8_t *dl_ch128;
-#endif
-  int avg1=0,avg2=0;
-
-  uint32_t nsymb = (frame_parms->Ncp==0) ? 7:6;
-  uint32_t symbol_mod = symbol % nsymb;
-
-  for (aatx=0; aatx<4; aatx++) //frame_parms->nb_antenna_ports_eNB;aatx++)
-    for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-      //clear average level
-
-#if defined(__x86_64__) || defined(__i386__)
-      avg128 = _mm_setzero_si128();
-      dl_ch128=(__m128i *)&dl_ch_estimates_ext[(aatx<<1)+aarx][symbol_mod*6*12];
-#elif defined(__arm__)
-      avg128 = vdupq_n_s32(0);
-      dl_ch128=(int16x8_t *)&dl_ch_estimates_ext[(aatx<<1)+aarx][symbol_mod*6*12];
-
-#endif
-      for (rb=0; rb<nb_rb; rb++) {
-#if defined(__x86_64__) || defined(__i386__)
-        avg128 = _mm_add_epi32(avg128,_mm_madd_epi16(dl_ch128[0],dl_ch128[0]));
-        avg128 = _mm_add_epi32(avg128,_mm_madd_epi16(dl_ch128[1],dl_ch128[1]));
-        avg128 = _mm_add_epi32(avg128,_mm_madd_epi16(dl_ch128[2],dl_ch128[2]));
-#elif defined(__arm__)
-// to be filled in
-#endif
-        dl_ch128+=3;
-        /*
-          if (rb==0) {
-          print_shorts("dl_ch128",&dl_ch128[0]);
-          print_shorts("dl_ch128",&dl_ch128[1]);
-          print_shorts("dl_ch128",&dl_ch128[2]);
-          }
-        */
-      }
-
-      avg1 = (((int*)&avg128)[0] +
-              ((int*)&avg128)[1] +
-              ((int*)&avg128)[2] +
-              ((int*)&avg128)[3])/(nb_rb*12);
-
-      if (avg1>avg2)
-        avg2 = avg1;
-
-      //msg("Channel level : %d, %d\n",avg1, avg2);
-    }
-#if defined(__x86_64__) || defined(__i386__)
-  _mm_empty();
-  _m_empty();
-#endif
-  return(avg2);
-
-}
-
-#if defined(__x86_64__) || defined(__i386__)
-__m128i mmtmpP0,mmtmpP1,mmtmpP2,mmtmpP3;
-#elif defined(__arm__)
-int16x8_t mmtmpP0,mmtmpP1,mmtmpP2,mmtmpP3;
-#endif
-void pbch_channel_compensation(int **rxdataF_ext,
-                               int **dl_ch_estimates_ext,
-                               int **rxdataF_comp,
-                               LTE_DL_FRAME_PARMS *frame_parms,
-                               uint8_t symbol,
-                               uint8_t output_shift)
-{
-
-  uint16_t rb,nb_rb=6;
-  uint8_t aatx,aarx,symbol_mod;
-#if defined(__x86_64__) || defined(__i386__)
-  __m128i *dl_ch128,*rxdataF128,*rxdataF_comp128;
-#elif defined(__arm__)
-
-#endif
-  symbol_mod = (symbol>=(7-frame_parms->Ncp)) ? symbol-(7-frame_parms->Ncp) : symbol;
-
-  for (aatx=0; aatx<4; aatx++) //frame_parms->nb_antenna_ports_eNB;aatx++)
-    for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-
-#if defined(__x86_64__) || defined(__i386__)
-      dl_ch128          = (__m128i *)&dl_ch_estimates_ext[(aatx<<1)+aarx][symbol_mod*6*12];
-      rxdataF128        = (__m128i *)&rxdataF_ext[aarx][symbol_mod*6*12];
-      rxdataF_comp128   = (__m128i *)&rxdataF_comp[(aatx<<1)+aarx][symbol_mod*6*12];
-
-#elif defined(__arm__)
-// to be filled in
-#endif
-
-      for (rb=0; rb<nb_rb; rb++) {
-        //printf("rb %d\n",rb);
-#if defined(__x86_64__) || defined(__i386__)
-        // multiply by conjugated channel
-        mmtmpP0 = _mm_madd_epi16(dl_ch128[0],rxdataF128[0]);
-        //  print_ints("re",&mmtmpP0);
-        // mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
-        mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[0],_MM_SHUFFLE(2,3,0,1));
-        mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
-        mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
-        //  print_ints("im",&mmtmpP1);
-        mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[0]);
-        // mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
-        mmtmpP0 = _mm_srai_epi32(mmtmpP0,output_shift);
-        //  print_ints("re(shift)",&mmtmpP0);
-        mmtmpP1 = _mm_srai_epi32(mmtmpP1,output_shift);
-        //  print_ints("im(shift)",&mmtmpP1);
-        mmtmpP2 = _mm_unpacklo_epi32(mmtmpP0,mmtmpP1);
-        mmtmpP3 = _mm_unpackhi_epi32(mmtmpP0,mmtmpP1);
-        //      print_ints("c0",&mmtmpP2);
-        //  print_ints("c1",&mmtmpP3);
-        rxdataF_comp128[0] = _mm_packs_epi32(mmtmpP2,mmtmpP3);
-        //  print_shorts("rx:",rxdataF128);
-        //  print_shorts("ch:",dl_ch128);
-        //  print_shorts("pack:",rxdataF_comp128);
-
-        // multiply by conjugated channel
-        mmtmpP0 = _mm_madd_epi16(dl_ch128[1],rxdataF128[1]);
-        // mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
-        mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[1],_MM_SHUFFLE(2,3,0,1));
-        mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
-        mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
-        mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[1]);
-        // mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
-        mmtmpP0 = _mm_srai_epi32(mmtmpP0,output_shift);
-        mmtmpP1 = _mm_srai_epi32(mmtmpP1,output_shift);
-        mmtmpP2 = _mm_unpacklo_epi32(mmtmpP0,mmtmpP1);
-        mmtmpP3 = _mm_unpackhi_epi32(mmtmpP0,mmtmpP1);
-        rxdataF_comp128[1] = _mm_packs_epi32(mmtmpP2,mmtmpP3);
-        //  print_shorts("rx:",rxdataF128+1);
-        //  print_shorts("ch:",dl_ch128+1);
-        //  print_shorts("pack:",rxdataF_comp128+1);
-
-        if (symbol_mod>1) {
-          // multiply by conjugated channel
-          mmtmpP0 = _mm_madd_epi16(dl_ch128[2],rxdataF128[2]);
-          // mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
-          mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[2],_MM_SHUFFLE(2,3,0,1));
-          mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
-          mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
-          mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[2]);
-          // mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
-          mmtmpP0 = _mm_srai_epi32(mmtmpP0,output_shift);
-          mmtmpP1 = _mm_srai_epi32(mmtmpP1,output_shift);
-          mmtmpP2 = _mm_unpacklo_epi32(mmtmpP0,mmtmpP1);
-          mmtmpP3 = _mm_unpackhi_epi32(mmtmpP0,mmtmpP1);
-          rxdataF_comp128[2] = _mm_packs_epi32(mmtmpP2,mmtmpP3);
-          //  print_shorts("rx:",rxdataF128+2);
-          //  print_shorts("ch:",dl_ch128+2);
-          //      print_shorts("pack:",rxdataF_comp128+2);
-
-          dl_ch128+=3;
-          rxdataF128+=3;
-          rxdataF_comp128+=3;
-        } else {
-          dl_ch128+=2;
-          rxdataF128+=2;
-          rxdataF_comp128+=2;
-        }
-#elif defined(__arm__)
-// to be filled in
-#endif
-      }
-    }
-#if defined(__x86_64__) || defined(__i386__)
-  _mm_empty();
-  _m_empty();
-#endif
-}
-
-void pbch_detection_mrc(LTE_DL_FRAME_PARMS *frame_parms,
-                        int **rxdataF_comp,
-                        uint8_t symbol)
-{
-
-  uint8_t aatx, symbol_mod;
-  int i, nb_rb=6;
-#if defined(__x86_64__) || defined(__i386__)
-  __m128i *rxdataF_comp128_0,*rxdataF_comp128_1;
-#elif defined(__arm__)
-  int16x8_t *rxdataF_comp128_0,*rxdataF_comp128_1;
-#endif
-  symbol_mod = (symbol>=(7-frame_parms->Ncp)) ? symbol-(7-frame_parms->Ncp) : symbol;
-
-  if (frame_parms->nb_antennas_rx>1) {
-    for (aatx=0; aatx<4; aatx++) { //frame_parms->nb_antenna_ports_eNB;aatx++) {
-#if defined(__x86_64__) || defined(__i386__)
-      rxdataF_comp128_0   = (__m128i *)&rxdataF_comp[(aatx<<1)][symbol_mod*6*12];
-      rxdataF_comp128_1   = (__m128i *)&rxdataF_comp[(aatx<<1)+1][symbol_mod*6*12];
-#elif defined(__arm__)
-      rxdataF_comp128_0   = (int16x8_t *)&rxdataF_comp[(aatx<<1)][symbol_mod*6*12];
-      rxdataF_comp128_1   = (int16x8_t *)&rxdataF_comp[(aatx<<1)+1][symbol_mod*6*12];
-
-#endif
-      // MRC on each re of rb, both on MF output and magnitude (for 16QAM/64QAM llr computation)
-      for (i=0; i<nb_rb*3; i++) {
-#if defined(__x86_64__) || defined(__i386__)
-        rxdataF_comp128_0[i] = _mm_adds_epi16(_mm_srai_epi16(rxdataF_comp128_0[i],1),_mm_srai_epi16(rxdataF_comp128_1[i],1));
-#elif defined(__arm__)
-        rxdataF_comp128_0[i] = vhaddq_s16(rxdataF_comp128_0[i],rxdataF_comp128_1[i]);
-
-#endif
-      }
-    }
-  }
-#if defined(__x86_64__) || defined(__i386__)
-  _mm_empty();
-  _m_empty();
-#endif
-}
-
-void pbch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
-                     uint8_t *pbch_e,
-                     uint32_t length)
-{
-  int i;
-  uint8_t reset;
-  uint32_t x1, x2, s=0;
-
-  reset = 1;
-  // x1 is set in lte_gold_generic
-  x2 = frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.6.1
-  //  msg("pbch_scrambling: Nid_cell = %d\n",x2);
-
-  for (i=0; i<length; i++) {
-    if ((i&0x1f)==0) {
-      s = lte_gold_generic(&x1, &x2, reset);
-      //      printf("lte_gold[%d]=%x\n",i,s);
-      reset = 0;
-    }
-
-    pbch_e[i] = (pbch_e[i]&1) ^ ((s>>(i&0x1f))&1);
-
-  }
-}
-
-void pbch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
-                       int8_t* llr,
-                       uint32_t length,
-                       uint8_t frame_mod4)
-{
-  int i;
-  uint8_t reset;
-  uint32_t x1, x2, s=0;
-
-  reset = 1;
-  // x1 is set in first call to lte_gold_generic
-  x2 = frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.6.1
-  //  msg("pbch_unscrambling: Nid_cell = %d\n",x2);
-
-  for (i=0; i<length; i++) {
-    if (i%32==0) {
-      s = lte_gold_generic(&x1, &x2, reset);
-      //      printf("lte_gold[%d]=%x\n",i,s);
-      reset = 0;
-    }
-
-    // take the quarter of the PBCH that corresponds to this frame
-    if ((i>=(frame_mod4*(length>>2))) && (i<((1+frame_mod4)*(length>>2)))) {
-
-      if (((s>>(i%32))&1)==0)
-        llr[i] = -llr[i];
-    }
-  }
-}
-
-void pbch_alamouti(LTE_DL_FRAME_PARMS *frame_parms,
-                   int **rxdataF_comp,
-                   uint8_t symbol)
-{
-
-
-  int16_t *rxF0,*rxF1;
-  //  __m128i *ch_mag0,*ch_mag1,*ch_mag0b,*ch_mag1b;
-  uint8_t rb,re,symbol_mod;
-  int jj;
-
-  //  printf("Doing alamouti\n");
-  symbol_mod = (symbol>=(7-frame_parms->Ncp)) ? symbol-(7-frame_parms->Ncp) : symbol;
-  jj         = (symbol_mod*6*12);
-
-  rxF0     = (int16_t*)&rxdataF_comp[0][jj];  //tx antenna 0  h0*y
-  rxF1     = (int16_t*)&rxdataF_comp[2][jj];  //tx antenna 1  h1*y
-
-  for (rb=0; rb<6; rb++) {
-
-    for (re=0; re<12; re+=2) {
-
-      // Alamouti RX combining
-
-      rxF0[0] = rxF0[0] + rxF1[2];
-      rxF0[1] = rxF0[1] - rxF1[3];
-
-      rxF0[2] = rxF0[2] - rxF1[0];
-      rxF0[3] = rxF0[3] + rxF1[1];
-
-      rxF0+=4;
-      rxF1+=4;
-    }
-
-  }
-
-}
-
-void pbch_quantize(int8_t *pbch_llr8,
-                   int16_t *pbch_llr,
-                   uint16_t len)
-{
-
-  uint16_t i;
-
-  for (i=0; i<len; i++) {
-    if (pbch_llr[i]>7)
-      pbch_llr8[i]=7;
-    else if (pbch_llr[i]<-8)
-      pbch_llr8[i]=-8;
-    else
-      pbch_llr8[i] = (char)(pbch_llr[i]);
-
-  }
-}
-
-static unsigned char dummy_w_rx[3*3*(16+PBCH_A)];
-static int8_t pbch_w_rx[3*3*(16+PBCH_A)],pbch_d_rx[96+(3*(16+PBCH_A))];
-
-
-uint16_t rx_pbch(LTE_UE_COMMON *lte_ue_common_vars,
-                 LTE_UE_PBCH *lte_ue_pbch_vars,
-                 LTE_DL_FRAME_PARMS *frame_parms,
-                 uint8_t eNB_id,
-                 MIMO_mode_t mimo_mode,
-                 uint32_t high_speed_flag,
-                 uint8_t frame_mod4)
-{
-
-  uint8_t log2_maxh;//,aatx,aarx;
-  int max_h=0;
-
-  int symbol,i;
-  uint32_t nsymb = (frame_parms->Ncp==0) ? 14:12;
-  uint16_t  pbch_E;
-  uint8_t pbch_a[8];
-  uint8_t RCC;
-
-  int8_t *pbch_e_rx;
-  uint8_t *decoded_output = lte_ue_pbch_vars->decoded_output;
-  uint16_t crc;
-
-
-  //  pbch_D    = 16+PBCH_A;
-
-  pbch_E  = (frame_parms->Ncp==0) ? 1920 : 1728; //RE/RB * #RB * bits/RB (QPSK)
-  pbch_e_rx = &lte_ue_pbch_vars->llr[frame_mod4*(pbch_E>>2)];
-#ifdef DEBUG_PBCH
-  LOG_D(PHY,"[PBCH] starting symbol loop (Ncp %d, frame_mod4 %d,mimo_mode %d\n",frame_parms->Ncp,frame_mod4,mimo_mode);
-#endif
-
-  // clear LLR buffer
-  memset(lte_ue_pbch_vars->llr,0,pbch_E);
-
-  for (symbol=(nsymb>>1); symbol<(nsymb>>1)+4; symbol++) {
-
-#ifdef DEBUG_PBCH
-    LOG_D(PHY,"[PBCH] starting extract\n");
-#endif
-    pbch_extract(lte_ue_common_vars->common_vars_rx_data_per_thread[0].rxdataF,
-                 lte_ue_common_vars->common_vars_rx_data_per_thread[0].dl_ch_estimates[eNB_id],
-                 lte_ue_pbch_vars->rxdataF_ext,
-                 lte_ue_pbch_vars->dl_ch_estimates_ext,
-                 symbol,
-                 high_speed_flag,
-                 frame_parms);
-#ifdef DEBUG_PBCH
-    LOG_D(PHY,"[PHY] PBCH Symbol %d\n",symbol);
-    LOG_D(PHY,"[PHY] PBCH starting channel_level\n");
-#endif
-
-    max_h = pbch_channel_level(lte_ue_pbch_vars->dl_ch_estimates_ext,
-                               frame_parms,
-                               symbol);
-    log2_maxh = 3+(log2_approx(max_h)/2);
-
-#ifdef DEBUG_PBCH
-    LOG_D(PHY,"[PHY] PBCH log2_maxh = %d (%d)\n",log2_maxh,max_h);
-#endif
-
-    pbch_channel_compensation(lte_ue_pbch_vars->rxdataF_ext,
-                              lte_ue_pbch_vars->dl_ch_estimates_ext,
-                              lte_ue_pbch_vars->rxdataF_comp,
-                              frame_parms,
-                              symbol,
-                              log2_maxh); // log2_maxh+I0_shift
-
-    if (frame_parms->nb_antennas_rx > 1)
-      pbch_detection_mrc(frame_parms,
-                         lte_ue_pbch_vars->rxdataF_comp,
-                         symbol);
-
-
-    if (mimo_mode == ALAMOUTI) {
-      pbch_alamouti(frame_parms,lte_ue_pbch_vars->rxdataF_comp,symbol);
-    } else if (mimo_mode != SISO) {
-      LOG_D(PHY,"[PBCH][RX] Unsupported MIMO mode\n");
-      return(-1);
-    }
-
-    if (symbol>(nsymb>>1)+1) {
-      pbch_quantize(pbch_e_rx,
-                    (short*)&(lte_ue_pbch_vars->rxdataF_comp[0][(symbol%(nsymb>>1))*72]),
-                    144);
-
-      pbch_e_rx+=144;
-    } else {
-      pbch_quantize(pbch_e_rx,
-                    (short*)&(lte_ue_pbch_vars->rxdataF_comp[0][(symbol%(nsymb>>1))*72]),
-                    96);
-
-      pbch_e_rx+=96;
-    }
-
-
-  }
-
-  pbch_e_rx = lte_ue_pbch_vars->llr;
-
-
-
-  //un-scrambling
-#ifdef DEBUG_PBCH
-  LOG_D(PHY,"[PBCH] doing unscrambling\n");
-#endif
-
-
-  pbch_unscrambling(frame_parms,
-                    pbch_e_rx,
-                    pbch_E,
-                    frame_mod4);
-
-
-
-  //un-rate matching
-#ifdef DEBUG_PBCH
-  LOG_D(PHY,"[PBCH] doing un-rate-matching\n");
-#endif
-
-
-  memset(dummy_w_rx,0,3*3*(16+PBCH_A));
-  RCC = generate_dummy_w_cc(16+PBCH_A,
-                            dummy_w_rx);
-
-
-  lte_rate_matching_cc_rx(RCC,pbch_E,pbch_w_rx,dummy_w_rx,pbch_e_rx);
-
-  sub_block_deinterleaving_cc((unsigned int)(PBCH_A+16),
-                              &pbch_d_rx[96],
-                              &pbch_w_rx[0]);
-
-  memset(pbch_a,0,((16+PBCH_A)>>3));
-
-
-
-
-  phy_viterbi_lte_sse2(pbch_d_rx+96,pbch_a,16+PBCH_A);
-
-  // Fix byte endian of PBCH (bit 23 goes in first)
-  for (i=0; i<(PBCH_A>>3); i++)
-    decoded_output[(PBCH_A>>3)-i-1] = pbch_a[i];
-
-#ifdef DEBUG_PBCH
-
-  for (i=0; i<(PBCH_A>>3); i++)
-    LOG_I(PHY,"[PBCH] pbch_a[%d] = %x\n",i,decoded_output[i]);
-
-#endif //DEBUG_PBCH
-
-#ifdef DEBUG_PBCH
-  LOG_I(PHY,"PBCH CRC %x : %x\n",
-      crc16(pbch_a,PBCH_A),
-      ((uint16_t)pbch_a[PBCH_A>>3]<<8)+pbch_a[(PBCH_A>>3)+1]);
-#endif
-
-  crc = (crc16(pbch_a,PBCH_A)>>16) ^
-        (((uint16_t)pbch_a[PBCH_A>>3]<<8)+pbch_a[(PBCH_A>>3)+1]);
-
-  if (crc == 0x0000)
-    return(1);
-  else if (crc == 0xffff)
-    return(2);
-  else if (crc == 0x5555)
-    return(4);
-  else
-    return(-1);
-
-
-}
@@ -29,48 +29,13 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
+#include "PHY/impl_defs_top.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 //#define DEBUG_PCFICH
+extern uint8_t pcfich_b[4][32];

-void generate_pcfich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms)
-{
-
-  uint16_t kbar = 6 * (frame_parms->Nid_cell %(2*frame_parms->N_RB_DL));
-  uint16_t first_reg;
-  uint16_t *pcfich_reg = frame_parms->pcfich_reg;
-
-  pcfich_reg[0] = kbar/6;
-  first_reg = pcfich_reg[0];
-
-  frame_parms->pcfich_first_reg_idx=0;
-
-  pcfich_reg[1] = ((kbar + (frame_parms->N_RB_DL>>1)*6)%(frame_parms->N_RB_DL*12))/6;
-
-  if (pcfich_reg[1] < pcfich_reg[0]) {
-    frame_parms->pcfich_first_reg_idx = 1;
-    first_reg = pcfich_reg[1];
-  }
-
-  pcfich_reg[2] = ((kbar + (frame_parms->N_RB_DL)*6)%(frame_parms->N_RB_DL*12))/6;
-
-  if (pcfich_reg[2] < first_reg) {
-    frame_parms->pcfich_first_reg_idx = 2;
-    first_reg = pcfich_reg[2];
-  }
-
-  pcfich_reg[3] = ((kbar + ((3*frame_parms->N_RB_DL)>>1)*6)%(frame_parms->N_RB_DL*12))/6;
-
-  if (pcfich_reg[3] < first_reg) {
-    frame_parms->pcfich_first_reg_idx = 3;
-    first_reg = pcfich_reg[3];
-  }
-
-
-  //#ifdef DEBUG_PCFICH
-  printf("pcfich_reg : %d,%d,%d,%d\n",pcfich_reg[0],pcfich_reg[1],pcfich_reg[2],pcfich_reg[3]);
-  //#endif
-}

 void pcfich_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
                       uint8_t subframe,
@@ -96,37 +61,7 @@ void pcfich_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
  }
 }

-void pcfich_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
-                         uint8_t subframe,
-                         int16_t *d)
-{

-  uint32_t i;
-  uint8_t reset;
-  uint32_t x1, x2, s=0;
-
-  reset = 1;
-  // x1 is set in lte_gold_generic
-  x2 = ((((2*frame_parms->Nid_cell)+1)*(1+subframe))<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.7.1
-
-  for (i=0; i<32; i++) {
-    if ((i&0x1f)==0) {
-      s = lte_gold_generic(&x1, &x2, reset);
-      //printf("lte_gold[%d]=%x\n",i,s);
-      reset = 0;
-    }
-
-    if (((s>>(i&0x1f))&1) == 1)
-      d[i]=-d[i];
-
-  }
-}
-
-uint8_t pcfich_b[4][32]= {{0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1},
-  {1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0},
-  {1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1,0,1,1},
-  {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
-};

 void generate_pcfich(uint8_t num_pdcch_symbols,
                     int16_t amp,
@@ -215,98 +150,3 @@ void generate_pcfich(uint8_t num_pdcch_symbols,
 }


-uint8_t rx_pcfich(LTE_DL_FRAME_PARMS *frame_parms,
-                  uint8_t subframe,
-                  LTE_UE_PDCCH *lte_ue_pdcch_vars,
-                  MIMO_mode_t mimo_mode)
-{
-
-  uint8_t pcfich_quad;
-  uint8_t i,j;
-  uint16_t reg_offset;
-
-  int32_t **rxdataF_comp = lte_ue_pdcch_vars->rxdataF_comp;
-  int16_t pcfich_d[32],*pcfich_d_ptr;
-  int32_t metric,old_metric=-16384;
-  uint8_t num_pdcch_symbols=3;
-  uint16_t *pcfich_reg = frame_parms->pcfich_reg;
-
-  // demapping
-  // loop over 4 quadruplets and lookup REGs
-  //  m=0;
-  pcfich_d_ptr = pcfich_d;
-
-  for (pcfich_quad=0; pcfich_quad<4; pcfich_quad++) {
-    reg_offset = (pcfich_reg[pcfich_quad]*4);
-
-    for (i=0; i<4; i++) {
-
-      pcfich_d_ptr[0] = ((int16_t*)&rxdataF_comp[0][reg_offset+i])[0]; // RE component
-      pcfich_d_ptr[1] = ((int16_t*)&rxdataF_comp[0][reg_offset+i])[1]; // IM component
-#ifdef DEBUG_PCFICH      
-      printf("rx_pcfich: quad %d, i %d, offset %d =>  (%d,%d) => pcfich_d_ptr[0] %d \n",pcfich_quad,i,reg_offset+i,
-             ((int16_t*)&rxdataF_comp[0][reg_offset+i])[0],
-             ((int16_t*)&rxdataF_comp[0][reg_offset+i])[1],
-             pcfich_d_ptr[0]);
-#endif
-      pcfich_d_ptr+=2;
-    }
-
-    /*
-    }
-    else { // ALAMOUTI
-    for (i=0;i<4;i+=2) {
-    pcfich_d_ptr[0] = 0;
-    pcfich_d_ptr[1] = 0;
-    pcfich_d_ptr[2] = 0;
-    pcfich_d_ptr[3] = 0;
-    for (j=0;j<frame_parms->nb_antennas_rx;j++) {
-
-    pcfich_d_ptr[0] += (((int16_t*)&rxdataF_comp[j][reg_offset+i])[0]+
-         ((int16_t*)&rxdataF_comp[j+2][reg_offset+i+1])[0]); // RE component
-    pcfich_d_ptr[1] += (((int16_t*)&rxdataF_comp[j][reg_offset+i])[1] -
-         ((int16_t*)&rxdataF_comp[j+2][reg_offset+i+1])[1]);// IM component
-
-    pcfich_d_ptr[2] += (((int16_t*)&rxdataF_comp[j][reg_offset+i+1])[0]-
-         ((int16_t*)&rxdataF_comp[j+2][reg_offset+i])[0]); // RE component
-    pcfich_d_ptr[3] += (((int16_t*)&rxdataF_comp[j][reg_offset+i+1])[1] +
-         ((int16_t*)&rxdataF_comp[j+2][reg_offset+i])[1]);// IM component
-
-
-    }
-
-    pcfich_d_ptr+=4;
-
-    }
-    */
-  }
-
-  // pcfhich unscrambling
-
-  pcfich_unscrambling(frame_parms,subframe,pcfich_d);
-
-  // pcfich detection
-
-  for (i=0; i<3; i++) {
-    metric = 0;
-
-    for (j=0; j<32; j++) {
-      //      printf("pcfich_b[%d][%d] %d => pcfich_d[%d] %d\n",i,j,pcfich_b[i][j],j,pcfich_d[j]);
-      metric += (int32_t)(((pcfich_b[i][j]==0) ? (pcfich_d[j]) : (-pcfich_d[j])));
-    }
-
-#ifdef DEBUG_PCFICH
-    printf("metric %d : %d\n",i,metric);
-#endif
-
-    if (metric > old_metric) {
-      num_pdcch_symbols = 1+i;
-      old_metric = metric;
-    }
-  }
-
-#ifdef DEBUG_PCFICH
-  printf("[PHY] PCFICH detected for %d PDCCH symbols\n",num_pdcch_symbols);
-#endif
-  return(num_pdcch_symbols);
-}
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/pcfich.c
+* \brief Top-level routines for generating and decoding  the PCFICH/CFI physical/transport channel V8.6 2009-03
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+#include "PHY/impl_defs_top.h"
+#include "PHY/defs_eNB.h"
+
+void generate_pcfich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms)
+{
+
+  uint16_t kbar = 6 * (frame_parms->Nid_cell %(2*frame_parms->N_RB_DL));
+  uint16_t first_reg;
+  uint16_t *pcfich_reg = frame_parms->pcfich_reg;
+
+  pcfich_reg[0] = kbar/6;
+  first_reg = pcfich_reg[0];
+
+  frame_parms->pcfich_first_reg_idx=0;
+
+  pcfich_reg[1] = ((kbar + (frame_parms->N_RB_DL>>1)*6)%(frame_parms->N_RB_DL*12))/6;
+
+  if (pcfich_reg[1] < pcfich_reg[0]) {
+    frame_parms->pcfich_first_reg_idx = 1;
+    first_reg = pcfich_reg[1];
+  }
+
+  pcfich_reg[2] = ((kbar + (frame_parms->N_RB_DL)*6)%(frame_parms->N_RB_DL*12))/6;
+
+  if (pcfich_reg[2] < first_reg) {
+    frame_parms->pcfich_first_reg_idx = 2;
+    first_reg = pcfich_reg[2];
+  }
+
+  pcfich_reg[3] = ((kbar + ((3*frame_parms->N_RB_DL)>>1)*6)%(frame_parms->N_RB_DL*12))/6;
+
+  if (pcfich_reg[3] < first_reg) {
+    frame_parms->pcfich_first_reg_idx = 3;
+    first_reg = pcfich_reg[3];
+  }
+
+
+  //#ifdef DEBUG_PCFICH
+  printf("pcfich_reg : %d,%d,%d,%d\n",pcfich_reg[0],pcfich_reg[1],pcfich_reg[2],pcfich_reg[3]);
+  //#endif
+}
@@ -1,3 +1,4 @@
+
 /*
 * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +21,7 @@
 */

 /*! \file PHY/LTE_TRANSPORT/phich.c
-* \brief Top-level routines for generating and decoding  the PHICH/HI physical/transport channel V8.6 2009-03
+* \brief Top-level routines for generating the PHICH/HI physical/transport channel V8.6 2009-03
 * \author R. Knopp
 * \date 2011
 * \version 0.1
@@ -30,15 +31,11 @@
 * \warning
 */

-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "SCHED/defs.h"
-#include "defs.h"
-
-#include "LAYER2/MAC/extern.h"
-#include "LAYER2/MAC/defs.h"
-
+#include "PHY/defs_eNB.h"
+#include "PHY/impl_defs_top.h"
 #include "T.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "transport_common_proto.h"

 //#define DEBUG_PHICH 1

@@ -48,365 +45,6 @@
 //unsigned short phich_reg[MAX_NUM_PHICH_GROUPS][3];


-uint8_t rv_table[4] = {0, 2, 3, 1};
-
-uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
-{
-
-  // for FDD
-  if (frame_parms->frame_type == FDD)
-    return 1;
-
-  // for TDD
-  switch (frame_parms->tdd_config) {
-
-  case 0:
-    if ((subframe==0) || (subframe==5))
-      return(2);
-    else return(1);
-
-    break;
-
-  case 1:
-    if ((subframe==0) || (subframe==5))
-      return(0);
-    else return(1);
-
-    break;
-
-  case 2:
-    if ((subframe==3) || (subframe==8))
-      return(1);
-    else return(0);
-
-    break;
-
-  case 3:
-    if ((subframe==0) || (subframe==8) || (subframe==9))
-      return(1);
-    else return(0);
-
-    break;
-
-  case 4:
-    if ((subframe==8) || (subframe==9))
-      return(1);
-    else return(0);
-
-    break;
-
-  case 5:
-    if (subframe==8)
-      return(1);
-    else return(0);
-
-    break;
-
-  case 6:
-    return(1);
-    break;
-
-  default:
-    return(0);
-  }
-}
-
-unsigned char subframe2_ul_harq(LTE_DL_FRAME_PARMS *frame_parms,unsigned char subframe)
-{
-
-  if (frame_parms->frame_type == FDD)
-    return(subframe&7);
-
-  switch (frame_parms->tdd_config) {
-  case 3:
-    if ( (subframe == 8) || (subframe == 9) ) {
-      return(subframe-8);
-    } else if (subframe==0)
-      return(2);
-    else {
-      LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      return(0);
-    }
-
-    break;
-
-  case 4:
-     if ( (subframe == 8) || (subframe == 9) ) {
-       return(subframe-8);
-     } else {
-       LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-             subframe,frame_parms->tdd_config);
-       return(0);
-     }
-
-     break;
-
-  }
-
-  return(0);
-}
-
-int phich_frame2_pusch_frame(LTE_DL_FRAME_PARMS *frame_parms, int frame, int subframe)
-{
-  int pusch_frame;
-
-  if (frame_parms->frame_type == FDD) {
-    pusch_frame = subframe<4 ? frame + 1024 - 1 : frame;
-  } else {
-    // Note this is not true, but it doesn't matter, the frame number is irrelevant for TDD!
-    pusch_frame = (frame);
-  }
-
-  //LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, subframe, pusch_frame);
-  return pusch_frame % 1024;
-}
-
-uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
-{
-  uint8_t pusch_subframe = 255;
-
-  if (frame_parms->frame_type == FDD)
-    return subframe < 4 ? subframe + 6 : subframe - 4;
-
-  switch (frame_parms->tdd_config) {
-  case 0:
-    if (subframe == 0)
-      pusch_subframe = (3);
-    else if (subframe == 5) {
-      pusch_subframe = (8);
-    } else if (subframe == 6)
-      pusch_subframe = (2);
-    else if (subframe == 1)
-      pusch_subframe = (7);
-    else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-		  subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 1:
-    if (subframe == 6)
-      pusch_subframe = (2);
-    else if (subframe == 9)
-      pusch_subframe = (3);
-    else if (subframe == 1)
-      pusch_subframe = (7);
-    else if (subframe == 4)
-      pusch_subframe = (8);
-    else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 2:
-    if (subframe == 8)
-      pusch_subframe = (2);
-    else if (subframe == 3)
-      pusch_subframe = (7);
-    else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 3:
-    if ( (subframe == 8) || (subframe == 9) ) {
-      pusch_subframe = (subframe-6);
-    } else if (subframe==0)
-      pusch_subframe = (4);
-    else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 4:
-    if ( (subframe == 8) || (subframe == 9) ) {
-      pusch_subframe = (subframe-6);
-    } else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 5:
-    if (subframe == 8) {
-      pusch_subframe = (2);
-    } else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  case 6:
-    if (subframe == 6) {
-      pusch_subframe = (2);
-    } else if (subframe == 9) {
-      pusch_subframe = (3);
-    } else if (subframe == 0) {
-      pusch_subframe = (4);
-    } else if (subframe == 1) {
-      pusch_subframe = (7);
-    } else if (subframe == 5) {
-      pusch_subframe = (8);
-    } else {
-      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      pusch_subframe = (0);
-    }
-
-    break;
-
-  default:
-    AssertFatal(1==0, "no implementation for TDD UL/DL-config = %d!\n", frame_parms->tdd_config);
-    pusch_subframe = (0);
-  }
-
-  LOG_D(PHY, "subframe  %d: PUSCH subframe = %d\n", subframe, pusch_subframe);
-  return pusch_subframe;
-}
-
-int check_pcfich(LTE_DL_FRAME_PARMS *frame_parms,uint16_t reg)
-{
-
-  if ((reg == frame_parms->pcfich_reg[0]) ||
-      (reg == frame_parms->pcfich_reg[1]) ||
-      (reg == frame_parms->pcfich_reg[2]) ||
-      (reg == frame_parms->pcfich_reg[3]))
-    return(1);
-
-  return(0);
-}
-
-void generate_phich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms)
-{
-
-  unsigned short n0 = (frame_parms->N_RB_DL * 2) - 4;  // 2 REG per RB less the 4 used by PCFICH in first symbol
-  unsigned short n1 = (frame_parms->N_RB_DL * 3);      // 3 REG per RB in second and third symbol
-  unsigned short n2 = n1;
-  unsigned short mprime = 0;
-  unsigned short Ngroup_PHICH;
-  //  uint16_t *phich_reg = frame_parms->phich_reg;
-  uint16_t *pcfich_reg = frame_parms->pcfich_reg;
-
-  // compute Ngroup_PHICH (see formula at beginning of Section 6.9 in 36-211
-  Ngroup_PHICH = (frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)/48;
-
-
-  if (((frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)%48) > 0)
-    Ngroup_PHICH++;
-
-  // check if Extended prefix
-  if (frame_parms->Ncp == 1) {
-    Ngroup_PHICH<<=1;
-  }
-
-#ifdef DEBUG_PHICH
-  LOG_D(PHY,"Ngroup_PHICH %d (phich_config_common.phich_resource %d,phich_config_common.phich_duration %s, NidCell %d,Ncp %d, frame_type %d), smallest pcfich REG %d, n0 %d, n1 %d (first PHICH REG %d)\n",
-    ((frame_parms->Ncp == NORMAL)?Ngroup_PHICH:(Ngroup_PHICH>>1)),
-    frame_parms->phich_config_common.phich_resource,
-    frame_parms->phich_config_common.phich_duration==normal?"normal":"extended",
-    frame_parms->Nid_cell,frame_parms->Ncp,frame_parms->frame_type,
-    pcfich_reg[frame_parms->pcfich_first_reg_idx],
-    n0,
-    n1,
-    ((frame_parms->Nid_cell))%n0);
-#endif
-
-  // This is the algorithm from Section 6.9.3 in 36-211, it works only for normal PHICH duration for now ...
-
-  for (mprime=0; 
-       mprime<((frame_parms->Ncp == NORMAL)?Ngroup_PHICH:(Ngroup_PHICH>>1)); 
-       mprime++) {
-
-    if (frame_parms->phich_config_common.phich_duration==normal) { // normal PHICH duration
-
-      frame_parms->phich_reg[mprime][0] = (frame_parms->Nid_cell + mprime)%n0;
-
-      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
-        frame_parms->phich_reg[mprime][0]++;
-
-      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
-        frame_parms->phich_reg[mprime][0]++;
-
-      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
-        frame_parms->phich_reg[mprime][0]++;
-
-      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
-        frame_parms->phich_reg[mprime][0]++;
-
-      frame_parms->phich_reg[mprime][1] = (frame_parms->Nid_cell + mprime + (n0/3))%n0;
-
-      
-      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
-        frame_parms->phich_reg[mprime][1]++;
-      
-      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
-        frame_parms->phich_reg[mprime][1]++;
-
-      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
-        frame_parms->phich_reg[mprime][1]++;
-
-      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
-        frame_parms->phich_reg[mprime][1]++;
-      
-
-      frame_parms->phich_reg[mprime][2] = (frame_parms->Nid_cell + mprime + (2*n0/3))%n0;
-      
-      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
-        frame_parms->phich_reg[mprime][2]++;
-
-      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
-        frame_parms->phich_reg[mprime][2]++;
-
-      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
-        frame_parms->phich_reg[mprime][2]++;
-
-      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
-        frame_parms->phich_reg[mprime][2]++;
-      
-#ifdef DEBUG_PHICH
-      printf("phich_reg :%d => %d,%d,%d\n",mprime,frame_parms->phich_reg[mprime][0],frame_parms->phich_reg[mprime][1],frame_parms->phich_reg[mprime][2]);
-#endif
-    } else { // extended PHICH duration
-      frame_parms->phich_reg[mprime<<1][0] = (frame_parms->Nid_cell + mprime)%n0;
-      frame_parms->phich_reg[1+(mprime<<1)][0] = (frame_parms->Nid_cell + mprime)%n0;
-
-      frame_parms->phich_reg[mprime<<1][1] = ((frame_parms->Nid_cell*n1/n0) + mprime + (n1/3))%n1;
-      frame_parms->phich_reg[mprime<<1][2] = ((frame_parms->Nid_cell*n2/n0) + mprime + (2*n2/3))%n2;
-
-      frame_parms->phich_reg[1+(mprime<<1)][1] = ((frame_parms->Nid_cell*n1/n0) + mprime + (n1/3))%n1;
-      frame_parms->phich_reg[1+(mprime<<1)][2] = ((frame_parms->Nid_cell*n2/n0) + mprime + (2*n2/3))%n2;
-      //#ifdef DEBUG_PHICH
-      printf("phich_reg :%d => %d,%d,%d\n",mprime<<1,frame_parms->phich_reg[mprime<<1][0],frame_parms->phich_reg[mprime][1],frame_parms->phich_reg[mprime][2]);
-      printf("phich_reg :%d => %d,%d,%d\n",1+(mprime<<1),frame_parms->phich_reg[1+(mprime<<1)][0],frame_parms->phich_reg[1+(mprime<<1)][1],frame_parms->phich_reg[1+(mprime<<1)][2]);
-      //#endif
-    }
-  } // mprime loop
-}  // num_pdcch_symbols loop
-
-
-void generate_phich_emul(LTE_DL_FRAME_PARMS *frame_parms,
-                         uint8_t HI,
-                         uint8_t subframe)
-{
-
-
-}

 int32_t alam_bpsk_perm1[4] = {2,1,4,3}; // -conj(x) 1 (-1-j) -> 2 (1-j), 2->1, 3 (-1+j) -> (4) 1+j, 4->3
 int32_t alam_bpsk_perm2[4] = {3,4,2,1}; // conj(x) 1 (-1-j) -> 3 (-1+j), 3->1, 2 (1-j) -> 4 (1+j), 4->2
@@ -1065,436 +703,6 @@ void generate_phich(LTE_DL_FRAME_PARMS *frame_parms,
  } // normal/extended prefix
 }

-// This routine demodulates the PHICH and updates PUSCH/ULSCH parameters
-
-void rx_phich(PHY_VARS_UE *ue,
-	      UE_rxtx_proc_t *proc,
-              uint8_t subframe,
-              uint8_t eNB_id)
-{
-
-
-  LTE_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
-  LTE_UE_PDCCH **pdcch_vars = &ue->pdcch_vars[ue->current_thread_id[subframe]][eNB_id];
-
-  //  uint8_t HI;
-  uint8_t harq_pid = phich_subframe_to_harq_pid(frame_parms,proc->frame_rx,subframe);
-  LTE_UE_ULSCH_t *ulsch = ue->ulsch[eNB_id];
-  int16_t phich_d[24],*phich_d_ptr,HI16;
-  //  unsigned int i,aa;
-  int8_t d[24],*dp;
-  uint16_t reg_offset;
-
-  // scrambling
-  uint32_t x1, x2, s=0;
-  uint8_t reset = 1;
-  int16_t cs[12];
-  uint32_t i,i2,i3,phich_quad;
-  int32_t **rxdataF_comp = pdcch_vars[eNB_id]->rxdataF_comp;
-  uint8_t Ngroup_PHICH,ngroup_PHICH,nseq_PHICH;
-  uint8_t NSF_PHICH = 4;
-  uint8_t pusch_subframe;
-
-  int8_t delta_PUSCH_acc[4] = {-1,0,1,3};
-
-  // check if we're expecting a PHICH in this subframe
-  LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH RX\n",ue->Mod_id,harq_pid,proc->frame_rx,subframe);
-
-  if (!ulsch)
-    return;
-
-  LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH RX Status: %d \n",ue->Mod_id,harq_pid,proc->frame_rx,subframe, ulsch->harq_processes[harq_pid]->status);
-
-  if (ulsch->harq_processes[harq_pid]->status == ACTIVE) {
-     LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH RX ACTIVE\n",ue->Mod_id,harq_pid,proc->frame_rx,subframe);
-    Ngroup_PHICH = (frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)/48;
-
-    if (((frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)%48) > 0)
-      Ngroup_PHICH++;
-
-    if (frame_parms->Ncp == 1)
-      NSF_PHICH = 2;
-
-
-    ngroup_PHICH = (ulsch->harq_processes[harq_pid]->first_rb +
-                    ulsch->harq_processes[harq_pid]->n_DMRS)%Ngroup_PHICH;
-
-    if ((frame_parms->tdd_config == 0) && (frame_parms->frame_type == TDD) ) {
-      pusch_subframe = phich_subframe2_pusch_subframe(frame_parms,subframe);
-
-      if ((pusch_subframe == 4) || (pusch_subframe == 9))
-        ngroup_PHICH += Ngroup_PHICH;
-    }
-
-    nseq_PHICH = ((ulsch->harq_processes[harq_pid]->first_rb/Ngroup_PHICH) +
-                  ulsch->harq_processes[harq_pid]->n_DMRS)%(2*NSF_PHICH);
-  } else {
-    LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH RX %s\n",
-        ue->Mod_id,
-        harq_pid,
-        proc->frame_rx,
-        subframe,
-        (ulsch->harq_processes[harq_pid]->status==SCH_IDLE?   "SCH_IDLE"  :
-        (ulsch->harq_processes[harq_pid]->status==ACTIVE?     "ACTIVE"    :
-        (ulsch->harq_processes[harq_pid]->status==CBA_ACTIVE? "CBA_ACTIVE":
-        (ulsch->harq_processes[harq_pid]->status==DISABLED?   "DISABLED"  : "UNKNOWN")))));
-
-    return;
-  }
-
-  memset(d,0,24*sizeof(int8_t));
-  phich_d_ptr = phich_d;
-
-  // x1 is set in lte_gold_generic
-  x2 = (((subframe+1)*((frame_parms->Nid_cell<<1)+1))<<9) + frame_parms->Nid_cell;
-
-  s = lte_gold_generic(&x1, &x2, reset);
-
-  // compute scrambling sequence
-  for (i=0; i<12; i++) {
-    cs[i] = 1-(((s>>(i&0x1f))&1)<<1);
-  }
-
-  if (frame_parms->Ncp == 0) { // Normal Cyclic Prefix
-
-
-    // 12 output symbols (Msymb)
-
-    for (i=0,i2=0,i3=0; i<3; i++,i2+=4,i3+=8) {
-      switch (nseq_PHICH) {
-      case 0: // +1 +1 +1 +1
-        d[i3]   = cs[i2];
-        d[1+i3] = cs[i2];
-        d[2+i3] = cs[1+i2];
-        d[3+i3] = cs[1+i2];
-        d[4+i3] = cs[2+i2];
-        d[5+i3] = cs[2+i2];
-        d[6+i3] = cs[3+i2];
-        d[7+i3] = cs[3+i2];
-        break;
-
-      case 1: // +1 -1 +1 -1
-        d[i3] = cs[i2];
-        d[1+i3] = cs[i2];
-        d[2+i3] = -cs[1+i2];
-        d[3+i3] = -cs[1+i2];
-        d[4+i3] = cs[2+i2];
-        d[5+i3] = cs[2+i2];
-        d[6+i3] = -cs[3+i2];
-        d[7+i3] = -cs[3+i2];
-        break;
-
-      case 2: // +1 +1 -1 -1
-        d[i3]   = cs[i2];
-        d[1+i3]   = cs[i2];
-        d[2+i3] = cs[1+i2];
-        d[3+i3] = cs[1+i2];
-        d[4+i3] = -cs[2+i2];
-        d[5+i3] = -cs[2+i2];
-        d[6+i3] = -cs[3+i2];
-        d[7+i3] = -cs[3+i2];
-        break;
-
-      case 3: // +1 -1 -1 +1
-        d[i3]   = cs[i2];
-        d[1+i3]   = cs[i2];
-        d[2+i3] = -cs[1+i2];
-        d[3+i3] = -cs[1+i2];
-        d[4+i3] = -cs[2+i2];
-        d[5+i3] = -cs[2+i2];
-        d[6+i3] = cs[3+i2];
-        d[7+i3] = cs[3+i2];
-        break;
-
-      case 4: // +j +j +j +j
-        d[i3]   = -cs[i2];
-        d[1+i3] = cs[i2];
-        d[2+i3] = -cs[1+i2];
-        d[3+i3] = cs[1+i2];
-        d[4+i3] = -cs[2+i2];
-        d[5+i3] = cs[2+i2];
-        d[6+i3] = -cs[3+i2];
-        d[7+i3] = cs[3+i2];
-        break;
-
-      case 5: // +j -j +j -j
-        d[1+i3] = cs[i2];
-        d[3+i3] = -cs[1+i2];
-        d[5+i3] = cs[2+i2];
-        d[7+i3] = -cs[3+i2];
-        d[i3]   = -cs[i2];
-        d[2+i3] = cs[1+i2];
-        d[4+i3] = -cs[2+i2];
-        d[6+i3] = cs[3+i2];
-        break;
-
-      case 6: // +j +j -j -j
-        d[1+i3] = cs[i2];
-        d[3+i3] = cs[1+i2];
-        d[5+i3] = -cs[2+i2];
-        d[7+i3] = -cs[3+i2];
-        d[i3]   = -cs[i2];
-        d[2+i3] = -cs[1+i2];
-        d[4+i3] = cs[2+i2];
-        d[6+i3] = cs[3+i2];
-        break;
-
-      case 7: // +j -j -j +j
-        d[1+i3] = cs[i2];
-        d[3+i3] = -cs[1+i2];
-        d[5+i3] = -cs[2+i2];
-        d[7+i3] = cs[3+i2];
-        d[i3]   = -cs[i2];
-        d[2+i3] = cs[1+i2];
-        d[4+i3] = cs[2+i2];
-        d[6+i3] = -cs[3+i2];
-        break;
-
-      default:
-        AssertFatal(1==0,"phich_coding.c: Illegal PHICH Number\n");
-      } // nseq_PHICH
-    }
-
-#ifdef DEBUG_PHICH
-    LOG_D(PHY,"PHICH =>");
-
-    for (i=0; i<24; i++) {
-      LOG_D(PHY,"%2d,",d[i]);
-    }
-
-    LOG_D(PHY,"\n");
-#endif
-    // demodulation here
-
-
-  } else { // extended prefix
-
-    // 6 output symbols
-    if ((ngroup_PHICH & 1) == 1)
-      dp = &d[4];
-    else
-      dp = d;
-
-    switch (nseq_PHICH) {
-    case 0: // +1 +1
-      dp[0]  = cs[0];
-      dp[2]  = cs[1];
-      dp[8]  = cs[2];
-      dp[10] = cs[3];
-      dp[16] = cs[4];
-      dp[18] = cs[5];
-      dp[1]  = cs[0];
-      dp[3]  = cs[1];
-      dp[9]  = cs[2];
-      dp[11] = cs[3];
-      dp[17] = cs[4];
-      dp[19] = cs[5];
-      break;
-
-    case 1: // +1 -1
-      dp[0]  = cs[0];
-      dp[2]  = -cs[1];
-      dp[8]  = cs[2];
-      dp[10] = -cs[3];
-      dp[16] = cs[4];
-      dp[18] = -cs[5];
-      dp[1]  = cs[0];
-      dp[3]  = -cs[1];
-      dp[9]  = cs[2];
-      dp[11] = -cs[3];
-      dp[17] = cs[4];
-      dp[19] = -cs[5];
-      break;
-
-    case 2: // +j +j
-      dp[1]  = cs[0];
-      dp[3]  = cs[1];
-      dp[9]  = cs[2];
-      dp[11] = cs[3];
-      dp[17] = cs[4];
-      dp[19] = cs[5];
-      dp[0]  = -cs[0];
-      dp[2]  = -cs[1];
-      dp[8]  = -cs[2];
-      dp[10] = -cs[3];
-      dp[16] = -cs[4];
-      dp[18] = -cs[5];
-
-      break;
-
-    case 3: // +j -j
-      dp[1]  = cs[0];
-      dp[3]  = -cs[1];
-      dp[9]  = cs[2];
-      dp[11] = -cs[3];
-      dp[17] = cs[4];
-      dp[19] = -cs[5];
-      dp[0]  = -cs[0];
-      dp[2]  = cs[1];
-      dp[8]  = -cs[2];
-      dp[10] = cs[3];
-      dp[16] = -cs[4];
-      dp[18] = cs[5];
-      break;
-
-    default:
-      AssertFatal(1==0,"phich_coding.c: Illegal PHICH Number\n");
-    }
-  }
-
-  HI16 = 0;
-
-  //#ifdef DEBUG_PHICH
-
-  //#endif
-  /*
-  for (i=0;i<200;i++)
-    printf("re %d: %d %d\n",i,((int16_t*)&rxdataF_comp[0][i])[0],((int16_t*)&rxdataF_comp[0][i])[1]);
-  */
-  for (phich_quad=0; phich_quad<3; phich_quad++) {
-    if (frame_parms->Ncp == 1)
-      reg_offset = (frame_parms->phich_reg[ngroup_PHICH][phich_quad]*4)+ (phich_quad*frame_parms->N_RB_DL*12);
-    else
-      reg_offset = (frame_parms->phich_reg[ngroup_PHICH][phich_quad]*4);
-
-    //    msg("\n[PUSCH 0]PHICH (RX) quad %d (%d)=>",phich_quad,reg_offset);
-    dp = &d[phich_quad*8];;
-
-    for (i=0; i<8; i++) {
-      phich_d_ptr[i] = ((int16_t*)&rxdataF_comp[0][reg_offset])[i];
-
-#ifdef DEBUG_PHICH
-      LOG_D(PHY,"%d,",((int16_t*)&rxdataF_comp[0][reg_offset])[i]);
-#endif
-
-      HI16 += (phich_d_ptr[i] * dp[i]);
-    }
-  }
-
-#ifdef DEBUG_PHICH
-  LOG_D(PHY,"\n");
-  LOG_D(PHY,"HI16 %d\n",HI16);
-#endif
-
-  if (HI16>0) {   //NACK
-    if (ue->ulsch_Msg3_active[eNB_id] == 1) {
-      LOG_D(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d\n",
-            ue->Mod_id,harq_pid,
-            proc->frame_rx,
-            subframe,
-            HI16,
-            nseq_PHICH,
-            ngroup_PHICH);
-
-      ulsch->f_pusch += delta_PUSCH_acc[ulsch->harq_processes[harq_pid]->TPC];
-
-      LOG_D(PHY,"[PUSCH %d] AbsSubframe %d.%d: f_pusch (ACC) %d, adjusting by %d (TPC %d)\n",
-                 harq_pid,proc->frame_rx,subframe,ulsch->f_pusch,
-                    delta_PUSCH_acc[ulsch->harq_processes[harq_pid]->TPC],
-                    ulsch->harq_processes[harq_pid]->TPC);
-
-
-      ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
-      //      ulsch->harq_processes[harq_pid]->Ndi = 0;
-      ulsch->harq_processes[harq_pid]->round++;
-      ulsch->harq_processes[harq_pid]->rvidx = rv_table[ulsch->harq_processes[harq_pid]->round&3];
-
-      if (ulsch->harq_processes[harq_pid]->round>=ue->frame_parms.maxHARQ_Msg3Tx) {
-        ulsch->harq_processes[harq_pid]->subframe_scheduling_flag =0;
-        ulsch->harq_processes[harq_pid]->status = SCH_IDLE;
-        // inform MAC that Msg3 transmission has failed
-        ue->ulsch_Msg3_active[eNB_id] = 0;
-      }
-    } else {
-#ifdef UE_DEBUG_TRACE
-      LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received NAK (%d) nseq %d, ngroup %d round %d (Mlimit %d)\n",
-            ue->Mod_id,harq_pid,
-            proc->frame_rx%1024,
-            subframe,
-            HI16,
-            nseq_PHICH,
-            ngroup_PHICH,
-            ulsch->harq_processes[harq_pid]->round,
-            ulsch->Mlimit);
-#endif
-
-      //      ulsch->harq_processes[harq_pid]->Ndi = 0;
-      ulsch->harq_processes[harq_pid]->round++;
-      
-      if ( ulsch->harq_processes[harq_pid]->round >= (ulsch->Mlimit - 1) )
-      {
-          // this is last push re transmission
-          ulsch->harq_processes[harq_pid]->rvidx = rv_table[ulsch->harq_processes[harq_pid]->round&3];
-          ulsch->O_RI = 0;
-          ulsch->O    = 0;
-          ulsch->uci_format = HLC_subband_cqi_nopmi;
-
-          // disable phich decoding since it is the last retransmission
-          ulsch->harq_processes[harq_pid]->status = SCH_IDLE;
-
-          //ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 0;
-          //ulsch->harq_processes[harq_pid]->round  = 0;
-
-          //LOG_I(PHY,"PUSCH MAX Retransmission acheived ==> flush harq buff (%d) \n",harq_pid);
-          //LOG_I(PHY,"[HARQ-UL harqId: %d] PHICH NACK MAX RETRANS(%d) ==> subframe_scheduling_flag = %d round: %d\n", harq_pid, ulsch->Mlimit, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag, ulsch->harq_processes[harq_pid]->round);
-      }
-      else
-      {
-          // ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
-          ulsch->harq_processes[harq_pid]->rvidx = rv_table[ulsch->harq_processes[harq_pid]->round&3];
-          ulsch->O_RI = 0;
-          ulsch->O    = 0;
-          ulsch->uci_format = HLC_subband_cqi_nopmi;
-          //LOG_I(PHY,"[HARQ-UL harqId: %d] PHICH NACK ==> subframe_scheduling_flag = %d round: %d\n", harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,ulsch->harq_processes[harq_pid]->round);
-      }
-    }
-#if T_TRACER
-    T(T_UE_PHY_ULSCH_UE_NACK, T_INT(eNB_id), T_INT(proc->frame_rx%1024), T_INT(subframe), T_INT(ulsch->rnti),
-      T_INT(harq_pid));
-#endif
-
-  } else {  //ACK
-    if (ue->ulsch_Msg3_active[eNB_id] == 1) {
-      LOG_D(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
-            ue->Mod_id,harq_pid,
-            proc->frame_rx,
-            subframe,
-            HI16,
-            nseq_PHICH,ngroup_PHICH);
-    } else {
-#ifdef UE_DEBUG_TRACE
-      LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
-            ue->Mod_id,harq_pid,
-            proc->frame_rx%1024,
-            subframe, HI16,
-            nseq_PHICH,ngroup_PHICH);
-#endif
-    }
-
-   // LOG_I(PHY,"[HARQ-UL harqId: %d] subframe_scheduling_flag = %d \n",harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag);
-
-    // Incase of adaptive retransmission, PHICH is always decoded as ACK (at least with OAI-eNB)
-    // Workaround:
-    // rely only on DCI0 decoding and check if NDI has toggled
-    //   save current harq_processes content in temporary struct
-    //   harqId-8 corresponds to the temporary struct. In total we have 8 harq process(0 ..7) + 1 temporary harq process()
-    //ulsch->harq_processes[8] = ulsch->harq_processes[harq_pid];
-
-
-    ulsch->harq_processes[harq_pid]->status                   = SCH_IDLE;
-    ulsch->harq_processes[harq_pid]->round                    = 0;
-    ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 0;
-    // inform MAC?
-    ue->ulsch_Msg3_active[eNB_id] = 0;
-
-#if T_TRACER
-    T(T_UE_PHY_ULSCH_UE_ACK, T_INT(eNB_id), T_INT(proc->frame_rx%1024), T_INT(subframe), T_INT(ulsch->rnti),
-      T_INT(harq_pid));
-#endif
-
-  }
-
-}

 void generate_phich_top(PHY_VARS_eNB *eNB,
                        eNB_rxtx_proc_t *proc,
@@ -0,0 +1,383 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/phich_common.c
+* \brief Top-level routines for generating and decoding  the PHICH/HI physical/transport channel V8.6 2009-03
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+
+#include "PHY/defs_eNB.h"
+
+
+uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
+{
+
+  // for FDD
+  if (frame_parms->frame_type == FDD)
+    return 1;
+
+  // for TDD
+  switch (frame_parms->tdd_config) {
+
+  case 0:
+    if ((subframe==0) || (subframe==5))
+      return(2);
+    else return(1);
+
+    break;
+
+  case 1:
+    if ((subframe==0) || (subframe==5))
+      return(0);
+    else return(1);
+
+    break;
+
+  case 2:
+    if ((subframe==3) || (subframe==8))
+      return(1);
+    else return(0);
+
+    break;
+
+  case 3:
+    if ((subframe==0) || (subframe==8) || (subframe==9))
+      return(1);
+    else return(0);
+
+    break;
+
+  case 4:
+    if ((subframe==8) || (subframe==9))
+      return(1);
+    else return(0);
+
+    break;
+
+  case 5:
+    if (subframe==8)
+      return(1);
+    else return(0);
+
+    break;
+
+  case 6:
+    return(1);
+    break;
+
+  default:
+    return(0);
+  }
+}
+
+unsigned char subframe2_ul_harq(LTE_DL_FRAME_PARMS *frame_parms,unsigned char subframe)
+{
+
+  if (frame_parms->frame_type == FDD)
+    return(subframe&7);
+
+  switch (frame_parms->tdd_config) {
+  case 3:
+    if ( (subframe == 8) || (subframe == 9) ) {
+      return(subframe-8);
+    } else if (subframe==0)
+      return(2);
+    else {
+      LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      return(0);
+    }
+
+    break;
+
+  case 4:
+     if ( (subframe == 8) || (subframe == 9) ) {
+       return(subframe-8);
+     } else {
+       LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
+             subframe,frame_parms->tdd_config);
+       return(0);
+     }
+
+     break;
+
+  }
+
+  return(0);
+}
+
+int phich_frame2_pusch_frame(LTE_DL_FRAME_PARMS *frame_parms, int frame, int subframe)
+{
+  int pusch_frame;
+
+  if (frame_parms->frame_type == FDD) {
+    pusch_frame = subframe<4 ? frame + 1024 - 1 : frame;
+  } else {
+    // Note this is not true, but it doesn't matter, the frame number is irrelevant for TDD!
+    pusch_frame = (frame);
+  }
+
+  //LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, subframe, pusch_frame);
+  return pusch_frame % 1024;
+}
+
+uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
+{
+  uint8_t pusch_subframe = 255;
+
+  if (frame_parms->frame_type == FDD)
+    return subframe < 4 ? subframe + 6 : subframe - 4;
+
+  switch (frame_parms->tdd_config) {
+  case 0:
+    if (subframe == 0)
+      pusch_subframe = (3);
+    else if (subframe == 5) {
+      pusch_subframe = (8);
+    } else if (subframe == 6)
+      pusch_subframe = (2);
+    else if (subframe == 1)
+      pusch_subframe = (7);
+    else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+		  subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 1:
+    if (subframe == 6)
+      pusch_subframe = (2);
+    else if (subframe == 9)
+      pusch_subframe = (3);
+    else if (subframe == 1)
+      pusch_subframe = (7);
+    else if (subframe == 4)
+      pusch_subframe = (8);
+    else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 2:
+    if (subframe == 8)
+      pusch_subframe = (2);
+    else if (subframe == 3)
+      pusch_subframe = (7);
+    else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 3:
+    if ( (subframe == 8) || (subframe == 9) ) {
+      pusch_subframe = (subframe-6);
+    } else if (subframe==0)
+      pusch_subframe = (4);
+    else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 4:
+    if ( (subframe == 8) || (subframe == 9) ) {
+      pusch_subframe = (subframe-6);
+    } else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 5:
+    if (subframe == 8) {
+      pusch_subframe = (2);
+    } else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  case 6:
+    if (subframe == 6) {
+      pusch_subframe = (2);
+    } else if (subframe == 9) {
+      pusch_subframe = (3);
+    } else if (subframe == 0) {
+      pusch_subframe = (4);
+    } else if (subframe == 1) {
+      pusch_subframe = (7);
+    } else if (subframe == 5) {
+      pusch_subframe = (8);
+    } else {
+      AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
+            subframe,frame_parms->tdd_config);
+      pusch_subframe = (0);
+    }
+
+    break;
+
+  default:
+    AssertFatal(1==0, "no implementation for TDD UL/DL-config = %d!\n", frame_parms->tdd_config);
+    pusch_subframe = (0);
+  }
+
+  LOG_D(PHY, "subframe  %d: PUSCH subframe = %d\n", subframe, pusch_subframe);
+  return pusch_subframe;
+}
+
+int check_pcfich(LTE_DL_FRAME_PARMS *frame_parms,uint16_t reg)
+{
+
+  if ((reg == frame_parms->pcfich_reg[0]) ||
+      (reg == frame_parms->pcfich_reg[1]) ||
+      (reg == frame_parms->pcfich_reg[2]) ||
+      (reg == frame_parms->pcfich_reg[3]))
+    return(1);
+
+  return(0);
+}
+
+void generate_phich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms)
+{
+
+  unsigned short n0 = (frame_parms->N_RB_DL * 2) - 4;  // 2 REG per RB less the 4 used by PCFICH in first symbol
+  unsigned short n1 = (frame_parms->N_RB_DL * 3);      // 3 REG per RB in second and third symbol
+  unsigned short n2 = n1;
+  unsigned short mprime = 0;
+  unsigned short Ngroup_PHICH;
+  //  uint16_t *phich_reg = frame_parms->phich_reg;
+  uint16_t *pcfich_reg = frame_parms->pcfich_reg;
+
+  // compute Ngroup_PHICH (see formula at beginning of Section 6.9 in 36-211
+  Ngroup_PHICH = (frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)/48;
+
+
+  if (((frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)%48) > 0)
+    Ngroup_PHICH++;
+
+  // check if Extended prefix
+  if (frame_parms->Ncp == 1) {
+    Ngroup_PHICH<<=1;
+  }
+
+#ifdef DEBUG_PHICH
+  LOG_D(PHY,"Ngroup_PHICH %d (phich_config_common.phich_resource %d,phich_config_common.phich_duration %s, NidCell %d,Ncp %d, frame_type %d), smallest pcfich REG %d, n0 %d, n1 %d (first PHICH REG %d)\n",
+    ((frame_parms->Ncp == NORMAL)?Ngroup_PHICH:(Ngroup_PHICH>>1)),
+    frame_parms->phich_config_common.phich_resource,
+    frame_parms->phich_config_common.phich_duration==normal?"normal":"extended",
+    frame_parms->Nid_cell,frame_parms->Ncp,frame_parms->frame_type,
+    pcfich_reg[frame_parms->pcfich_first_reg_idx],
+    n0,
+    n1,
+    ((frame_parms->Nid_cell))%n0);
+#endif
+
+  // This is the algorithm from Section 6.9.3 in 36-211, it works only for normal PHICH duration for now ...
+
+  for (mprime=0; 
+       mprime<((frame_parms->Ncp == NORMAL)?Ngroup_PHICH:(Ngroup_PHICH>>1)); 
+       mprime++) {
+
+    if (frame_parms->phich_config_common.phich_duration==normal) { // normal PHICH duration
+
+      frame_parms->phich_reg[mprime][0] = (frame_parms->Nid_cell + mprime)%n0;
+
+      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
+        frame_parms->phich_reg[mprime][0]++;
+
+      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
+        frame_parms->phich_reg[mprime][0]++;
+
+      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
+        frame_parms->phich_reg[mprime][0]++;
+
+      if (frame_parms->phich_reg[mprime][0]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
+        frame_parms->phich_reg[mprime][0]++;
+
+      frame_parms->phich_reg[mprime][1] = (frame_parms->Nid_cell + mprime + (n0/3))%n0;
+
+      
+      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
+        frame_parms->phich_reg[mprime][1]++;
+      
+      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
+        frame_parms->phich_reg[mprime][1]++;
+
+      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
+        frame_parms->phich_reg[mprime][1]++;
+
+      if (frame_parms->phich_reg[mprime][1]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
+        frame_parms->phich_reg[mprime][1]++;
+      
+
+      frame_parms->phich_reg[mprime][2] = (frame_parms->Nid_cell + mprime + (2*n0/3))%n0;
+      
+      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[frame_parms->pcfich_first_reg_idx])
+        frame_parms->phich_reg[mprime][2]++;
+
+      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+1)&3])
+        frame_parms->phich_reg[mprime][2]++;
+
+      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+2)&3])
+        frame_parms->phich_reg[mprime][2]++;
+
+      if (frame_parms->phich_reg[mprime][2]>=pcfich_reg[(frame_parms->pcfich_first_reg_idx+3)&3])
+        frame_parms->phich_reg[mprime][2]++;
+      
+#ifdef DEBUG_PHICH
+      printf("phich_reg :%d => %d,%d,%d\n",mprime,frame_parms->phich_reg[mprime][0],frame_parms->phich_reg[mprime][1],frame_parms->phich_reg[mprime][2]);
+#endif
+    } else { // extended PHICH duration
+      frame_parms->phich_reg[mprime<<1][0] = (frame_parms->Nid_cell + mprime)%n0;
+      frame_parms->phich_reg[1+(mprime<<1)][0] = (frame_parms->Nid_cell + mprime)%n0;
+
+      frame_parms->phich_reg[mprime<<1][1] = ((frame_parms->Nid_cell*n1/n0) + mprime + (n1/3))%n1;
+      frame_parms->phich_reg[mprime<<1][2] = ((frame_parms->Nid_cell*n2/n0) + mprime + (2*n2/3))%n2;
+
+      frame_parms->phich_reg[1+(mprime<<1)][1] = ((frame_parms->Nid_cell*n1/n0) + mprime + (n1/3))%n1;
+      frame_parms->phich_reg[1+(mprime<<1)][2] = ((frame_parms->Nid_cell*n2/n0) + mprime + (2*n2/3))%n2;
+      //#ifdef DEBUG_PHICH
+      printf("phich_reg :%d => %d,%d,%d\n",mprime<<1,frame_parms->phich_reg[mprime<<1][0],frame_parms->phich_reg[mprime][1],frame_parms->phich_reg[mprime][2]);
+      printf("phich_reg :%d => %d,%d,%d\n",1+(mprime<<1),frame_parms->phich_reg[1+(mprime<<1)][0],frame_parms->phich_reg[1+(mprime<<1)][1],frame_parms->phich_reg[1+(mprime<<1)][2]);
+      //#endif
+    }
+  } // mprime loop
+}  // num_pdcch_symbols loop
@@ -29,8 +29,8 @@
 * \note
 * \warning
 */
-//#include "defs.h"
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 void generate_pilots(PHY_VARS_eNB *eNB,
                     int32_t **txdataF,
@@ -29,9 +29,9 @@
 * \note
 * \warning
 */
-//#include "defs.h"
-#include "PHY/defs.h"

+#include "PHY/defs_eNB.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"

 int generate_mbsfn_pilot(PHY_VARS_eNB *eNB,
 			 eNB_rxtx_proc_t *proc,
@@ -1,209 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file PHY/LTE_TRANSPORT/uespec_pilots.c
-* \brief Top-level routines for generating DL ue-specific reference signals V12.5 2015-03
-* \author X.JIANG
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: xiwen.jiangeurecom.fr
-* \note
-* \warning
-*/
-//#include "defs.h"
-#include "PHY/defs.h"
-
-void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
-                     uint8_t UE_id,
-                     int32_t **txdataF,
-                     int16_t amp,
-                     uint16_t Ntti,
-		     uint8_t beamforming_mode)
-{
-
-  /*LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
-
-  uint32_t tti,tti_offset,slot_offset,Nsymb,samples_per_symbol;
-  uint8_t second_pilot,aa;
-
-  //  printf("Doing TX pilots Nsymb %d, second_pilot %d\n",Nsymb,second_pilot);
-  
-  switch(beamforming_mode){
-  case 7:
-    for (tti=0; tti<Ntti; tti++) {
-
-      tti_offset = tti*frame_parms->ofdm_symbol_size*Nsymb;
-      samples_per_symbol = frame_parms->ofdm_symbol_size;
-      slot_offset = (tti*2)%20;
-
-      //    printf("tti %d : offset %d (slot %d)\n",tti,tti_offset,slot_offset);
-      //Generate UE specific Pilots
-      printf("generate_dl_ue_spec:tti_offset=%d\n",tti_offset);
-
-      if(frame_parms->Ncp==0) {
-        for(aa=0;aa<frame_parms->nb_antennas_tx;aa++){ 
-          //antenna port 5 symbol 0 slot 0
-          lte_dl_ue_spec(phy_vars_eNB,
-                         UE_id,
-                         &txdataF[aa][tti_offset+3*samples_per_symbol],
-                         amp,
-                         slot_offset,
-              	         1,
-                         5,
-                         0);
-
-          //antenna port 5 symbol 1 slot 0
-          lte_dl_ue_spec(phy_vars_eNB,
-                         UE_id,
-                         &txdataF[aa][tti_offset+6*samples_per_symbol],
-                         amp,
-                         slot_offset,
-            	         1,
-                         5,
-                         0);
-
-          //antenna port 5 symbol 0 slot 1
-          lte_dl_ue_spec(phy_vars_eNB,
-                         UE_id,
-                         &txdataF[aa][tti_offset+9*samples_per_symbol],
-                         amp,
-                         slot_offset+1,
-            	         0,
-                         5,
-                         0);
-
-          //antenna port 5 symbol 1 slot 1
-          lte_dl_ue_spec(phy_vars_eNB,
-                         UE_id,
-                         &txdataF[aa][tti_offset+12*samples_per_symbol],
-                         amp,
-                         slot_offset+1,
-            	         1,
-                         5,
-                         0);
-	}
-      } else{
-      	msg("generate_ue_soec_pilots:Extented Cyclic Prefix for TM7 is not supported yet.\n");
-      }
-
-
-    }
-    break;
-
-  case 8:
-  case 9:
-  case 10:
-  default:
-    msg("[generate_ue_spec_pilots(in uespec_pilots.c)]ERROR:beamforming mode %d is not supported\n",beamforming_mode);
-    
- }*/
-}
-
-/*int generate_ue_spec_pilots_slot(PHY_VARS_eNB *phy_vars_eNB,
-                         int32_t **txdataF,
-                         int16_t amp,
-                         uint16_t slot,
-                         int first_pilot_only)
-{
-
-  LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
-  uint32_t slot_offset,Nsymb,samples_per_symbol;
-  uint8_t second_pilot;
-
-  if (slot<0 || slot>= 20) {
-    msg("generate_pilots_slot: slot not in range (%d)\n",slot);
-    return(-1);
-  }
-
-  Nsymb = (frame_parms->Ncp==0)?7:6;
-  second_pilot = (frame_parms->Ncp==0)?4:3;
-
-
-  slot_offset = slot*frame_parms->ofdm_symbol_size*Nsymb;
-  samples_per_symbol = frame_parms->ofdm_symbol_size;
-
-  //    printf("tti %d : offset %d (slot %d)\n",tti,tti_offset,slot_offset);
-  //Generate Pilots
-
-  //antenna 0 symbol 0 slot 0
-  lte_dl_cell_spec(phy_vars_eNB,
-                   &txdataF[0][slot_offset],
-                   amp,
-                   slot,
-                   0,
-                   0);
-
-
-  if (first_pilot_only==0) {
-    //antenna 0 symbol 3 slot 0
-    lte_dl_cell_spec(phy_vars_eNB,
-                     &txdataF[0][slot_offset+(second_pilot*samples_per_symbol)],
-                     amp,
-                     slot,
-                     1,
-                     0);
-  }
-
-  if (frame_parms->nb_antennas_tx > 1) {
-    if (frame_parms->mode1_flag) {
-      // antenna 1 symbol 0 slot 0
-      lte_dl_cell_spec(phy_vars_eNB,
-                       &txdataF[1][slot_offset],
-                       amp,
-                       slot,
-                       0,
-                       0);
-
-      if (first_pilot_only==0) {
-        // antenna 1 symbol 3 slot 0
-        lte_dl_cell_spec(phy_vars_eNB,
-                         &txdataF[1][slot_offset+(second_pilot*samples_per_symbol)],
-                         amp,
-                         slot,
-                         1,
-                         0);
-      }
-    } else {
-
-      // antenna 1 symbol 0 slot 0
-      lte_dl_cell_spec(phy_vars_eNB,
-                       &txdataF[1][slot_offset],
-                       amp,
-                       slot,
-                       0,
-                       1);
-
-      if (first_pilot_only == 0) {
-        // antenna 1 symbol 3 slot 0
-        lte_dl_cell_spec(phy_vars_eNB,
-                         &txdataF[1][slot_offset+(second_pilot*samples_per_symbol)],
-                         amp,
-                         slot,
-                         1,
-                         1);
-      }
-    }
-  }
-
-  return(0);
-}*/
-
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+
+int is_pmch_subframe(uint32_t frame, int subframe, LTE_DL_FRAME_PARMS *frame_parms)
+{
+
+  uint32_t period;
+  uint8_t i;
+
+  //  LOG_D(PHY,"is_pmch_subframe: frame %d, subframe %d, num_MBSFN_config %d\n",
+  //  frame,subframe,frame_parms->num_MBSFN_config);
+
+  for (i=0; i<frame_parms->num_MBSFN_config; i++) {  // we have at least one MBSFN configuration
+    period = 1<<frame_parms->MBSFN_config[i].radioframeAllocationPeriod;
+
+    if ((frame % period) == frame_parms->MBSFN_config[i].radioframeAllocationOffset) {
+      if (frame_parms->MBSFN_config[i].fourFrames_flag == 0) {
+        if (frame_parms->frame_type == FDD) {
+          switch (subframe) {
+
+          case 1:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF1) > 0)
+              return(1);
+
+            break;
+
+          case 2:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF2) > 0)
+              return(1);
+
+            break;
+
+          case 3:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF3) > 0)
+              return(1);
+
+            break;
+
+          case 6:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF6) > 0)
+              return(1);
+
+            break;
+
+          case 7:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF7) > 0)
+              return(1);
+
+            break;
+
+          case 8:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_FDD_SF8) > 0)
+              return(1);
+
+            break;
+          }
+        } else  {
+          switch (subframe) {
+          case 3:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_TDD_SF3) > 0)
+              return(1);
+
+            break;
+
+          case 4:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_TDD_SF4) > 0)
+              return(1);
+
+            break;
+
+          case 7:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_TDD_SF7) > 0)
+              return(1);
+
+            break;
+
+          case 8:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_TDD_SF8) > 0)
+              return(1);
+
+            break;
+
+          case 9:
+            if ((frame_parms->MBSFN_config[i].mbsfn_SubframeConfig & MBSFN_TDD_SF9) > 0)
+              return(1);
+
+            break;
+          }
+        }
+
+      } else { // handle 4 frames case
+
+      }
+    }
+  }
+
+  return(0);
+}
@@ -19,7 +19,8 @@
 *      contact@openairinterface.org
 */

-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
 #include "PHY/impl_defs_lte.h"

 //#define DEBUG_PC 0
@@ -94,7 +95,6 @@ double computeRhoB_eNB(uint8_t pa,
  return(rho_b_dB);
 }

-
 double computeRhoA_UE(PDSCH_CONFIG_DEDICATED *pdsch_config_dedicated,
                      LTE_UE_DLSCH_t *dlsch_ue,
                      unsigned char dl_power_off,
@@ -150,3 +150,4 @@ double computeRhoB_UE(PDSCH_CONFIG_DEDICATED  *pdsch_config_dedicated,
 #endif
  return(rho_b_dB);
 }
+
@@ -0,0 +1,771 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/prach_common.c
+ * \brief Common routines for UE/eNB PRACH physical channel V8.6 2009-03
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#include "PHY/sse_intrin.h"
+#include "PHY/defs_common.h"
+#include "PHY/phy_extern.h"
+#include "PHY/phy_extern_ue.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+
+uint16_t NCS_unrestricted[16] = {0,13,15,18,22,26,32,38,46,59,76,93,119,167,279,419};
+uint16_t NCS_restricted[15]   = {15,18,22,26,32,38,46,55,68,82,100,128,158,202,237}; // high-speed case
+uint16_t NCS_4[7]             = {2,4,6,8,10,12,15};
+
+int16_t ru[2*839]; // quantized roots of unity
+uint32_t ZC_inv[839]; // multiplicative inverse for roots u
+uint16_t du[838];
+
+// This is table 5.7.1-4 from 36.211
+PRACH_TDD_PREAMBLE_MAP tdd_preamble_map[64][7] = {
+  // TDD Configuration Index 0
+  { {1,{{0,1,0,2}}},{1,{{0,1,0,1}}}, {1,{{0,1,0,0}}}, {1,{{0,1,0,2}}}, {1,{{0,1,0,1}}}, {1,{{0,1,0,0}}}, {1,{{0,1,0,2}}}},
+  // TDD Configuration Index 1
+  { {1,{{0,2,0,2}}},{1,{{0,2,0,1}}}, {1,{{0,2,0,0}}}, {1,{{0,2,0,2}}}, {1,{{0,2,0,1}}}, {1,{{0,2,0,0}}}, {1,{{0,2,0,2}}}},
+  // TDD Configuration Index 2
+  { {1,{{0,1,1,2}}},{1,{{0,1,1,1}}}, {1,{{0,1,1,0}}}, {1,{{0,1,0,1}}}, {1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,1,1}}}},
+  // TDD Configuration Index 3
+  { {1,{{0,0,0,2}}},{1,{{0,0,0,1}}}, {1,{{0,0,0,0}}}, {1,{{0,0,0,2}}}, {1,{{0,0,0,1}}}, {1,{{0,0,0,0}}}, {1,{{0,0,0,2}}}},
+  // TDD Configuration Index 4
+  { {1,{{0,0,1,2}}},{1,{{0,0,1,1}}}, {1,{{0,0,1,0}}}, {1,{{0,0,0,1}}}, {1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,1,1}}}},
+  // TDD Configuration Index 5
+  { {1,{{0,0,0,1}}},{1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,1}}}},
+  // TDD Configuration Index 6
+  { {2,{{0,0,0,2},{0,0,1,2}}}, {2,{{0,0,0,1},{0,0,1,1}}}, {2,{{0,0,0,0},{0,0,1,0}}}, {2,{{0,0,0,1},{0,0,0,2}}}, {2,{{0,0,0,0},{0,0,0,1}}}, {2,{{0,0,0,0},{1,0,0,0}}}, {2,{{0,0,0,2},{0,0,1,1}}}},
+  // TDD Configuration Index 7
+  { {2,{{0,0,0,1},{0,0,1,1}}}, {2,{{0,0,0,0},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,0},{0,0,0,2}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,1},{0,0,1,0}}}},
+  // TDD Configuration Index 8
+  { {2,{{0,0,0,0},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,0},{0,0,0,1}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,0},{0,0,1,1}}}},
+  // TDD Configuration Index 9
+  { {3,{{0,0,0,1},{0,0,0,2},{0,0,1,2}}}, {3,{{0,0,0,0},{0,0,0,1},{0,0,1,1}}}, {3,{{0,0,0,0},{0,0,1,0},{1,0,0,0}}}, {3,{{0,0,0,0},{0,0,0,1},{0,0,0,2}}}, {3,{{0,0,0,0},{0,0,0,1},{1,0,0,1}}}, {3,{{0,0,0,0},{1,0,0,0},{2,0,0,0}}}, {3,{{0,0,0,1},{0,0,0,2},{0,0,1,1}}}},
+  // TDD Configuration Index 10
+  { {3,{{0,0,0,0},{0,0,1,0},{0,0,1,1}}}, {3,{{0,0,0,1},{0,0,1,0},{0,0,1,1}}}, {3,{{0,0,0,0},{0,0,1,0},{1,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,0},{0,0,0,1},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,0},{0,0,0,2},{0,0,1,0}}}},
+  // TDD Configuration Index 11
+  { {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,0},{0,0,0,1},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,1},{0,0,1,0},{0,0,1,1}}}},
+  // TDD Configuration Index 12
+  { {4,{{0,0,0,1},{0,0,0,2},{0,0,1,1},{0,0,1,2}}}, {4,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1}}},
+    {4,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0}}},
+    {4,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,2}}},
+    {4,{{0,0,0,0},{0,0,0,1},{1,0,0,0},{1,0,0,1}}},
+    {4,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0}}},
+    {4,{{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1}}}
+  },
+  // TDD Configuration Index 13
+  { {4,{{0,0,0,0},{0,0,0,2},{0,0,1,0},{0,0,1,2}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,1}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,1}}}
+  },
+  // TDD Configuration Index 14
+  { {4,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{0,0,0,2},{0,0,1,0},{0,0,1,1}}}
+  },
+  // TDD Configuration Index 15
+  { {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,1},{0,0,1,2}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{1,0,0,1}}},
+    {5,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,1},{1,0,0,2}}},
+    {5,{{0,0,0,0},{0,0,0,1},{1,0,0,0},{1,0,0,1},{2,0,0,1}}}, {5,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0}}},
+    {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1}}}
+  },
+  // TDD Configuration Index 16
+  { {5,{{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1},{0,0,1,2}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{1,0,1,1}}},
+    {5,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,1,0}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,0},{1,0,0,2}}},
+    {5,{{0,0,0,0},{0,0,0,1},{1,0,0,0},{1,0,0,1},{2,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}
+  },
+  // TDD Configuration Index 17
+  { {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,2}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{1,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {5,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,0},{1,0,0,1}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}
+  },
+  // TDD Configuration Index 18
+  { {6,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1},{0,0,1,2}}},
+    {6,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{1,0,0,1},{1,0,1,1}}},
+    {6,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0},{2,0,1,0}}},
+    {6,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{1,0,0,0},{1,0,0,1},{1,0,0,2}}},
+    {6,{{0,0,0,0},{0,0,0,1},{1,0,0,0},{1,0,0,1},{2,0,0,0},{2,0,0,1}}},
+    {6,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0},{5,0,0,0}}},
+    {6,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1},{1,0,0,2}}}
+  },
+  // TDD Configuration Index 19
+  { {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{1,0,0,0},{1,0,1,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,0},{0,0,0,1},{0,0,0,2},{0,0,1,0},{0,0,1,1},{1,0,1,1}}}
+  },
+  // TDD Configuration Index 20
+  { {1,{{0,1,0,1}}},{1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,1}}}, {1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,1}}}},
+  // TDD Configuration Index 21
+  { {1,{{0,2,0,1}}},{1,{{0,2,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,1}}}, {1,{{0,2,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,1}}}},
+
+  // TDD Configuration Index 22
+  { {1,{{0,1,1,1}}},{1,{{0,1,1,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,1,0}}}},
+
+  // TDD Configuration Index 23
+  { {1,{{0,0,0,1}}},{1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,1}}}, {1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,1}}}},
+
+  // TDD Configuration Index 24
+  { {1,{{0,0,1,1}}},{1,{{0,0,1,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,1,0}}}},
+
+  // TDD Configuration Index 25
+  { {2,{{0,0,0,1},{0,0,1,1}}}, {2,{{0,0,0,0},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,1},{1,0,0,1}}}, {2,{{0,0,0,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,1},{0,0,1,0}}}},
+
+  // TDD Configuration Index 26
+  { {3,{{0,0,0,1},{0,0,1,1},{1,0,0,1}}}, {3,{{0,0,0,0},{0,0,1,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,1},{1,0,0,1},{2,0,0,1}}}, {3,{{0,0,0,0},{1,0,0,0},{2,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,1},{0,0,1,0},{1,0,0,1}}}},
+
+  // TDD Configuration Index 27
+  { {4,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1}}}, {4,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1}}},
+    {4,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0}}}
+  },
+
+  // TDD Configuration Index 28
+  { {5,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1},{2,0,0,1}}}, {5,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {5,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1},{4,0,0,1}}},
+    {5,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {5,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0},{2,0,0,1}}}
+  },
+
+  // TDD Configuration Index 29
+  { {6,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1},{2,0,0,1},{2,0,1,1}}},
+    {6,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0},{2,0,1,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1},{4,0,0,1},{5,0,0,1}}},
+    {6,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0},{5,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0},{2,0,0,1},{2,0,1,0}}}
+  },
+
+
+  // TDD Configuration Index 30
+  { {1,{{0,1,0,1}}},{1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,1}}}, {1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,1}}}},
+
+  // TDD Configuration Index 31
+  { {1,{{0,2,0,1}}},{1,{{0,2,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,1}}}, {1,{{0,2,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,1}}}},
+
+  // TDD Configuration Index 32
+  { {1,{{0,1,1,1}}},{1,{{0,1,1,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,1,0}}}},
+
+  // TDD Configuration Index 33
+  { {1,{{0,0,0,1}}},{1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,1}}}, {1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,1}}}},
+
+  // TDD Configuration Index 34
+  { {1,{{0,0,1,1}}},{1,{{0,0,1,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,1,0}}}},
+
+  // TDD Configuration Index 35
+  { {2,{{0,0,0,1},{0,0,1,1}}}, {2,{{0,0,0,0},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,1},{1,0,0,1}}}, {2,{{0,0,0,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,1},{0,0,1,0}}}},
+
+  // TDD Configuration Index 36
+  { {3,{{0,0,0,1},{0,0,1,1},{1,0,0,1}}}, {3,{{0,0,0,0},{0,0,1,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,1},{1,0,0,1},{2,0,0,1}}}, {3,{{0,0,0,0},{1,0,0,0},{2,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,1},{0,0,1,0},{1,0,0,1}}}},
+
+  // TDD Configuration Index 37
+  { {4,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1}}}, {4,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1}}},
+    {4,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0}}}
+  },
+
+  // TDD Configuration Index 38
+  { {5,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1},{2,0,0,1}}}, {5,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {5,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1},{4,0,0,1}}},
+    {5,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {5,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0},{2,0,0,1}}}
+  },
+
+  // TDD Configuration Index 39
+  { {6,{{0,0,0,1},{0,0,1,1},{1,0,0,1},{1,0,1,1},{2,0,0,1},{2,0,1,1}}},
+    {6,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0},{2,0,0,0},{2,0,1,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,1},{1,0,0,1},{2,0,0,1},{3,0,0,1},{4,0,0,1},{5,0,0,1}}},
+    {6,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0},{4,0,0,0},{5,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {6,{{0,0,0,1},{0,0,1,0},{1,0,0,1},{1,0,1,0},{2,0,0,1},{2,0,1,0}}}
+  },
+
+  // TDD Configuration Index 40
+  { {1,{{0,1,0,0}}},{0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,1,0,0}}}},
+  // TDD Configuration Index 41
+  { {1,{{0,2,0,0}}},{0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,2,0,0}}}},
+
+  // TDD Configuration Index 42
+  { {1,{{0,1,1,0}}},{0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}},
+
+  // TDD Configuration Index 43
+  { {1,{{0,0,0,0}}},{0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {1,{{0,0,0,0}}}},
+
+  // TDD Configuration Index 44
+  { {1,{{0,0,1,0}}},{0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}, {0,{{0,0,0,0}}}},
+
+  // TDD Configuration Index 45
+  { {2,{{0,0,0,0},{0,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0}}}, {2,{{0,0,0,0},{1,0,0,0}}}},
+
+  // TDD Configuration Index 46
+  { {3,{{0,0,0,0},{0,0,1,0},{1,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,0},{1,0,0,0},{2,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0}}}, {3,{{0,0,0,0},{1,0,0,0},{2,0,0,0}}}},
+
+  // TDD Configuration Index 47
+  { {4,{{0,0,0,0},{0,0,1,0},{1,0,0,0},{1,0,1,0}}}, {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}}},
+    {4,{{0,0,0,0},{1,0,0,0},{2,0,0,0},{3,0,0,0}}}
+  }
+};
+
+
+
+uint16_t prach_root_sequence_map0_3[838] = { 129, 710, 140, 699, 120, 719, 210, 629, 168, 671, 84, 755, 105, 734, 93, 746, 70, 769, 60, 779,
+                                             2, 837, 1, 838,
+                                             56, 783, 112, 727, 148, 691,
+                                             80, 759, 42, 797, 40, 799,
+                                             35, 804, 73, 766, 146, 693,
+                                             31, 808, 28, 811, 30, 809, 27, 812, 29, 810,
+                                             24, 815, 48, 791, 68, 771, 74, 765, 178, 661, 136, 703,
+                                             86, 753, 78, 761, 43, 796, 39, 800, 20, 819, 21, 818,
+                                             95, 744, 202, 637, 190, 649, 181, 658, 137, 702, 125, 714, 151, 688,
+                                             217, 622, 128, 711, 142, 697, 122, 717, 203, 636, 118, 721, 110, 729, 89, 750, 103, 736, 61,
+                                             778, 55, 784, 15, 824, 14, 825,
+                                             12, 827, 23, 816, 34, 805, 37, 802, 46, 793, 207, 632, 179, 660, 145, 694, 130, 709, 223, 616,
+                                             228, 611, 227, 612, 132, 707, 133, 706, 143, 696, 135, 704, 161, 678, 201, 638, 173, 666, 106,
+                                             733, 83, 756, 91, 748, 66, 773, 53, 786, 10, 829, 9, 830,
+                                             7, 832, 8, 831, 16, 823, 47, 792, 64, 775, 57, 782, 104, 735, 101, 738, 108, 731, 208, 631, 184,
+                                             655, 197, 642, 191, 648, 121, 718, 141, 698, 149, 690, 216, 623, 218, 621,
+                                             152, 687, 144, 695, 134, 705, 138, 701, 199, 640, 162, 677, 176, 663, 119, 720, 158, 681, 164,
+                                             675, 174, 665, 171, 668, 170, 669, 87, 752, 169, 670, 88, 751, 107, 732, 81, 758, 82, 757, 100,
+                                             739, 98, 741, 71, 768, 59, 780, 65, 774, 50, 789, 49, 790, 26, 813, 17, 822, 13, 826, 6, 833,
+                                             5, 834, 33, 806, 51, 788, 75, 764, 99, 740, 96, 743, 97, 742, 166, 673, 172, 667, 175, 664, 187,
+                                             652, 163, 676, 185, 654, 200, 639, 114, 725, 189, 650, 115, 724, 194, 645, 195, 644, 192, 647,
+                                             182, 657, 157, 682, 156, 683, 211, 628, 154, 685, 123, 716, 139, 700, 212, 627, 153, 686, 213,
+                                             626, 215, 624, 150, 689,
+                                             225, 614, 224, 615, 221, 618, 220, 619, 127, 712, 147, 692, 124, 715, 193, 646, 205, 634, 206,
+                                             633, 116, 723, 160, 679, 186, 653, 167, 672, 79, 760, 85, 754, 77, 762, 92, 747, 58, 781, 62,
+                                             777, 69, 770, 54, 785, 36, 803, 32, 807, 25, 814, 18, 821, 11, 828, 4, 835,
+                                             3, 836, 19, 820, 22, 817, 41, 798, 38, 801, 44, 795, 52, 787, 45, 794, 63, 776, 67, 772, 72,
+                                             767, 76, 763, 94, 745, 102, 737, 90, 749, 109, 730, 165, 674, 111, 728, 209, 630, 204, 635, 117,
+                                             722, 188, 651, 159, 680, 198, 641, 113, 726, 183, 656, 180, 659, 177, 662, 196, 643, 155, 684,
+                                             214, 625, 126, 713, 131, 708, 219, 620, 222, 617, 226, 613,
+                                             230, 609, 232, 607, 262, 577, 252, 587, 418, 421, 416, 423, 413, 426, 411, 428, 376, 463, 395,
+                                             444, 283, 556, 285, 554, 379, 460, 390, 449, 363, 476, 384, 455, 388, 451, 386, 453, 361, 478,
+                                             387, 452, 360, 479, 310, 529, 354, 485, 328, 511, 315, 524, 337, 502, 349, 490, 335, 504, 324,
+                                             515,
+                                             323, 516, 320, 519, 334, 505, 359, 480, 295, 544, 385, 454, 292, 547, 291, 548, 381, 458, 399,
+                                             440, 380, 459, 397, 442, 369, 470, 377, 462, 410, 429, 407, 432, 281, 558, 414, 425, 247, 592,
+                                             277, 562, 271, 568, 272, 567, 264, 575, 259, 580,
+                                             237, 602, 239, 600, 244, 595, 243, 596, 275, 564, 278, 561, 250, 589, 246, 593, 417, 422, 248,
+                                             591, 394, 445, 393, 446, 370, 469, 365, 474, 300, 539, 299, 540, 364, 475, 362, 477, 298, 541,
+                                             312, 527, 313, 526, 314, 525, 353, 486, 352, 487, 343, 496, 327, 512, 350, 489, 326, 513, 319,
+                                             520, 332, 507, 333, 506, 348, 491, 347, 492, 322, 517,
+                                             330, 509, 338, 501, 341, 498, 340, 499, 342, 497, 301, 538, 366, 473, 401, 438, 371, 468, 408,
+                                             431, 375, 464, 249, 590, 269, 570, 238, 601, 234, 605,
+                                             257, 582, 273, 566, 255, 584, 254, 585, 245, 594, 251, 588, 412, 427, 372, 467, 282, 557, 403,
+                                             436, 396, 443, 392, 447, 391, 448, 382, 457, 389, 450, 294, 545, 297, 542, 311, 528, 344, 495,
+                                             345, 494, 318, 521, 331, 508, 325, 514, 321, 518,
+                                             346, 493, 339, 500, 351, 488, 306, 533, 289, 550, 400, 439, 378, 461, 374, 465, 415, 424, 270,
+                                             569, 241, 598,
+                                             231, 608, 260, 579, 268, 571, 276, 563, 409, 430, 398, 441, 290, 549, 304, 535, 308, 531, 358,
+                                             481, 316, 523,
+                                             293, 546, 288, 551, 284, 555, 368, 471, 253, 586, 256, 583, 263, 576,
+                                             242, 597, 274, 565, 402, 437, 383, 456, 357, 482, 329, 510,
+                                             317, 522, 307, 532, 286, 553, 287, 552, 266, 573, 261, 578,
+                                             236, 603, 303, 536, 356, 483,
+                                             355, 484, 405, 434, 404, 435, 406, 433,
+                                             235, 604, 267, 572, 302, 537,
+                                             309, 530, 265, 574, 233, 606,
+                                             367, 472, 296, 543,
+                                             336, 503, 305, 534, 373, 466, 280, 559, 279, 560, 419, 420, 240, 599, 258, 581, 229, 610
+                                           };
+
+uint16_t prach_root_sequence_map4[138] = {  1,138,2,137,3,136,4,135,5,134,6,133,7,132,8,131,9,130,10,129,
+                                            11,128,12,127,13,126,14,125,15,124,16,123,17,122,18,121,19,120,20,119,
+                                            21,118,22,117,23,116,24,115,25,114,26,113,27,112,28,111,29,110,30,109,
+                                            31,108,32,107,33,106,34,105,35,104,36,103,37,102,38,101,39,100,40,99,
+                                            41,98,42,97,43,96,44,95,45,94,46,93,47,92,48,91,49,90,50,89,
+                                            51,88,52,87,53,86,54,85,55,84,56,83,57,82,58,81,59,80,60,79,
+                                            61,78,62,77,63,76,64,75,65,74,66,73,67,72,68,71,69,70
+                                         };
+
+void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
+{
+
+  FILE *fd;
+
+  fd = fopen("prach_config.txt","w");
+  fprintf(fd,"prach_config: subframe          = %d\n",subframe);
+  fprintf(fd,"prach_config: N_RB_UL           = %d\n",frame_parms->N_RB_UL);
+  fprintf(fd,"prach_config: frame_type        = %s\n",(frame_parms->frame_type==1) ? "TDD":"FDD");
+
+  if(frame_parms->frame_type==1) fprintf(fd,"prach_config: tdd_config        = %d\n",frame_parms->tdd_config);
+
+  fprintf(fd,"prach_config: rootSequenceIndex = %d\n",frame_parms->prach_config_common.rootSequenceIndex);
+  fprintf(fd,"prach_config: prach_ConfigIndex = %d\n",frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex);
+  fprintf(fd,"prach_config: Ncs_config        = %d\n",frame_parms->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig);
+  fprintf(fd,"prach_config: highSpeedFlag     = %d\n",frame_parms->prach_config_common.prach_ConfigInfo.highSpeedFlag);
+  fprintf(fd,"prach_config: n_ra_prboffset    = %d\n",frame_parms->prach_config_common.prach_ConfigInfo.prach_FreqOffset);
+  fclose(fd);
+
+}
+
+// This function computes the du
+void fill_du(uint8_t prach_fmt)
+{
+
+  uint16_t iu,u,p;
+  uint16_t N_ZC;
+  uint16_t *prach_root_sequence_map;
+
+  if (prach_fmt<4) {
+    N_ZC = 839;
+    prach_root_sequence_map = prach_root_sequence_map0_3;
+  } else {
+    N_ZC = 139;
+    prach_root_sequence_map = prach_root_sequence_map4;
+  }
+
+  for (iu=0; iu<(N_ZC-1); iu++) {
+
+    u=prach_root_sequence_map[iu];
+    p=1;
+
+    while (((u*p)%N_ZC)!=1)
+      p++;
+
+    du[u] = ((p<(N_ZC>>1)) ? p : (N_ZC-p));
+  }
+
+}
+
+uint8_t get_num_prach_tdd(module_id_t Mod_id)
+{
+  LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][0]->frame_parms;
+  return(tdd_preamble_map[fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex][fp->tdd_config].num_prach);
+}
+
+uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index)
+{
+  LTE_DL_FRAME_PARMS *fp = &PHY_vars_UE_g[Mod_id][0]->frame_parms;
+  return(tdd_preamble_map[fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex][fp->tdd_config].map[tdd_map_index].f_ra);
+}
+
+uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,lte_frame_type_t frame_type)
+{
+
+  if (frame_type == FDD) // FDD
+    return(prach_ConfigIndex>>4);
+
+  else {
+    if (prach_ConfigIndex < 20)
+      return (0);
+
+    if (prach_ConfigIndex < 30)
+      return (1);
+
+    if (prach_ConfigIndex < 40)
+      return (2);
+
+    if (prach_ConfigIndex < 48)
+      return (3);
+    else
+      return (4);
+  }
+}
+
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
+			     uint8_t prach_ConfigIndex, 
+			     uint8_t n_ra_prboffset,
+			     uint8_t tdd_mapindex, uint16_t Nf) 
+{
+  lte_frame_type_t frame_type         = frame_parms->frame_type;
+  uint8_t tdd_config         = frame_parms->tdd_config;
+
+  uint8_t n_ra_prb;
+  uint8_t f_ra,t1_ra;
+  uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
+  uint8_t Nsp=2;
+
+  if (frame_type == TDD) { // TDD
+
+    if (tdd_preamble_map[prach_ConfigIndex][tdd_config].num_prach==0) {
+      LOG_E(PHY, "Illegal prach_ConfigIndex %"PRIu8"", prach_ConfigIndex);
+      return(-1);
+    }
+
+    // adjust n_ra_prboffset for frequency multiplexing (p.36 36.211)
+    f_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[tdd_mapindex].f_ra;
+
+    if (prach_fmt < 4) {
+      if ((f_ra&1) == 0) {
+        n_ra_prb = n_ra_prboffset + 6*(f_ra>>1);
+      } else {
+        n_ra_prb = frame_parms->N_RB_UL - 6 - n_ra_prboffset + 6*(f_ra>>1);
+      }
+    } else {
+      if ((tdd_config >2) && (tdd_config<6))
+        Nsp = 2;
+
+      t1_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t1_ra;
+
+      if ((((Nf&1)*(2-Nsp)+t1_ra)&1) == 0) {
+        n_ra_prb = 6*f_ra;
+      } else {
+        n_ra_prb = frame_parms->N_RB_UL - 6*(f_ra+1);
+      }
+    }
+  }
+  else { //FDD
+    n_ra_prb = n_ra_prboffset;
+  }
+  return(n_ra_prb);
+}
+
+int is_prach_subframe0(LTE_DL_FRAME_PARMS *frame_parms,uint8_t prach_ConfigIndex,uint32_t frame, uint8_t subframe)
+{
+  //  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
+  uint8_t tdd_config         = frame_parms->tdd_config;
+  uint8_t t0_ra;
+  uint8_t t1_ra;
+  uint8_t t2_ra;
+
+  int prach_mask = 0;
+
+  if (frame_parms->frame_type == FDD) { //FDD
+    //implement Table 5.7.1-2 from 36.211 (Rel-10, p.41)
+    if ((((frame&1) == 1) && (subframe < 9)) ||
+        (((frame&1) == 0) && (subframe == 9)))  // This is an odd frame, ignore even-only PRACH frames
+      if (((prach_ConfigIndex&0xf)<3) || // 0,1,2,16,17,18,32,33,34,48,49,50
+          ((prach_ConfigIndex&0x1f)==18) || // 18,50
+          ((prach_ConfigIndex&0xf)==15))   // 15,47
+        return(0);
+
+    switch (prach_ConfigIndex&0x1f) {
+    case 0:
+    case 3:
+      if (subframe==1) prach_mask = 1;
+      break;
+
+    case 1:
+    case 4:
+      if (subframe==4) prach_mask = 1;
+      break;
+
+    case 2:
+    case 5:
+      if (subframe==7) prach_mask = 1;
+      break;
+
+    case 6:
+      if ((subframe==1) || (subframe==6)) prach_mask=1;
+      break;
+
+    case 7:
+      if ((subframe==2) || (subframe==7)) prach_mask=1;
+      break;
+
+    case 8:
+      if ((subframe==3) || (subframe==8)) prach_mask=1;
+      break;
+
+    case 9:
+      if ((subframe==1) || (subframe==4) || (subframe==7)) prach_mask=1;
+      break;
+
+    case 10:
+      if ((subframe==2) || (subframe==5) || (subframe==8)) prach_mask=1;
+      break;
+
+    case 11:
+      if ((subframe==3) || (subframe==6) || (subframe==9)) prach_mask=1;
+      break;
+
+    case 12:
+      if ((subframe&1)==0) prach_mask=1;
+      break;
+
+    case 13:
+      if ((subframe&1)==1) prach_mask=1;
+      break;
+
+    case 14:
+      prach_mask=1;
+      break;
+
+    case 15:
+      if (subframe==9) prach_mask=1;
+      break;
+    }
+  } else { // TDD
+
+    AssertFatal(prach_ConfigIndex<64,
+		"Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
+    AssertFatal(tdd_preamble_map[prach_ConfigIndex][tdd_config].num_prach>0,
+		"Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
+
+    t0_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t0_ra;
+    t1_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t1_ra;
+    t2_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t2_ra;
+#ifdef PRACH_DEBUG
+    LOG_I(PHY,"[PRACH] Checking for PRACH format (ConfigIndex %d) in TDD subframe %d (%d,%d,%d)\n",
+          prach_ConfigIndex,
+          subframe,
+          t0_ra,t1_ra,t2_ra);
+#endif
+
+    if ((((t0_ra == 1) && ((frame &1)==0))||  // frame is even and PRACH is in even frames
+         ((t0_ra == 2) && ((frame &1)==1))||  // frame is odd and PRACH is in odd frames
+         (t0_ra == 0)) &&                                // PRACH is in all frames
+        (((subframe<5)&&(t1_ra==0)) ||                   // PRACH is in 1st half-frame
+         (((subframe>4)&&(t1_ra==1))))) {                // PRACH is in 2nd half-frame
+      if ((prach_ConfigIndex<48) &&                          // PRACH only in normal UL subframe
+	  (((subframe%5)-2)==t2_ra)) prach_mask=1;
+      else if ((prach_ConfigIndex>47) && (((subframe%5)-1)==t2_ra)) prach_mask=1;      // PRACH can be in UpPTS
+    }
+  }
+
+  return(prach_mask);
+}
+
+int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t subframe) {
+  
+  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
+  int prach_mask             = is_prach_subframe0(frame_parms,prach_ConfigIndex,frame,subframe);
+
+#ifdef Rel14
+  int i;
+
+  for (i=0;i<4;i++) {
+    if (frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i] == 1) 
+      prach_mask|=(is_prach_subframe0(frame_parms,frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i],frame,subframe)<<(i+1));
+  }
+#endif
+  return(prach_mask);
+}
+
+
+void compute_prach_seq(uint16_t rootSequenceIndex,
+		       uint8_t prach_ConfigIndex,
+		       uint8_t zeroCorrelationZoneConfig,
+		       uint8_t highSpeedFlag,
+		       lte_frame_type_t frame_type,
+		       uint32_t X_u[64][839])
+{
+
+  // Compute DFT of x_u => X_u[k] = x_u(inv(u)*k)^* X_u[k] = exp(j\pi u*inv(u)*k*(inv(u)*k+1)/N_ZC)
+  unsigned int k,inv_u,i,NCS=0,num_preambles;
+  int N_ZC;
+  uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
+  uint16_t *prach_root_sequence_map;
+  uint16_t u, preamble_offset;
+  uint16_t n_shift_ra,n_shift_ra_bar, d_start,numshift;
+  uint8_t not_found;
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_COMPUTE_PRACH, VCD_FUNCTION_IN);
+
+#ifdef PRACH_DEBUG
+  LOG_I(PHY,"compute_prach_seq: NCS_config %d, prach_fmt %d\n",zeroCorrelationZoneConfig, prach_fmt);
+#endif
+
+  AssertFatal(prach_fmt<4,
+	      "PRACH sequence is only precomputed for prach_fmt<4 (have %"PRIu8")\n", prach_fmt );
+  N_ZC = (prach_fmt < 4) ? 839 : 139;
+  //init_prach_tables(N_ZC); //moved to phy_init_lte_ue/eNB, since it takes to long in real-time
+
+  if (prach_fmt < 4) {
+    prach_root_sequence_map = prach_root_sequence_map0_3;
+  } else {
+    // FIXME cannot be reached
+    prach_root_sequence_map = prach_root_sequence_map4;
+  }
+
+
+#ifdef PRACH_DEBUG
+  LOG_I( PHY, "compute_prach_seq: done init prach_tables\n" );
+#endif
+
+  if (highSpeedFlag== 0) {
+
+#ifdef PRACH_DEBUG
+    LOG_I(PHY,"Low speed prach : NCS_config %d\n",zeroCorrelationZoneConfig);
+#endif
+
+    AssertFatal(zeroCorrelationZoneConfig<=15,
+		"FATAL, Illegal Ncs_config for unrestricted format %"PRIu8"\n", zeroCorrelationZoneConfig );
+    NCS = NCS_unrestricted[zeroCorrelationZoneConfig];
+
+    num_preambles = (NCS==0) ? 64 : ((64*NCS)/N_ZC);
+
+    if (NCS>0) num_preambles++;
+
+    preamble_offset = 0;
+  } else {
+
+#ifdef PRACH_DEBUG
+    LOG_I( PHY, "high speed prach : NCS_config %"PRIu8"\n", zeroCorrelationZoneConfig );
+#endif
+
+    AssertFatal(zeroCorrelationZoneConfig<=14,
+		"FATAL, Illegal Ncs_config for restricted format %"PRIu8"\n", zeroCorrelationZoneConfig );
+    NCS = NCS_restricted[zeroCorrelationZoneConfig];
+    fill_du(prach_fmt);
+
+    num_preambles = 64; // compute ZC sequence for 64 possible roots
+    // find first non-zero shift root (stored in preamble_offset)
+    not_found = 1;
+    preamble_offset = 0;
+
+    while (not_found == 1) {
+      // current root depending on rootSequenceIndex
+      int index = (rootSequenceIndex + preamble_offset) % N_ZC;
+
+      if (prach_fmt<4) {
+        // prach_root_sequence_map points to prach_root_sequence_map0_3
+        DevAssert( index < sizeof(prach_root_sequence_map0_3) / sizeof(prach_root_sequence_map0_3[0]) );
+      } else {
+        // prach_root_sequence_map points to prach_root_sequence_map4
+        DevAssert( index < sizeof(prach_root_sequence_map4) / sizeof(prach_root_sequence_map4[0]) );
+      }
+
+      u = prach_root_sequence_map[index];
+
+      uint16_t n_group_ra = 0;
+
+      if ( (du[u]<(N_ZC/3)) && (du[u]>=NCS) ) {
+        n_shift_ra     = du[u]/NCS;
+        d_start        = (du[u]<<1) + (n_shift_ra * NCS);
+        n_group_ra     = N_ZC/d_start;
+        n_shift_ra_bar = max(0,(N_ZC-(du[u]<<1)-(n_group_ra*d_start))/N_ZC);
+      } else if  ( (du[u]>=(N_ZC/3)) && (du[u]<=((N_ZC - NCS)>>1)) ) {
+        n_shift_ra     = (N_ZC - (du[u]<<1))/NCS;
+        d_start        = N_ZC - (du[u]<<1) + (n_shift_ra * NCS);
+        n_group_ra     = du[u]/d_start;
+        n_shift_ra_bar = min(n_shift_ra,max(0,(du[u]- (n_group_ra*d_start))/NCS));
+      } else {
+        n_shift_ra     = 0;
+        n_shift_ra_bar = 0;
+      }
+
+      // This is the number of cyclic shifts for the current root u
+      numshift = (n_shift_ra*n_group_ra) + n_shift_ra_bar;
+
+      // skip to next root and recompute parameters if numshift==0
+      if (numshift>0)
+        not_found = 0;
+      else
+        preamble_offset++;
+    }
+  }
+
+#ifdef PRACH_DEBUG
+
+  if (NCS>0)
+    LOG_I( PHY, "Initializing %u preambles for PRACH (NCS_config %"PRIu8", NCS %u, N_ZC/NCS %u)\n",
+           num_preambles, zeroCorrelationZoneConfig, NCS, N_ZC/NCS );
+
+#endif
+
+  for (i=0; i<num_preambles; i++) {
+    int index = (rootSequenceIndex+i+preamble_offset) % N_ZC;
+
+    if (prach_fmt<4) {
+      // prach_root_sequence_map points to prach_root_sequence_map0_3
+      DevAssert( index < sizeof(prach_root_sequence_map0_3) / sizeof(prach_root_sequence_map0_3[0]) );
+    } else {
+      // prach_root_sequence_map points to prach_root_sequence_map4
+      DevAssert( index < sizeof(prach_root_sequence_map4) / sizeof(prach_root_sequence_map4[0]) );
+    }
+
+    u = prach_root_sequence_map[index];
+
+    inv_u = ZC_inv[u]; // multiplicative inverse of u
+
+
+    // X_u[0] stores the first ZC sequence where the root u has a non-zero number of shifts
+    // for the unrestricted case X_u[0] is the first root indicated by the rootSequenceIndex
+
+    for (k=0; k<N_ZC; k++) {
+      // 420 is the multiplicative inverse of 2 (required since ru is exp[j 2\pi n])
+      X_u[i][k] = ((uint32_t*)ru)[(((k*(1+(inv_u*k)))%N_ZC)*420)%N_ZC];
+    }
+  }
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_COMPUTE_PRACH, VCD_FUNCTION_OUT);
+
+}
+
+void init_prach_tables(int N_ZC)
+{
+
+  int i,m;
+
+  // Compute the modular multiplicative inverse 'iu' of u s.t. iu*u = 1 mod N_ZC
+  ZC_inv[0] = 0;
+  ZC_inv[1] = 1;
+
+  for (i=2; i<N_ZC; i++) {
+    for (m=2; m<N_ZC; m++)
+      if (((i*m)%N_ZC) == 1) {
+        ZC_inv[i] = m;
+        break;
+      }
+
+#ifdef PRACH_DEBUG
+
+    if (i<16)
+      printf("i %d : inv %d\n",i,ZC_inv[i]);
+
+#endif
+  }
+
+  // Compute quantized roots of unity
+  for (i=0; i<N_ZC; i++) {
+    ru[i<<1]     = (int16_t)(floor(32767.0*cos(2*M_PI*(double)i/N_ZC)));
+    ru[1+(i<<1)] = (int16_t)(floor(32767.0*sin(2*M_PI*(double)i/N_ZC)));
+#ifdef PRACH_DEBUG
+
+    if (i<16)
+      printf("i %d : runity %d,%d\n",i,ru[i<<1],ru[1+(i<<1)]);
+
+#endif
+  }
+}
+
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/prach_common.c
+ * \brief Common routines for UE/eNB PRACH physical channel V8.6 2009-03
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#include "PHY/sse_intrin.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+
+//#define PRACH_DEBUG 1
+//#define PRACH_WRITE_OUTPUT_DEBUG 1
+
+extern uint16_t NCS_unrestricted[16];
+extern uint16_t NCS_restricted[15];
+extern uint16_t NCS_4[7];
+
+extern int16_t ru[2*839]; // quantized roots of unity
+extern uint32_t ZC_inv[839]; // multiplicative inverse for roots u
+extern uint16_t du[838];
+
+
+
+// This is table 5.7.1-4 from 36.211
+extern PRACH_TDD_PREAMBLE_MAP tdd_preamble_map[64][7];
+
+
+
+
+extern uint16_t prach_root_sequence_map0_3[838];
+ 
+
+extern uint16_t prach_root_sequence_map4[138];
+
+void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
+
+
+// This function computes the du
+void fill_du(uint8_t prach_fmt);
+
+
+uint8_t get_num_prach_tdd(module_id_t Mod_id);
+
+
+uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index);
+
+
+uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,lte_frame_type_t frame_type);
+
+
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
+			     uint8_t prach_ConfigIndex, 
+			     uint8_t n_ra_prboffset,
+			     uint8_t tdd_mapindex, uint16_t Nf); 
+
+
+int is_prach_subframe0(LTE_DL_FRAME_PARMS *frame_parms,uint8_t prach_ConfigIndex,uint32_t frame, uint8_t subframe);
+
+int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t subframe);
+
+
+void compute_prach_seq(uint16_t rootSequenceIndex,
+		       uint8_t prach_ConfigIndex,
+		       uint8_t zeroCorrelationZoneConfig,
+		       uint8_t highSpeedFlag,
+		       lte_frame_type_t frame_type,
+		       uint32_t X_u[64][839]);
+
@@ -1,804 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file PHY/LTE_TRANSPORT/print_stats.c
-* \brief PHY statstic logging function
-* \author R. Knopp, F. Kaltenberger, navid nikaein
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr, navid.nikaein@eurecom.fr
-* \note
-* \warning
-*/
-
-#include "PHY/LTE_TRANSPORT/proto.h"
-
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "SCHED/extern.h"
-
-#ifdef OPENAIR2
-#include "../openair2/LAYER2/MAC/proto.h"
-#include "../openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#endif
-
-extern int mac_get_rrc_status(uint8_t Mod_id,uint8_t eNB_flag,uint8_t index);
-#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
-#include "common_lib.h"
-extern openair0_config_t openair0_cfg[];
-#endif
-
-int dump_ue_stats(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc,char* buffer, int length, runmode_t mode, int input_level_dBm)
-{
-
-  uint8_t eNB=0;
-  uint32_t RRC_status;
-  int len=length;
-  int harq_pid,round;
-
-  if (ue==NULL)
-    return 0;
-
-  if ((mode == normal_txrx) || (mode == no_L2_connect)) {
-    len += sprintf(&buffer[len], "[UE_PROC] UE %d, RNTI %x\n",ue->Mod_id, ue->pdcch_vars[0][0]->crnti);
-     len += sprintf(&buffer[len],"[UE PROC] RSRP[0] %.2f dBm/RE, RSSI %.2f dBm, RSRQ[0] %.2f dB, N0 %d dBm/RE (NF %.1f dB)\n",
-		    10*log10(ue->measurements.rsrp[0])-ue->rx_total_gain_dB,
-		    10*log10(ue->measurements.rssi)-ue->rx_total_gain_dB, 
-		    10*log10(ue->measurements.rsrq[0]),
-		    ue->measurements.n0_power_tot_dBm,
-		    (double)ue->measurements.n0_power_tot_dBm+132.24);
-
-    /*
-    len += sprintf(&buffer[len],
-                   "[UE PROC] Frame count: %d\neNB0 RSSI %d dBm/RE (%d dB, %d dB)\neNB1 RSSI %d dBm/RE (%d dB, %d dB)neNB2 RSSI %d dBm/RE (%d dB, %d dB)\nN0 %d dBm/RE, %f dBm/%dPRB (%d dB, %d dB)\n",
-                   proc->frame_rx,
-                   ue->measurements.rx_rssi_dBm[0],
-                   ue->measurements.rx_power_dB[0][0],
-                   ue->measurements.rx_power_dB[0][1],
-                   ue->measurements.rx_rssi_dBm[1],
-                   ue->measurements.rx_power_dB[1][0],
-                   ue->measurements.rx_power_dB[1][1],
-                   ue->measurements.rx_rssi_dBm[2],
-                   ue->measurements.rx_power_dB[2][0],
-                   ue->measurements.rx_power_dB[2][1],
-                   ue->measurements.n0_power_tot_dBm,
-                   ue->measurements.n0_power_tot_dBm+10*log10(12*ue->frame_parms.N_RB_DL),
-                   ue->frame_parms.N_RB_DL,
-                   ue->measurements.n0_power_dB[0],
-                   ue->measurements.n0_power_dB[1]);
-    */
-
-#ifdef EXMIMO
-    len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (LNA %d, vga %d dB)\n",ue->rx_total_gain_dB, openair0_cfg[0].rxg_mode[0],(int)openair0_cfg[0].rx_gain[0]);
-#endif
-#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
-    len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB\n",ue->rx_total_gain_dB);
-#endif
-#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
-    len += sprintf(&buffer[len], "[UE_PROC] Frequency offset %d Hz, estimated carrier frequency %f Hz\n",ue->common_vars.freq_offset,openair0_cfg[0].rx_freq[0]-ue->common_vars.freq_offset);
-#endif
-    len += sprintf(&buffer[len], "[UE PROC] UE mode = %s (%d)\n",mode_string[ue->UE_mode[0]],ue->UE_mode[0]);
-    len += sprintf(&buffer[len], "[UE PROC] timing_advance = %d\n",ue->timing_advance);
-    if (ue->UE_mode[0]==PUSCH) {
-      len += sprintf(&buffer[len], "[UE PROC] Po_PUSCH = %d dBm (PL %d dB, Po_NOMINAL_PUSCH %d dBm, PHR %d dB)\n", 
-		     ue->ulsch[0]->Po_PUSCH,
-		     get_PL(ue->Mod_id,ue->CC_id,0),
-		     ue->frame_parms.ul_power_control_config_common.p0_NominalPUSCH,
-		     ue->ulsch[0]->PHR);
-      len += sprintf(&buffer[len], "[UE PROC] Po_PUCCH = %d dBm (Po_NOMINAL_PUCCH %d dBm, g_pucch %d dB)\n", 
-		     get_PL(ue->Mod_id,ue->CC_id,0)+
-		     ue->frame_parms.ul_power_control_config_common.p0_NominalPUCCH+
-		     ue->dlsch[0][0][0]->g_pucch,
-		     ue->frame_parms.ul_power_control_config_common.p0_NominalPUCCH,
-		     ue->dlsch[0][0][0]->g_pucch);
-    }
-    //for (eNB=0;eNB<NUMBER_OF_eNB_MAX;eNB++) {
-    for (eNB=0; eNB<1; eNB++) {
-      len += sprintf(&buffer[len], "[UE PROC] RX spatial power eNB%d: [%d %d; %d %d] dB\n",
-                     eNB,
-                     ue->measurements.rx_spatial_power_dB[eNB][0][0],
-                     ue->measurements.rx_spatial_power_dB[eNB][0][1],
-                     ue->measurements.rx_spatial_power_dB[eNB][1][0],
-                     ue->measurements.rx_spatial_power_dB[eNB][1][1]);
-
-      len += sprintf(&buffer[len], "[UE PROC] RX total power eNB%d: %d dB, avg: %d dB\n",eNB,ue->measurements.rx_power_tot_dB[eNB],ue->measurements.rx_power_avg_dB[eNB]);
-      len += sprintf(&buffer[len], "[UE PROC] RX total power lin: %d, avg: %d, RX total noise lin: %d, avg: %d\n",ue->measurements.rx_power_tot[eNB],
-                     ue->measurements.rx_power_avg[eNB], ue->measurements.n0_power_tot, ue->measurements.n0_power_avg);
-      len += sprintf(&buffer[len], "[UE PROC] effective SINR %.2f dB\n",ue->sinr_eff);
-      len += sprintf(&buffer[len], "[UE PROC] Wideband CQI eNB %d: %d dB, avg: %d dB\n",eNB,ue->measurements.wideband_cqi_tot[eNB],ue->measurements.wideband_cqi_avg[eNB]);
-
-      switch (ue->frame_parms.N_RB_DL) {
-      case 6:
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 0): [%d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][0][0],
-                       ue->measurements.subband_cqi_dB[eNB][0][1],
-                       ue->measurements.subband_cqi_dB[eNB][0][2],
-                       ue->measurements.subband_cqi_dB[eNB][0][3],
-                       ue->measurements.subband_cqi_dB[eNB][0][4],
-                       ue->measurements.subband_cqi_dB[eNB][0][5]);
-
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 1): [%d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][1][0],
-                       ue->measurements.subband_cqi_dB[eNB][1][1],
-                       ue->measurements.subband_cqi_dB[eNB][1][2],
-                       ue->measurements.subband_cqi_dB[eNB][1][3],
-                       ue->measurements.subband_cqi_dB[eNB][1][4],
-                       ue->measurements.subband_cqi_dB[eNB][1][5]);
-
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 0): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][0],
-                       ue->measurements.subband_pmi_im[eNB][0][0],
-                       ue->measurements.subband_pmi_re[eNB][1][0],
-                       ue->measurements.subband_pmi_im[eNB][1][0],
-                       ue->measurements.subband_pmi_re[eNB][2][0],
-                       ue->measurements.subband_pmi_im[eNB][2][0],
-                       ue->measurements.subband_pmi_re[eNB][3][0],
-                       ue->measurements.subband_pmi_im[eNB][3][0],
-                       ue->measurements.subband_pmi_re[eNB][4][0],
-                       ue->measurements.subband_pmi_im[eNB][4][0],
-                       ue->measurements.subband_pmi_re[eNB][5][0],
-                       ue->measurements.subband_pmi_im[eNB][5][0]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 1): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][1],
-                       ue->measurements.subband_pmi_im[eNB][0][1],
-                       ue->measurements.subband_pmi_re[eNB][1][1],
-                       ue->measurements.subband_pmi_im[eNB][1][1],
-                       ue->measurements.subband_pmi_re[eNB][2][1],
-                       ue->measurements.subband_pmi_im[eNB][2][1],
-                       ue->measurements.subband_pmi_re[eNB][3][1],
-                       ue->measurements.subband_pmi_im[eNB][3][1],
-                       ue->measurements.subband_pmi_re[eNB][4][1],
-                       ue->measurements.subband_pmi_im[eNB][4][1],
-                       ue->measurements.subband_pmi_re[eNB][5][1],
-                       ue->measurements.subband_pmi_im[eNB][5][1]);
-
-        len += sprintf(&buffer[len], "[UE PROC] PMI Antenna selection eNB%d : [%d %d %d %d %d %d]\n",
-                       eNB,
-                       ue->measurements.selected_rx_antennas[eNB][0],
-                       ue->measurements.selected_rx_antennas[eNB][1],
-                       ue->measurements.selected_rx_antennas[eNB][2],
-                       ue->measurements.selected_rx_antennas[eNB][3],
-                       ue->measurements.selected_rx_antennas[eNB][4],
-                       ue->measurements.selected_rx_antennas[eNB][5]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (max): %jx\n",eNB,pmi2hex_2Ar1(quantize_subband_pmi(&ue->measurements,eNB,6)));
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (both): %jx,%jx\n",eNB,
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,0,6)),
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,1,6)));
-        break;
-
-      case 25:
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 0): [%d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][0][0],
-                       ue->measurements.subband_cqi_dB[eNB][0][1],
-                       ue->measurements.subband_cqi_dB[eNB][0][2],
-                       ue->measurements.subband_cqi_dB[eNB][0][3],
-                       ue->measurements.subband_cqi_dB[eNB][0][4],
-                       ue->measurements.subband_cqi_dB[eNB][0][5],
-                       ue->measurements.subband_cqi_dB[eNB][0][6]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 1): [%d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][1][0],
-                       ue->measurements.subband_cqi_dB[eNB][1][1],
-                       ue->measurements.subband_cqi_dB[eNB][1][2],
-                       ue->measurements.subband_cqi_dB[eNB][1][3],
-                       ue->measurements.subband_cqi_dB[eNB][1][4],
-                       ue->measurements.subband_cqi_dB[eNB][1][5],
-                       ue->measurements.subband_cqi_dB[eNB][1][6]);
-
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 0): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][0],
-                       ue->measurements.subband_pmi_im[eNB][0][0],
-                       ue->measurements.subband_pmi_re[eNB][1][0],
-                       ue->measurements.subband_pmi_im[eNB][1][0],
-                       ue->measurements.subband_pmi_re[eNB][2][0],
-                       ue->measurements.subband_pmi_im[eNB][2][0],
-                       ue->measurements.subband_pmi_re[eNB][3][0],
-                       ue->measurements.subband_pmi_im[eNB][3][0],
-                       ue->measurements.subband_pmi_re[eNB][4][0],
-                       ue->measurements.subband_pmi_im[eNB][4][0],
-                       ue->measurements.subband_pmi_re[eNB][5][0],
-                       ue->measurements.subband_pmi_im[eNB][5][0],
-                       ue->measurements.subband_pmi_re[eNB][6][0],
-                       ue->measurements.subband_pmi_im[eNB][6][0]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 1): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][1],
-                       ue->measurements.subband_pmi_im[eNB][0][1],
-                       ue->measurements.subband_pmi_re[eNB][1][1],
-                       ue->measurements.subband_pmi_im[eNB][1][1],
-                       ue->measurements.subband_pmi_re[eNB][2][1],
-                       ue->measurements.subband_pmi_im[eNB][2][1],
-                       ue->measurements.subband_pmi_re[eNB][3][1],
-                       ue->measurements.subband_pmi_im[eNB][3][1],
-                       ue->measurements.subband_pmi_re[eNB][4][1],
-                       ue->measurements.subband_pmi_im[eNB][4][1],
-                       ue->measurements.subband_pmi_re[eNB][5][1],
-                       ue->measurements.subband_pmi_im[eNB][5][1],
-                       ue->measurements.subband_pmi_re[eNB][6][1],
-                       ue->measurements.subband_pmi_im[eNB][6][1]);
-
-        len += sprintf(&buffer[len], "[UE PROC] PMI Antenna selection eNB%d : [%d %d %d %d %d %d %d]\n",
-                       eNB,
-                       ue->measurements.selected_rx_antennas[eNB][0],
-                       ue->measurements.selected_rx_antennas[eNB][1],
-                       ue->measurements.selected_rx_antennas[eNB][2],
-                       ue->measurements.selected_rx_antennas[eNB][3],
-                       ue->measurements.selected_rx_antennas[eNB][4],
-                       ue->measurements.selected_rx_antennas[eNB][5],
-                       ue->measurements.selected_rx_antennas[eNB][6]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (max): %jx\n",eNB,pmi2hex_2Ar1(quantize_subband_pmi(&ue->measurements,eNB,7)));
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (both): %jx,%jx\n",eNB,
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,0,7)),
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,1,7)));
-        break;
-
-      case 50:
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 0): [%d %d %d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][0][0],
-                       ue->measurements.subband_cqi_dB[eNB][0][1],
-                       ue->measurements.subband_cqi_dB[eNB][0][2],
-                       ue->measurements.subband_cqi_dB[eNB][0][3],
-                       ue->measurements.subband_cqi_dB[eNB][0][4],
-                       ue->measurements.subband_cqi_dB[eNB][0][5],
-                       ue->measurements.subband_cqi_dB[eNB][0][6],
-                       ue->measurements.subband_cqi_dB[eNB][0][7],
-                       ue->measurements.subband_cqi_dB[eNB][0][8]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 1): [%d %d %d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][1][0],
-                       ue->measurements.subband_cqi_dB[eNB][1][1],
-                       ue->measurements.subband_cqi_dB[eNB][1][2],
-                       ue->measurements.subband_cqi_dB[eNB][1][3],
-                       ue->measurements.subband_cqi_dB[eNB][1][4],
-                       ue->measurements.subband_cqi_dB[eNB][1][5],
-                       ue->measurements.subband_cqi_dB[eNB][1][6],
-                       ue->measurements.subband_cqi_dB[eNB][1][7],
-                       ue->measurements.subband_cqi_dB[eNB][1][8]);
-
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 0): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][0],
-                       ue->measurements.subband_pmi_im[eNB][0][0],
-                       ue->measurements.subband_pmi_re[eNB][1][0],
-                       ue->measurements.subband_pmi_im[eNB][1][0],
-                       ue->measurements.subband_pmi_re[eNB][2][0],
-                       ue->measurements.subband_pmi_im[eNB][2][0],
-                       ue->measurements.subband_pmi_re[eNB][3][0],
-                       ue->measurements.subband_pmi_im[eNB][3][0],
-                       ue->measurements.subband_pmi_re[eNB][4][0],
-                       ue->measurements.subband_pmi_im[eNB][4][0],
-                       ue->measurements.subband_pmi_re[eNB][5][0],
-                       ue->measurements.subband_pmi_im[eNB][5][0],
-                       ue->measurements.subband_pmi_re[eNB][6][0],
-                       ue->measurements.subband_pmi_im[eNB][6][0],
-                       ue->measurements.subband_pmi_re[eNB][7][0],
-                       ue->measurements.subband_pmi_im[eNB][7][0],
-                       ue->measurements.subband_pmi_re[eNB][8][0],
-                       ue->measurements.subband_pmi_im[eNB][8][0]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 1): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][1],
-                       ue->measurements.subband_pmi_im[eNB][0][1],
-                       ue->measurements.subband_pmi_re[eNB][1][1],
-                       ue->measurements.subband_pmi_im[eNB][1][1],
-                       ue->measurements.subband_pmi_re[eNB][2][1],
-                       ue->measurements.subband_pmi_im[eNB][2][1],
-                       ue->measurements.subband_pmi_re[eNB][3][1],
-                       ue->measurements.subband_pmi_im[eNB][3][1],
-                       ue->measurements.subband_pmi_re[eNB][4][1],
-                       ue->measurements.subband_pmi_im[eNB][4][1],
-                       ue->measurements.subband_pmi_re[eNB][5][1],
-                       ue->measurements.subband_pmi_im[eNB][5][1],
-                       ue->measurements.subband_pmi_re[eNB][6][1],
-                       ue->measurements.subband_pmi_im[eNB][6][1],
-                       ue->measurements.subband_pmi_re[eNB][7][1],
-                       ue->measurements.subband_pmi_im[eNB][7][1],
-                       ue->measurements.subband_pmi_re[eNB][8][1],
-                       ue->measurements.subband_pmi_im[eNB][8][1]);
-
-        len += sprintf(&buffer[len], "[UE PROC] PMI Antenna selection eNB%d : [%d %d %d %d %d %d %d %d %d]\n",
-                       eNB,
-                       ue->measurements.selected_rx_antennas[eNB][0],
-                       ue->measurements.selected_rx_antennas[eNB][1],
-                       ue->measurements.selected_rx_antennas[eNB][2],
-                       ue->measurements.selected_rx_antennas[eNB][3],
-                       ue->measurements.selected_rx_antennas[eNB][4],
-                       ue->measurements.selected_rx_antennas[eNB][5],
-                       ue->measurements.selected_rx_antennas[eNB][6],
-                       ue->measurements.selected_rx_antennas[eNB][7],
-                       ue->measurements.selected_rx_antennas[eNB][8]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (max): %jx\n",eNB,pmi2hex_2Ar1(quantize_subband_pmi(&ue->measurements,eNB,9)));
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (both): %jx,%jx\n",eNB,
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,0,9)),
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,1,9)));
-        break;
-
-      case 100:
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 0): [%d %d %d %d %d %d %d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][0][0],
-                       ue->measurements.subband_cqi_dB[eNB][0][1],
-                       ue->measurements.subband_cqi_dB[eNB][0][2],
-                       ue->measurements.subband_cqi_dB[eNB][0][3],
-                       ue->measurements.subband_cqi_dB[eNB][0][4],
-                       ue->measurements.subband_cqi_dB[eNB][0][5],
-                       ue->measurements.subband_cqi_dB[eNB][0][6],
-                       ue->measurements.subband_cqi_dB[eNB][0][7],
-                       ue->measurements.subband_cqi_dB[eNB][0][8],
-                       ue->measurements.subband_cqi_dB[eNB][0][9],
-                       ue->measurements.subband_cqi_dB[eNB][0][10],
-                       ue->measurements.subband_cqi_dB[eNB][0][11],
-                       ue->measurements.subband_cqi_dB[eNB][0][12]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband CQI eNB%d (Ant 1): [%d %d %d %d %d %d %d %d %d %d %d %d %d] dB\n",
-                       eNB,
-                       ue->measurements.subband_cqi_dB[eNB][1][0],
-                       ue->measurements.subband_cqi_dB[eNB][1][1],
-                       ue->measurements.subband_cqi_dB[eNB][1][2],
-                       ue->measurements.subband_cqi_dB[eNB][1][3],
-                       ue->measurements.subband_cqi_dB[eNB][1][4],
-                       ue->measurements.subband_cqi_dB[eNB][1][5],
-                       ue->measurements.subband_cqi_dB[eNB][1][6],
-                       ue->measurements.subband_cqi_dB[eNB][1][7],
-                       ue->measurements.subband_cqi_dB[eNB][1][8],
-                       ue->measurements.subband_cqi_dB[eNB][1][9],
-                       ue->measurements.subband_cqi_dB[eNB][1][10],
-                       ue->measurements.subband_cqi_dB[eNB][1][11],
-                       ue->measurements.subband_cqi_dB[eNB][1][12]);
-
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 0): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][0],
-                       ue->measurements.subband_pmi_im[eNB][0][0],
-                       ue->measurements.subband_pmi_re[eNB][1][0],
-                       ue->measurements.subband_pmi_im[eNB][1][0],
-                       ue->measurements.subband_pmi_re[eNB][2][0],
-                       ue->measurements.subband_pmi_im[eNB][2][0],
-                       ue->measurements.subband_pmi_re[eNB][3][0],
-                       ue->measurements.subband_pmi_im[eNB][3][0],
-                       ue->measurements.subband_pmi_re[eNB][4][0],
-                       ue->measurements.subband_pmi_im[eNB][4][0],
-                       ue->measurements.subband_pmi_re[eNB][5][0],
-                       ue->measurements.subband_pmi_im[eNB][5][0],
-                       ue->measurements.subband_pmi_re[eNB][6][0],
-                       ue->measurements.subband_pmi_im[eNB][6][0],
-                       ue->measurements.subband_pmi_re[eNB][7][0],
-                       ue->measurements.subband_pmi_im[eNB][7][0],
-                       ue->measurements.subband_pmi_re[eNB][8][0],
-                       ue->measurements.subband_pmi_im[eNB][8][0],
-                       ue->measurements.subband_pmi_re[eNB][9][0],
-                       ue->measurements.subband_pmi_im[eNB][9][0],
-                       ue->measurements.subband_pmi_re[eNB][10][0],
-                       ue->measurements.subband_pmi_im[eNB][10][0],
-                       ue->measurements.subband_pmi_re[eNB][11][0],
-                       ue->measurements.subband_pmi_im[eNB][11][0],
-                       ue->measurements.subband_pmi_re[eNB][12][0],
-                       ue->measurements.subband_pmi_im[eNB][12][0]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Subband PMI eNB%d (Ant 1): [(%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d) (%d %d)]\n",
-                       eNB,
-                       ue->measurements.subband_pmi_re[eNB][0][1],
-                       ue->measurements.subband_pmi_im[eNB][0][1],
-                       ue->measurements.subband_pmi_re[eNB][1][1],
-                       ue->measurements.subband_pmi_im[eNB][1][1],
-                       ue->measurements.subband_pmi_re[eNB][2][1],
-                       ue->measurements.subband_pmi_im[eNB][2][1],
-                       ue->measurements.subband_pmi_re[eNB][3][1],
-                       ue->measurements.subband_pmi_im[eNB][3][1],
-                       ue->measurements.subband_pmi_re[eNB][4][1],
-                       ue->measurements.subband_pmi_im[eNB][4][1],
-                       ue->measurements.subband_pmi_re[eNB][5][1],
-                       ue->measurements.subband_pmi_im[eNB][5][1],
-                       ue->measurements.subband_pmi_re[eNB][6][1],
-                       ue->measurements.subband_pmi_im[eNB][6][1],
-                       ue->measurements.subband_pmi_re[eNB][7][1],
-                       ue->measurements.subband_pmi_im[eNB][7][1],
-                       ue->measurements.subband_pmi_re[eNB][8][1],
-                       ue->measurements.subband_pmi_im[eNB][8][1],
-                       ue->measurements.subband_pmi_re[eNB][9][1],
-                       ue->measurements.subband_pmi_im[eNB][9][1],
-                       ue->measurements.subband_pmi_re[eNB][10][1],
-                       ue->measurements.subband_pmi_im[eNB][10][1],
-                       ue->measurements.subband_pmi_re[eNB][11][1],
-                       ue->measurements.subband_pmi_im[eNB][11][1],
-                       ue->measurements.subband_pmi_re[eNB][12][1],
-                       ue->measurements.subband_pmi_im[eNB][12][1]);
-
-        len += sprintf(&buffer[len], "[UE PROC] PMI Antenna selection eNB%d : [%d %d %d %d %d %d %d %d %d %d %d %d %d]\n",
-                       eNB,
-                       ue->measurements.selected_rx_antennas[eNB][0],
-                       ue->measurements.selected_rx_antennas[eNB][1],
-                       ue->measurements.selected_rx_antennas[eNB][2],
-                       ue->measurements.selected_rx_antennas[eNB][3],
-                       ue->measurements.selected_rx_antennas[eNB][4],
-                       ue->measurements.selected_rx_antennas[eNB][5],
-                       ue->measurements.selected_rx_antennas[eNB][6],
-                       ue->measurements.selected_rx_antennas[eNB][7],
-                       ue->measurements.selected_rx_antennas[eNB][8],
-                       ue->measurements.selected_rx_antennas[eNB][9],
-                       ue->measurements.selected_rx_antennas[eNB][10],
-                       ue->measurements.selected_rx_antennas[eNB][11],
-                       ue->measurements.selected_rx_antennas[eNB][12]);
-
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (max): %jx\n",eNB,pmi2hex_2Ar1(quantize_subband_pmi(&ue->measurements,eNB,13)));
-        len += sprintf(&buffer[len], "[UE PROC] Quantized PMI eNB %d (both): %jx,%jx\n",eNB,
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,0,13)),
-                       pmi2hex_2Ar1(quantize_subband_pmi2(&ue->measurements,eNB,1,13)));
-        break;
-      }
-
-#ifdef OPENAIR2
-      RRC_status = mac_UE_get_rrc_status(ue->Mod_id, 0);
-      len += sprintf(&buffer[len],"[UE PROC] RRC status = %d\n",RRC_status);
-#endif
-
- 
-      len += sprintf(&buffer[len], "[UE PROC] Transmission Mode %d \n",ue->transmission_mode[eNB]);
-      len += sprintf(&buffer[len], "[UE PROC] PBCH err conseq %d, PBCH error total %d, PBCH FER %d\n",
-                     ue->pbch_vars[eNB]->pdu_errors_conseq,
-                     ue->pbch_vars[eNB]->pdu_errors,
-                     ue->pbch_vars[eNB]->pdu_fer);
-
-      if (ue->transmission_mode[eNB] == 6)
-        len += sprintf(&buffer[len], "[UE PROC] Mode 6 Wideband CQI eNB %d : %d dB\n",eNB,ue->measurements.precoded_cqi_dB[eNB][0]);
-
-      for (harq_pid=0;harq_pid<8;harq_pid++) {
-	len+=sprintf(&buffer[len],"[UE PROC] eNB %d: CW 0 harq_pid %d, mcs %d:",eNB,harq_pid,ue->dlsch[0][0][0]->harq_processes[harq_pid]->mcs);
-	for (round=0;round<8;round++)
-	  len+=sprintf(&buffer[len],"%d/%d ",
-		       ue->dlsch[0][0][0]->harq_processes[harq_pid]->errors[round],
-		       ue->dlsch[0][0][0]->harq_processes[harq_pid]->trials[round]);
-	len+=sprintf(&buffer[len],"\n");
-      }
-      if (ue->dlsch[0][0] && ue->dlsch[0][0][0] && ue->dlsch[0][0][1]) {
-        len += sprintf(&buffer[len], "[UE PROC] Saved PMI for DLSCH eNB %d : %jx (%p)\n",eNB,pmi2hex_2Ar1(ue->dlsch[0][0][0]->pmi_alloc),ue->dlsch[0][0][0]);
-
-        len += sprintf(&buffer[len], "[UE PROC] eNB %d: dl_power_off = %d\n",eNB,ue->dlsch[0][0][0]->harq_processes[0]->dl_power_off);
-
-	for (harq_pid=0;harq_pid<8;harq_pid++) {
-	  len+=sprintf(&buffer[len],"[UE PROC] eNB %d: CW 1 harq_pid %d, mcs %d:",eNB,harq_pid,ue->dlsch[0][0][1]->harq_processes[0]->mcs);
-	  for (round=0;round<8;round++)
-	    len+=sprintf(&buffer[len],"%d/%d ",
-			 ue->dlsch[0][0][1]->harq_processes[harq_pid]->errors[round],
-			 ue->dlsch[0][0][1]->harq_processes[harq_pid]->trials[round]);
-	  len+=sprintf(&buffer[len],"\n");
-	}
-      }
-
-      len += sprintf(&buffer[len], "[UE PROC] DLSCH Total %d, Error %d, FER %d\n",ue->dlsch_received[0],ue->dlsch_errors[0],ue->dlsch_fer[0]);
-      len += sprintf(&buffer[len], "[UE PROC] DLSCH (SI) Total %d, Error %d\n",ue->dlsch_SI_received[0],ue->dlsch_SI_errors[0]);
-      len += sprintf(&buffer[len], "[UE PROC] DLSCH (RA) Total %d, Error %d\n",ue->dlsch_ra_received[0],ue->dlsch_ra_errors[0]);
-#if defined(Rel10) || defined(Rel14)
-      int i=0;
-
-      //len += sprintf(&buffer[len], "[UE PROC] MCH  Total %d\n", ue->dlsch_mch_received[0]);
-      for(i=0; i <ue->frame_parms.num_MBSFN_config; i++ ) {
-        len += sprintf(&buffer[len], "[UE PROC] MCH (MCCH MBSFN %d) Total %d, Error %d, Trials %d\n",
-                       i, ue->dlsch_mcch_received[i][0],ue->dlsch_mcch_errors[i][0],ue->dlsch_mcch_trials[i][0]);
-        len += sprintf(&buffer[len], "[UE PROC] MCH (MTCH MBSFN %d) Total %d, Error %d, Trials %d\n",
-                       i, ue->dlsch_mtch_received[i][0],ue->dlsch_mtch_errors[i][0],ue->dlsch_mtch_trials[i][0]);
-      }
-
-#endif
-      len += sprintf(&buffer[len], "[UE PROC] DLSCH Bitrate %dkbps\n",(ue->bitrate[0]/1000));
-      len += sprintf(&buffer[len], "[UE PROC] Total Received Bits %dkbits\n",(ue->total_received_bits[0]/1000));
-      len += sprintf(&buffer[len], "[UE PROC] IA receiver %d\n",ue->use_ia_receiver);
-
-    }
-
-  } else {
-    len += sprintf(&buffer[len], "[UE PROC] Frame count: %d, RSSI %3.2f dB (%d dB, %d dB), N0 %3.2f dB (%d dB, %d dB)\n",
-                   proc->frame_rx,
-                   10*log10(ue->measurements.rssi),
-                   ue->measurements.rx_power_dB[0][0],
-                   ue->measurements.rx_power_dB[0][1],
-                   10*log10(ue->measurements.n0_power_tot),
-                   ue->measurements.n0_power_dB[0],
-                   ue->measurements.n0_power_dB[1]);
-#ifdef EXMIMO
-    ue->rx_total_gain_dB = ((int)(10*log10(ue->measurements.rssi)))-input_level_dBm;
-    len += sprintf(&buffer[len], "[UE PROC] rxg_mode %d, input level (set by user) %d dBm, VGA gain %d dB ==> total gain %3.2f dB, noise figure %3.2f dB\n",
-                   openair0_cfg[0].rxg_mode[0],
-                   input_level_dBm,
-                   (int)openair0_cfg[0].rx_gain[0],
-                   10*log10(ue->measurements.rssi)-input_level_dBm,
-                   10*log10(ue->measurements.n0_power_tot)-ue->rx_total_gain_dB+105);
-#endif
-  }
-
-  len += sprintf(&buffer[len],"EOF\n");
-
-  return len;
-} // is_clusterhead
-
-/*
-int dump_eNB_stats(PHY_VARS_eNB *eNB, char* buffer, int length)
-{
-
-  unsigned int success=0;
-  uint8_t eNB_id,UE_id,i,j,number_of_cards_l=1;
-  uint32_t ulsch_errors=0,dlsch_errors=0;
-  uint32_t ulsch_round_attempts[4]= {0,0,0,0},ulsch_round_errors[4]= {0,0,0,0};
-  uint32_t dlsch_round_attempts[4]= {0,0,0,0},dlsch_round_errors[4]= {0,0,0,0};
-  uint32_t UE_id_mac, RRC_status;
-  eNB_rxtx_proc_t *proc = &eNB->proc.proc_rxtx[0];
-  if (eNB==NULL)
-    return 0;
-
-  int len = length;
-
-  //  if(eNB->frame==0){
-  eNB->total_dlsch_bitrate = 0;//eNB->UE_stats[UE_id].dlsch_bitrate + eNB->total_dlsch_bitrate;
-  eNB->total_transmitted_bits = 0;// eNB->UE_stats[UE_id].total_transmitted_bits +  eNB->total_transmitted_bits;
-  eNB->total_system_throughput = 0;//eNB->UE_stats[UE_id].total_transmitted_bits + eNB->total_system_throughput;
-  // }
-
-  for (eNB_id=0; eNB_id<number_of_cards_l; eNB_id++) {
-    len += sprintf(&buffer[len],"eNB %d/%d Frame %d: RX Gain %d dB, I0 %d dBm (%d,%d) dB \n",
-                   eNB_id,number_of_cards_l,
-                   proc->frame_tx,
-                   eNB->rx_total_gain_dB,
-                   eNB->measurements.n0_power_tot_dBm,
-                   eNB->measurements.n0_power_dB[0],
-                   eNB->measurements.n0_power_dB[1]);
-
-    len += sprintf(&buffer[len],"PRB I0 (%X.%X.%X.%X): ",
-		   eNB->rb_mask_ul[0],
-		   eNB->rb_mask_ul[1],eNB->rb_mask_ul[2],eNB->rb_mask_ul[3]);
-
-    for (i=0; i<eNB->frame_parms.N_RB_UL; i++) {
-      len += sprintf(&buffer[len],"%4d ",
-                     eNB->measurements.n0_subband_power_tot_dBm[i]);
-      if ((i>0) && ((i%25) == 0)) 
-	len += sprintf(&buffer[len],"\n");
-    }
-    len += sprintf(&buffer[len],"\n");
-    len += sprintf(&buffer[len],"\nPERFORMANCE PARAMETERS\n");
-
-    for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
-      if (eNB &&
-	  (eNB->dlsch!=NULL) &&
-	  (eNB->dlsch[(uint8_t)UE_id]!=NULL) &&
-	  (eNB->dlsch[(uint8_t)UE_id][0]->rnti>0)&&
-	  (eNB->UE_stats[UE_id].mode == PUSCH)) {	
-
-        eNB->total_dlsch_bitrate = eNB->UE_stats[UE_id].dlsch_bitrate + eNB->total_dlsch_bitrate;
-        eNB->total_transmitted_bits = eNB->UE_stats[UE_id].total_TBS + eNB->total_transmitted_bits;
-
-        //eNB->total_system_throughput = eNB->UE_stats[UE_id].total_transmitted_bits + eNB->total_system_throughput;
-         
-	for (i=0; i<8; i++)
-	  success = success + (eNB->UE_stats[UE_id].dlsch_trials[i][0] - eNB->UE_stats[UE_id].dlsch_l2_errors[i]);
-
-    
-	
-	len += sprintf(&buffer[len],"Total DLSCH %d kbits / %d frames ",(eNB->total_transmitted_bits/1000),proc->frame_tx+1);
-	len += sprintf(&buffer[len],"Total DLSCH throughput %d kbps ",(eNB->total_dlsch_bitrate/1000));
-	len += sprintf(&buffer[len],"Total DLSCH trans %d / %d frames\n",success,proc->frame_tx+1);
-	//len += sprintf(&buffer[len],"[eNB PROC] FULL MU-MIMO Transmissions/Total Transmissions = %d/%d\n",eNB->FULL_MUMIMO_transmissions,eNB->check_for_total_transmissions);
-	//len += sprintf(&buffer[len],"[eNB PROC] MU-MIMO Transmissions/Total Transmissions = %d/%d\n",eNB->check_for_MUMIMO_transmissions,eNB->check_for_total_transmissions);
-	//len += sprintf(&buffer[len],"[eNB PROC] SU-MIMO Transmissions/Total Transmissions = %d/%d\n",eNB->check_for_SUMIMO_transmissions,eNB->check_for_total_transmissions);
-	
-	len += sprintf(&buffer[len],"UE %d (%x) Power: (%d,%d) dB, Po_PUSCH: (%d,%d) dBm, Po_PUCCH (%d/%d) dBm, Po_PUCCH1 (%d,%d) dBm,  PUCCH1 Thres %d dBm \n",
-		       UE_id,
-		       eNB->UE_stats[UE_id].crnti,
-		       dB_fixed(eNB->pusch_vars[UE_id]->ulsch_power[0]),
-		       dB_fixed(eNB->pusch_vars[UE_id]->ulsch_power[1]),
-		       eNB->UE_stats[UE_id].UL_rssi[0],
-		       eNB->UE_stats[UE_id].UL_rssi[1],
-		       dB_fixed(eNB->UE_stats[UE_id].Po_PUCCH/eNB->frame_parms.N_RB_UL)-eNB->rx_total_gain_dB,
-		       eNB->frame_parms.ul_power_control_config_common.p0_NominalPUCCH,
-		       dB_fixed(eNB->UE_stats[UE_id].Po_PUCCH1_below/eNB->frame_parms.N_RB_UL)-eNB->rx_total_gain_dB,
-		       dB_fixed(eNB->UE_stats[UE_id].Po_PUCCH1_above/eNB->frame_parms.N_RB_UL)-eNB->rx_total_gain_dB,
-		       PUCCH1_THRES+eNB->measurements.n0_power_tot_dBm-dB_fixed(eNB->frame_parms.N_RB_UL));
-	
-	len+= sprintf(&buffer[len],"DL mcs %d, UL mcs %d, UL rb %d, delta_TF %d, ",
-		      eNB->dlsch[(uint8_t)UE_id][0]->harq_processes[0]->mcs,
-		      eNB->ulsch[(uint8_t)UE_id]->harq_processes[0]->mcs,
-		      eNB->ulsch[(uint8_t)UE_id]->harq_processes[0]->nb_rb,
-		      eNB->ulsch[(uint8_t)UE_id]->harq_processes[0]->delta_TF);
-	
-	len += sprintf(&buffer[len],"Wideband CQI: (%d,%d) dB\n",
-		       eNB->measurements.wideband_cqi_dB[UE_id][0],
-		       eNB->measurements.wideband_cqi_dB[UE_id][1]);
-	
-	len += sprintf(&buffer[len],"DL TM %d, DL_cqi %d, DL_pmi_single %jx ",
-		       eNB->transmission_mode[UE_id],
-		       eNB->UE_stats[UE_id].DL_cqi[0],
-		       pmi2hex_2Ar1(eNB->UE_stats[UE_id].DL_pmi_single));
-
-	len += sprintf(&buffer[len],"Timing advance %d samples (%d 16Ts), update %d ",
-		       eNB->UE_stats[UE_id].UE_timing_offset,
-		       eNB->UE_stats[UE_id].UE_timing_offset>>2,
-		       eNB->UE_stats[UE_id].timing_advance_update);
-	
-	len += sprintf(&buffer[len],"Mode = %s(%d) ",
-		       mode_string[eNB->UE_stats[UE_id].mode],
-		       eNB->UE_stats[UE_id].mode);
-	UE_id_mac = find_UE_id(eNB->Mod_id,eNB->dlsch[(uint8_t)UE_id][0]->rnti);
-	
-	if (UE_id_mac != -1) {
-	  RRC_status = mac_eNB_get_rrc_status(eNB->Mod_id,eNB->dlsch[(uint8_t)UE_id][0]->rnti);
-	  len += sprintf(&buffer[len],"UE_id_mac = %d, RRC status = %d\n",UE_id_mac,RRC_status);
-	} else
-	  len += sprintf(&buffer[len],"UE_id_mac = -1\n");
-	
-        len += sprintf(&buffer[len],"SR received/total: %d/%d (diff %d)\n",
-                       eNB->UE_stats[UE_id].sr_received,
-                       eNB->UE_stats[UE_id].sr_total,
-                       eNB->UE_stats[UE_id].sr_total-eNB->UE_stats[UE_id].sr_received);
-	
-	len += sprintf(&buffer[len],"DL Subband CQI: ");
-
-	int nb_sb;
-	switch (eNB->frame_parms.N_RB_DL) {
-	case 6:
-	  nb_sb=0;
-	  break;
-	case 15:
-	  nb_sb = 4;
-	case 25:
-	  nb_sb = 7;
-	  break;
-	case 50:
-	  nb_sb = 9;
-	  break;
-	case 75:
-	  nb_sb = 10;
-	  break;
-	case 100:
-	  nb_sb = 13;
-	  break;
-	default:
-	  nb_sb=0;
-	  break;
-	}	
-	for (i=0; i<nb_sb; i++)
-	  len += sprintf(&buffer[len],"%2d ",
-			 eNB->UE_stats[UE_id].DL_subband_cqi[0][i]);
-	len += sprintf(&buffer[len],"\n");
-	
-
-
-        ulsch_errors = 0;
-
-        for (j=0; j<4; j++) {
-          ulsch_round_attempts[j]=0;
-          ulsch_round_errors[j]=0;
-        }
-
-        len += sprintf(&buffer[len],"ULSCH errors/attempts per harq (per round): \n");
-
-        for (i=0; i<8; i++) {
-          len += sprintf(&buffer[len],"   harq %d: %d/%d (fer %d) (%d/%d, %d/%d, %d/%d, %d/%d) ",
-                         i,
-                         eNB->UE_stats[UE_id].ulsch_errors[i],
-                         eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][0],
-                         eNB->UE_stats[UE_id].ulsch_round_fer[i][0],
-                         eNB->UE_stats[UE_id].ulsch_round_errors[i][0],
-                         eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][0],
-                         eNB->UE_stats[UE_id].ulsch_round_errors[i][1],
-                         eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][1],
-                         eNB->UE_stats[UE_id].ulsch_round_errors[i][2],
-                         eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][2],
-                         eNB->UE_stats[UE_id].ulsch_round_errors[i][3],
-                         eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][3]);
-	  if ((i&1) == 1)
-	    len += sprintf(&buffer[len],"\n");
-	    
-          ulsch_errors+=eNB->UE_stats[UE_id].ulsch_errors[i];
-
-          for (j=0; j<4; j++) {
-            ulsch_round_attempts[j]+=eNB->UE_stats[UE_id].ulsch_decoding_attempts[i][j];
-            ulsch_round_errors[j]+=eNB->UE_stats[UE_id].ulsch_round_errors[i][j];
-          }
-        }
-
-        len += sprintf(&buffer[len],"ULSCH errors/attempts total %d/%d (%d/%d, %d/%d, %d/%d, %d/%d)\n",
-                       ulsch_errors,ulsch_round_attempts[0],
-
-                       ulsch_round_errors[0],ulsch_round_attempts[0],
-                       ulsch_round_errors[1],ulsch_round_attempts[1],
-                       ulsch_round_errors[2],ulsch_round_attempts[2],
-                       ulsch_round_errors[3],ulsch_round_attempts[3]);
-
-        dlsch_errors = 0;
-
-        for (j=0; j<4; j++) {
-          dlsch_round_attempts[j]=0;
-          dlsch_round_errors[j]=0;
-        }
-
-        len += sprintf(&buffer[len],"DLSCH errors/attempts per harq (per round): \n");
-
-        for (i=0; i<8; i++) {
-          len += sprintf(&buffer[len],"   harq %d: %d/%d (%d/%d/%d, %d/%d/%d, %d/%d/%d, %d/%d/%d) ",
-                         i,
-                         eNB->UE_stats[UE_id].dlsch_l2_errors[i],
-                         eNB->UE_stats[UE_id].dlsch_trials[i][0],
-                         eNB->UE_stats[UE_id].dlsch_ACK[i][0],
-                         eNB->UE_stats[UE_id].dlsch_NAK[i][0],
-                         eNB->UE_stats[UE_id].dlsch_trials[i][0],
-                         eNB->UE_stats[UE_id].dlsch_ACK[i][1],
-                         eNB->UE_stats[UE_id].dlsch_NAK[i][1],
-                         eNB->UE_stats[UE_id].dlsch_trials[i][1],
-                         eNB->UE_stats[UE_id].dlsch_ACK[i][2],
-                         eNB->UE_stats[UE_id].dlsch_NAK[i][2],
-                         eNB->UE_stats[UE_id].dlsch_trials[i][2],
-                         eNB->UE_stats[UE_id].dlsch_ACK[i][3],
-                         eNB->UE_stats[UE_id].dlsch_NAK[i][3],
-                         eNB->UE_stats[UE_id].dlsch_trials[i][3]);
-	  if ((i&1) == 1)
-	    len += sprintf(&buffer[len],"\n");
-
-
-          dlsch_errors+=eNB->UE_stats[UE_id].dlsch_l2_errors[i];
-
-          for (j=0; j<4; j++) {
-            dlsch_round_attempts[j]+=eNB->UE_stats[UE_id].dlsch_trials[i][j];
-            dlsch_round_errors[j]+=eNB->UE_stats[UE_id].dlsch_NAK[i][j];
-          }
-        }
-
-        len += sprintf(&buffer[len],"DLSCH errors/attempts total %d/%d (%d/%d, %d/%d, %d/%d, %d/%d): \n",
-                       dlsch_errors,dlsch_round_attempts[0],
-                       dlsch_round_errors[0],dlsch_round_attempts[0],
-                       dlsch_round_errors[1],dlsch_round_attempts[1],
-                       dlsch_round_errors[2],dlsch_round_attempts[2],
-                       dlsch_round_errors[3],dlsch_round_attempts[3]);
-
-
-        len += sprintf(&buffer[len],"DLSCH total bits from MAC: %dkbit ",(eNB->UE_stats[UE_id].total_TBS_MAC)/1000);
-        len += sprintf(&buffer[len],"DLSCH total bits ack'ed: %dkbit ",(eNB->UE_stats[UE_id].total_TBS)/1000);
-        len += sprintf(&buffer[len],"DLSCH Average throughput (100 frames): %dkbps\n",(eNB->UE_stats[UE_id].dlsch_bitrate/1000));
-	//        len += sprintf(&buffer[len],"[eNB PROC] Transmission Mode %d\n",eNB->transmission_mode[UE_id]);
-      }
-    }
-
-    len += sprintf(&buffer[len],"\n");
-  }
-  
-  len += sprintf(&buffer[len],"EOF\n");
-  
-  return len;
-}
-*/
@@ -36,8 +36,8 @@
 */

 //#include "defs.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"

 int generate_pss(int32_t **txdataF,
                 short amp,
@@ -105,10 +105,3 @@ int generate_pss(int32_t **txdataF,
  return(0);
 }

-int generate_pss_emul(PHY_VARS_eNB *phy_vars_eNb,uint8_t sect_id)
-{
-
-  LOG_D(PHY,"EMUL eNB generate_pss_emul eNB %d, sect_id %d\n",phy_vars_eNb->Mod_id,sect_id);
-  eNB_transport_info[phy_vars_eNb->Mod_id][phy_vars_eNb->CC_id].cntl.pss=sect_id;
-  return(0);
-}
@@ -0,0 +1,270 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/pucch_common.c
+* \brief Top-level routines common to eNB/UE for the PUCCH physical channel V8.6 2009-03
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h" 
+#include "LAYER2/MAC/mac.h"
+
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+
+#include "T.h"
+
+void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7])
+{
+
+  uint8_t ns,l,reset=1,i,N_UL_symb;
+  uint32_t x1,x2,j=0,s=0;
+
+  N_UL_symb = (frame_parms->Ncp==0) ? 7 : 6;
+  x2 = frame_parms->Nid_cell;
+
+  for (ns=0; ns<20; ns++) {
+
+    for (l=0; l<N_UL_symb; l++) {
+      ncs_cell[ns][l]=0;
+
+      for (i=0; i<8; i++) {
+        if ((j%32) == 0) {
+          s = lte_gold_generic(&x1,&x2,reset);
+          //    printf("s %x\n",s);
+          reset=0;
+        }
+
+        if (((s>>(j%32))&1)==1)
+          ncs_cell[ns][l] += (1<<i);
+
+        j++;
+      }
+
+#ifdef DEBUG_PUCCH_TX
+      printf("[PHY] PUCCH ncs_cell init (j %d): Ns %d, l %d => ncs_cell %d\n",j,ns,l,ncs_cell[ns][l]);
+#endif
+    }
+
+  }
+}
+
+int16_t W4[3][4] = {{32767, 32767, 32767, 32767},
+  {32767,-32768, 32767,-32768},
+  {32767,-32768,-32768, 32767}
+};
+int16_t W3_re[3][6] = {{32767, 32767, 32767},
+  {32767,-16384,-16384},
+  {32767,-16384,-16384}
+};
+
+int16_t W3_im[3][6] = {{0    ,0     ,0     },
+  {0    , 28377,-28378},
+  {0    ,-28378, 28377}
+};
+
+char *pucch_format_string[] = {
+  "format 1",
+  "format 1a",
+  "format 1b",
+  "pucch_format1b_csA2",
+  "pucch_format1b_csA3",
+  "pucch_format1b_csA4",
+  "format 2",
+  "format 2a",
+  "format 2b",
+  "pucch_format3"
+};
+
+
+
+uint8_t chcod_tbl[128][48] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
+  {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1},
+  {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0},
+  {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+  {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1},
+  {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1},
+  {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0},
+  {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0},
+  {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1},
+  {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1},
+  {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0},
+  {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0},
+  {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
+  {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1},
+  {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0},
+  {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1},
+  {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0},
+  {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0},
+  {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1},
+  {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1},
+  {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0},
+  {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+  {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1},
+  {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1},
+  {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0},
+  {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0},
+  {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1},
+  {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1},
+  {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0},
+  {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
+  {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1},
+  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1},
+  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
+  {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
+  {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+  {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1},
+  {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0},
+  {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0},
+  {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
+  {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1},
+  {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0},
+  {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+  {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1},
+  {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1},
+  {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0},
+  {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0},
+  {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1},
+  {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},
+  {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1},
+  {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1},
+  {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0},
+  {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0},
+  {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1},
+  {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1},
+  {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0},
+  {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0},
+  {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1},
+  {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1},
+  {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0},
+  {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+  {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1},
+  {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1},
+  {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0},
+  {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1},
+  {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0},
+  {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0},
+  {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1},
+  {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+  {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+  {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0},
+  {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1},
+  {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1},
+  {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+  {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0},
+  {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1},
+  {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1},
+  {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0},
+  {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0},
+  {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1},
+  {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0},
+  {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1},
+  {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
+  {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0},
+  {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0},
+  {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1},
+  {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1},
+  {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0},
+  {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0},
+  {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1},
+  {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1},
+  {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0},
+  {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0},
+  {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1},
+  {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1},
+  {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0},
+  {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0},
+  {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1},
+  {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1},
+  {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
+  {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0},
+  {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1},
+  {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1},
+  {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0},
+  {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0},
+  {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1},
+  {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1},
+  {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0},
+  {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0},
+  {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1},
+  {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1},
+  {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0},
+  {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1},
+  {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0},
+  {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0},
+  {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1},
+  {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},
+  {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+  {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0},
+  {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1},
+  {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+  {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0},
+  {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0},
+  {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1},
+  {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1},
+  {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0},
+  {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0},
+  {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1} };
+
+int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
+int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+
+// W5_TBL
+int16_t W5_fmt3_re[5][5] = { {32767, 32767, 32767, 32767, 32767},
+  {32767, 10125, -26509, -26509, 10125},
+  {32767, -26509, 10125, 10125, -26509},
+  {32767, -26509, 10125, 10125, -26509},
+  {32767, 10125, -26509, -26509, 10125} };
+
+int16_t W5_fmt3_im[5][5] = { {0, 0, 0, 0, 0},
+  {0, 31163, 19259, -19259, -31163},
+  {0, 19259, -31163, 31163, -19259},
+  {0, -19259, 31163, -31163, 19259},
+  {0, -31163, -19259, 19259, 31163} };
+
+int16_t W4_fmt3[4][4] = { {32767, 32767, 32767, 32767},
+  {32767, -32767, 32767, -32767},
+  {32767, 32767, -32767, -32767},
+  {32767, -32767, -32767, 32767} };
+
+// W2 TBL
+int16_t W2[2] = {32767, 32767};
+
+// e^j*pai*floor (ncs_cell(ns,l)/64)/2
+int16_t RotTBL_re[4] = {32767, 0, -32767, 0};
+int16_t RotTBL_im[4] = {0, 32767, 0, -32767};
+
+//np4_tbl, np5_tbl
+uint8_t Np5_TBL[5] = {0, 3, 6, 8, 10};
+uint8_t Np4_TBL[4] = {0, 3, 6, 9};
+
+// alpha_TBL
+int16_t alphaTBL_re[12] = {32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383, 0, 16383, 28377};
+int16_t alphaTBL_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383};
+
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/pucch.c
+* \brief Top-level routines for generating and decoding the PUCCH physical channel V8.6 2009-03
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+
+#include <stdint.h>
+
+/* PUCCH format3 >> */
+#define D_I             0
+#define D_Q             1
+#define D_IQDATA        2
+#define D_NSLT1SF       2
+#define D_NSYM1SLT      7
+#define D_NSYM1SF       2*7
+#define D_NSC1RB        12
+#define D_NRB1PUCCH     2
+#define D_NPUCCH_SF5    5
+#define D_NPUCCH_SF4    4
+
+extern int16_t W4[3][4];
+
+extern int16_t W3_re[3][6];
+
+
+extern int16_t W3_im[3][6];
+
+extern int16_t alpha_re[12];
+extern int16_t alpha_im[12];
+
+extern char *pucch_format_string[];
+
+extern uint8_t chcod_tbl[128][48];
+
+extern int16_t W5_fmt3_re[5][5];
+
+extern int16_t W5_fmt3_im[5][5];
+
+extern int16_t W4_fmt3[4][4];
+
+extern int16_t W2[2];
+
+extern int16_t RotTBL_re[4];
+extern int16_t RotTBL_im[4];
+
+//np4_tbl, np5_tbl
+extern uint8_t Np5_TBL[5];
+extern uint8_t Np4_TBL[4];
+
+// alpha_TBL
+extern int16_t alphaTBL_re[12];
+extern int16_t alphaTBL_im[12];
@@ -20,7 +20,7 @@
 */

 /*! \file PHY/LTE_TRANSPORT/rar_tools.c
-* \brief Routine for filling the PUSCH/ULSCH data structures based on a random-access response (RAR) SDU from MAC.  Note this is both for UE and eNB. V8.6 2009-03
+* \brief Routine for filling the PUSCH/ULSCH data structures based on a random-access response (RAR) SDU from MAC.  Note this is for eNB. 
 * \author R. Knopp
 * \date 2011
 * \version 0.1
@@ -29,14 +29,12 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "SCHED/defs.h"
-#include "SCHED/extern.h"
-#include "LAYER2/MAC/defs.h"
-#include "SCHED/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/phy_extern.h"
+#include "SCHED/sched_eNB.h"
+#include "LAYER2/MAC/mac.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
-
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "assertions.h"

 extern uint16_t RIV2nb_rb_LUT6[32];
@@ -194,159 +192,3 @@ int generate_eNB_ulsch_params_from_rar(PHY_VARS_eNB *eNB,
  return(0);
 }

-int8_t delta_PUSCH_msg2[8] = {-6,-4,-2,0,2,4,6,8};
-
-int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *ue,
-				      UE_rxtx_proc_t *proc,
-                                      unsigned char eNB_id )
-{
-
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR,VCD_FUNCTION_IN);
-
-  //  RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *)rar_pdu;
-  uint8_t transmission_mode = ue->transmission_mode[eNB_id];
-  unsigned char *rar_pdu = ue->dlsch_ra[eNB_id]->harq_processes[0]->b;
-  unsigned char subframe = ue->ulsch_Msg3_subframe[eNB_id];
-  LTE_UE_ULSCH_t *ulsch  = ue->ulsch[eNB_id];
-  PHY_MEASUREMENTS *meas = &ue->measurements;
-
-  LTE_DL_FRAME_PARMS *frame_parms =  &ue->frame_parms;
-  //  int current_dlsch_cqi = ue->current_dlsch_cqi[eNB_id];
-
-  uint8_t *rar = (uint8_t *)(rar_pdu+1);
-  uint8_t harq_pid = subframe2harq_pid(frame_parms,proc->frame_tx,subframe);
-  uint16_t rballoc;
-  uint8_t cqireq;
-  uint16_t *RIV2nb_rb_LUT, *RIV2first_rb_LUT;
-  uint16_t RIV_max = 0;
-
-  LOG_D(PHY,"[eNB][RAPROC] Frame %d: generate_ue_ulsch_params_from_rar: subframe %d (harq_pid %d)\n",proc->frame_tx,subframe,harq_pid);
-
-  switch (frame_parms->N_RB_DL) {
-  case 6:
-    RIV2nb_rb_LUT     = &RIV2nb_rb_LUT6[0];
-    RIV2first_rb_LUT  = &RIV2first_rb_LUT6[0];
-    RIV_max           = RIV_max6;
-    break;
-
-  case 25:
-    RIV2nb_rb_LUT     = &RIV2nb_rb_LUT25[0];
-    RIV2first_rb_LUT  = &RIV2first_rb_LUT25[0];
-    RIV_max           = RIV_max25;
-    break;
-
-  case 50:
-    RIV2nb_rb_LUT     = &RIV2nb_rb_LUT50[0];
-    RIV2first_rb_LUT  = &RIV2first_rb_LUT50[0];
-    RIV_max           = RIV_max50;
-    break;
-
-  case 100:
-    RIV2nb_rb_LUT     = &RIV2nb_rb_LUT100[0];
-    RIV2first_rb_LUT  = &RIV2first_rb_LUT100[0];
-    RIV_max           = RIV_max100;
-    break;
-
-  default:
-    DevParam(frame_parms->N_RB_DL, eNB_id, harq_pid);
-    break;
-  }
-
-
-
-  ulsch->harq_processes[harq_pid]->TPC                                   = (rar[3]>>2)&7;//rar->TPC;
-
-  rballoc = (((uint16_t)(rar[1]&7))<<7)|(rar[2]>>1);
-  cqireq=rar[3]&1;
-
-  if (rballoc>RIV_max) {
-    LOG_D(PHY,"rar_tools.c: ERROR: rb_alloc (%x) > RIV_max\n",rballoc);
-    return(-1);
-  }
-
-  ulsch->harq_processes[harq_pid]->first_rb                              = RIV2first_rb_LUT[rballoc];
-  ulsch->harq_processes[harq_pid]->nb_rb                                 = RIV2nb_rb_LUT[rballoc];
-
-  AssertFatal(ulsch->harq_processes[harq_pid]->nb_rb >0, "nb_rb == 0\n");
-
-  ulsch->power_offset = ue_power_offsets[ulsch->harq_processes[harq_pid]->nb_rb];
-
-  AssertFatal(ulsch->harq_processes[harq_pid]->nb_rb <= 6,"unlikely rb count for RAR grant : nb_rb > 6\n");
-
-  //  ulsch->harq_processes[harq_pid]->Ndi                                   = 1;
-  if (ulsch->harq_processes[harq_pid]->round == 0)
-    ulsch->harq_processes[harq_pid]->status = ACTIVE;
-
-  if (cqireq==1) {
-    ulsch->O_RI                                  = 1;
-
-    if (meas->rank[eNB_id] == 1) {
-      ulsch->uci_format                          = wideband_cqi_rank2_2A;
-      ulsch->O                                   = sizeof_wideband_cqi_rank2_2A_5MHz;
-      ulsch->o_RI[0]                             = 1;
-    } else {
-      ulsch->uci_format                          = wideband_cqi_rank1_2A;
-      ulsch->O                                   = sizeof_wideband_cqi_rank1_2A_5MHz;
-      ulsch->o_RI[0]                             = 0;
-    }
-
-    ulsch->uci_format = HLC_subband_cqi_nopmi;
-    fill_CQI(ulsch,meas,eNB_id,0,ue->frame_parms.N_RB_DL,0, transmission_mode,ue->sinr_eff);
-
-    if (((proc->frame_tx % 100) == 0) || (proc->frame_tx < 10))
-      print_CQI(ulsch->o,ulsch->uci_format,eNB_id,ue->frame_parms.N_RB_DL);
-  } else {
-    ulsch->O_RI                                = 0;
-    ulsch->O                                   = 0;
-  }
-
-  ulsch->harq_processes[harq_pid]->O_ACK                                  = 0;//2;
-
-  ulsch->beta_offset_cqi_times8                  = 18;
-  ulsch->beta_offset_ri_times8                   = 10;
-  ulsch->beta_offset_harqack_times8              = 16;
-
-  ulsch->Nsymb_pusch                             = 12-(frame_parms->Ncp<<1);
-  ulsch->rnti = (((uint16_t)rar[4])<<8)+rar[5];  //rar->t_crnti;
-
-  if (ulsch->harq_processes[harq_pid]->round == 0) {
-    ulsch->harq_processes[harq_pid]->status = ACTIVE;
-    ulsch->harq_processes[harq_pid]->rvidx = 0;
-    ulsch->harq_processes[harq_pid]->mcs         = ((rar[2]&1)<<3)|(rar[3]>>5);
-    ulsch->harq_processes[harq_pid]->TPC         = (rar[3]>>2)&7;
-    //ulsch->harq_processes[harq_pid]->TBS         = dlsch_tbs25[ulsch->harq_processes[harq_pid]->mcs][ulsch->harq_processes[harq_pid]->nb_rb-1];
-    ulsch->harq_processes[harq_pid]->TBS         = TBStable[get_I_TBS_UL(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
-    ulsch->harq_processes[harq_pid]->Msc_initial   = 12*ulsch->harq_processes[harq_pid]->nb_rb;
-    ulsch->harq_processes[harq_pid]->Nsymb_initial = 9;
-    ulsch->harq_processes[harq_pid]->round = 0;
-  } else {
-    ulsch->harq_processes[harq_pid]->rvidx = 0;
-    ulsch->harq_processes[harq_pid]->round++;
-  }
-
-  // initialize power control based on PRACH power
-  ulsch->f_pusch = delta_PUSCH_msg2[ulsch->harq_processes[harq_pid]->TPC] +
-                   get_deltaP_rampup(ue->Mod_id,ue->CC_id);
-  LOG_D(PHY,"[UE %d][PUSCH PC] Initializing f_pusch to %d dB, TPC %d (delta_PUSCH_msg2 %d dB), deltaP_rampup %d dB\n",
-        ue->Mod_id,ulsch->f_pusch,ulsch->harq_processes[harq_pid]->TPC,delta_PUSCH_msg2[ulsch->harq_processes[harq_pid]->TPC],
-        get_deltaP_rampup(ue->Mod_id,ue->CC_id));
-
-
-  //#ifdef DEBUG_RAR
-  LOG_D(PHY,"ulsch ra (UE): harq_pid %d\n",harq_pid);
-  LOG_D(PHY,"ulsch ra (UE): NBRB     %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
-  LOG_D(PHY,"ulsch ra (UE): first_rb %x\n",ulsch->harq_processes[harq_pid]->first_rb);
-  LOG_D(PHY,"ulsch ra (UE): nb_rb    %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
-  LOG_D(PHY,"ulsch ra (UE): round    %d\n",ulsch->harq_processes[harq_pid]->round);
-  LOG_D(PHY,"ulsch ra (UE): TBS      %d\n",ulsch->harq_processes[harq_pid]->TBS);
-  LOG_D(PHY,"ulsch ra (UE): mcs      %d\n",ulsch->harq_processes[harq_pid]->mcs);
-  LOG_D(PHY,"ulsch ra (UE): TPC      %d\n",ulsch->harq_processes[harq_pid]->TPC);
-  LOG_D(PHY,"ulsch ra (UE): O        %d\n",ulsch->O);
-  LOG_D(PHY,"ulsch ra (UE): ORI      %d\n",ulsch->O_RI);
-
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR,VCD_FUNCTION_OUT);
-
-  //#endif
-  return(0);
-}
-
@@ -31,7 +31,7 @@
 */
 #ifndef __LTE_TRANSPORT_SLSS__C__
 #define __LTE_TRANSPORT_SLSS__C__
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"

 extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);

@@ -31,7 +31,7 @@
 */
 #ifndef __LTE_TRANSPORT_SLSS__C__
 #define __LTE_TRANSPORT_SLSS__C__
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"

 extern int
 multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
@@ -31,7 +31,7 @@
 */
 #ifndef __LTE_TRANSPORT_SLSS__C__
 #define __LTE_TRANSPORT_SLSS__C__
-#include "PHY/defs.h"
+#include "PHY/defs_UE.h"


 void generate_slss(PHY_VARS_UE *ue,SLSS_t *slss,int frame_tx,int subframe_tx) {
@@ -29,9 +29,9 @@
 * \note
 * \warning
 */
-#include "PHY/defs.h"
-#include "defs.h"
-#include "PHY/extern.h"
+#include "PHY/defs_eNB.h"
+#include "transport_eNB.h"
+#include "PHY/phy_extern.h"

 //#define DEBUG_SSS

@@ -82,383 +82,3 @@ int generate_sss(int32_t **txdataF,
  return(0);
 }

-int pss_ch_est(PHY_VARS_UE *ue,
-               int32_t pss_ext[4][72],
-               int32_t sss_ext[4][72])
-{
-
-  int16_t *pss;
-  int16_t *pss_ext2,*sss_ext2,*sss_ext3,tmp_re,tmp_im,tmp_re2,tmp_im2;
-  uint8_t aarx,i;
-  LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
-
-  switch (ue->common_vars.eNb_id) {
-
-  case 0:
-    pss = &primary_synch0[10];
-    break;
-
-  case 1:
-    pss = &primary_synch1[10];
-    break;
-
-  case 2:
-    pss = &primary_synch2[10];
-    break;
-
-  default:
-    pss = &primary_synch0[10];
-    break;
-  }
-
-  sss_ext3 = (int16_t*)&sss_ext[0][5];
-
-  for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-
-    sss_ext2 = (int16_t*)&sss_ext[aarx][5];
-    pss_ext2 = (int16_t*)&pss_ext[aarx][5];
-
-    for (i=0; i<62; i++) {
-
-      // This is H*(PSS) = R* \cdot PSS
-      tmp_re = (int16_t)(((pss_ext2[i<<1] * (int32_t)pss[i<<1])>>15)     + ((pss_ext2[1+(i<<1)] * (int32_t)pss[1+(i<<1)])>>15));
-      tmp_im = (int16_t)(((pss_ext2[i<<1] * (int32_t)pss[1+(i<<1)])>>15) - ((pss_ext2[1+(i<<1)] * (int32_t)pss[(i<<1)])>>15));
-      //      printf("H*(%d,%d) : (%d,%d)\n",aarx,i,tmp_re,tmp_im);
-      // This is R(SSS) \cdot H*(PSS)
-      tmp_re2 = (int16_t)(((tmp_re * (int32_t)sss_ext2[i<<1])>>15)     - ((tmp_im * (int32_t)sss_ext2[1+(i<<1)]>>15)));
-      tmp_im2 = (int16_t)(((tmp_re * (int32_t)sss_ext2[1+(i<<1)])>>15) + ((tmp_im * (int32_t)sss_ext2[(i<<1)]>>15)));
-
-      //      printf("SSSi(%d,%d) : (%d,%d)\n",aarx,i,sss_ext2[i<<1],sss_ext2[1+(i<<1)]);
-      //      printf("SSSo(%d,%d) : (%d,%d)\n",aarx,i,tmp_re2,tmp_im2);
-      // MRC on RX antennas
-      if (aarx==0) {
-        sss_ext3[i<<1]      = tmp_re2;
-        sss_ext3[1+(i<<1)]  = tmp_im2;
-      } else {
-        sss_ext3[i<<1]      += tmp_re2;
-        sss_ext3[1+(i<<1)]  += tmp_im2;
-      }
-    }
-  }
-
-  // sss_ext now contains the compensated SSS
-  return(0);
-}
-
-
-int _do_pss_sss_extract(PHY_VARS_UE *ue,
-                    int32_t pss_ext[4][72],
-                    int32_t sss_ext[4][72],
-                    uint8_t doPss, uint8_t doSss,
-					uint8_t subframe) // add flag to indicate extracting only PSS, only SSS, or both
-{
-
-
-
-  uint16_t rb,nb_rb=6;
-  uint8_t i,aarx;
-  int32_t *pss_rxF,*pss_rxF_ext;
-  int32_t *sss_rxF,*sss_rxF_ext;
-  LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
-  uint8_t next_thread_id = ue->current_thread_id[subframe]== (RX_NB_TH-1) ? 0:(ue->current_thread_id[subframe]+1);
-
-  int rx_offset = frame_parms->ofdm_symbol_size-3*12;
-  uint8_t pss_symb,sss_symb;
-
-  int32_t **rxdataF;
-
-  //LOG_I(PHY,"do_pss_sss_extract subframe %d \n",subframe);
-  for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-
-	  if (frame_parms->frame_type == FDD) {
-	    pss_symb = 6-frame_parms->Ncp;
-	    sss_symb = pss_symb-1;
-
-	    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-	    pss_rxF  =  &rxdataF[aarx][(rx_offset + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-	    sss_rxF  =  &rxdataF[aarx][(rx_offset + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-
-	  } else {
-	    pss_symb = 2;
-	    sss_symb = frame_parms->symbols_per_tti-1;
-
-	    if(subframe==5 || subframe==0)
-	    {
-	    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-	    sss_rxF  =  &rxdataF[aarx][(rx_offset + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-
-	    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[next_thread_id].rxdataF;
-	    pss_rxF  =  &rxdataF[aarx][(rx_offset + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-	    }
-	    else if(subframe==6 || subframe==1)
-	    {
-		    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-		    pss_rxF  =  &rxdataF[aarx][(rx_offset + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-
-		    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[next_thread_id].rxdataF;
-		    sss_rxF  =  &rxdataF[aarx][(rx_offset + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-	    }
-	    else
-	    {
-	    	AssertFatal(0,"");
-	    }
-
-	  }
-    //printf("extract_rbs: symbol_mod=%d, rx_offset=%d, ch_offset=%d\n",symbol_mod,
-    //   (rx_offset + (symbol*(frame_parms->ofdm_symbol_size)))*2,
-    //   LTE_CE_OFFSET+ch_offset+(symbol_mod*(frame_parms->ofdm_symbol_size)));
-
-    pss_rxF_ext    = &pss_ext[aarx][0];
-    sss_rxF_ext    = &sss_ext[aarx][0];
-
-    for (rb=0; rb<nb_rb; rb++) {
-      // skip DC carrier
-      if (rb==3) {
-        if(frame_parms->frame_type == FDD)
-        {
-          sss_rxF       = &rxdataF[aarx][(1 + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-          pss_rxF       = &rxdataF[aarx][(1 + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-        }
-        else
-        {
-        	if(subframe==5 || subframe==0)
-        	{
-    	    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-    	    sss_rxF  =  &rxdataF[aarx][(1 + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-
-    	    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[next_thread_id].rxdataF;
-    	    pss_rxF  =  &rxdataF[aarx][(1 + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-        	}
-    	    else if(subframe==6 || subframe==1)
-    	    {
-    		    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-    		    pss_rxF  =  &rxdataF[aarx][(rx_offset + (pss_symb*(frame_parms->ofdm_symbol_size)))];
-
-    		    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[next_thread_id].rxdataF;
-    		    sss_rxF  =  &rxdataF[aarx][(rx_offset + (sss_symb*(frame_parms->ofdm_symbol_size)))];
-    	    }
-    	    else
-    	    {
-    	    	AssertFatal(0,"");
-    	    }
-        }
-      }
-
-      for (i=0; i<12; i++) {
-        if (doPss) {pss_rxF_ext[i]=pss_rxF[i];}
-        if (doSss) {sss_rxF_ext[i]=sss_rxF[i];}
-      }
-
-      pss_rxF+=12;
-      sss_rxF+=12;
-      pss_rxF_ext+=12;
-      sss_rxF_ext+=12;
-    }
-
-  }
-
-  return(0);
-}
-
-int pss_sss_extract(PHY_VARS_UE *phy_vars_ue,
-                    int32_t pss_ext[4][72],
-                    int32_t sss_ext[4][72],
-					uint8_t subframe)
-{
-  return _do_pss_sss_extract(phy_vars_ue, pss_ext, sss_ext, 1 /* doPss */, 1 /* doSss */, subframe);
-}
-
-int pss_only_extract(PHY_VARS_UE *phy_vars_ue,
-                    int32_t pss_ext[4][72],
-                    uint8_t subframe)
-{
-  static int32_t dummy[4][72];
-  return _do_pss_sss_extract(phy_vars_ue, pss_ext, dummy, 1 /* doPss */, 0 /* doSss */, subframe);
-}
-
-
-int sss_only_extract(PHY_VARS_UE *phy_vars_ue,
-                    int32_t sss_ext[4][72],
-                    uint8_t subframe)
-{
-  static int32_t dummy[4][72];
-  return _do_pss_sss_extract(phy_vars_ue, dummy, sss_ext, 0 /* doPss */, 1 /* doSss */, subframe);
-}
-
-
-int16_t phase_re[7] = {16383, 25101, 30791, 32767, 30791, 25101, 16383};
-int16_t phase_im[7] = {-28378, -21063, -11208, 0, 11207, 21062, 28377};
-
-
-int rx_sss(PHY_VARS_UE *ue,int32_t *tot_metric,uint8_t *flip_max,uint8_t *phase_max)
-{
-
-  uint8_t i;
-  int32_t pss_ext[4][72];
-  int32_t sss0_ext[4][72],sss5_ext[4][72];
-  uint8_t Nid2 = ue->common_vars.eNb_id;
-  uint8_t flip,phase;
-  uint16_t Nid1;
-  int16_t *sss0,*sss5;
-  LTE_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
-  int32_t metric;
-  int16_t *d0,*d5;
-
-  if (frame_parms->frame_type == FDD) {
-#ifdef DEBUG_SSS
-
-    if (frame_parms->Ncp == NORMAL)
-      msg("[PHY][UE%d] Doing SSS for FDD Normal Prefix\n",ue->Mod_id);
-    else
-      msg("[PHY][UE%d] Doing SSS for FDD Extended Prefix\n",ue->Mod_id);
-
-#endif
-    // Do FFTs for SSS/PSS
-    // SSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti/2)-2, // second to last symbol of
-             0,                                  // slot 0
-             ue->rx_offset,
-             0,
-	     1);
-    // PSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti/2)-1, // last symbol of
-             0,                                  // slot 0
-             ue->rx_offset,
-             0,
-	     1);
-  } else { // TDD
-#ifdef DEBUG_SSS
-    if (ue->frame_parms->Ncp == NORMAL)
-      msg("[PHY][UE%d] Doing SSS for TDD Normal Prefix\n",ue->Mod_id);
-    else
-      msg("[PHY][UE%d] Doing SSS for TDD Extended Prefix\n",ue->Mod_id);
-
-#endif
-    // SSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti>>1)-1,  // last symbol of
-             1,                                    // slot 1
-             ue->rx_offset,
-             0,
-	     1);
-    // PSS
-    slot_fep(ue,
-             2,                                   // symbol 2 of
-             2,                                   // slot 2
-             ue->rx_offset,
-             0,
-	     1);
-  }
-  // pss sss extract for subframe 0
-  pss_sss_extract(ue,
-                  pss_ext,
-                  sss0_ext,0);
-  /*
-  write_output("rxsig0.m","rxs0",&ue->common_vars.rxdata[0][0],ue->frame_parms.samples_per_tti,1,1);
-  write_output("rxdataF0.m","rxF0",&ue->common_vars.rxdataF[0][0],2*14*ue->frame_parms.ofdm_symbol_size,2,1);
-  write_output("pss_ext0.m","pssext0",pss_ext,72,1,1);
-  write_output("sss0_ext0.m","sss0ext0",sss0_ext,72,1,1);
-  */
-
-  // get conjugated channel estimate from PSS (symbol 6), H* = R* \cdot PSS
-  // and do channel estimation and compensation based on PSS
-
-  pss_ch_est(ue,
-             pss_ext,
-             sss0_ext);
-
-  //  write_output("sss0_comp0.m","sss0comp0",sss0_ext,72,1,1);
-
-  if (ue->frame_parms.frame_type == FDD) { // FDD
-
-    // SSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti/2)-2,
-             10,
-             ue->rx_offset,
-             0,1);
-    // PSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti/2)-1,
-             10,
-             ue->rx_offset,
-             0,1);
-  } else { // TDD
-    // SSS
-    slot_fep(ue,
-             (frame_parms->symbols_per_tti>>1)-1,
-             11,
-             ue->rx_offset,
-             0,
-	     1);
-    // PSS
-    slot_fep(ue,
-             2,
-             12,
-             ue->rx_offset,
-             0,
-	     1);
-  }
-
-  // pss sss extract for subframe 5
-  pss_sss_extract(ue,
-                  pss_ext,
-                  sss5_ext,5);
-
-  //  write_output("sss5_ext0.m","sss5ext0",sss5_ext,72,1,1);
-  // get conjugated channel estimate from PSS (symbol 6), H* = R* \cdot PSS
-  // and do channel estimation and compensation based on PSS
-
-  pss_ch_est(ue,
-             pss_ext,
-             sss5_ext);
-
-
-
-  // now do the SSS detection based on the precomputed sequences in PHY/LTE_TRANSPORT/sss.h
-
-  *tot_metric = -99999999;
-
-
-  sss0 = (int16_t*)&sss0_ext[0][5];
-  sss5 = (int16_t*)&sss5_ext[0][5];
-
-  for (flip=0; flip<2; flip++) {      //  d0/d5 flip in RX frame
-    for (phase=0; phase<7; phase++) { // phase offset between PSS and SSS
-      for (Nid1 = 0 ; Nid1 <= 167; Nid1++) {  // 168 possible Nid1 values
-        metric = 0;
-
-        if (flip==0) {
-          d0 = &d0_sss[62*(Nid2 + (Nid1*3))];
-          d5 = &d5_sss[62*(Nid2 + (Nid1*3))];
-        } else {
-          d5 = &d0_sss[62*(Nid2 + (Nid1*3))];
-          d0 = &d5_sss[62*(Nid2 + (Nid1*3))];
-        }
-
-        // This is the inner product using one particular value of each unknown parameter
-        for (i=0; i<62; i++) {
-          metric += (int16_t)(((d0[i]*((((phase_re[phase]*(int32_t)sss0[i<<1])>>19)-((phase_im[phase]*(int32_t)sss0[1+(i<<1)])>>19)))) +
-                               (d5[i]*((((phase_re[phase]*(int32_t)sss5[i<<1])>>19)-((phase_im[phase]*(int32_t)sss5[1+(i<<1)])>>19))))));
-        }
-
-        // if the current metric is better than the last save it
-        if (metric > *tot_metric) {
-          *tot_metric = metric;
-          ue->frame_parms.Nid_cell = Nid2+(3*Nid1);
-          *phase_max = phase;
-          *flip_max=flip;
-#ifdef DEBUG_SSS
-          msg("(flip,phase,Nid1) (%d,%d,%d), metric_phase %d tot_metric %d, phase_max %d, flip_max %d\n",flip,phase,Nid1,metric,*tot_metric,*phase_max,*flip_max);
-#endif
-
-        }
-      }
-    }
-  }
-
-  return(0);
-}
-
@@ -0,0 +1,282 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/transport_commont.h
+* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX) common to both eNB/UE
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+* \note
+* \warning
+*/
+#ifndef __TRANSPORT_COMMON__H__
+#define __TRANSPORT_COMMON__H__
+#include "PHY/defs_common.h"
+#include "PHY/impl_defs_lte.h"
+#include "dci.h"
+#include "mdci.h"
+//#include "uci.h"
+#ifndef STANDALONE_COMPILE
+#include "UTIL/LISTS/list.h"
+#endif
+
+#define MOD_TABLE_QPSK_OFFSET 1
+#define MOD_TABLE_16QAM_OFFSET 5
+#define MOD_TABLE_64QAM_OFFSET 21
+#define MOD_TABLE_PSS_OFFSET 85
+
+// structures below implement 36-211 and 36-212
+
+/** @addtogroup _PHY_TRANSPORT_
+ * @{
+ */
+
+
+
+#define NSOFT 1827072
+#define LTE_NULL 2
+
+// maximum of 3 segments before each coding block if data length exceeds 6144 bits.
+
+#define MAX_NUM_DLSCH_SEGMENTS 16
+#define MAX_NUM_ULSCH_SEGMENTS MAX_NUM_DLSCH_SEGMENTS
+#define MAX_DLSCH_PAYLOAD_BYTES (MAX_NUM_DLSCH_SEGMENTS*768)
+#define MAX_ULSCH_PAYLOAD_BYTES (MAX_NUM_ULSCH_SEGMENTS*768)
+
+#define MAX_NUM_CHANNEL_BITS (14*1200*6)  // 14 symbols, 1200 REs, 12 bits/RE
+#define MAX_NUM_RE (14*1200)
+
+#if !defined(SI_RNTI)
+#define SI_RNTI  (rnti_t)0xffff
+#endif
+#if !defined(M_RNTI)
+#define M_RNTI   (rnti_t)0xfffd
+#endif
+#if !defined(P_RNTI)
+#define P_RNTI   (rnti_t)0xfffe
+#endif
+#if !defined(CBA_RNTI)
+#define CBA_RNTI (rnti_t)0xfff4
+#endif
+#if !defined(C_RNTI)
+#define C_RNTI   (rnti_t)0x1234
+#endif
+// These are the codebook indexes according to Table 6.3.4.2.3-1 of 36.211
+//1 layer
+#define PMI_2A_11  0
+#define PMI_2A_1m1 1
+#define PMI_2A_1j  2
+#define PMI_2A_1mj 3
+//2 layers
+#define PMI_2A_R1_10 0
+#define PMI_2A_R1_11 1
+#define PMI_2A_R1_1j 2
+
+typedef enum { SEARCH_EXIST=0,
+	       SEARCH_EXIST_OR_FREE} find_type_t;
+
+typedef enum {
+  SCH_IDLE=0,
+  ACTIVE,
+  CBA_ACTIVE,
+  DISABLED
+} SCH_status_t;
+
+
+
+
+#ifdef Rel14
+typedef enum {
+  CEmodeA = 0,
+  CEmodeB = 1
+} CEmode_t;
+#endif
+
+#define PUSCH_x 2
+#define PUSCH_y 3
+
+typedef enum {
+  pucch_format1=0,
+  pucch_format1a,
+  pucch_format1b,
+  pucch_format1b_csA2,
+  pucch_format1b_csA3,
+  pucch_format1b_csA4,
+  pucch_format2,
+  pucch_format2a,
+  pucch_format2b,
+  pucch_format3    // PUCCH format3
+} PUCCH_FMT_t;
+
+typedef enum {
+  SR,
+  HARQ,
+  CQI,
+  HARQ_SR,
+  HARQ_CQI,
+  SR_CQI,
+  HARQ_SR_CQI  
+} UCI_type_t;
+
+#ifdef Rel14
+typedef enum {
+  NOCE,
+  CEMODEA,
+  CEMODEB
+} UE_type_t;
+#endif
+
+
+
+
+
+typedef enum {
+  SI_PDSCH=0,
+  RA_PDSCH,
+  P_PDSCH,
+  PDSCH,
+  PDSCH1,
+  PMCH
+} PDSCH_t;
+
+typedef enum {
+  rx_standard=0,
+  rx_IC_single_stream,
+  rx_IC_dual_stream,
+  rx_SIC_dual_stream
+} RX_type_t;
+
+
+typedef enum {
+  DCI_COMMON_SPACE,
+  DCI_UE_SPACE
+} dci_space_t;
+
+typedef struct {
+  uint8_t f_ra;
+  uint8_t t0_ra;
+  uint8_t t1_ra;
+  uint8_t t2_ra;
+} PRACH_TDD_PREAMBLE_MAP_elem;
+typedef struct {
+  uint8_t num_prach;
+  PRACH_TDD_PREAMBLE_MAP_elem map[6];
+} PRACH_TDD_PREAMBLE_MAP;
+
+#ifdef Rel14
+
+typedef struct {
+  uint16_t slss_id;
+  uint8_t *slmib;
+} SLSS_t;
+
+typedef struct {
+  // SL Configuration
+  /// Number of SL resource blocks (1-100)
+  uint32_t N_SL_RB;
+  /// prb-start (0-99)
+  uint32_t prb_Start;
+  /// prb-End (0-99)
+  uint32_t prb_End;
+  /// SL-OffsetIndicator (0-10239)
+  uint32_t SL_OffsetIndicator;
+  /// PSCCH subframe bitmap, first 64-bits (up to 40 bits for Rel 12)
+  uint64_t bitmap1;
+  /// PSCCH subframe bitmap, 2nd 64-bits (up to 100 bits for Rel 14)
+  uint64_t bitmap2;
+
+  // SCI parameters
+  /// npscch resource index
+  uint32_t n_pscch;
+  /// format of SCI (0,1)
+  uint32_t format;
+  /// SCI0 frequency hopping flag
+  uint32_t freq_hopping_flag;
+  /// SCI0 Resource Block Coding
+  uint32_t resource_block_coding;
+  /// SCI0 Time Resource Pattern for SLSCH
+  uint32_t time_resource_pattern;
+  /// SCI0 MCS for SLSCH
+  uint32_t mcs;
+  /// SCI0 Timing advance indication for SLSCH
+  uint32_t timing_advance_indication;
+  /// SCI0 Group Destination ID for SLSCH
+  uint32_t group_destination_id;
+
+  // SLSCH Parameters
+  /// Number of Subbands (36.213 14.1.1.2)
+  uint32_t Nsb;
+  /// N_RB_HO (36.213 14.1.1.2)
+  uint32_t N_RB_HO;
+  /// n_ss_PSSCH (36.211 9.2.4)
+  uint32_t n_ss_PSSCH;
+  /// n_ssf_PSSCH
+  uint32_t n_ssf_PSSCH;
+  /// cinit (36.331 hoppingParameter-r12)
+  uint32_t cinit;
+  /// redundancy version
+  uint32_t rvidx;
+  /// n_prime_VRB (36.213 14.1.1.2.1)
+  uint32_t n_prime_VRB;
+  /// M_RB_PSSCH_RP (36.213 14.1.3
+  uint32_t M_RB_PSSCH_RP;
+  /// n_prime_PRB (36.213 14.1.1.4
+  uint32_t n_prime_PRB;
+  /// m_nprime_PRB_PSSCH (36.213 14.1.3)
+  uint32_t m_nprime_PRB_PSCCH;
+  /// payload length
+  int payload_length;
+  /// pointer to payload
+  uint8_t *payload;
+} SLSCH_t;
+
+typedef struct {
+  /// payload length
+  int payload_length;
+	uint8_t payload[100];
+} SLDCH_t;
+
+#define TTI_SYNC 0
+#define SLSS 1
+#define SLDCH 2
+#define SLSCH 3
+
+typedef struct UE_tport_header_s {
+  int packet_type;
+  uint16_t absSF;
+} UE_tport_header_t;
+
+typedef struct UE_tport_s {
+  UE_tport_header_t header;
+  union {
+    SLSS_t slss;
+    SLDCH_t sldch;
+    SLSCH_t slsch;
+  };
+  uint8_t payload[1500];
+} UE_tport_t;
+
+#endif
+
+/**@}*/
+#endif
@@ -0,0 +1,294 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/LTE_TRANSPORT/transport_proto.h
+ * \brief Function prototypes for eNB PHY physical/transport channel processing and generation V8.6 2009-03
+ * \author R. Knopp, F. Kaltenberger
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#ifndef __LTE_TRANSPORT_COMMON_PROTO__H__
+#define __LTE_TRANSPORT_COMMON_PROTO__H__
+#include "PHY/defs_common.h"
+
+
+
+
+// Functions below implement minor procedures from 36-211 and 36-212
+
+/** \brief Compute Q (modulation order) based on I_MCS PDSCH.  Implements table 7.1.7.1-1 from 36.213.
+    @param I_MCS */
+uint8_t get_Qm(uint8_t I_MCS);
+
+/** \brief Compute Q (modulation order) based on I_MCS for PUSCH.  Implements table 8.6.1-1 from 36.213.
+    @param I_MCS */
+uint8_t get_Qm_ul(uint8_t I_MCS);
+
+/** \brief Compute I_TBS (transport-block size) based on I_MCS for PDSCH.  Implements table 7.1.7.1-1 from 36.213.
+    @param I_MCS */
+uint8_t get_I_TBS(uint8_t I_MCS);
+
+/** \brief Compute I_TBS (transport-block size) based on I_MCS for PUSCH.  Implements table 8.6.1-1 from 36.213.
+    @param I_MCS */
+unsigned char get_I_TBS_UL(unsigned char I_MCS);
+
+/** \brief Compute Q (modulation order) based on downlink I_MCS. Implements table 7.1.7.1-1 from 36.213.
+    @param I_MCS
+    @param nb_rb
+    @return Transport block size */
+uint32_t get_TBS_DL(uint8_t mcs, uint16_t nb_rb);
+
+/** \brief Compute Q (modulation order) based on uplink I_MCS. Implements table 7.1.7.1-1 from 36.213.
+    @param I_MCS
+    @param nb_rb
+    @return Transport block size */
+uint32_t get_TBS_UL(uint8_t mcs, uint16_t nb_rb);
+
+/* \brief Return bit-map of resource allocation for a given DCI rballoc (RIV format) and vrb type
+   @param N_RB_DL number of PRB on DL
+   @param indicator for even/odd slot
+   @param vrb vrb index
+   @param Ngap Gap indicator
+*/
+uint32_t get_prb(int N_RB_DL,int odd_slot,int vrb,int Ngap);
+
+/* \brief Return prb for a given vrb index
+   @param vrb_type VRB type (0=localized,1=distributed)
+   @param rb_alloc_dci rballoc field from DCI
+*/
+uint32_t get_rballoc(vrb_t vrb_type,uint16_t rb_alloc_dci);
+
+
+/* \brief Return bit-map of resource allocation for a given DCI rballoc (RIV format) and vrb type
+   @returns Transmission mode (1-7)
+*/
+uint8_t get_transmission_mode(module_id_t Mod_id, uint8_t CC_id, rnti_t rnti);
+
+
+/* \brief
+   @param ra_header Header of resource allocation (0,1) (See sections 7.1.6.1/7.1.6.2 of 36.213 Rel8.6)
+   @param rb_alloc Bitmap allocation from DCI (format 1,2)
+   @returns number of physical resource blocks
+*/
+uint32_t conv_nprb(uint8_t ra_header,uint32_t rb_alloc,int N_RB_DL);
+
+int get_G(LTE_DL_FRAME_PARMS *frame_parms,uint16_t nb_rb,uint32_t *rb_alloc,uint8_t mod_order,uint8_t Nl,uint8_t num_pdcch_symbols,int frame,uint8_t subframe, uint8_t beamforming_mode);
+
+int adjust_G(LTE_DL_FRAME_PARMS *frame_parms,uint32_t *rb_alloc,uint8_t mod_order,uint8_t subframe);
+int adjust_G2(LTE_DL_FRAME_PARMS *frame_parms,uint32_t *rb_alloc,uint8_t mod_order,uint8_t subframe,uint8_t symbol);
+
+
+#ifndef modOrder
+#define modOrder(I_MCS,I_TBS) ((I_MCS-I_TBS)*2+2) // Find modulation order from I_TBS and I_MCS
+#endif
+
+/** \fn uint8_t I_TBS2I_MCS(uint8_t I_TBS);
+    \brief This function maps I_tbs to I_mcs according to Table 7.1.7.1-1 in 3GPP TS 36.213 V8.6.0. Where there is two supported modulation orders for the same I_TBS then either high or low modulation is chosen by changing the equality of the two first comparisons in the if-else statement.
+    \param I_TBS Index of Transport Block Size
+    \return I_MCS given I_TBS
+*/
+uint8_t I_TBS2I_MCS(uint8_t I_TBS);
+
+/** \fn uint8_t SE2I_TBS(float SE,
+    uint8_t N_PRB,
+    uint8_t symbPerRB);
+    \brief This function maps a requested throughput in number of bits to I_tbs. The throughput is calculated as a function of modulation order, RB allocation and number of symbols per RB. The mapping orginates in the "Transport block size table" (Table 7.1.7.2.1-1 in 3GPP TS 36.213 V8.6.0)
+    \param SE Spectral Efficiency (before casting to integer, multiply by 1024, remember to divide result by 1024!)
+    \param N_PRB Number of PhysicalResourceBlocks allocated \sa lte_frame_parms->N_RB_DL
+    \param symbPerRB Number of symbols per resource block allocated to this channel
+    \return I_TBS given an SE and an N_PRB
+*/
+uint8_t SE2I_TBS(float SE,
+                 uint8_t N_PRB,
+                 uint8_t symbPerRB);
+/** \brief This function generates the sounding reference symbol (SRS) for the uplink according to 36.211 v8.6.0. If IFFT_FPGA is defined, the SRS is quantized to a QPSK sequence.
+    @param frame_parms LTE DL Frame Parameters
+    @param soundingrs_ul_config_dedicated Dynamic configuration from RRC during Connection Establishment
+    @param txdataF pointer to the frequency domain TX signal
+    @returns 0 on success*/
+
+int generate_srs(LTE_DL_FRAME_PARMS *frame_parms,
+		 SOUNDINGRS_UL_CONFIG_DEDICATED *soundingrs_ul_config_dedicated,
+		 int *txdataF,
+		 int16_t amp,
+		 uint32_t subframe);
+
+
+/*!
+  \brief This function generates the downlink reference signal for the PUSCH according to 36.211 v8.6.0. The DRS occuies the RS defined by rb_alloc and the symbols 2 and 8 for extended CP and 3 and 10 for normal CP.
+*/
+
+
+/*!
+  \brief This function initializes the Group Hopping, Sequence Hopping and nPRS sequences for PUCCH/PUSCH according to 36.211 v8.6.0. It should be called after configuration of UE (reception of SIB2/3) and initial configuration of eNB (or after reconfiguration of cell-specific parameters).
+  @param frame_parms Pointer to a LTE_DL_FRAME_PARMS structure (eNB or UE)*/
+void init_ul_hopping(LTE_DL_FRAME_PARMS *frame_parms);
+
+
+int32_t compareints (const void * a, const void * b);
+
+uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,frame_t frame,uint8_t subframe);
+
+int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci);
+
+void generate_pcfich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms);
+
+void generate_phich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms);
+
+uint32_t check_phich_reg(LTE_DL_FRAME_PARMS *frame_parms,uint32_t kprime,uint8_t lprime,uint8_t mi);
+
+void generate_RIV_tables(void);
+
+/** \brief  This routine provides the relationship between a PHICH TXOp and its corresponding PUSCH subframe (Table 8.3.-1 from 36.213).
+    @param frame_parms Pointer to DL frame configuration parameters
+    @param subframe Subframe of received/transmitted PHICH
+    @returns subframe of PUSCH transmission
+*/
+uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
+
+/** \brief  This routine provides the relationship between a PHICH TXOp and its corresponding PUSCH frame (Table 8.3.-1 from 36.213).
+    @param frame_parms Pointer to DL frame configuration parameters
+    @param frame Frame of received/transmitted PHICH
+    @param subframe Subframe of received/transmitted PHICH
+    @returns frame of PUSCH transmission
+*/
+int phich_frame2_pusch_frame(LTE_DL_FRAME_PARMS *frame_parms, int frame, int subframe);
+
+uint16_t computeRIV(uint16_t N_RB_DL,uint16_t RBstart,uint16_t Lcrbs);
+
+int get_nCCE_offset_l1(int *CCE_table,
+                       const unsigned char L,
+                       const int nCCE,
+                       const int common_dci,
+                       const unsigned short rnti,
+                       const unsigned char subframe);
+
+uint16_t get_nCCE(uint8_t num_pdcch_symbols,LTE_DL_FRAME_PARMS *frame_parms,uint8_t mi);
+
+uint16_t get_nquad(uint8_t num_pdcch_symbols,LTE_DL_FRAME_PARMS *frame_parms,uint8_t mi);
+
+uint8_t get_mi(LTE_DL_FRAME_PARMS *frame,uint8_t subframe);
+
+uint16_t get_nCCE_mac(uint8_t Mod_id,uint8_t CC_id,int num_pdcch_symbols,int subframe);
+
+uint8_t get_num_pdcch_symbols(uint8_t num_dci,DCI_ALLOC_t *dci_alloc,LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
+
+void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7]);
+
+/*!
+  \brief Check for PRACH TXop in subframe
+  @param frame_parms Pointer to LTE_DL_FRAME_PARMS
+  @param frame frame index to check
+  @param subframe subframe index to check
+  @returns 0 on success
+*/
+int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,frame_t frame, uint8_t subframe);
+
+/*!
+  \brief Helper for MAC, returns number of available PRACH in TDD for a particular configuration index
+  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
+  @returns 0-5 depending on number of available prach
+*/
+uint8_t get_num_prach_tdd(module_id_t Mod_id);
+
+/*!
+  \brief Return the PRACH format as a function of the Configuration Index and Frame type.
+  @param prach_ConfigIndex PRACH Configuration Index
+  @param frame_type 0-FDD, 1-TDD
+  @returns 0-1 accordingly
+*/
+uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,lte_frame_type_t frame_type);
+
+/*!
+  \brief Helper for MAC, returns frequency index of PRACH resource in TDD for a particular configuration index
+  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
+  @returns 0-5 depending on number of available prach
+*/
+uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index);
+
+/*!
+  \brief Comp ute DFT of PRACH ZC sequences.  Used for generation of prach in UE and reception of PRACH in eNB.
+  @param rootSequenceIndex PRACH root sequence
+  #param prach_ConfigIndex PRACH Configuration Index
+  @param zeroCorrelationZoneConfig PRACH ncs_config
+  @param highSpeedFlat PRACH High-Speed Flag
+  @param frame_type TDD/FDD flag
+  @param Xu DFT output
+*/
+void compute_prach_seq(uint16_t rootSequenceIndex,
+		       uint8_t prach_ConfigIndex,
+		       uint8_t zeroCorrelationZoneConfig,
+		       uint8_t highSpeedFlag,
+		       lte_frame_type_t frame_type,
+		       uint32_t X_u[64][839]);
+
+
+void init_prach_tables(int N_ZC);
+
+/*!
+  \brief Return the status of MBSFN in this frame/subframe
+  @param frame Frame index
+  @param subframe Subframe index
+  @param frame_parms Pointer to frame parameters
+  @returns 1 if subframe is for MBSFN
+*/
+int is_pmch_subframe(frame_t frame, int subframe, LTE_DL_FRAME_PARMS *frame_parms);
+
+
+/** \brief  This routine expands a single (wideband) PMI to subband PMI bitmap similar to the one used in the UCI and in the dlsch_modulation routine
+    @param frame_parms Pointer to DL frame configuration parameters
+    @param wideband_pmi (0,1,2,3 for rank 0 and 0,1 for rank 1)
+    @param rank (0 or 1)
+    @returns subband PMI bitmap
+*/
+uint32_t pmi_extend(LTE_DL_FRAME_PARMS *frame_parms,uint8_t wideband_pmi, uint8_t rank);
+
+uint64_t pmi2hex_2Ar1(uint32_t pmi);
+
+uint64_t pmi2hex_2Ar2(uint32_t pmi);
+
+uint8_t get_pmi(uint8_t N_RB_DL,MIMO_mode_t mode, uint32_t pmi_alloc,uint16_t rb);
+
+// DL power control functions
+double get_pa_dB(uint8_t pa);
+
+void init_scrambling_lut(void);
+
+void init_unscrambling_lut(void);
+
+
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
+			     uint8_t prach_ConfigIndex, 
+			     uint8_t n_ra_prboffset,
+			     uint8_t tdd_mapindex, uint16_t Nf);
+
+uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,frame_t frame,uint8_t subframe);
+uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n);
+
+uint32_t conv_1C_RIV(int32_t rballoc,uint32_t N_RB_DL);
+
+void conv_rballoc(uint8_t ra_header,uint32_t rb_alloc,uint32_t N_RB_DL,uint32_t *rb_alloc2);
+
+#endif
@@ -29,21 +29,18 @@
 * \note
 * \warning
 */
-#ifndef __LTE_TRANSPORT_DEFS__H__
-#define __LTE_TRANSPORT_DEFS__H__
-#include "PHY/defs.h"
+#ifndef __TRANSPORT_ENB__H__
+#define __TRANSPORT_ENB__H__
+#include "transport_common.h"
+//#include "PHY/defs_eNB.h"
 #include "PHY/impl_defs_lte.h"
 #include "dci.h"
 #include "mdci.h"
-#include "uci.h"
+#include "uci_common.h"
 #ifndef STANDALONE_COMPILE
 #include "UTIL/LISTS/list.h"
 #endif

-#define MOD_TABLE_QPSK_OFFSET 1
-#define MOD_TABLE_16QAM_OFFSET 5
-#define MOD_TABLE_64QAM_OFFSET 21
-#define MOD_TABLE_PSS_OFFSET 85

 // structures below implement 36-211 and 36-212

@@ -53,56 +50,6 @@



-#define NSOFT 1827072
-#define LTE_NULL 2
-
-// maximum of 3 segments before each coding block if data length exceeds 6144 bits.
-
-#define MAX_NUM_DLSCH_SEGMENTS 16
-#define MAX_NUM_ULSCH_SEGMENTS MAX_NUM_DLSCH_SEGMENTS
-#define MAX_DLSCH_PAYLOAD_BYTES (MAX_NUM_DLSCH_SEGMENTS*768)
-#define MAX_ULSCH_PAYLOAD_BYTES (MAX_NUM_ULSCH_SEGMENTS*768)
-
-#define MAX_NUM_CHANNEL_BITS (14*1200*6)  // 14 symbols, 1200 REs, 12 bits/RE
-#define MAX_NUM_RE (14*1200)
-
-#if !defined(SI_RNTI)
-#define SI_RNTI  (rnti_t)0xffff
-#endif
-#if !defined(M_RNTI)
-#define M_RNTI   (rnti_t)0xfffd
-#endif
-#if !defined(P_RNTI)
-#define P_RNTI   (rnti_t)0xfffe
-#endif
-#if !defined(CBA_RNTI)
-#define CBA_RNTI (rnti_t)0xfff4
-#endif
-#if !defined(C_RNTI)
-#define C_RNTI   (rnti_t)0x1234
-#endif
-// These are the codebook indexes according to Table 6.3.4.2.3-1 of 36.211
-//1 layer
-#define PMI_2A_11  0
-#define PMI_2A_1m1 1
-#define PMI_2A_1j  2
-#define PMI_2A_1mj 3
-//2 layers
-#define PMI_2A_R1_10 0
-#define PMI_2A_R1_11 1
-#define PMI_2A_R1_1j 2
-
-typedef enum { SEARCH_EXIST=0,
-	       SEARCH_EXIST_OR_FREE} find_type_t;
-
-typedef enum {
-  SCH_IDLE=0,
-  ACTIVE,
-  CBA_ACTIVE,
-  DISABLED
-} SCH_status_t;
-
-
 typedef struct {
  /// Status Flag indicating for this DLSCH (idle,active,disabled)
  SCH_status_t status;
@@ -180,86 +127,6 @@ typedef struct {
  uint8_t codeword;
 } LTE_DL_eNB_HARQ_t;

-typedef struct {
-  /// Indicator of first transmission
-  uint8_t first_tx;
-  /// Last Ndi received for this process on DCI (used for C-RNTI only)
-  uint8_t DCINdi;
-  /// Flag indicating that this ULSCH has a new packet (start of new round)
-  //  uint8_t Ndi;
-  /// Status Flag indicating for this ULSCH (idle,active,disabled)
-  SCH_status_t status;
-  /// Subframe scheduling indicator (i.e. Transmission opportunity indicator)
-  uint8_t subframe_scheduling_flag;
-  /// Subframe cba scheduling indicator (i.e. Transmission opportunity indicator)
-  uint8_t subframe_cba_scheduling_flag;
-  /// First Allocated RB
-  uint16_t first_rb;
-  /// Current Number of RBs
-  uint16_t nb_rb;
-  /// Last TPC command
-  uint8_t TPC;
-  /// Transport block size
-  uint32_t TBS;
-  /// The payload + CRC size in bits, "B" from 36-212
-  uint32_t B;
-  /// Length of ACK information (bits)
-  uint8_t O_ACK;
-  /// Pointer to the payload
-  uint8_t *b;
-  /// Pointers to transport block segments
-  uint8_t *c[MAX_NUM_ULSCH_SEGMENTS];
-  /// RTC values for each segment (for definition see 36-212 V8.6 2009-03, p.15)
-  uint32_t RTC[MAX_NUM_ULSCH_SEGMENTS];
-  /// Index of current HARQ round for this ULSCH
-  uint8_t round;
-  /// MCS format of this ULSCH
-  uint8_t mcs;
-  /// Redundancy-version of the current sub-frame
-  uint8_t rvidx;
-  /// Turbo-code outputs (36-212 V8.6 2009-03, p.12
-  uint8_t d[MAX_NUM_ULSCH_SEGMENTS][(96+3+(3*6144))];
-  /// Sub-block interleaver outputs (36-212 V8.6 2009-03, p.16-17)
-  uint8_t w[MAX_NUM_ULSCH_SEGMENTS][3*6144];
-  /// Number of code segments (for definition see 36-212 V8.6 2009-03, p.9)
-  uint32_t C;
-  /// Number of "small" code segments (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Cminus;
-  /// Number of "large" code segments (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Cplus;
-  /// Number of bits in "small" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Kminus;
-  /// Number of bits in "large" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Kplus;
-  /// Total number of bits across all segments
-  uint32_t sumKr;
-  /// Number of "Filler" bits (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t F;
-  /// Msc_initial, Initial number of subcarriers for ULSCH (36-212, v8.6 2009-03, p.26-27)
-  uint16_t Msc_initial;
-  /// Nsymb_initial, Initial number of symbols for ULSCH (36-212, v8.6 2009-03, p.26-27)
-  uint8_t Nsymb_initial;
-  /// n_DMRS  for cyclic shift of DMRS (36.213 Table 9.1.2-2)
-  uint8_t n_DMRS;
-  /// n_DMRS2 for cyclic shift of DMRS (36.211 Table 5.5.1.1.-1)
-  uint8_t n_DMRS2;
-  /// Flag to indicate that this is a control only ULSCH (i.e. no MAC SDU)
-  uint8_t control_only;
-  /// Flag to indicate that this is a calibration ULSCH (i.e. no MAC SDU and filled with TDD calibration information)
-  //  int calibration_flag;
-  /// Number of soft channel bits
-  uint32_t G;
-
-  // decode phich
-  uint8_t decode_phich;
-} LTE_UL_UE_HARQ_t;
-
-#ifdef Rel14
-typedef enum {
-  CEmodeA = 0,
-  CEmodeB = 1
-} CEmode_t;
-#endif

 typedef struct {
  /// TX buffers for UE-spec transmission (antenna ports 5 or 7..14, prior to precoding)
@@ -311,81 +178,7 @@ typedef struct {
 #endif
 } LTE_eNB_DLSCH_t;

-#define PUSCH_x 2
-#define PUSCH_y 3

-typedef struct {
-  /// Current Number of Symbols
-  uint8_t Nsymb_pusch;
-  /// SRS active flag
-  uint8_t srs_active;
-  /// Pointers to 8 HARQ processes for the ULSCH
-  LTE_UL_UE_HARQ_t *harq_processes[8];
-  /// Pointer to CQI data (+1 for 8 bits crc)
-  uint8_t o[1+MAX_CQI_BYTES];
-  /// Length of CQI data (bits)
-  uint8_t O;
-  /// Format of CQI data
-  UCI_format_t uci_format;
-  /// Rank information
-  uint8_t o_RI[2];
-  /// Length of rank information (bits)
-  uint8_t O_RI;
-  /// Pointer to ACK
-  uint8_t o_ACK[4];
-  /// Minimum number of CQI bits for PUSCH (36-212 r8.6, Sec 5.2.4.1 p. 37)
-  uint8_t O_CQI_MIN;
-  /// ACK/NAK Bundling flag
-  uint8_t bundling;
-  /// Concatenated "e"-sequences (for definition see 36-212 V8.6 2009-03, p.17-18)
-  uint8_t e[MAX_NUM_CHANNEL_BITS];
-  /// Interleaved "h"-sequences (for definition see 36-212 V8.6 2009-03, p.17-18)
-  uint8_t h[MAX_NUM_CHANNEL_BITS];
-  /// Scrambled "b"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
-  uint8_t b_tilde[MAX_NUM_CHANNEL_BITS];
-  /// Modulated "d"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
-  int32_t d[MAX_NUM_RE];
-  /// Transform-coded "z"-sequences (for definition see 36-211 V8.6 2009-03, p.14-15)
-  int32_t z[MAX_NUM_RE];
-  /// "q" sequences for CQI/PMI (for definition see 36-212 V8.6 2009-03, p.27)
-  uint8_t q[MAX_CQI_PAYLOAD];
-  /// coded and interleaved CQI bits
-  uint8_t o_w[(MAX_CQI_BITS+8)*3];
-  /// coded CQI bits
-  uint8_t o_d[96+((MAX_CQI_BITS+8)*3)];
-  /// coded ACK bits
-  uint8_t q_ACK[MAX_ACK_PAYLOAD];
-  /// coded RI bits
-  uint8_t q_RI[MAX_RI_PAYLOAD];
-  /// beta_offset_cqi times 8
-  uint16_t beta_offset_cqi_times8;
-  /// beta_offset_ri times 8
-  uint16_t beta_offset_ri_times8;
-  /// beta_offset_harqack times 8
-  uint16_t beta_offset_harqack_times8;
-  /// power_offset
-  uint8_t power_offset;
-  // for cooperative communication
-  uint8_t cooperation_flag;
-  /// RNTI attributed to this ULSCH
-  uint16_t rnti;
-  /// f_PUSCH parameter for PUSCH power control
-  int16_t f_pusch;
-  /// Po_PUSCH - target output power for PUSCH
-  int16_t Po_PUSCH;
-  /// PHR - current power headroom (based on last PUSCH transmission)
-  int16_t PHR;
-  /// Po_SRS - target output power for SRS
-  int16_t Po_SRS;
-  /// num active cba group
-  uint8_t num_active_cba_groups;
-  /// num dci found for cba
-  uint8_t num_cba_dci[10];
-  /// allocated CBA RNTI
-  uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP];
-  /// UL max-harq-retransmission
-  uint8_t Mlimit;
-} LTE_UE_ULSCH_t;

 typedef struct {
  /// Flag indicating that this ULSCH has been allocated by a DCI (otherwise it is a retransmission based on PHICH NAK)
@@ -510,38 +303,6 @@ typedef struct {
  int32_t delta_TF;
 } LTE_UL_eNB_HARQ_t;

-
-typedef enum {
-  pucch_format1=0,
-  pucch_format1a,
-  pucch_format1b,
-  pucch_format1b_csA2,
-  pucch_format1b_csA3,
-  pucch_format1b_csA4,
-  pucch_format2,
-  pucch_format2a,
-  pucch_format2b,
-  pucch_format3    // PUCCH format3
-} PUCCH_FMT_t;
-
-typedef enum {
-  SR,
-  HARQ,
-  CQI,
-  HARQ_SR,
-  HARQ_CQI,
-  SR_CQI,
-  HARQ_SR_CQI
-} UCI_type_t;
-
-#ifdef Rel14
-typedef enum {
-  NOCE,
-  CEMODEA,
-  CEMODEB
-} UE_type_t;
-#endif
-
 typedef struct {
  uint8_t     active;
  /// Absolute frame for this UCI
@@ -592,124 +353,6 @@ typedef struct {
 #endif
 } LTE_eNB_UCI;

-typedef struct {
-  /// HARQ process mask, indicates which processes are currently active
-  uint16_t harq_mask;
-  /// Pointers to 8 HARQ processes for the ULSCH
-  LTE_UL_eNB_HARQ_t *harq_processes[8];
-  /// Maximum number of HARQ rounds
-  uint8_t Mlimit;
-  /// Maximum number of iterations used in eNB turbo decoder
-  uint8_t max_turbo_iterations;
-  /// ACK/NAK Bundling flag
-  uint8_t bundling;
-  /// beta_offset_cqi times 8
-  uint16_t beta_offset_cqi_times8;
-  /// beta_offset_ri times 8
-  uint16_t beta_offset_ri_times8;
-  /// beta_offset_harqack times 8
-  uint16_t beta_offset_harqack_times8;
-  /// Flag to indicate that eNB awaits UE Msg3
-  uint8_t Msg3_active;
-  /// RNTI attributed to this ULSCH
-  uint16_t rnti;
-  /// cyclic shift for DM RS
-  uint8_t cyclicShift;
-  /// cooperation flag
-  uint8_t cooperation_flag;
-  /// num active cba group
-  uint8_t num_active_cba_groups;
-  /// allocated CBA RNTI for this ulsch
-  uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP];
-#ifdef LOCALIZATION
-  /// epoch timestamp in millisecond
-  int32_t reference_timestamp_ms;
-  /// aggregate physical states every n millisecond
-  int32_t aggregation_period_ms;
-  /// a set of lists used for localization
-  struct list loc_rss_list[10], loc_rssi_list[10], loc_subcarrier_rss_list[10], loc_timing_advance_list[10], loc_timing_update_list[10];
-  struct list tot_loc_rss_list, tot_loc_rssi_list, tot_loc_subcarrier_rss_list, tot_loc_timing_advance_list, tot_loc_timing_update_list;
-#endif
-} LTE_eNB_ULSCH_t;
-
-typedef struct {
-  /// Indicator of first transmission
-  uint8_t first_tx;
-  /// Last Ndi received for this process on DCI (used for C-RNTI only)
-  uint8_t DCINdi;
-  /// DLSCH status flag indicating
-  SCH_status_t status;
-  /// Transport block size
-  uint32_t TBS;
-  /// The payload + CRC size in bits
-  uint32_t B;
-  /// Pointer to the payload
-  uint8_t *b;
-  /// Pointers to transport block segments
-  uint8_t *c[MAX_NUM_DLSCH_SEGMENTS];
-  /// RTC values for each segment (for definition see 36-212 V8.6 2009-03, p.15)
-  uint32_t RTC[MAX_NUM_DLSCH_SEGMENTS];
-  /// Index of current HARQ round for this DLSCH
-  uint8_t round;
-  /// MCS format for this DLSCH
-  uint8_t mcs;
-  /// Qm (modulation order) for this DLSCH
-  uint8_t Qm;
-  /// Redundancy-version of the current sub-frame
-  uint8_t rvidx;
-  /// MIMO mode for this DLSCH
-  MIMO_mode_t mimo_mode;
-  /// soft bits for each received segment ("w"-sequence)(for definition see 36-212 V8.6 2009-03, p.15)
-  int16_t w[MAX_NUM_DLSCH_SEGMENTS][3*(6144+64)];
-  /// for abstraction soft bits for each received segment ("w"-sequence)(for definition see 36-212 V8.6 2009-03, p.15)
-  double w_abs[MAX_NUM_DLSCH_SEGMENTS][3*(6144+64)];
-  /// soft bits for each received segment ("d"-sequence)(for definition see 36-212 V8.6 2009-03, p.15)
-  int16_t *d[MAX_NUM_DLSCH_SEGMENTS];
-  /// Number of code segments (for definition see 36-212 V8.6 2009-03, p.9)
-  uint32_t C;
-  /// Number of "small" code segments (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Cminus;
-  /// Number of "large" code segments (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Cplus;
-  /// Number of bits in "small" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Kminus;
-  /// Number of bits in "large" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t Kplus;
-  /// Number of "Filler" bits (for definition see 36-212 V8.6 2009-03, p.10)
-  uint32_t F;
-  /// Number of MIMO layers (streams) (for definition see 36-212 V8.6 2009-03, p.17)
-  uint8_t Nl;
-  /// current delta_pucch
-  int8_t delta_PUCCH;
-  /// Number of soft channel bits
-  uint32_t G;
-  /// Current Number of RBs
-  uint16_t nb_rb;
-  /// Current subband PMI allocation
-  uint16_t pmi_alloc;
-  /// Current RB allocation (even slots)
-  uint32_t rb_alloc_even[4];
-  /// Current RB allocation (odd slots)
-  uint32_t rb_alloc_odd[4];
-  /// distributed/localized flag
-  vrb_t vrb_type;
-  /// downlink power offset field
-  uint8_t dl_power_off;
-  /// trials per round statistics
-  uint32_t trials[8];
-  /// error statistics per round
-  uint32_t errors[8];
-  /// codeword this transport block is mapped to
-  uint8_t codeword;
-} LTE_DL_UE_HARQ_t;
-
-typedef struct {
-  /// time-based localization, relying on TA and TOA
-  double time_based;
-  /// power-based localization, relying on RSS and RSSI
-  double power_based;
-} eNB_UE_estimated_distances;
-
 typedef struct {
  /// UL RSSI per receive antenna
  int32_t UL_rssi[NB_ANTENNAS_RX];
@@ -782,187 +425,39 @@ typedef struct {
  int total_TBS_last;
  /// Bitrate on the PDSCH [bps]
  unsigned int dlsch_bitrate;
-  //  unsigned int total_transmitted_bits;
-#ifdef LOCALIZATION
-  eNB_UE_estimated_distances distance;
-  int32_t *subcarrier_rssi;
-#endif
 } LTE_eNB_UE_stats;

 typedef struct {
-  /// HARQ process id
-  uint8_t harq_id;
-  /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
-  uint8_t ack;
-  /// send status (for PUCCH)
-  uint8_t send_harq_status;
-  /// nCCE (for PUCCH)
-  uint8_t nCCE;
-  /// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
-  uint8_t vDAI_DL;
-  /// DAI value detected from DCI0/4. 0xff indicates not touched
-  uint8_t vDAI_UL;
-} harq_status_t;
-
-typedef struct {
-  /// RNTI
-  uint16_t rnti;
-  /// Active flag for DLSCH demodulation
-  uint8_t active;
-  /// Transmission mode
-  uint8_t mode1_flag;
-  /// amplitude of PDSCH (compared to RS) in symbols without pilots
-  int16_t sqrt_rho_a;
-  /// amplitude of PDSCH (compared to RS) in symbols containing pilots
-  int16_t sqrt_rho_b;
-  /// Current HARQ process id threadRx Odd and threadRx Even
-  uint8_t current_harq_pid;
-  /// Current subband antenna selection
-  uint32_t antenna_alloc;
-  /// Current subband RI allocation
-  uint32_t ri_alloc;
-  /// Current subband CQI1 allocation
-  uint32_t cqi_alloc1;
-  /// Current subband CQI2 allocation
-  uint32_t cqi_alloc2;
-  /// saved subband PMI allocation from last PUSCH/PUCCH report
-  uint16_t pmi_alloc;
-  /// HARQ-ACKs
-  harq_status_t harq_ack[10];
-  /// Pointers to up to 8 HARQ processes
-  LTE_DL_UE_HARQ_t *harq_processes[8];
-  /// Maximum number of HARQ processes(for definition see 36-212 V8.6 2009-03, p.17
-  uint8_t Mdlharq;
-  /// MIMO transmission mode indicator for this sub-frame (for definition see 36-212 V8.6 2009-03, p.17)
-  uint8_t Kmimo;
-  /// Nsoft parameter related to UE Category
-  uint32_t Nsoft;
-  /// Maximum number of Turbo iterations
+  /// HARQ process mask, indicates which processes are currently active
+  uint16_t harq_mask;
+  /// Pointers to 8 HARQ processes for the ULSCH
+  LTE_UL_eNB_HARQ_t *harq_processes[8];
+  /// Maximum number of HARQ rounds
+  uint8_t Mlimit;
+  /// Maximum number of iterations used in eNB turbo decoder
  uint8_t max_turbo_iterations;
-  /// number of iterations used in last turbo decoding
-  uint8_t last_iteration_cnt;
-  /// accumulated tx power adjustment for PUCCH
-  int8_t               g_pucch;
-} LTE_UE_DLSCH_t;
+  /// ACK/NAK Bundling flag
+  uint8_t bundling;
+  /// beta_offset_cqi times 8
+  uint16_t beta_offset_cqi_times8;
+  /// beta_offset_ri times 8
+  uint16_t beta_offset_ri_times8;
+  /// beta_offset_harqack times 8
+  uint16_t beta_offset_harqack_times8;
+  /// Flag to indicate that eNB awaits UE Msg3
+  uint8_t Msg3_active;
+  /// RNTI attributed to this ULSCH
+  uint16_t rnti;
+  /// cyclic shift for DM RS
+  uint8_t cyclicShift;
+  /// cooperation flag
+  uint8_t cooperation_flag;
+  /// num active cba group
+  uint8_t num_active_cba_groups;
+  /// allocated CBA RNTI for this ulsch
+  uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP];
+} LTE_eNB_ULSCH_t;


-
-typedef enum {
-  SI_PDSCH=0,
-  RA_PDSCH,
-  P_PDSCH,
-  PDSCH,
-  PDSCH1,
-  PMCH
-} PDSCH_t;
-
-typedef enum {
-  rx_standard=0,
-  rx_IC_single_stream,
-  rx_IC_dual_stream,
-  rx_SIC_dual_stream
-} RX_type_t;
-
-
-#ifdef Rel14
-typedef enum {
-  DCI_COMMON_SPACE,
-  DCI_UE_SPACE
-} dci_space_t;
-
-
-typedef struct {
-  uint16_t slss_id;
-  uint8_t *slmib;
-} SLSS_t;
-
-typedef struct {
-  // SL Configuration
-  /// Number of SL resource blocks (1-100)
-  uint32_t N_SL_RB;
-  /// prb-start (0-99)
-  uint32_t prb_Start;
-  /// prb-End (0-99)
-  uint32_t prb_End;
-  /// SL-OffsetIndicator (0-10239)
-  uint32_t SL_OffsetIndicator;
-  /// PSCCH subframe bitmap, first 64-bits (up to 40 bits for Rel 12)
-  uint64_t bitmap1;
-  /// PSCCH subframe bitmap, 2nd 64-bits (up to 100 bits for Rel 14)
-  uint64_t bitmap2;
-
-  // SCI parameters
-  /// npscch resource index
-  uint32_t n_pscch;
-  /// format of SCI (0,1)
-  uint32_t format;
-  /// SCI0 frequency hopping flag
-  uint32_t freq_hopping_flag;
-  /// SCI0 Resource Block Coding
-  uint32_t resource_block_coding;
-  /// SCI0 Time Resource Pattern for SLSCH
-  uint32_t time_resource_pattern;
-  /// SCI0 MCS for SLSCH
-  uint32_t mcs;
-  /// SCI0 Timing advance indication for SLSCH
-  uint32_t timing_advance_indication;
-  /// SCI0 Group Destination ID for SLSCH
-  uint32_t group_destination_id;
-
-  // SLSCH Parameters
-  /// Number of Subbands (36.213 14.1.1.2)
-  uint32_t Nsb;
-  /// N_RB_HO (36.213 14.1.1.2)
-  uint32_t N_RB_HO;
-  /// n_ss_PSSCH (36.211 9.2.4)
-  uint32_t n_ss_PSSCH;
-  /// n_ssf_PSSCH
-  uint32_t n_ssf_PSSCH;
-  /// cinit (36.331 hoppingParameter-r12)
-  uint32_t cinit;
-  /// redundancy version
-  uint32_t rvidx;
-  /// n_prime_VRB (36.213 14.1.1.2.1)
-  uint32_t n_prime_VRB;
-  /// M_RB_PSSCH_RP (36.213 14.1.3
-  uint32_t M_RB_PSSCH_RP;
-  /// n_prime_PRB (36.213 14.1.1.4
-  uint32_t n_prime_PRB;
-  /// m_nprime_PRB_PSSCH (36.213 14.1.3)
-  uint32_t m_nprime_PRB_PSCCH;
-  /// payload length
-  int payload_length;
-  /// pointer to payload
-  uint8_t *payload;
-} SLSCH_t;
-
-typedef struct {
-  /// payload length
-  int payload_length;
-	uint8_t payload[100];
-} SLDCH_t;
-
-#define TTI_SYNC 0
-#define SLSS 1
-#define SLDCH 2
-#define SLSCH 3
-
-typedef struct UE_tport_header_s {
-  int packet_type;
-  uint16_t absSF;
-} UE_tport_header_t;
-
-typedef struct UE_tport_s {
-  UE_tport_header_t header;
-  union {
-    SLSS_t slss;
-    SLDCH_t sldch;
-    SLSCH_t slsch;
-  };
-  uint8_t payload[1500];
-} UE_tport_t;
-
-#endif
-
 /**@}*/
 #endif
@@ -48,3 +48,5 @@ extern int16_t d0_sss[504*62],d5_sss[504*62];

 extern uint8_t wACK[5][4];
 extern int8_t wACK_RX[5][4];
+
+extern uint32_t bitrev_cc_dci[32];
--- a/Show More
+++ b/Show More