1. 13 Aug, 2017 2 commits
  2. 11 Aug, 2017 3 commits
  3. 10 Aug, 2017 6 commits
  4. 09 Aug, 2017 5 commits
  5. 08 Aug, 2017 4 commits
  6. 07 Aug, 2017 1 commit
  7. 27 Jul, 2017 3 commits
  8. 26 Jul, 2017 4 commits
  9. 25 Jul, 2017 8 commits
  10. 24 Jul, 2017 1 commit
  11. 19 Jul, 2017 1 commit
  12. 06 Jul, 2017 1 commit
  13. 05 Jun, 2017 1 commit
    • Raymond Knopp's avatar
      Merge branch 'develop' into RU-RAU-split · d23697ae
      Raymond Knopp authored
      Conflicts:
      	openair1/PHY/INIT/lte_init.c
      	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
      	openair1/PHY/LTE_TRANSPORT/dci.c
      	openair1/PHY/LTE_TRANSPORT/dci_tools.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
      	openair1/PHY/LTE_TRANSPORT/if4_tools.c
      	openair1/PHY/LTE_TRANSPORT/if5_tools.c
      	openair1/PHY/LTE_TRANSPORT/if5_tools.h
      	openair1/PHY/LTE_TRANSPORT/pcfich.c
      	openair1/PHY/LTE_TRANSPORT/phich.c
      	openair1/PHY/LTE_TRANSPORT/prach.c
      	openair1/PHY/LTE_TRANSPORT/rar_tools.c
      	openair1/PHY/LTE_TRANSPORT/srs_modulation.c
      	openair1/PHY/defs.h
      	openair1/PHY/impl_defs_lte.h
      	openair1/PHY/impl_defs_top.h
      	openair1/SCHED/phy_procedures_lte_eNb.c
      	openair1/SCHED/phy_procedures_lte_ue.c
      	openair2/COMMON/mac_rrc_primitives.h
      	openair2/ENB_APP/enb_config.c
      	openair2/ENB_APP/enb_config.h
      	openair2/LAYER2/MAC/config.c
      	openair2/LAYER2/MAC/eNB_scheduler.c
      	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
      	openair2/LAYER2/MAC/eNB_scheduler_mch.c
      	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
      	openair2/LAYER2/MAC/main.c
      	openair2/LAYER2/MAC/proto.h
      	openair2/RRC/LITE/MESSAGES/asn1_msg.c
      	openair2/RRC/LITE/MESSAGES/asn1_msg.h
      	openair2/RRC/LITE/rrc_UE.c
      	openair2/RRC/LITE/rrc_common.c
      	openair2/RRC/LITE/rrc_eNB.c
      	targets/ARCH/COMMON/common_lib.c
      	targets/ARCH/COMMON/common_lib.h
      	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
      	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
      	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
      	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
      	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
      	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
      	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
      	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
      	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
      	targets/RT/USER/lte-enb.c
      	targets/RT/USER/lte-softmodem.c
      	targets/RT/USER/lte-ue.c
      	targets/RT/USER/rt_wrapper.h
      	targets/SIMU/USER/channel_sim.c
      	targets/SIMU/USER/init_lte.c
      	targets/SIMU/USER/oaisim.c
      	targets/SIMU/USER/oaisim_functions.c
      d23697ae